diff --git a/compatibility/smoke/Proto2StaleGencodeSmokeTest.java b/compatibility/smoke/Proto2StaleGencodeSmokeTest.java
new file mode 100644
index 0000000000000..80c5811d78846
--- /dev/null
+++ b/compatibility/smoke/Proto2StaleGencodeSmokeTest.java
@@ -0,0 +1,41 @@
+package smoke;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import legacy_gencode_test.proto2.Proto2GencodeTestProto;
+import legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+public class Proto2StaleGencodeSmokeTest {
+  @Test
+  public void testProto2Extensions() throws Exception {
+    com.google.protobuf.ExtensionRegistry registry = com.google.protobuf.ExtensionRegistry.newInstance();
+    Proto2GencodeTestProto.registerAllExtensions(registry);
+
+    TestMostTypesProto2.Builder b = TestMostTypesProto2.newBuilder();
+    b.setExtension(Proto2GencodeTestProto.extensionInt32, 123);
+    
+    Proto2GencodeTestProto.ForeignMessage.Builder fb = Proto2GencodeTestProto.ForeignMessage.newBuilder();
+    fb.setC(456);
+    b.setExtension(Proto2GencodeTestProto.extensionMessage, fb.build());
+
+    TestMostTypesProto2 msg = b.build();
+    
+    assertThat(msg.hasExtension(Proto2GencodeTestProto.extensionInt32)).isTrue();
+    assertThat(msg.getExtension(Proto2GencodeTestProto.extensionInt32)).isEqualTo(123);
+    assertThat(msg.hasExtension(Proto2GencodeTestProto.extensionMessage)).isTrue();
+    assertThat(msg.getExtension(Proto2GencodeTestProto.extensionMessage).getC()).isEqualTo(456);
+
+    byte[] bytes = msg.toByteArray();
+    TestMostTypesProto2 parsed = TestMostTypesProto2.parseFrom(bytes, registry);
+    
+    assertThat(parsed.hasExtension(Proto2GencodeTestProto.extensionInt32)).isTrue();
+    assertThat(parsed.getExtension(Proto2GencodeTestProto.extensionInt32)).isEqualTo(123);
+    assertThat(parsed.hasExtension(Proto2GencodeTestProto.extensionMessage)).isTrue();
+    assertThat(parsed.getExtension(Proto2GencodeTestProto.extensionMessage).getC()).isEqualTo(456);
+  }
+}
diff --git a/compatibility/smoke/add_gencode.sh b/compatibility/smoke/add_gencode.sh
index 3b51b40436604..a07d884542338 100755
--- a/compatibility/smoke/add_gencode.sh
+++ b/compatibility/smoke/add_gencode.sh
@@ -10,11 +10,11 @@ VER="$1"
 TMP_DIR="/tmp/protoc-$VER/"
 
 # Cleanup the tmp dir on either clean or dirty exit
-trap "rm -r \"$TMP_DIR\"" EXIT
+trap "rm -rf \"$TMP_DIR\"" EXIT
 
 cd /tmp/
 wget -O protoc-$VER.zip "https://github.com/protocolbuffers/protobuf/releases/download/v$VER/protoc-$VER-linux-x86_64.zip"
-unzip protoc-$VER.zip -d "protoc-$VER/"
+unzip -o protoc-$VER.zip -d "protoc-$VER/"
 cd -
 
 PROTOC="/tmp/protoc-$VER/bin/protoc"
@@ -23,6 +23,20 @@ $PROTOC --version
 
 mkdir -p v$VER
 $PROTOC proto3_gencode_test.proto --java_out=v$VER
+# Extract the first segment of the version. Note that up to 3.20.0 the release versioning was
+# 3.x (major.minor.point), and after that it transitioned to 21.x (which corresponds to the
+# Java runtime's minor version, e.g. release 21.0 is Java 3.21.0).
+MAJOR="${VER%%.*}"
+
+# Proto2 extendable messages generated before 3.25.8 are not source compatible with the 4.x runtime
+# due to a generic typing conflict.
+if (( MAJOR < 25 )); then
+  echo "Skipping proto2 for $VER"
+else
+  $PROTOC proto2_gencode_test.proto --java_out=v$VER
+fi
+
+
 
 cp CHECKED_IN_GENCODE_BUILD.bazel.template v$VER/BUILD.bazel
 
diff --git a/compatibility/smoke/proto2_gencode_test.proto b/compatibility/smoke/proto2_gencode_test.proto
new file mode 100644
index 0000000000000..145610ef471cc
--- /dev/null
+++ b/compatibility/smoke/proto2_gencode_test.proto
@@ -0,0 +1,171 @@
+syntax = "proto2";
+
+package legacy_gencode_test.proto2;
+
+option java_outer_classname = "Proto2GencodeTestProto";
+
+message TestMessage {
+  optional string x = 2;
+  optional NestedTestMessage y = 3;
+}
+
+message NestedTestMessage {
+  repeated int32 z = 1;
+}
+
+// Proto2 version of TestMostTypesProto3
+message TestMostTypesProto2 {
+  message NestedMessage {
+    optional int32 a = 1;
+    optional TestMostTypesProto2 corecursive = 2;
+  }
+
+  enum NestedEnum {
+    FOO = 0;
+    BAR = 1;
+    BAZ = 2;
+    NEG = -1;
+  }
+
+  enum AliasedEnum {
+    option allow_alias = true;
+
+    ALIAS_FOO = 0;
+    ALIAS_BAR = 1;
+    ALIAS_BAZ = 2;
+    MOO = 2;
+    moo = 2;
+    bAz = 2;
+  }
+
+  optional int32 optional_int32 = 1;
+  optional int64 optional_int64 = 2;
+  optional uint32 optional_uint32 = 3;
+  optional uint64 optional_uint64 = 4;
+  optional sint32 optional_sint32 = 5;
+  optional sint64 optional_sint64 = 6;
+  optional fixed32 optional_fixed32 = 7;
+  optional fixed64 optional_fixed64 = 8;
+  optional sfixed32 optional_sfixed32 = 9;
+  optional sfixed64 optional_sfixed64 = 10;
+  optional float optional_float = 11;
+  optional double optional_double = 12;
+  optional bool optional_bool = 13;
+  optional string optional_string = 14;
+  optional bytes optional_bytes = 15;
+
+  optional NestedMessage optional_nested_message = 18;
+  optional ForeignMessage optional_foreign_message = 19;
+
+  optional NestedEnum optional_nested_enum = 21;
+  optional ForeignEnum optional_foreign_enum = 22;
+  optional AliasedEnum optional_aliased_enum = 23;
+
+  optional TestMostTypesProto2 recursive_message = 27;
+
+  // Repeated
+  repeated int32 repeated_int32 = 31;
+  repeated int64 repeated_int64 = 32;
+  repeated uint32 repeated_uint32 = 33;
+  repeated uint64 repeated_uint64 = 34;
+  repeated sint32 repeated_sint32 = 35;
+  repeated sint64 repeated_sint64 = 36;
+  repeated fixed32 repeated_fixed32 = 37;
+  repeated fixed64 repeated_fixed64 = 38;
+  repeated sfixed32 repeated_sfixed32 = 39;
+  repeated sfixed64 repeated_sfixed64 = 40;
+  repeated float repeated_float = 41;
+  repeated double repeated_double = 42;
+  repeated bool repeated_bool = 43;
+  repeated string repeated_string = 44;
+  repeated bytes repeated_bytes = 45;
+
+  repeated NestedMessage repeated_nested_message = 48;
+  repeated ForeignMessage repeated_foreign_message = 49;
+
+  repeated NestedEnum repeated_nested_enum = 51;
+  repeated ForeignEnum repeated_foreign_enum = 52;
+
+  // Packed
+  repeated int32 packed_int32 = 75 [packed = true];
+  repeated int64 packed_int64 = 76 [packed = true];
+  repeated uint32 packed_uint32 = 77 [packed = true];
+  repeated uint64 packed_uint64 = 78 [packed = true];
+  repeated sint32 packed_sint32 = 79 [packed = true];
+  repeated sint64 packed_sint64 = 80 [packed = true];
+  repeated fixed32 packed_fixed32 = 81 [packed = true];
+  repeated fixed64 packed_fixed64 = 82 [packed = true];
+  repeated sfixed32 packed_sfixed32 = 83 [packed = true];
+  repeated sfixed64 packed_sfixed64 = 84 [packed = true];
+  repeated float packed_float = 85 [packed = true];
+  repeated double packed_double = 86 [packed = true];
+  repeated bool packed_bool = 87 [packed = true];
+  repeated NestedEnum packed_nested_enum = 88 [packed = true];
+
+  // Unpacked
+  repeated int32 unpacked_int32 = 89 [packed = false];
+  repeated int64 unpacked_int64 = 90 [packed = false];
+  repeated uint32 unpacked_uint32 = 91 [packed = false];
+  repeated uint64 unpacked_uint64 = 92 [packed = false];
+  repeated sint32 unpacked_sint32 = 93 [packed = false];
+  repeated sint64 unpacked_sint64 = 94 [packed = false];
+  repeated fixed32 unpacked_fixed32 = 95 [packed = false];
+  repeated fixed64 unpacked_fixed64 = 96 [packed = false];
+  repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];
+  repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];
+  repeated float unpacked_float = 99 [packed = false];
+  repeated double unpacked_double = 100 [packed = false];
+  repeated bool unpacked_bool = 101 [packed = false];
+  repeated NestedEnum unpacked_nested_enum = 102 [packed = false];
+
+  // Map
+  map<int32, int32> map_int32_int32 = 56;
+  map<int64, int64> map_int64_int64 = 57;
+  map<uint32, uint32> map_uint32_uint32 = 58;
+  map<uint64, uint64> map_uint64_uint64 = 59;
+  map<sint32, sint32> map_sint32_sint32 = 60;
+  map<sint64, sint64> map_sint64_sint64 = 61;
+  map<fixed32, fixed32> map_fixed32_fixed32 = 62;
+  map<fixed64, fixed64> map_fixed64_fixed64 = 63;
+  map<sfixed32, sfixed32> map_sfixed32_sfixed32 = 64;
+  map<sfixed64, sfixed64> map_sfixed64_sfixed64 = 65;
+  map<int32, float> map_int32_float = 66;
+  map<int32, double> map_int32_double = 67;
+  map<bool, bool> map_bool_bool = 68;
+  map<string, string> map_string_string = 69;
+  map<string, bytes> map_string_bytes = 70;
+  map<string, NestedMessage> map_string_nested_message = 71;
+  map<string, ForeignMessage> map_string_foreign_message = 72;
+  map<string, NestedEnum> map_string_nested_enum = 73;
+  map<string, ForeignEnum> map_string_foreign_enum = 74;
+
+  oneof oneof_field {
+    uint32 oneof_uint32 = 111;
+    NestedMessage oneof_nested_message = 112;
+    string oneof_string = 113;
+    bytes oneof_bytes = 114;
+    bool oneof_bool = 115;
+    uint64 oneof_uint64 = 116;
+    float oneof_float = 117;
+    double oneof_double = 118;
+    NestedEnum oneof_enum = 119;
+  }
+
+  extensions 1000 to max;
+}
+
+message ForeignMessage {
+  optional int32 c = 1;
+}
+
+enum ForeignEnum {
+  FOREIGN_FOO = 0;
+  FOREIGN_BAR = 1;
+  FOREIGN_BAZ = 2;
+}
+
+// Extensions for TestMostTypesProto2
+extend TestMostTypesProto2 {
+  optional int32 extension_int32 = 1001;
+  optional ForeignMessage extension_message = 1002;
+}
diff --git a/compatibility/smoke/refresh_gencode.sh b/compatibility/smoke/refresh_gencode.sh
index 727114043b15d..a32daf7232c97 100755
--- a/compatibility/smoke/refresh_gencode.sh
+++ b/compatibility/smoke/refresh_gencode.sh
@@ -12,5 +12,5 @@ trap "mv ${build}.original ${build}" EXIT
 
 # Update the subdirs.
 for file in v*; do
-	add_gencode.sh "${file:1}"
+	./add_gencode.sh "${file:1}"
 done
diff --git a/compatibility/smoke/stale_gencode_smoke_test.bzl b/compatibility/smoke/stale_gencode_smoke_test.bzl
index 65e6198fe26fa..e756fb64a398c 100644
--- a/compatibility/smoke/stale_gencode_smoke_test.bzl
+++ b/compatibility/smoke/stale_gencode_smoke_test.bzl
@@ -14,3 +14,23 @@ def stale_gencode_smoke_test(version):
             "@protobuf_maven_dev//:junit_junit",
         ],
     )
+
+    # Proto2 extendable messages generated before 3.25.8 (release version 25.8) are not source
+    # compatible with the 4.x runtime due to a generic typing conflict. We skip versions with
+    # release major version < 25 (which covers 3.x and 21.x).
+    if int(version.split(".")[0]) >= 25:
+        java_test(
+            name = "stale_gencode_proto2_smoke_test_v%s" % version,
+            srcs = ["Proto2StaleGencodeSmokeTest.java"],
+            test_class = "smoke.Proto2StaleGencodeSmokeTest",
+            deps = [
+                "//java/core",
+                "//:protobuf_java",
+                "//:protobuf_java_util",
+                "//compatibility/smoke/v%s:checked_in_gencode" % version,
+                "@protobuf_maven_dev//:com_google_truth_truth",
+                "@protobuf_maven_dev//:junit_junit",
+            ],
+        )
+
+
diff --git a/compatibility/smoke/v25.8/BUILD.bazel b/compatibility/smoke/v25.8/BUILD.bazel
index 599ca4733284a..3194d76786471 100644
--- a/compatibility/smoke/v25.8/BUILD.bazel
+++ b/compatibility/smoke/v25.8/BUILD.bazel
@@ -1,8 +1,8 @@
 load("@rules_java//java:java_library.bzl", "java_library")
 
 java_library(
-    name = "checked_in_gencode",
-    srcs = glob(["**/*.java"]),
-    visibility = ["//compatibility:__subpackages__"],
-    deps = ["//:protobuf_java"],
+	name = "checked_in_gencode",
+	srcs = glob(["**/*.java"]),
+	deps = ["//:protobuf_java"],
+	visibility = ["//compatibility:__subpackages__"],
 )
diff --git a/compatibility/smoke/v25.8/legacy_gencode_test/proto2/Proto2GencodeTestProto.java b/compatibility/smoke/v25.8/legacy_gencode_test/proto2/Proto2GencodeTestProto.java
new file mode 100644
index 0000000000000..b53a3c5909dcf
--- /dev/null
+++ b/compatibility/smoke/v25.8/legacy_gencode_test/proto2/Proto2GencodeTestProto.java
@@ -0,0 +1,22639 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: proto2_gencode_test.proto
+
+// Protobuf Java Version: 3.25.8
+package legacy_gencode_test.proto2;
+
+public final class Proto2GencodeTestProto {
+  private Proto2GencodeTestProto() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+    registry.add(legacy_gencode_test.proto2.Proto2GencodeTestProto.extensionInt32);
+    registry.add(legacy_gencode_test.proto2.Proto2GencodeTestProto.extensionMessage);
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  /**
+   * Protobuf enum {@code legacy_gencode_test.proto2.ForeignEnum}
+   */
+  public enum ForeignEnum
+      implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     * <code>FOREIGN_FOO = 0;</code>
+     */
+    FOREIGN_FOO(0),
+    /**
+     * <code>FOREIGN_BAR = 1;</code>
+     */
+    FOREIGN_BAR(1),
+    /**
+     * <code>FOREIGN_BAZ = 2;</code>
+     */
+    FOREIGN_BAZ(2),
+    ;
+
+    /**
+     * <code>FOREIGN_FOO = 0;</code>
+     */
+    public static final int FOREIGN_FOO_VALUE = 0;
+    /**
+     * <code>FOREIGN_BAR = 1;</code>
+     */
+    public static final int FOREIGN_BAR_VALUE = 1;
+    /**
+     * <code>FOREIGN_BAZ = 2;</code>
+     */
+    public static final int FOREIGN_BAZ_VALUE = 2;
+
+
+    public final int getNumber() {
+      return value;
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static ForeignEnum valueOf(int value) {
+      return forNumber(value);
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     */
+    public static ForeignEnum forNumber(int value) {
+      switch (value) {
+        case 0: return FOREIGN_FOO;
+        case 1: return FOREIGN_BAR;
+        case 2: return FOREIGN_BAZ;
+        default: return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap<ForeignEnum>
+        internalGetValueMap() {
+      return internalValueMap;
+    }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        ForeignEnum> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap<ForeignEnum>() {
+            public ForeignEnum findValueByNumber(int number) {
+              return ForeignEnum.forNumber(number);
+            }
+          };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
+      return getDescriptor().getValues().get(ordinal());
+    }
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
+      return getDescriptor();
+    }
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.getDescriptor().getEnumTypes().get(0);
+    }
+
+    private static final ForeignEnum[] VALUES = values();
+
+    public static ForeignEnum valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private ForeignEnum(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:legacy_gencode_test.proto2.ForeignEnum)
+  }
+
+  public interface TestMessageOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:legacy_gencode_test.proto2.TestMessage)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>optional string x = 2;</code>
+     * @return Whether the x field is set.
+     */
+    boolean hasX();
+    /**
+     * <code>optional string x = 2;</code>
+     * @return The x.
+     */
+    java.lang.String getX();
+    /**
+     * <code>optional string x = 2;</code>
+     * @return The bytes for x.
+     */
+    com.google.protobuf.ByteString
+        getXBytes();
+
+    /**
+     * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+     * @return Whether the y field is set.
+     */
+    boolean hasY();
+    /**
+     * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+     * @return The y.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage getY();
+    /**
+     * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessageOrBuilder getYOrBuilder();
+  }
+  /**
+   * Protobuf type {@code legacy_gencode_test.proto2.TestMessage}
+   */
+  public static final class TestMessage extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:legacy_gencode_test.proto2.TestMessage)
+      TestMessageOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use TestMessage.newBuilder() to construct.
+    private TestMessage(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private TestMessage() {
+      x_ = "";
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new TestMessage();
+    }
+
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMessage_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMessage_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage.class, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage.Builder.class);
+    }
+
+    private int bitField0_;
+    public static final int X_FIELD_NUMBER = 2;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object x_ = "";
+    /**
+     * <code>optional string x = 2;</code>
+     * @return Whether the x field is set.
+     */
+    @java.lang.Override
+    public boolean hasX() {
+      return ((bitField0_ & 0x00000001) != 0);
+    }
+    /**
+     * <code>optional string x = 2;</code>
+     * @return The x.
+     */
+    @java.lang.Override
+    public java.lang.String getX() {
+      java.lang.Object ref = x_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
+          x_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     * <code>optional string x = 2;</code>
+     * @return The bytes for x.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getXBytes() {
+      java.lang.Object ref = x_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        x_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int Y_FIELD_NUMBER = 3;
+    private legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage y_;
+    /**
+     * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+     * @return Whether the y field is set.
+     */
+    @java.lang.Override
+    public boolean hasY() {
+      return ((bitField0_ & 0x00000002) != 0);
+    }
+    /**
+     * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+     * @return The y.
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage getY() {
+      return y_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.getDefaultInstance() : y_;
+    }
+    /**
+     * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessageOrBuilder getYOrBuilder() {
+      return y_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.getDefaultInstance() : y_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (((bitField0_ & 0x00000001) != 0)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 2, x_);
+      }
+      if (((bitField0_ & 0x00000002) != 0)) {
+        output.writeMessage(3, getY());
+      }
+      getUnknownFields().writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, x_);
+      }
+      if (((bitField0_ & 0x00000002) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(3, getY());
+      }
+      size += getUnknownFields().getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage)) {
+        return super.equals(obj);
+      }
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage other = (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage) obj;
+
+      if (hasX() != other.hasX()) return false;
+      if (hasX()) {
+        if (!getX()
+            .equals(other.getX())) return false;
+      }
+      if (hasY() != other.hasY()) return false;
+      if (hasY()) {
+        if (!getY()
+            .equals(other.getY())) return false;
+      }
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasX()) {
+        hash = (37 * hash) + X_FIELD_NUMBER;
+        hash = (53 * hash) + getX().hashCode();
+      }
+      if (hasY()) {
+        hash = (37 * hash) + Y_FIELD_NUMBER;
+        hash = (53 * hash) + getY().hashCode();
+      }
+      hash = (29 * hash) + getUnknownFields().hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code legacy_gencode_test.proto2.TestMessage}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:legacy_gencode_test.proto2.TestMessage)
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessageOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMessage_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMessage_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage.class, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage.Builder.class);
+      }
+
+      // Construct using legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+          getYFieldBuilder();
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        bitField0_ = 0;
+        x_ = "";
+        y_ = null;
+        if (yBuilder_ != null) {
+          yBuilder_.dispose();
+          yBuilder_ = null;
+        }
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMessage_descriptor;
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage getDefaultInstanceForType() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage build() {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage buildPartial() {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage result = new legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage result) {
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.x_ = x_;
+          to_bitField0_ |= 0x00000001;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.y_ = yBuilder_ == null
+              ? y_
+              : yBuilder_.build();
+          to_bitField0_ |= 0x00000002;
+        }
+        result.bitField0_ |= to_bitField0_;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage) {
+          return mergeFrom((legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage other) {
+        if (other == legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage.getDefaultInstance()) return this;
+        if (other.hasX()) {
+          x_ = other.x_;
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
+        if (other.hasY()) {
+          mergeY(other.getY());
+        }
+        this.mergeUnknownFields(other.getUnknownFields());
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
+        try {
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 18: {
+                x_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 18
+              case 26: {
+                input.readMessage(
+                    getYFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 26
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.unwrapIOException();
+        } finally {
+          onChanged();
+        } // finally
+        return this;
+      }
+      private int bitField0_;
+
+      private java.lang.Object x_ = "";
+      /**
+       * <code>optional string x = 2;</code>
+       * @return Whether the x field is set.
+       */
+      public boolean hasX() {
+        return ((bitField0_ & 0x00000001) != 0);
+      }
+      /**
+       * <code>optional string x = 2;</code>
+       * @return The x.
+       */
+      public java.lang.String getX() {
+        java.lang.Object ref = x_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          if (bs.isValidUtf8()) {
+            x_ = s;
+          }
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>optional string x = 2;</code>
+       * @return The bytes for x.
+       */
+      public com.google.protobuf.ByteString
+          getXBytes() {
+        java.lang.Object ref = x_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          x_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>optional string x = 2;</code>
+       * @param value The x to set.
+       * @return This builder for chaining.
+       */
+      public Builder setX(
+          java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
+        x_ = value;
+        bitField0_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string x = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearX() {
+        x_ = getDefaultInstance().getX();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string x = 2;</code>
+       * @param value The bytes for x to set.
+       * @return This builder for chaining.
+       */
+      public Builder setXBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
+        x_ = value;
+        bitField0_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+
+      private legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage y_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessageOrBuilder> yBuilder_;
+      /**
+       * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+       * @return Whether the y field is set.
+       */
+      public boolean hasY() {
+        return ((bitField0_ & 0x00000002) != 0);
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+       * @return The y.
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage getY() {
+        if (yBuilder_ == null) {
+          return y_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.getDefaultInstance() : y_;
+        } else {
+          return yBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+       */
+      public Builder setY(legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage value) {
+        if (yBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          y_ = value;
+        } else {
+          yBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00000002;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+       */
+      public Builder setY(
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.Builder builderForValue) {
+        if (yBuilder_ == null) {
+          y_ = builderForValue.build();
+        } else {
+          yBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00000002;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+       */
+      public Builder mergeY(legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage value) {
+        if (yBuilder_ == null) {
+          if (((bitField0_ & 0x00000002) != 0) &&
+            y_ != null &&
+            y_ != legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.getDefaultInstance()) {
+            getYBuilder().mergeFrom(value);
+          } else {
+            y_ = value;
+          }
+        } else {
+          yBuilder_.mergeFrom(value);
+        }
+        if (y_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+       */
+      public Builder clearY() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        y_ = null;
+        if (yBuilder_ != null) {
+          yBuilder_.dispose();
+          yBuilder_ = null;
+        }
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.Builder getYBuilder() {
+        bitField0_ |= 0x00000002;
+        onChanged();
+        return getYFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessageOrBuilder getYOrBuilder() {
+        if (yBuilder_ != null) {
+          return yBuilder_.getMessageOrBuilder();
+        } else {
+          return y_ == null ?
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.getDefaultInstance() : y_;
+        }
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessageOrBuilder> 
+          getYFieldBuilder() {
+        if (yBuilder_ == null) {
+          yBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessageOrBuilder>(
+                  getY(),
+                  getParentForChildren(),
+                  isClean());
+          y_ = null;
+        }
+        return yBuilder_;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:legacy_gencode_test.proto2.TestMessage)
+    }
+
+    // @@protoc_insertion_point(class_scope:legacy_gencode_test.proto2.TestMessage)
+    private static final legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage();
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<TestMessage>
+        PARSER = new com.google.protobuf.AbstractParser<TestMessage>() {
+      @java.lang.Override
+      public TestMessage parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (com.google.protobuf.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new com.google.protobuf.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
+      }
+    };
+
+    public static com.google.protobuf.Parser<TestMessage> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<TestMessage> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  public interface NestedTestMessageOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:legacy_gencode_test.proto2.NestedTestMessage)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>repeated int32 z = 1;</code>
+     * @return A list containing the z.
+     */
+    java.util.List<java.lang.Integer> getZList();
+    /**
+     * <code>repeated int32 z = 1;</code>
+     * @return The count of z.
+     */
+    int getZCount();
+    /**
+     * <code>repeated int32 z = 1;</code>
+     * @param index The index of the element to return.
+     * @return The z at the given index.
+     */
+    int getZ(int index);
+  }
+  /**
+   * Protobuf type {@code legacy_gencode_test.proto2.NestedTestMessage}
+   */
+  public static final class NestedTestMessage extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:legacy_gencode_test.proto2.NestedTestMessage)
+      NestedTestMessageOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use NestedTestMessage.newBuilder() to construct.
+    private NestedTestMessage(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private NestedTestMessage() {
+      z_ = emptyIntList();
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new NestedTestMessage();
+    }
+
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_NestedTestMessage_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_NestedTestMessage_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.class, legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.Builder.class);
+    }
+
+    public static final int Z_FIELD_NUMBER = 1;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList z_ =
+        emptyIntList();
+    /**
+     * <code>repeated int32 z = 1;</code>
+     * @return A list containing the z.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getZList() {
+      return z_;
+    }
+    /**
+     * <code>repeated int32 z = 1;</code>
+     * @return The count of z.
+     */
+    public int getZCount() {
+      return z_.size();
+    }
+    /**
+     * <code>repeated int32 z = 1;</code>
+     * @param index The index of the element to return.
+     * @return The z at the given index.
+     */
+    public int getZ(int index) {
+      return z_.getInt(index);
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      for (int i = 0; i < z_.size(); i++) {
+        output.writeInt32(1, z_.getInt(i));
+      }
+      getUnknownFields().writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      {
+        int dataSize = 0;
+        for (int i = 0; i < z_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt32SizeNoTag(z_.getInt(i));
+        }
+        size += dataSize;
+        size += 1 * getZList().size();
+      }
+      size += getUnknownFields().getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage)) {
+        return super.equals(obj);
+      }
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage other = (legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage) obj;
+
+      if (!getZList()
+          .equals(other.getZList())) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (getZCount() > 0) {
+        hash = (37 * hash) + Z_FIELD_NUMBER;
+        hash = (53 * hash) + getZList().hashCode();
+      }
+      hash = (29 * hash) + getUnknownFields().hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code legacy_gencode_test.proto2.NestedTestMessage}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:legacy_gencode_test.proto2.NestedTestMessage)
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessageOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_NestedTestMessage_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_NestedTestMessage_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.class, legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.Builder.class);
+      }
+
+      // Construct using legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.newBuilder()
+      private Builder() {
+
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        bitField0_ = 0;
+        z_ = emptyIntList();
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_NestedTestMessage_descriptor;
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage getDefaultInstanceForType() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage build() {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage buildPartial() {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage result = new legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          z_.makeImmutable();
+          result.z_ = z_;
+        }
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage) {
+          return mergeFrom((legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage other) {
+        if (other == legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.getDefaultInstance()) return this;
+        if (!other.z_.isEmpty()) {
+          if (z_.isEmpty()) {
+            z_ = other.z_;
+            z_.makeImmutable();
+            bitField0_ |= 0x00000001;
+          } else {
+            ensureZIsMutable();
+            z_.addAll(other.z_);
+          }
+          onChanged();
+        }
+        this.mergeUnknownFields(other.getUnknownFields());
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
+        try {
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                int v = input.readInt32();
+                ensureZIsMutable();
+                z_.addInt(v);
+                break;
+              } // case 8
+              case 10: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureZIsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  z_.addInt(input.readInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.unwrapIOException();
+        } finally {
+          onChanged();
+        } // finally
+        return this;
+      }
+      private int bitField0_;
+
+      private com.google.protobuf.Internal.IntList z_ = emptyIntList();
+      private void ensureZIsMutable() {
+        if (!z_.isModifiable()) {
+          z_ = makeMutableCopy(z_);
+        }
+        bitField0_ |= 0x00000001;
+      }
+      /**
+       * <code>repeated int32 z = 1;</code>
+       * @return A list containing the z.
+       */
+      public java.util.List<java.lang.Integer>
+          getZList() {
+        z_.makeImmutable();
+        return z_;
+      }
+      /**
+       * <code>repeated int32 z = 1;</code>
+       * @return The count of z.
+       */
+      public int getZCount() {
+        return z_.size();
+      }
+      /**
+       * <code>repeated int32 z = 1;</code>
+       * @param index The index of the element to return.
+       * @return The z at the given index.
+       */
+      public int getZ(int index) {
+        return z_.getInt(index);
+      }
+      /**
+       * <code>repeated int32 z = 1;</code>
+       * @param index The index to set the value at.
+       * @param value The z to set.
+       * @return This builder for chaining.
+       */
+      public Builder setZ(
+          int index, int value) {
+
+        ensureZIsMutable();
+        z_.setInt(index, value);
+        bitField0_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 z = 1;</code>
+       * @param value The z to add.
+       * @return This builder for chaining.
+       */
+      public Builder addZ(int value) {
+
+        ensureZIsMutable();
+        z_.addInt(value);
+        bitField0_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 z = 1;</code>
+       * @param values The z to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllZ(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureZIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, z_);
+        bitField0_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 z = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearZ() {
+        z_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:legacy_gencode_test.proto2.NestedTestMessage)
+    }
+
+    // @@protoc_insertion_point(class_scope:legacy_gencode_test.proto2.NestedTestMessage)
+    private static final legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage();
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<NestedTestMessage>
+        PARSER = new com.google.protobuf.AbstractParser<NestedTestMessage>() {
+      @java.lang.Override
+      public NestedTestMessage parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (com.google.protobuf.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new com.google.protobuf.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
+      }
+    };
+
+    public static com.google.protobuf.Parser<NestedTestMessage> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<NestedTestMessage> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  public interface TestMostTypesProto2OrBuilder extends
+      // @@protoc_insertion_point(interface_extends:legacy_gencode_test.proto2.TestMostTypesProto2)
+      com.google.protobuf.GeneratedMessageV3.
+          ExtendableMessageOrBuilder<TestMostTypesProto2> {
+
+    /**
+     * <code>optional int32 optional_int32 = 1;</code>
+     * @return Whether the optionalInt32 field is set.
+     */
+    boolean hasOptionalInt32();
+    /**
+     * <code>optional int32 optional_int32 = 1;</code>
+     * @return The optionalInt32.
+     */
+    int getOptionalInt32();
+
+    /**
+     * <code>optional int64 optional_int64 = 2;</code>
+     * @return Whether the optionalInt64 field is set.
+     */
+    boolean hasOptionalInt64();
+    /**
+     * <code>optional int64 optional_int64 = 2;</code>
+     * @return The optionalInt64.
+     */
+    long getOptionalInt64();
+
+    /**
+     * <code>optional uint32 optional_uint32 = 3;</code>
+     * @return Whether the optionalUint32 field is set.
+     */
+    boolean hasOptionalUint32();
+    /**
+     * <code>optional uint32 optional_uint32 = 3;</code>
+     * @return The optionalUint32.
+     */
+    int getOptionalUint32();
+
+    /**
+     * <code>optional uint64 optional_uint64 = 4;</code>
+     * @return Whether the optionalUint64 field is set.
+     */
+    boolean hasOptionalUint64();
+    /**
+     * <code>optional uint64 optional_uint64 = 4;</code>
+     * @return The optionalUint64.
+     */
+    long getOptionalUint64();
+
+    /**
+     * <code>optional sint32 optional_sint32 = 5;</code>
+     * @return Whether the optionalSint32 field is set.
+     */
+    boolean hasOptionalSint32();
+    /**
+     * <code>optional sint32 optional_sint32 = 5;</code>
+     * @return The optionalSint32.
+     */
+    int getOptionalSint32();
+
+    /**
+     * <code>optional sint64 optional_sint64 = 6;</code>
+     * @return Whether the optionalSint64 field is set.
+     */
+    boolean hasOptionalSint64();
+    /**
+     * <code>optional sint64 optional_sint64 = 6;</code>
+     * @return The optionalSint64.
+     */
+    long getOptionalSint64();
+
+    /**
+     * <code>optional fixed32 optional_fixed32 = 7;</code>
+     * @return Whether the optionalFixed32 field is set.
+     */
+    boolean hasOptionalFixed32();
+    /**
+     * <code>optional fixed32 optional_fixed32 = 7;</code>
+     * @return The optionalFixed32.
+     */
+    int getOptionalFixed32();
+
+    /**
+     * <code>optional fixed64 optional_fixed64 = 8;</code>
+     * @return Whether the optionalFixed64 field is set.
+     */
+    boolean hasOptionalFixed64();
+    /**
+     * <code>optional fixed64 optional_fixed64 = 8;</code>
+     * @return The optionalFixed64.
+     */
+    long getOptionalFixed64();
+
+    /**
+     * <code>optional sfixed32 optional_sfixed32 = 9;</code>
+     * @return Whether the optionalSfixed32 field is set.
+     */
+    boolean hasOptionalSfixed32();
+    /**
+     * <code>optional sfixed32 optional_sfixed32 = 9;</code>
+     * @return The optionalSfixed32.
+     */
+    int getOptionalSfixed32();
+
+    /**
+     * <code>optional sfixed64 optional_sfixed64 = 10;</code>
+     * @return Whether the optionalSfixed64 field is set.
+     */
+    boolean hasOptionalSfixed64();
+    /**
+     * <code>optional sfixed64 optional_sfixed64 = 10;</code>
+     * @return The optionalSfixed64.
+     */
+    long getOptionalSfixed64();
+
+    /**
+     * <code>optional float optional_float = 11;</code>
+     * @return Whether the optionalFloat field is set.
+     */
+    boolean hasOptionalFloat();
+    /**
+     * <code>optional float optional_float = 11;</code>
+     * @return The optionalFloat.
+     */
+    float getOptionalFloat();
+
+    /**
+     * <code>optional double optional_double = 12;</code>
+     * @return Whether the optionalDouble field is set.
+     */
+    boolean hasOptionalDouble();
+    /**
+     * <code>optional double optional_double = 12;</code>
+     * @return The optionalDouble.
+     */
+    double getOptionalDouble();
+
+    /**
+     * <code>optional bool optional_bool = 13;</code>
+     * @return Whether the optionalBool field is set.
+     */
+    boolean hasOptionalBool();
+    /**
+     * <code>optional bool optional_bool = 13;</code>
+     * @return The optionalBool.
+     */
+    boolean getOptionalBool();
+
+    /**
+     * <code>optional string optional_string = 14;</code>
+     * @return Whether the optionalString field is set.
+     */
+    boolean hasOptionalString();
+    /**
+     * <code>optional string optional_string = 14;</code>
+     * @return The optionalString.
+     */
+    java.lang.String getOptionalString();
+    /**
+     * <code>optional string optional_string = 14;</code>
+     * @return The bytes for optionalString.
+     */
+    com.google.protobuf.ByteString
+        getOptionalStringBytes();
+
+    /**
+     * <code>optional bytes optional_bytes = 15;</code>
+     * @return Whether the optionalBytes field is set.
+     */
+    boolean hasOptionalBytes();
+    /**
+     * <code>optional bytes optional_bytes = 15;</code>
+     * @return The optionalBytes.
+     */
+    com.google.protobuf.ByteString getOptionalBytes();
+
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+     * @return Whether the optionalNestedMessage field is set.
+     */
+    boolean hasOptionalNestedMessage();
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+     * @return The optionalNestedMessage.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getOptionalNestedMessage();
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder getOptionalNestedMessageOrBuilder();
+
+    /**
+     * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+     * @return Whether the optionalForeignMessage field is set.
+     */
+    boolean hasOptionalForeignMessage();
+    /**
+     * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+     * @return The optionalForeignMessage.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getOptionalForeignMessage();
+    /**
+     * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder getOptionalForeignMessageOrBuilder();
+
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum optional_nested_enum = 21;</code>
+     * @return Whether the optionalNestedEnum field is set.
+     */
+    boolean hasOptionalNestedEnum();
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum optional_nested_enum = 21;</code>
+     * @return The optionalNestedEnum.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getOptionalNestedEnum();
+
+    /**
+     * <code>optional .legacy_gencode_test.proto2.ForeignEnum optional_foreign_enum = 22;</code>
+     * @return Whether the optionalForeignEnum field is set.
+     */
+    boolean hasOptionalForeignEnum();
+    /**
+     * <code>optional .legacy_gencode_test.proto2.ForeignEnum optional_foreign_enum = 22;</code>
+     * @return The optionalForeignEnum.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getOptionalForeignEnum();
+
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.AliasedEnum optional_aliased_enum = 23;</code>
+     * @return Whether the optionalAliasedEnum field is set.
+     */
+    boolean hasOptionalAliasedEnum();
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.AliasedEnum optional_aliased_enum = 23;</code>
+     * @return The optionalAliasedEnum.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum getOptionalAliasedEnum();
+
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+     * @return Whether the recursiveMessage field is set.
+     */
+    boolean hasRecursiveMessage();
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+     * @return The recursiveMessage.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 getRecursiveMessage();
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder getRecursiveMessageOrBuilder();
+
+    /**
+     * <pre>
+     * Repeated
+     * </pre>
+     *
+     * <code>repeated int32 repeated_int32 = 31;</code>
+     * @return A list containing the repeatedInt32.
+     */
+    java.util.List<java.lang.Integer> getRepeatedInt32List();
+    /**
+     * <pre>
+     * Repeated
+     * </pre>
+     *
+     * <code>repeated int32 repeated_int32 = 31;</code>
+     * @return The count of repeatedInt32.
+     */
+    int getRepeatedInt32Count();
+    /**
+     * <pre>
+     * Repeated
+     * </pre>
+     *
+     * <code>repeated int32 repeated_int32 = 31;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedInt32 at the given index.
+     */
+    int getRepeatedInt32(int index);
+
+    /**
+     * <code>repeated int64 repeated_int64 = 32;</code>
+     * @return A list containing the repeatedInt64.
+     */
+    java.util.List<java.lang.Long> getRepeatedInt64List();
+    /**
+     * <code>repeated int64 repeated_int64 = 32;</code>
+     * @return The count of repeatedInt64.
+     */
+    int getRepeatedInt64Count();
+    /**
+     * <code>repeated int64 repeated_int64 = 32;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedInt64 at the given index.
+     */
+    long getRepeatedInt64(int index);
+
+    /**
+     * <code>repeated uint32 repeated_uint32 = 33;</code>
+     * @return A list containing the repeatedUint32.
+     */
+    java.util.List<java.lang.Integer> getRepeatedUint32List();
+    /**
+     * <code>repeated uint32 repeated_uint32 = 33;</code>
+     * @return The count of repeatedUint32.
+     */
+    int getRepeatedUint32Count();
+    /**
+     * <code>repeated uint32 repeated_uint32 = 33;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedUint32 at the given index.
+     */
+    int getRepeatedUint32(int index);
+
+    /**
+     * <code>repeated uint64 repeated_uint64 = 34;</code>
+     * @return A list containing the repeatedUint64.
+     */
+    java.util.List<java.lang.Long> getRepeatedUint64List();
+    /**
+     * <code>repeated uint64 repeated_uint64 = 34;</code>
+     * @return The count of repeatedUint64.
+     */
+    int getRepeatedUint64Count();
+    /**
+     * <code>repeated uint64 repeated_uint64 = 34;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedUint64 at the given index.
+     */
+    long getRepeatedUint64(int index);
+
+    /**
+     * <code>repeated sint32 repeated_sint32 = 35;</code>
+     * @return A list containing the repeatedSint32.
+     */
+    java.util.List<java.lang.Integer> getRepeatedSint32List();
+    /**
+     * <code>repeated sint32 repeated_sint32 = 35;</code>
+     * @return The count of repeatedSint32.
+     */
+    int getRepeatedSint32Count();
+    /**
+     * <code>repeated sint32 repeated_sint32 = 35;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedSint32 at the given index.
+     */
+    int getRepeatedSint32(int index);
+
+    /**
+     * <code>repeated sint64 repeated_sint64 = 36;</code>
+     * @return A list containing the repeatedSint64.
+     */
+    java.util.List<java.lang.Long> getRepeatedSint64List();
+    /**
+     * <code>repeated sint64 repeated_sint64 = 36;</code>
+     * @return The count of repeatedSint64.
+     */
+    int getRepeatedSint64Count();
+    /**
+     * <code>repeated sint64 repeated_sint64 = 36;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedSint64 at the given index.
+     */
+    long getRepeatedSint64(int index);
+
+    /**
+     * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+     * @return A list containing the repeatedFixed32.
+     */
+    java.util.List<java.lang.Integer> getRepeatedFixed32List();
+    /**
+     * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+     * @return The count of repeatedFixed32.
+     */
+    int getRepeatedFixed32Count();
+    /**
+     * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedFixed32 at the given index.
+     */
+    int getRepeatedFixed32(int index);
+
+    /**
+     * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+     * @return A list containing the repeatedFixed64.
+     */
+    java.util.List<java.lang.Long> getRepeatedFixed64List();
+    /**
+     * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+     * @return The count of repeatedFixed64.
+     */
+    int getRepeatedFixed64Count();
+    /**
+     * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedFixed64 at the given index.
+     */
+    long getRepeatedFixed64(int index);
+
+    /**
+     * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+     * @return A list containing the repeatedSfixed32.
+     */
+    java.util.List<java.lang.Integer> getRepeatedSfixed32List();
+    /**
+     * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+     * @return The count of repeatedSfixed32.
+     */
+    int getRepeatedSfixed32Count();
+    /**
+     * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedSfixed32 at the given index.
+     */
+    int getRepeatedSfixed32(int index);
+
+    /**
+     * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+     * @return A list containing the repeatedSfixed64.
+     */
+    java.util.List<java.lang.Long> getRepeatedSfixed64List();
+    /**
+     * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+     * @return The count of repeatedSfixed64.
+     */
+    int getRepeatedSfixed64Count();
+    /**
+     * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedSfixed64 at the given index.
+     */
+    long getRepeatedSfixed64(int index);
+
+    /**
+     * <code>repeated float repeated_float = 41;</code>
+     * @return A list containing the repeatedFloat.
+     */
+    java.util.List<java.lang.Float> getRepeatedFloatList();
+    /**
+     * <code>repeated float repeated_float = 41;</code>
+     * @return The count of repeatedFloat.
+     */
+    int getRepeatedFloatCount();
+    /**
+     * <code>repeated float repeated_float = 41;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedFloat at the given index.
+     */
+    float getRepeatedFloat(int index);
+
+    /**
+     * <code>repeated double repeated_double = 42;</code>
+     * @return A list containing the repeatedDouble.
+     */
+    java.util.List<java.lang.Double> getRepeatedDoubleList();
+    /**
+     * <code>repeated double repeated_double = 42;</code>
+     * @return The count of repeatedDouble.
+     */
+    int getRepeatedDoubleCount();
+    /**
+     * <code>repeated double repeated_double = 42;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedDouble at the given index.
+     */
+    double getRepeatedDouble(int index);
+
+    /**
+     * <code>repeated bool repeated_bool = 43;</code>
+     * @return A list containing the repeatedBool.
+     */
+    java.util.List<java.lang.Boolean> getRepeatedBoolList();
+    /**
+     * <code>repeated bool repeated_bool = 43;</code>
+     * @return The count of repeatedBool.
+     */
+    int getRepeatedBoolCount();
+    /**
+     * <code>repeated bool repeated_bool = 43;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedBool at the given index.
+     */
+    boolean getRepeatedBool(int index);
+
+    /**
+     * <code>repeated string repeated_string = 44;</code>
+     * @return A list containing the repeatedString.
+     */
+    java.util.List<java.lang.String>
+        getRepeatedStringList();
+    /**
+     * <code>repeated string repeated_string = 44;</code>
+     * @return The count of repeatedString.
+     */
+    int getRepeatedStringCount();
+    /**
+     * <code>repeated string repeated_string = 44;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedString at the given index.
+     */
+    java.lang.String getRepeatedString(int index);
+    /**
+     * <code>repeated string repeated_string = 44;</code>
+     * @param index The index of the value to return.
+     * @return The bytes of the repeatedString at the given index.
+     */
+    com.google.protobuf.ByteString
+        getRepeatedStringBytes(int index);
+
+    /**
+     * <code>repeated bytes repeated_bytes = 45;</code>
+     * @return A list containing the repeatedBytes.
+     */
+    java.util.List<com.google.protobuf.ByteString> getRepeatedBytesList();
+    /**
+     * <code>repeated bytes repeated_bytes = 45;</code>
+     * @return The count of repeatedBytes.
+     */
+    int getRepeatedBytesCount();
+    /**
+     * <code>repeated bytes repeated_bytes = 45;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedBytes at the given index.
+     */
+    com.google.protobuf.ByteString getRepeatedBytes(int index);
+
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+     */
+    java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> 
+        getRepeatedNestedMessageList();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getRepeatedNestedMessage(int index);
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+     */
+    int getRepeatedNestedMessageCount();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+     */
+    java.util.List<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> 
+        getRepeatedNestedMessageOrBuilderList();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder getRepeatedNestedMessageOrBuilder(
+        int index);
+
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+     */
+    java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> 
+        getRepeatedForeignMessageList();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getRepeatedForeignMessage(int index);
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+     */
+    int getRepeatedForeignMessageCount();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+     */
+    java.util.List<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder> 
+        getRepeatedForeignMessageOrBuilderList();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder getRepeatedForeignMessageOrBuilder(
+        int index);
+
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+     * @return A list containing the repeatedNestedEnum.
+     */
+    java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> getRepeatedNestedEnumList();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+     * @return The count of repeatedNestedEnum.
+     */
+    int getRepeatedNestedEnumCount();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedNestedEnum at the given index.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getRepeatedNestedEnum(int index);
+
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+     * @return A list containing the repeatedForeignEnum.
+     */
+    java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum> getRepeatedForeignEnumList();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+     * @return The count of repeatedForeignEnum.
+     */
+    int getRepeatedForeignEnumCount();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedForeignEnum at the given index.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getRepeatedForeignEnum(int index);
+
+    /**
+     * <pre>
+     * Packed
+     * </pre>
+     *
+     * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+     * @return A list containing the packedInt32.
+     */
+    java.util.List<java.lang.Integer> getPackedInt32List();
+    /**
+     * <pre>
+     * Packed
+     * </pre>
+     *
+     * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+     * @return The count of packedInt32.
+     */
+    int getPackedInt32Count();
+    /**
+     * <pre>
+     * Packed
+     * </pre>
+     *
+     * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedInt32 at the given index.
+     */
+    int getPackedInt32(int index);
+
+    /**
+     * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+     * @return A list containing the packedInt64.
+     */
+    java.util.List<java.lang.Long> getPackedInt64List();
+    /**
+     * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+     * @return The count of packedInt64.
+     */
+    int getPackedInt64Count();
+    /**
+     * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedInt64 at the given index.
+     */
+    long getPackedInt64(int index);
+
+    /**
+     * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+     * @return A list containing the packedUint32.
+     */
+    java.util.List<java.lang.Integer> getPackedUint32List();
+    /**
+     * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+     * @return The count of packedUint32.
+     */
+    int getPackedUint32Count();
+    /**
+     * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedUint32 at the given index.
+     */
+    int getPackedUint32(int index);
+
+    /**
+     * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+     * @return A list containing the packedUint64.
+     */
+    java.util.List<java.lang.Long> getPackedUint64List();
+    /**
+     * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+     * @return The count of packedUint64.
+     */
+    int getPackedUint64Count();
+    /**
+     * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedUint64 at the given index.
+     */
+    long getPackedUint64(int index);
+
+    /**
+     * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+     * @return A list containing the packedSint32.
+     */
+    java.util.List<java.lang.Integer> getPackedSint32List();
+    /**
+     * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+     * @return The count of packedSint32.
+     */
+    int getPackedSint32Count();
+    /**
+     * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedSint32 at the given index.
+     */
+    int getPackedSint32(int index);
+
+    /**
+     * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+     * @return A list containing the packedSint64.
+     */
+    java.util.List<java.lang.Long> getPackedSint64List();
+    /**
+     * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+     * @return The count of packedSint64.
+     */
+    int getPackedSint64Count();
+    /**
+     * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedSint64 at the given index.
+     */
+    long getPackedSint64(int index);
+
+    /**
+     * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+     * @return A list containing the packedFixed32.
+     */
+    java.util.List<java.lang.Integer> getPackedFixed32List();
+    /**
+     * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+     * @return The count of packedFixed32.
+     */
+    int getPackedFixed32Count();
+    /**
+     * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedFixed32 at the given index.
+     */
+    int getPackedFixed32(int index);
+
+    /**
+     * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+     * @return A list containing the packedFixed64.
+     */
+    java.util.List<java.lang.Long> getPackedFixed64List();
+    /**
+     * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+     * @return The count of packedFixed64.
+     */
+    int getPackedFixed64Count();
+    /**
+     * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedFixed64 at the given index.
+     */
+    long getPackedFixed64(int index);
+
+    /**
+     * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+     * @return A list containing the packedSfixed32.
+     */
+    java.util.List<java.lang.Integer> getPackedSfixed32List();
+    /**
+     * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+     * @return The count of packedSfixed32.
+     */
+    int getPackedSfixed32Count();
+    /**
+     * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedSfixed32 at the given index.
+     */
+    int getPackedSfixed32(int index);
+
+    /**
+     * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+     * @return A list containing the packedSfixed64.
+     */
+    java.util.List<java.lang.Long> getPackedSfixed64List();
+    /**
+     * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+     * @return The count of packedSfixed64.
+     */
+    int getPackedSfixed64Count();
+    /**
+     * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedSfixed64 at the given index.
+     */
+    long getPackedSfixed64(int index);
+
+    /**
+     * <code>repeated float packed_float = 85 [packed = true];</code>
+     * @return A list containing the packedFloat.
+     */
+    java.util.List<java.lang.Float> getPackedFloatList();
+    /**
+     * <code>repeated float packed_float = 85 [packed = true];</code>
+     * @return The count of packedFloat.
+     */
+    int getPackedFloatCount();
+    /**
+     * <code>repeated float packed_float = 85 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedFloat at the given index.
+     */
+    float getPackedFloat(int index);
+
+    /**
+     * <code>repeated double packed_double = 86 [packed = true];</code>
+     * @return A list containing the packedDouble.
+     */
+    java.util.List<java.lang.Double> getPackedDoubleList();
+    /**
+     * <code>repeated double packed_double = 86 [packed = true];</code>
+     * @return The count of packedDouble.
+     */
+    int getPackedDoubleCount();
+    /**
+     * <code>repeated double packed_double = 86 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedDouble at the given index.
+     */
+    double getPackedDouble(int index);
+
+    /**
+     * <code>repeated bool packed_bool = 87 [packed = true];</code>
+     * @return A list containing the packedBool.
+     */
+    java.util.List<java.lang.Boolean> getPackedBoolList();
+    /**
+     * <code>repeated bool packed_bool = 87 [packed = true];</code>
+     * @return The count of packedBool.
+     */
+    int getPackedBoolCount();
+    /**
+     * <code>repeated bool packed_bool = 87 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedBool at the given index.
+     */
+    boolean getPackedBool(int index);
+
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+     * @return A list containing the packedNestedEnum.
+     */
+    java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> getPackedNestedEnumList();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+     * @return The count of packedNestedEnum.
+     */
+    int getPackedNestedEnumCount();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedNestedEnum at the given index.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getPackedNestedEnum(int index);
+
+    /**
+     * <pre>
+     * Unpacked
+     * </pre>
+     *
+     * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+     * @return A list containing the unpackedInt32.
+     */
+    java.util.List<java.lang.Integer> getUnpackedInt32List();
+    /**
+     * <pre>
+     * Unpacked
+     * </pre>
+     *
+     * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+     * @return The count of unpackedInt32.
+     */
+    int getUnpackedInt32Count();
+    /**
+     * <pre>
+     * Unpacked
+     * </pre>
+     *
+     * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedInt32 at the given index.
+     */
+    int getUnpackedInt32(int index);
+
+    /**
+     * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+     * @return A list containing the unpackedInt64.
+     */
+    java.util.List<java.lang.Long> getUnpackedInt64List();
+    /**
+     * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+     * @return The count of unpackedInt64.
+     */
+    int getUnpackedInt64Count();
+    /**
+     * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedInt64 at the given index.
+     */
+    long getUnpackedInt64(int index);
+
+    /**
+     * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+     * @return A list containing the unpackedUint32.
+     */
+    java.util.List<java.lang.Integer> getUnpackedUint32List();
+    /**
+     * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+     * @return The count of unpackedUint32.
+     */
+    int getUnpackedUint32Count();
+    /**
+     * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedUint32 at the given index.
+     */
+    int getUnpackedUint32(int index);
+
+    /**
+     * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+     * @return A list containing the unpackedUint64.
+     */
+    java.util.List<java.lang.Long> getUnpackedUint64List();
+    /**
+     * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+     * @return The count of unpackedUint64.
+     */
+    int getUnpackedUint64Count();
+    /**
+     * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedUint64 at the given index.
+     */
+    long getUnpackedUint64(int index);
+
+    /**
+     * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+     * @return A list containing the unpackedSint32.
+     */
+    java.util.List<java.lang.Integer> getUnpackedSint32List();
+    /**
+     * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+     * @return The count of unpackedSint32.
+     */
+    int getUnpackedSint32Count();
+    /**
+     * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedSint32 at the given index.
+     */
+    int getUnpackedSint32(int index);
+
+    /**
+     * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+     * @return A list containing the unpackedSint64.
+     */
+    java.util.List<java.lang.Long> getUnpackedSint64List();
+    /**
+     * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+     * @return The count of unpackedSint64.
+     */
+    int getUnpackedSint64Count();
+    /**
+     * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedSint64 at the given index.
+     */
+    long getUnpackedSint64(int index);
+
+    /**
+     * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+     * @return A list containing the unpackedFixed32.
+     */
+    java.util.List<java.lang.Integer> getUnpackedFixed32List();
+    /**
+     * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+     * @return The count of unpackedFixed32.
+     */
+    int getUnpackedFixed32Count();
+    /**
+     * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedFixed32 at the given index.
+     */
+    int getUnpackedFixed32(int index);
+
+    /**
+     * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+     * @return A list containing the unpackedFixed64.
+     */
+    java.util.List<java.lang.Long> getUnpackedFixed64List();
+    /**
+     * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+     * @return The count of unpackedFixed64.
+     */
+    int getUnpackedFixed64Count();
+    /**
+     * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedFixed64 at the given index.
+     */
+    long getUnpackedFixed64(int index);
+
+    /**
+     * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+     * @return A list containing the unpackedSfixed32.
+     */
+    java.util.List<java.lang.Integer> getUnpackedSfixed32List();
+    /**
+     * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+     * @return The count of unpackedSfixed32.
+     */
+    int getUnpackedSfixed32Count();
+    /**
+     * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedSfixed32 at the given index.
+     */
+    int getUnpackedSfixed32(int index);
+
+    /**
+     * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+     * @return A list containing the unpackedSfixed64.
+     */
+    java.util.List<java.lang.Long> getUnpackedSfixed64List();
+    /**
+     * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+     * @return The count of unpackedSfixed64.
+     */
+    int getUnpackedSfixed64Count();
+    /**
+     * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedSfixed64 at the given index.
+     */
+    long getUnpackedSfixed64(int index);
+
+    /**
+     * <code>repeated float unpacked_float = 99 [packed = false];</code>
+     * @return A list containing the unpackedFloat.
+     */
+    java.util.List<java.lang.Float> getUnpackedFloatList();
+    /**
+     * <code>repeated float unpacked_float = 99 [packed = false];</code>
+     * @return The count of unpackedFloat.
+     */
+    int getUnpackedFloatCount();
+    /**
+     * <code>repeated float unpacked_float = 99 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedFloat at the given index.
+     */
+    float getUnpackedFloat(int index);
+
+    /**
+     * <code>repeated double unpacked_double = 100 [packed = false];</code>
+     * @return A list containing the unpackedDouble.
+     */
+    java.util.List<java.lang.Double> getUnpackedDoubleList();
+    /**
+     * <code>repeated double unpacked_double = 100 [packed = false];</code>
+     * @return The count of unpackedDouble.
+     */
+    int getUnpackedDoubleCount();
+    /**
+     * <code>repeated double unpacked_double = 100 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedDouble at the given index.
+     */
+    double getUnpackedDouble(int index);
+
+    /**
+     * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+     * @return A list containing the unpackedBool.
+     */
+    java.util.List<java.lang.Boolean> getUnpackedBoolList();
+    /**
+     * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+     * @return The count of unpackedBool.
+     */
+    int getUnpackedBoolCount();
+    /**
+     * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedBool at the given index.
+     */
+    boolean getUnpackedBool(int index);
+
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+     * @return A list containing the unpackedNestedEnum.
+     */
+    java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> getUnpackedNestedEnumList();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+     * @return The count of unpackedNestedEnum.
+     */
+    int getUnpackedNestedEnumCount();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedNestedEnum at the given index.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getUnpackedNestedEnum(int index);
+
+    /**
+     * <pre>
+     * Map
+     * </pre>
+     *
+     * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+     */
+    int getMapInt32Int32Count();
+    /**
+     * <pre>
+     * Map
+     * </pre>
+     *
+     * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+     */
+    boolean containsMapInt32Int32(
+        int key);
+    /**
+     * Use {@link #getMapInt32Int32Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapInt32Int32();
+    /**
+     * <pre>
+     * Map
+     * </pre>
+     *
+     * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapInt32Int32Map();
+    /**
+     * <pre>
+     * Map
+     * </pre>
+     *
+     * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+     */
+    int getMapInt32Int32OrDefault(
+        int key,
+        int defaultValue);
+    /**
+     * <pre>
+     * Map
+     * </pre>
+     *
+     * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+     */
+    int getMapInt32Int32OrThrow(
+        int key);
+
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
+    int getMapInt64Int64Count();
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
+    boolean containsMapInt64Int64(
+        long key);
+    /**
+     * Use {@link #getMapInt64Int64Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapInt64Int64();
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapInt64Int64Map();
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
+    long getMapInt64Int64OrDefault(
+        long key,
+        long defaultValue);
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
+    long getMapInt64Int64OrThrow(
+        long key);
+
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
+    int getMapUint32Uint32Count();
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
+    boolean containsMapUint32Uint32(
+        int key);
+    /**
+     * Use {@link #getMapUint32Uint32Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapUint32Uint32();
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapUint32Uint32Map();
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
+    int getMapUint32Uint32OrDefault(
+        int key,
+        int defaultValue);
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
+    int getMapUint32Uint32OrThrow(
+        int key);
+
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
+    int getMapUint64Uint64Count();
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
+    boolean containsMapUint64Uint64(
+        long key);
+    /**
+     * Use {@link #getMapUint64Uint64Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapUint64Uint64();
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapUint64Uint64Map();
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
+    long getMapUint64Uint64OrDefault(
+        long key,
+        long defaultValue);
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
+    long getMapUint64Uint64OrThrow(
+        long key);
+
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
+    int getMapSint32Sint32Count();
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
+    boolean containsMapSint32Sint32(
+        int key);
+    /**
+     * Use {@link #getMapSint32Sint32Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapSint32Sint32();
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapSint32Sint32Map();
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
+    int getMapSint32Sint32OrDefault(
+        int key,
+        int defaultValue);
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
+    int getMapSint32Sint32OrThrow(
+        int key);
+
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
+    int getMapSint64Sint64Count();
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
+    boolean containsMapSint64Sint64(
+        long key);
+    /**
+     * Use {@link #getMapSint64Sint64Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapSint64Sint64();
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapSint64Sint64Map();
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
+    long getMapSint64Sint64OrDefault(
+        long key,
+        long defaultValue);
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
+    long getMapSint64Sint64OrThrow(
+        long key);
+
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
+    int getMapFixed32Fixed32Count();
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
+    boolean containsMapFixed32Fixed32(
+        int key);
+    /**
+     * Use {@link #getMapFixed32Fixed32Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapFixed32Fixed32();
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapFixed32Fixed32Map();
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
+    int getMapFixed32Fixed32OrDefault(
+        int key,
+        int defaultValue);
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
+    int getMapFixed32Fixed32OrThrow(
+        int key);
+
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
+    int getMapFixed64Fixed64Count();
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
+    boolean containsMapFixed64Fixed64(
+        long key);
+    /**
+     * Use {@link #getMapFixed64Fixed64Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapFixed64Fixed64();
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapFixed64Fixed64Map();
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
+    long getMapFixed64Fixed64OrDefault(
+        long key,
+        long defaultValue);
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
+    long getMapFixed64Fixed64OrThrow(
+        long key);
+
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    int getMapSfixed32Sfixed32Count();
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    boolean containsMapSfixed32Sfixed32(
+        int key);
+    /**
+     * Use {@link #getMapSfixed32Sfixed32Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapSfixed32Sfixed32();
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapSfixed32Sfixed32Map();
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    int getMapSfixed32Sfixed32OrDefault(
+        int key,
+        int defaultValue);
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    int getMapSfixed32Sfixed32OrThrow(
+        int key);
+
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    int getMapSfixed64Sfixed64Count();
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    boolean containsMapSfixed64Sfixed64(
+        long key);
+    /**
+     * Use {@link #getMapSfixed64Sfixed64Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapSfixed64Sfixed64();
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapSfixed64Sfixed64Map();
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    long getMapSfixed64Sfixed64OrDefault(
+        long key,
+        long defaultValue);
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    long getMapSfixed64Sfixed64OrThrow(
+        long key);
+
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    int getMapInt32FloatCount();
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    boolean containsMapInt32Float(
+        int key);
+    /**
+     * Use {@link #getMapInt32FloatMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Float>
+    getMapInt32Float();
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Float>
+    getMapInt32FloatMap();
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    float getMapInt32FloatOrDefault(
+        int key,
+        float defaultValue);
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    float getMapInt32FloatOrThrow(
+        int key);
+
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    int getMapInt32DoubleCount();
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    boolean containsMapInt32Double(
+        int key);
+    /**
+     * Use {@link #getMapInt32DoubleMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Double>
+    getMapInt32Double();
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Double>
+    getMapInt32DoubleMap();
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    double getMapInt32DoubleOrDefault(
+        int key,
+        double defaultValue);
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    double getMapInt32DoubleOrThrow(
+        int key);
+
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    int getMapBoolBoolCount();
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    boolean containsMapBoolBool(
+        boolean key);
+    /**
+     * Use {@link #getMapBoolBoolMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Boolean, java.lang.Boolean>
+    getMapBoolBool();
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    java.util.Map<java.lang.Boolean, java.lang.Boolean>
+    getMapBoolBoolMap();
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    boolean getMapBoolBoolOrDefault(
+        boolean key,
+        boolean defaultValue);
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    boolean getMapBoolBoolOrThrow(
+        boolean key);
+
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    int getMapStringStringCount();
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    boolean containsMapStringString(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringStringMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, java.lang.String>
+    getMapStringString();
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    java.util.Map<java.lang.String, java.lang.String>
+    getMapStringStringMap();
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    /* nullable */
+java.lang.String getMapStringStringOrDefault(
+        java.lang.String key,
+        /* nullable */
+java.lang.String defaultValue);
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    java.lang.String getMapStringStringOrThrow(
+        java.lang.String key);
+
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    int getMapStringBytesCount();
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    boolean containsMapStringBytes(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringBytesMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, com.google.protobuf.ByteString>
+    getMapStringBytes();
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    java.util.Map<java.lang.String, com.google.protobuf.ByteString>
+    getMapStringBytesMap();
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    /* nullable */
+com.google.protobuf.ByteString getMapStringBytesOrDefault(
+        java.lang.String key,
+        /* nullable */
+com.google.protobuf.ByteString defaultValue);
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    com.google.protobuf.ByteString getMapStringBytesOrThrow(
+        java.lang.String key);
+
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    int getMapStringNestedMessageCount();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    boolean containsMapStringNestedMessage(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringNestedMessageMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage>
+    getMapStringNestedMessage();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage>
+    getMapStringNestedMessageMap();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getMapStringNestedMessageOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage defaultValue);
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getMapStringNestedMessageOrThrow(
+        java.lang.String key);
+
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    int getMapStringForeignMessageCount();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    boolean containsMapStringForeignMessage(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringForeignMessageMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage>
+    getMapStringForeignMessage();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage>
+    getMapStringForeignMessageMap();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getMapStringForeignMessageOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage defaultValue);
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getMapStringForeignMessageOrThrow(
+        java.lang.String key);
+
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    int getMapStringNestedEnumCount();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    boolean containsMapStringNestedEnum(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringNestedEnumMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>
+    getMapStringNestedEnum();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>
+    getMapStringNestedEnumMap();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getMapStringNestedEnumOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum         defaultValue);
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getMapStringNestedEnumOrThrow(
+        java.lang.String key);
+
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    int getMapStringForeignEnumCount();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    boolean containsMapStringForeignEnum(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringForeignEnumMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum>
+    getMapStringForeignEnum();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum>
+    getMapStringForeignEnumMap();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getMapStringForeignEnumOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum         defaultValue);
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getMapStringForeignEnumOrThrow(
+        java.lang.String key);
+
+    /**
+     * <code>uint32 oneof_uint32 = 111;</code>
+     * @return Whether the oneofUint32 field is set.
+     */
+    boolean hasOneofUint32();
+    /**
+     * <code>uint32 oneof_uint32 = 111;</code>
+     * @return The oneofUint32.
+     */
+    int getOneofUint32();
+
+    /**
+     * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+     * @return Whether the oneofNestedMessage field is set.
+     */
+    boolean hasOneofNestedMessage();
+    /**
+     * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+     * @return The oneofNestedMessage.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getOneofNestedMessage();
+    /**
+     * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder getOneofNestedMessageOrBuilder();
+
+    /**
+     * <code>string oneof_string = 113;</code>
+     * @return Whether the oneofString field is set.
+     */
+    boolean hasOneofString();
+    /**
+     * <code>string oneof_string = 113;</code>
+     * @return The oneofString.
+     */
+    java.lang.String getOneofString();
+    /**
+     * <code>string oneof_string = 113;</code>
+     * @return The bytes for oneofString.
+     */
+    com.google.protobuf.ByteString
+        getOneofStringBytes();
+
+    /**
+     * <code>bytes oneof_bytes = 114;</code>
+     * @return Whether the oneofBytes field is set.
+     */
+    boolean hasOneofBytes();
+    /**
+     * <code>bytes oneof_bytes = 114;</code>
+     * @return The oneofBytes.
+     */
+    com.google.protobuf.ByteString getOneofBytes();
+
+    /**
+     * <code>bool oneof_bool = 115;</code>
+     * @return Whether the oneofBool field is set.
+     */
+    boolean hasOneofBool();
+    /**
+     * <code>bool oneof_bool = 115;</code>
+     * @return The oneofBool.
+     */
+    boolean getOneofBool();
+
+    /**
+     * <code>uint64 oneof_uint64 = 116;</code>
+     * @return Whether the oneofUint64 field is set.
+     */
+    boolean hasOneofUint64();
+    /**
+     * <code>uint64 oneof_uint64 = 116;</code>
+     * @return The oneofUint64.
+     */
+    long getOneofUint64();
+
+    /**
+     * <code>float oneof_float = 117;</code>
+     * @return Whether the oneofFloat field is set.
+     */
+    boolean hasOneofFloat();
+    /**
+     * <code>float oneof_float = 117;</code>
+     * @return The oneofFloat.
+     */
+    float getOneofFloat();
+
+    /**
+     * <code>double oneof_double = 118;</code>
+     * @return Whether the oneofDouble field is set.
+     */
+    boolean hasOneofDouble();
+    /**
+     * <code>double oneof_double = 118;</code>
+     * @return The oneofDouble.
+     */
+    double getOneofDouble();
+
+    /**
+     * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum oneof_enum = 119;</code>
+     * @return Whether the oneofEnum field is set.
+     */
+    boolean hasOneofEnum();
+    /**
+     * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum oneof_enum = 119;</code>
+     * @return The oneofEnum.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getOneofEnum();
+
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.OneofFieldCase getOneofFieldCase();
+  }
+  /**
+   * <pre>
+   * Proto2 version of TestMostTypesProto3
+   * </pre>
+   *
+   * Protobuf type {@code legacy_gencode_test.proto2.TestMostTypesProto2}
+   */
+  public static final class TestMostTypesProto2 extends
+      com.google.protobuf.GeneratedMessageV3.ExtendableMessage<
+        TestMostTypesProto2> implements
+      // @@protoc_insertion_point(message_implements:legacy_gencode_test.proto2.TestMostTypesProto2)
+      TestMostTypesProto2OrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use TestMostTypesProto2.newBuilder() to construct.
+    private TestMostTypesProto2(com.google.protobuf.GeneratedMessageV3.ExtendableBuilder<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2, ?> builder) {
+      super(builder);
+    }
+    private TestMostTypesProto2() {
+      optionalString_ = "";
+      optionalBytes_ = com.google.protobuf.ByteString.EMPTY;
+      optionalNestedEnum_ = 0;
+      optionalForeignEnum_ = 0;
+      optionalAliasedEnum_ = 0;
+      repeatedInt32_ = emptyIntList();
+      repeatedInt64_ = emptyLongList();
+      repeatedUint32_ = emptyIntList();
+      repeatedUint64_ = emptyLongList();
+      repeatedSint32_ = emptyIntList();
+      repeatedSint64_ = emptyLongList();
+      repeatedFixed32_ = emptyIntList();
+      repeatedFixed64_ = emptyLongList();
+      repeatedSfixed32_ = emptyIntList();
+      repeatedSfixed64_ = emptyLongList();
+      repeatedFloat_ = emptyFloatList();
+      repeatedDouble_ = emptyDoubleList();
+      repeatedBool_ = emptyBooleanList();
+      repeatedString_ =
+          com.google.protobuf.LazyStringArrayList.emptyList();
+      repeatedBytes_ = emptyList(com.google.protobuf.ByteString.class);
+      repeatedNestedMessage_ = java.util.Collections.emptyList();
+      repeatedForeignMessage_ = java.util.Collections.emptyList();
+      repeatedNestedEnum_ = java.util.Collections.emptyList();
+      repeatedForeignEnum_ = java.util.Collections.emptyList();
+      packedInt32_ = emptyIntList();
+      packedInt64_ = emptyLongList();
+      packedUint32_ = emptyIntList();
+      packedUint64_ = emptyLongList();
+      packedSint32_ = emptyIntList();
+      packedSint64_ = emptyLongList();
+      packedFixed32_ = emptyIntList();
+      packedFixed64_ = emptyLongList();
+      packedSfixed32_ = emptyIntList();
+      packedSfixed64_ = emptyLongList();
+      packedFloat_ = emptyFloatList();
+      packedDouble_ = emptyDoubleList();
+      packedBool_ = emptyBooleanList();
+      packedNestedEnum_ = java.util.Collections.emptyList();
+      unpackedInt32_ = emptyIntList();
+      unpackedInt64_ = emptyLongList();
+      unpackedUint32_ = emptyIntList();
+      unpackedUint64_ = emptyLongList();
+      unpackedSint32_ = emptyIntList();
+      unpackedSint64_ = emptyLongList();
+      unpackedFixed32_ = emptyIntList();
+      unpackedFixed64_ = emptyLongList();
+      unpackedSfixed32_ = emptyIntList();
+      unpackedSfixed64_ = emptyLongList();
+      unpackedFloat_ = emptyFloatList();
+      unpackedDouble_ = emptyDoubleList();
+      unpackedBool_ = emptyBooleanList();
+      unpackedNestedEnum_ = java.util.Collections.emptyList();
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new TestMostTypesProto2();
+    }
+
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor;
+    }
+
+    @SuppressWarnings({"rawtypes"})
+    @java.lang.Override
+    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
+        int number) {
+      switch (number) {
+        case 56:
+          return internalGetMapInt32Int32();
+        case 57:
+          return internalGetMapInt64Int64();
+        case 58:
+          return internalGetMapUint32Uint32();
+        case 59:
+          return internalGetMapUint64Uint64();
+        case 60:
+          return internalGetMapSint32Sint32();
+        case 61:
+          return internalGetMapSint64Sint64();
+        case 62:
+          return internalGetMapFixed32Fixed32();
+        case 63:
+          return internalGetMapFixed64Fixed64();
+        case 64:
+          return internalGetMapSfixed32Sfixed32();
+        case 65:
+          return internalGetMapSfixed64Sfixed64();
+        case 66:
+          return internalGetMapInt32Float();
+        case 67:
+          return internalGetMapInt32Double();
+        case 68:
+          return internalGetMapBoolBool();
+        case 69:
+          return internalGetMapStringString();
+        case 70:
+          return internalGetMapStringBytes();
+        case 71:
+          return internalGetMapStringNestedMessage();
+        case 72:
+          return internalGetMapStringForeignMessage();
+        case 73:
+          return internalGetMapStringNestedEnum();
+        case 74:
+          return internalGetMapStringForeignEnum();
+        default:
+          throw new RuntimeException(
+              "Invalid map field number: " + number);
+      }
+    }
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.class, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder.class);
+    }
+
+    /**
+     * Protobuf enum {@code legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum}
+     */
+    public enum NestedEnum
+        implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * <code>FOO = 0;</code>
+       */
+      FOO(0),
+      /**
+       * <code>BAR = 1;</code>
+       */
+      BAR(1),
+      /**
+       * <code>BAZ = 2;</code>
+       */
+      BAZ(2),
+      /**
+       * <code>NEG = -1;</code>
+       */
+      NEG(-1),
+      ;
+
+      /**
+       * <code>FOO = 0;</code>
+       */
+      public static final int FOO_VALUE = 0;
+      /**
+       * <code>BAR = 1;</code>
+       */
+      public static final int BAR_VALUE = 1;
+      /**
+       * <code>BAZ = 2;</code>
+       */
+      public static final int BAZ_VALUE = 2;
+      /**
+       * <code>NEG = -1;</code>
+       */
+      public static final int NEG_VALUE = -1;
+
+
+      public final int getNumber() {
+        return value;
+      }
+
+      /**
+       * @param value The numeric wire value of the corresponding enum entry.
+       * @return The enum associated with the given numeric wire value.
+       * @deprecated Use {@link #forNumber(int)} instead.
+       */
+      @java.lang.Deprecated
+      public static NestedEnum valueOf(int value) {
+        return forNumber(value);
+      }
+
+      /**
+       * @param value The numeric wire value of the corresponding enum entry.
+       * @return The enum associated with the given numeric wire value.
+       */
+      public static NestedEnum forNumber(int value) {
+        switch (value) {
+          case 0: return FOO;
+          case 1: return BAR;
+          case 2: return BAZ;
+          case -1: return NEG;
+          default: return null;
+        }
+      }
+
+      public static com.google.protobuf.Internal.EnumLiteMap<NestedEnum>
+          internalGetValueMap() {
+        return internalValueMap;
+      }
+      private static final com.google.protobuf.Internal.EnumLiteMap<
+          NestedEnum> internalValueMap =
+            new com.google.protobuf.Internal.EnumLiteMap<NestedEnum>() {
+              public NestedEnum findValueByNumber(int number) {
+                return NestedEnum.forNumber(number);
+              }
+            };
+
+      public final com.google.protobuf.Descriptors.EnumValueDescriptor
+          getValueDescriptor() {
+        return getDescriptor().getValues().get(ordinal());
+      }
+      public final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptorForType() {
+        return getDescriptor();
+      }
+      public static final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDescriptor().getEnumTypes().get(0);
+      }
+
+      private static final NestedEnum[] VALUES = values();
+
+      public static NestedEnum valueOf(
+          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+        if (desc.getType() != getDescriptor()) {
+          throw new java.lang.IllegalArgumentException(
+            "EnumValueDescriptor is not for this type.");
+        }
+        return VALUES[desc.getIndex()];
+      }
+
+      private final int value;
+
+      private NestedEnum(int value) {
+        this.value = value;
+      }
+
+      // @@protoc_insertion_point(enum_scope:legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum)
+    }
+
+    /**
+     * Protobuf enum {@code legacy_gencode_test.proto2.TestMostTypesProto2.AliasedEnum}
+     */
+    public enum AliasedEnum
+        implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * <code>ALIAS_FOO = 0;</code>
+       */
+      ALIAS_FOO(0),
+      /**
+       * <code>ALIAS_BAR = 1;</code>
+       */
+      ALIAS_BAR(1),
+      /**
+       * <code>ALIAS_BAZ = 2;</code>
+       */
+      ALIAS_BAZ(2),
+      ;
+
+      /**
+       * <code>MOO = 2;</code>
+       */
+      public static final AliasedEnum MOO = ALIAS_BAZ;
+      /**
+       * <code>moo = 2;</code>
+       */
+      public static final AliasedEnum moo = ALIAS_BAZ;
+      /**
+       * <code>bAz = 2;</code>
+       */
+      public static final AliasedEnum bAz = ALIAS_BAZ;
+      /**
+       * <code>ALIAS_FOO = 0;</code>
+       */
+      public static final int ALIAS_FOO_VALUE = 0;
+      /**
+       * <code>ALIAS_BAR = 1;</code>
+       */
+      public static final int ALIAS_BAR_VALUE = 1;
+      /**
+       * <code>ALIAS_BAZ = 2;</code>
+       */
+      public static final int ALIAS_BAZ_VALUE = 2;
+      /**
+       * <code>MOO = 2;</code>
+       */
+      public static final int MOO_VALUE = 2;
+      /**
+       * <code>moo = 2;</code>
+       */
+      public static final int moo_VALUE = 2;
+      /**
+       * <code>bAz = 2;</code>
+       */
+      public static final int bAz_VALUE = 2;
+
+
+      public final int getNumber() {
+        return value;
+      }
+
+      /**
+       * @param value The numeric wire value of the corresponding enum entry.
+       * @return The enum associated with the given numeric wire value.
+       * @deprecated Use {@link #forNumber(int)} instead.
+       */
+      @java.lang.Deprecated
+      public static AliasedEnum valueOf(int value) {
+        return forNumber(value);
+      }
+
+      /**
+       * @param value The numeric wire value of the corresponding enum entry.
+       * @return The enum associated with the given numeric wire value.
+       */
+      public static AliasedEnum forNumber(int value) {
+        switch (value) {
+          case 0: return ALIAS_FOO;
+          case 1: return ALIAS_BAR;
+          case 2: return ALIAS_BAZ;
+          default: return null;
+        }
+      }
+
+      public static com.google.protobuf.Internal.EnumLiteMap<AliasedEnum>
+          internalGetValueMap() {
+        return internalValueMap;
+      }
+      private static final com.google.protobuf.Internal.EnumLiteMap<
+          AliasedEnum> internalValueMap =
+            new com.google.protobuf.Internal.EnumLiteMap<AliasedEnum>() {
+              public AliasedEnum findValueByNumber(int number) {
+                return AliasedEnum.forNumber(number);
+              }
+            };
+
+      public final com.google.protobuf.Descriptors.EnumValueDescriptor
+          getValueDescriptor() {
+        return getDescriptor().getValues().get(ordinal());
+      }
+      public final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptorForType() {
+        return getDescriptor();
+      }
+      public static final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDescriptor().getEnumTypes().get(1);
+      }
+
+      private static final AliasedEnum[] VALUES = getStaticValuesArray();
+      private static AliasedEnum[] getStaticValuesArray() {
+        return new AliasedEnum[] {
+        ALIAS_FOO, ALIAS_BAR, ALIAS_BAZ, MOO, moo, bAz, 
+        };
+      }
+      public static AliasedEnum valueOf(
+          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+        if (desc.getType() != getDescriptor()) {
+          throw new java.lang.IllegalArgumentException(
+            "EnumValueDescriptor is not for this type.");
+        }
+        return VALUES[desc.getIndex()];
+      }
+
+      private final int value;
+
+      private AliasedEnum(int value) {
+        this.value = value;
+      }
+
+      // @@protoc_insertion_point(enum_scope:legacy_gencode_test.proto2.TestMostTypesProto2.AliasedEnum)
+    }
+
+    public interface NestedMessageOrBuilder extends
+        // @@protoc_insertion_point(interface_extends:legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage)
+        com.google.protobuf.MessageOrBuilder {
+
+      /**
+       * <code>optional int32 a = 1;</code>
+       * @return Whether the a field is set.
+       */
+      boolean hasA();
+      /**
+       * <code>optional int32 a = 1;</code>
+       * @return The a.
+       */
+      int getA();
+
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+       * @return Whether the corecursive field is set.
+       */
+      boolean hasCorecursive();
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+       * @return The corecursive.
+       */
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 getCorecursive();
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+       */
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder getCorecursiveOrBuilder();
+    }
+    /**
+     * Protobuf type {@code legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage}
+     */
+    public static final class NestedMessage extends
+        com.google.protobuf.GeneratedMessageV3 implements
+        // @@protoc_insertion_point(message_implements:legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage)
+        NestedMessageOrBuilder {
+    private static final long serialVersionUID = 0L;
+      // Use NestedMessage.newBuilder() to construct.
+      private NestedMessage(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+        super(builder);
+      }
+      private NestedMessage() {
+      }
+
+      @java.lang.Override
+      @SuppressWarnings({"unused"})
+      protected java.lang.Object newInstance(
+          UnusedPrivateParameter unused) {
+        return new NestedMessage();
+      }
+
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_NestedMessage_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_NestedMessage_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.class, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder.class);
+      }
+
+      private int bitField0_;
+      public static final int A_FIELD_NUMBER = 1;
+      private int a_ = 0;
+      /**
+       * <code>optional int32 a = 1;</code>
+       * @return Whether the a field is set.
+       */
+      @java.lang.Override
+      public boolean hasA() {
+        return ((bitField0_ & 0x00000001) != 0);
+      }
+      /**
+       * <code>optional int32 a = 1;</code>
+       * @return The a.
+       */
+      @java.lang.Override
+      public int getA() {
+        return a_;
+      }
+
+      public static final int CORECURSIVE_FIELD_NUMBER = 2;
+      private legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 corecursive_;
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+       * @return Whether the corecursive field is set.
+       */
+      @java.lang.Override
+      public boolean hasCorecursive() {
+        return ((bitField0_ & 0x00000002) != 0);
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+       * @return The corecursive.
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 getCorecursive() {
+        return corecursive_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance() : corecursive_;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder getCorecursiveOrBuilder() {
+        return corecursive_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance() : corecursive_;
+      }
+
+      private byte memoizedIsInitialized = -1;
+      @java.lang.Override
+      public final boolean isInitialized() {
+        byte isInitialized = memoizedIsInitialized;
+        if (isInitialized == 1) return true;
+        if (isInitialized == 0) return false;
+
+        if (hasCorecursive()) {
+          if (!getCorecursive().isInitialized()) {
+            memoizedIsInitialized = 0;
+            return false;
+          }
+        }
+        memoizedIsInitialized = 1;
+        return true;
+      }
+
+      @java.lang.Override
+      public void writeTo(com.google.protobuf.CodedOutputStream output)
+                          throws java.io.IOException {
+        if (((bitField0_ & 0x00000001) != 0)) {
+          output.writeInt32(1, a_);
+        }
+        if (((bitField0_ & 0x00000002) != 0)) {
+          output.writeMessage(2, getCorecursive());
+        }
+        getUnknownFields().writeTo(output);
+      }
+
+      @java.lang.Override
+      public int getSerializedSize() {
+        int size = memoizedSize;
+        if (size != -1) return size;
+
+        size = 0;
+        if (((bitField0_ & 0x00000001) != 0)) {
+          size += com.google.protobuf.CodedOutputStream
+            .computeInt32Size(1, a_);
+        }
+        if (((bitField0_ & 0x00000002) != 0)) {
+          size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(2, getCorecursive());
+        }
+        size += getUnknownFields().getSerializedSize();
+        memoizedSize = size;
+        return size;
+      }
+
+      @java.lang.Override
+      public boolean equals(final java.lang.Object obj) {
+        if (obj == this) {
+         return true;
+        }
+        if (!(obj instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage)) {
+          return super.equals(obj);
+        }
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage other = (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) obj;
+
+        if (hasA() != other.hasA()) return false;
+        if (hasA()) {
+          if (getA()
+              != other.getA()) return false;
+        }
+        if (hasCorecursive() != other.hasCorecursive()) return false;
+        if (hasCorecursive()) {
+          if (!getCorecursive()
+              .equals(other.getCorecursive())) return false;
+        }
+        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+        return true;
+      }
+
+      @java.lang.Override
+      public int hashCode() {
+        if (memoizedHashCode != 0) {
+          return memoizedHashCode;
+        }
+        int hash = 41;
+        hash = (19 * hash) + getDescriptor().hashCode();
+        if (hasA()) {
+          hash = (37 * hash) + A_FIELD_NUMBER;
+          hash = (53 * hash) + getA();
+        }
+        if (hasCorecursive()) {
+          hash = (37 * hash) + CORECURSIVE_FIELD_NUMBER;
+          hash = (53 * hash) + getCorecursive().hashCode();
+        }
+        hash = (29 * hash) + getUnknownFields().hashCode();
+        memoizedHashCode = hash;
+        return hash;
+      }
+
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseFrom(
+          java.nio.ByteBuffer data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data);
+      }
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseFrom(
+          java.nio.ByteBuffer data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data, extensionRegistry);
+      }
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseFrom(
+          com.google.protobuf.ByteString data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data);
+      }
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseFrom(
+          com.google.protobuf.ByteString data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data, extensionRegistry);
+      }
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseFrom(byte[] data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data);
+      }
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseFrom(
+          byte[] data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data, extensionRegistry);
+      }
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseFrom(java.io.InputStream input)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3
+            .parseWithIOException(PARSER, input);
+      }
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseFrom(
+          java.io.InputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3
+            .parseWithIOException(PARSER, input, extensionRegistry);
+      }
+
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseDelimitedFrom(java.io.InputStream input)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3
+            .parseDelimitedWithIOException(PARSER, input);
+      }
+
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseDelimitedFrom(
+          java.io.InputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3
+            .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+      }
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseFrom(
+          com.google.protobuf.CodedInputStream input)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3
+            .parseWithIOException(PARSER, input);
+      }
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3
+            .parseWithIOException(PARSER, input, extensionRegistry);
+      }
+
+      @java.lang.Override
+      public Builder newBuilderForType() { return newBuilder(); }
+      public static Builder newBuilder() {
+        return DEFAULT_INSTANCE.toBuilder();
+      }
+      public static Builder newBuilder(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage prototype) {
+        return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+      }
+      @java.lang.Override
+      public Builder toBuilder() {
+        return this == DEFAULT_INSTANCE
+            ? new Builder() : new Builder().mergeFrom(this);
+      }
+
+      @java.lang.Override
+      protected Builder newBuilderForType(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        Builder builder = new Builder(parent);
+        return builder;
+      }
+      /**
+       * Protobuf type {@code legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage}
+       */
+      public static final class Builder extends
+          com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+          // @@protoc_insertion_point(builder_implements:legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage)
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder {
+        public static final com.google.protobuf.Descriptors.Descriptor
+            getDescriptor() {
+          return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_NestedMessage_descriptor;
+        }
+
+        @java.lang.Override
+        protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+            internalGetFieldAccessorTable() {
+          return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_NestedMessage_fieldAccessorTable
+              .ensureFieldAccessorsInitialized(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.class, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder.class);
+        }
+
+        // Construct using legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.newBuilder()
+        private Builder() {
+          maybeForceBuilderInitialization();
+        }
+
+        private Builder(
+            com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+          super(parent);
+          maybeForceBuilderInitialization();
+        }
+        private void maybeForceBuilderInitialization() {
+          if (com.google.protobuf.GeneratedMessageV3
+                  .alwaysUseFieldBuilders) {
+            getCorecursiveFieldBuilder();
+          }
+        }
+        @java.lang.Override
+        public Builder clear() {
+          super.clear();
+          bitField0_ = 0;
+          a_ = 0;
+          corecursive_ = null;
+          if (corecursiveBuilder_ != null) {
+            corecursiveBuilder_.dispose();
+            corecursiveBuilder_ = null;
+          }
+          return this;
+        }
+
+        @java.lang.Override
+        public com.google.protobuf.Descriptors.Descriptor
+            getDescriptorForType() {
+          return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_NestedMessage_descriptor;
+        }
+
+        @java.lang.Override
+        public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getDefaultInstanceForType() {
+          return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance();
+        }
+
+        @java.lang.Override
+        public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage build() {
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage result = buildPartial();
+          if (!result.isInitialized()) {
+            throw newUninitializedMessageException(result);
+          }
+          return result;
+        }
+
+        @java.lang.Override
+        public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage buildPartial() {
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage result = new legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage(this);
+          if (bitField0_ != 0) { buildPartial0(result); }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartial0(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage result) {
+          int from_bitField0_ = bitField0_;
+          int to_bitField0_ = 0;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.a_ = a_;
+            to_bitField0_ |= 0x00000001;
+          }
+          if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.corecursive_ = corecursiveBuilder_ == null
+                ? corecursive_
+                : corecursiveBuilder_.build();
+            to_bitField0_ |= 0x00000002;
+          }
+          result.bitField0_ |= to_bitField0_;
+        }
+
+        @java.lang.Override
+        public Builder clone() {
+          return super.clone();
+        }
+        @java.lang.Override
+        public Builder setField(
+            com.google.protobuf.Descriptors.FieldDescriptor field,
+            java.lang.Object value) {
+          return super.setField(field, value);
+        }
+        @java.lang.Override
+        public Builder clearField(
+            com.google.protobuf.Descriptors.FieldDescriptor field) {
+          return super.clearField(field);
+        }
+        @java.lang.Override
+        public Builder clearOneof(
+            com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+          return super.clearOneof(oneof);
+        }
+        @java.lang.Override
+        public Builder setRepeatedField(
+            com.google.protobuf.Descriptors.FieldDescriptor field,
+            int index, java.lang.Object value) {
+          return super.setRepeatedField(field, index, value);
+        }
+        @java.lang.Override
+        public Builder addRepeatedField(
+            com.google.protobuf.Descriptors.FieldDescriptor field,
+            java.lang.Object value) {
+          return super.addRepeatedField(field, value);
+        }
+        @java.lang.Override
+        public Builder mergeFrom(com.google.protobuf.Message other) {
+          if (other instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) {
+            return mergeFrom((legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage)other);
+          } else {
+            super.mergeFrom(other);
+            return this;
+          }
+        }
+
+        public Builder mergeFrom(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage other) {
+          if (other == legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance()) return this;
+          if (other.hasA()) {
+            setA(other.getA());
+          }
+          if (other.hasCorecursive()) {
+            mergeCorecursive(other.getCorecursive());
+          }
+          this.mergeUnknownFields(other.getUnknownFields());
+          onChanged();
+          return this;
+        }
+
+        @java.lang.Override
+        public final boolean isInitialized() {
+          if (hasCorecursive()) {
+            if (!getCorecursive().isInitialized()) {
+              return false;
+            }
+          }
+          return true;
+        }
+
+        @java.lang.Override
+        public Builder mergeFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+          if (extensionRegistry == null) {
+            throw new java.lang.NullPointerException();
+          }
+          try {
+            boolean done = false;
+            while (!done) {
+              int tag = input.readTag();
+              switch (tag) {
+                case 0:
+                  done = true;
+                  break;
+                case 8: {
+                  a_ = input.readInt32();
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 8
+                case 18: {
+                  input.readMessage(
+                      getCorecursiveFieldBuilder().getBuilder(),
+                      extensionRegistry);
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 18
+                default: {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+              } // switch (tag)
+            } // while (!done)
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.unwrapIOException();
+          } finally {
+            onChanged();
+          } // finally
+          return this;
+        }
+        private int bitField0_;
+
+        private int a_ ;
+        /**
+         * <code>optional int32 a = 1;</code>
+         * @return Whether the a field is set.
+         */
+        @java.lang.Override
+        public boolean hasA() {
+          return ((bitField0_ & 0x00000001) != 0);
+        }
+        /**
+         * <code>optional int32 a = 1;</code>
+         * @return The a.
+         */
+        @java.lang.Override
+        public int getA() {
+          return a_;
+        }
+        /**
+         * <code>optional int32 a = 1;</code>
+         * @param value The a to set.
+         * @return This builder for chaining.
+         */
+        public Builder setA(int value) {
+
+          a_ = value;
+          bitField0_ |= 0x00000001;
+          onChanged();
+          return this;
+        }
+        /**
+         * <code>optional int32 a = 1;</code>
+         * @return This builder for chaining.
+         */
+        public Builder clearA() {
+          bitField0_ = (bitField0_ & ~0x00000001);
+          a_ = 0;
+          onChanged();
+          return this;
+        }
+
+        private legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 corecursive_;
+        private com.google.protobuf.SingleFieldBuilderV3<
+            legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder> corecursiveBuilder_;
+        /**
+         * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+         * @return Whether the corecursive field is set.
+         */
+        public boolean hasCorecursive() {
+          return ((bitField0_ & 0x00000002) != 0);
+        }
+        /**
+         * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+         * @return The corecursive.
+         */
+        public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 getCorecursive() {
+          if (corecursiveBuilder_ == null) {
+            return corecursive_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance() : corecursive_;
+          } else {
+            return corecursiveBuilder_.getMessage();
+          }
+        }
+        /**
+         * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+         */
+        public Builder setCorecursive(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 value) {
+          if (corecursiveBuilder_ == null) {
+            if (value == null) {
+              throw new NullPointerException();
+            }
+            corecursive_ = value;
+          } else {
+            corecursiveBuilder_.setMessage(value);
+          }
+          bitField0_ |= 0x00000002;
+          onChanged();
+          return this;
+        }
+        /**
+         * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+         */
+        public Builder setCorecursive(
+            legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder builderForValue) {
+          if (corecursiveBuilder_ == null) {
+            corecursive_ = builderForValue.build();
+          } else {
+            corecursiveBuilder_.setMessage(builderForValue.build());
+          }
+          bitField0_ |= 0x00000002;
+          onChanged();
+          return this;
+        }
+        /**
+         * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+         */
+        public Builder mergeCorecursive(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 value) {
+          if (corecursiveBuilder_ == null) {
+            if (((bitField0_ & 0x00000002) != 0) &&
+              corecursive_ != null &&
+              corecursive_ != legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance()) {
+              getCorecursiveBuilder().mergeFrom(value);
+            } else {
+              corecursive_ = value;
+            }
+          } else {
+            corecursiveBuilder_.mergeFrom(value);
+          }
+          if (corecursive_ != null) {
+            bitField0_ |= 0x00000002;
+            onChanged();
+          }
+          return this;
+        }
+        /**
+         * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+         */
+        public Builder clearCorecursive() {
+          bitField0_ = (bitField0_ & ~0x00000002);
+          corecursive_ = null;
+          if (corecursiveBuilder_ != null) {
+            corecursiveBuilder_.dispose();
+            corecursiveBuilder_ = null;
+          }
+          onChanged();
+          return this;
+        }
+        /**
+         * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+         */
+        public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder getCorecursiveBuilder() {
+          bitField0_ |= 0x00000002;
+          onChanged();
+          return getCorecursiveFieldBuilder().getBuilder();
+        }
+        /**
+         * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+         */
+        public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder getCorecursiveOrBuilder() {
+          if (corecursiveBuilder_ != null) {
+            return corecursiveBuilder_.getMessageOrBuilder();
+          } else {
+            return corecursive_ == null ?
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance() : corecursive_;
+          }
+        }
+        /**
+         * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+         */
+        private com.google.protobuf.SingleFieldBuilderV3<
+            legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder> 
+            getCorecursiveFieldBuilder() {
+          if (corecursiveBuilder_ == null) {
+            corecursiveBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder>(
+                    getCorecursive(),
+                    getParentForChildren(),
+                    isClean());
+            corecursive_ = null;
+          }
+          return corecursiveBuilder_;
+        }
+        @java.lang.Override
+        public final Builder setUnknownFields(
+            final com.google.protobuf.UnknownFieldSet unknownFields) {
+          return super.setUnknownFields(unknownFields);
+        }
+
+        @java.lang.Override
+        public final Builder mergeUnknownFields(
+            final com.google.protobuf.UnknownFieldSet unknownFields) {
+          return super.mergeUnknownFields(unknownFields);
+        }
+
+
+        // @@protoc_insertion_point(builder_scope:legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage)
+      }
+
+      // @@protoc_insertion_point(class_scope:legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage)
+      private static final legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage DEFAULT_INSTANCE;
+      static {
+        DEFAULT_INSTANCE = new legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage();
+      }
+
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getDefaultInstance() {
+        return DEFAULT_INSTANCE;
+      }
+
+      @java.lang.Deprecated public static final com.google.protobuf.Parser<NestedMessage>
+          PARSER = new com.google.protobuf.AbstractParser<NestedMessage>() {
+        @java.lang.Override
+        public NestedMessage parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
+        }
+      };
+
+      public static com.google.protobuf.Parser<NestedMessage> parser() {
+        return PARSER;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Parser<NestedMessage> getParserForType() {
+        return PARSER;
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getDefaultInstanceForType() {
+        return DEFAULT_INSTANCE;
+      }
+
+    }
+
+    private int bitField0_;
+    private int oneofFieldCase_ = 0;
+    @SuppressWarnings("serial")
+    private java.lang.Object oneofField_;
+    public enum OneofFieldCase
+        implements com.google.protobuf.Internal.EnumLite,
+            com.google.protobuf.AbstractMessage.InternalOneOfEnum {
+      ONEOF_UINT32(111),
+      ONEOF_NESTED_MESSAGE(112),
+      ONEOF_STRING(113),
+      ONEOF_BYTES(114),
+      ONEOF_BOOL(115),
+      ONEOF_UINT64(116),
+      ONEOF_FLOAT(117),
+      ONEOF_DOUBLE(118),
+      ONEOF_ENUM(119),
+      ONEOFFIELD_NOT_SET(0);
+      private final int value;
+      private OneofFieldCase(int value) {
+        this.value = value;
+      }
+      /**
+       * @param value The number of the enum to look for.
+       * @return The enum associated with the given number.
+       * @deprecated Use {@link #forNumber(int)} instead.
+       */
+      @java.lang.Deprecated
+      public static OneofFieldCase valueOf(int value) {
+        return forNumber(value);
+      }
+
+      public static OneofFieldCase forNumber(int value) {
+        switch (value) {
+          case 111: return ONEOF_UINT32;
+          case 112: return ONEOF_NESTED_MESSAGE;
+          case 113: return ONEOF_STRING;
+          case 114: return ONEOF_BYTES;
+          case 115: return ONEOF_BOOL;
+          case 116: return ONEOF_UINT64;
+          case 117: return ONEOF_FLOAT;
+          case 118: return ONEOF_DOUBLE;
+          case 119: return ONEOF_ENUM;
+          case 0: return ONEOFFIELD_NOT_SET;
+          default: return null;
+        }
+      }
+      public int getNumber() {
+        return this.value;
+      }
+    };
+
+    public OneofFieldCase
+    getOneofFieldCase() {
+      return OneofFieldCase.forNumber(
+          oneofFieldCase_);
+    }
+
+    public static final int OPTIONAL_INT32_FIELD_NUMBER = 1;
+    private int optionalInt32_ = 0;
+    /**
+     * <code>optional int32 optional_int32 = 1;</code>
+     * @return Whether the optionalInt32 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalInt32() {
+      return ((bitField0_ & 0x00000001) != 0);
+    }
+    /**
+     * <code>optional int32 optional_int32 = 1;</code>
+     * @return The optionalInt32.
+     */
+    @java.lang.Override
+    public int getOptionalInt32() {
+      return optionalInt32_;
+    }
+
+    public static final int OPTIONAL_INT64_FIELD_NUMBER = 2;
+    private long optionalInt64_ = 0L;
+    /**
+     * <code>optional int64 optional_int64 = 2;</code>
+     * @return Whether the optionalInt64 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalInt64() {
+      return ((bitField0_ & 0x00000002) != 0);
+    }
+    /**
+     * <code>optional int64 optional_int64 = 2;</code>
+     * @return The optionalInt64.
+     */
+    @java.lang.Override
+    public long getOptionalInt64() {
+      return optionalInt64_;
+    }
+
+    public static final int OPTIONAL_UINT32_FIELD_NUMBER = 3;
+    private int optionalUint32_ = 0;
+    /**
+     * <code>optional uint32 optional_uint32 = 3;</code>
+     * @return Whether the optionalUint32 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalUint32() {
+      return ((bitField0_ & 0x00000004) != 0);
+    }
+    /**
+     * <code>optional uint32 optional_uint32 = 3;</code>
+     * @return The optionalUint32.
+     */
+    @java.lang.Override
+    public int getOptionalUint32() {
+      return optionalUint32_;
+    }
+
+    public static final int OPTIONAL_UINT64_FIELD_NUMBER = 4;
+    private long optionalUint64_ = 0L;
+    /**
+     * <code>optional uint64 optional_uint64 = 4;</code>
+     * @return Whether the optionalUint64 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalUint64() {
+      return ((bitField0_ & 0x00000008) != 0);
+    }
+    /**
+     * <code>optional uint64 optional_uint64 = 4;</code>
+     * @return The optionalUint64.
+     */
+    @java.lang.Override
+    public long getOptionalUint64() {
+      return optionalUint64_;
+    }
+
+    public static final int OPTIONAL_SINT32_FIELD_NUMBER = 5;
+    private int optionalSint32_ = 0;
+    /**
+     * <code>optional sint32 optional_sint32 = 5;</code>
+     * @return Whether the optionalSint32 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalSint32() {
+      return ((bitField0_ & 0x00000010) != 0);
+    }
+    /**
+     * <code>optional sint32 optional_sint32 = 5;</code>
+     * @return The optionalSint32.
+     */
+    @java.lang.Override
+    public int getOptionalSint32() {
+      return optionalSint32_;
+    }
+
+    public static final int OPTIONAL_SINT64_FIELD_NUMBER = 6;
+    private long optionalSint64_ = 0L;
+    /**
+     * <code>optional sint64 optional_sint64 = 6;</code>
+     * @return Whether the optionalSint64 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalSint64() {
+      return ((bitField0_ & 0x00000020) != 0);
+    }
+    /**
+     * <code>optional sint64 optional_sint64 = 6;</code>
+     * @return The optionalSint64.
+     */
+    @java.lang.Override
+    public long getOptionalSint64() {
+      return optionalSint64_;
+    }
+
+    public static final int OPTIONAL_FIXED32_FIELD_NUMBER = 7;
+    private int optionalFixed32_ = 0;
+    /**
+     * <code>optional fixed32 optional_fixed32 = 7;</code>
+     * @return Whether the optionalFixed32 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalFixed32() {
+      return ((bitField0_ & 0x00000040) != 0);
+    }
+    /**
+     * <code>optional fixed32 optional_fixed32 = 7;</code>
+     * @return The optionalFixed32.
+     */
+    @java.lang.Override
+    public int getOptionalFixed32() {
+      return optionalFixed32_;
+    }
+
+    public static final int OPTIONAL_FIXED64_FIELD_NUMBER = 8;
+    private long optionalFixed64_ = 0L;
+    /**
+     * <code>optional fixed64 optional_fixed64 = 8;</code>
+     * @return Whether the optionalFixed64 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalFixed64() {
+      return ((bitField0_ & 0x00000080) != 0);
+    }
+    /**
+     * <code>optional fixed64 optional_fixed64 = 8;</code>
+     * @return The optionalFixed64.
+     */
+    @java.lang.Override
+    public long getOptionalFixed64() {
+      return optionalFixed64_;
+    }
+
+    public static final int OPTIONAL_SFIXED32_FIELD_NUMBER = 9;
+    private int optionalSfixed32_ = 0;
+    /**
+     * <code>optional sfixed32 optional_sfixed32 = 9;</code>
+     * @return Whether the optionalSfixed32 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalSfixed32() {
+      return ((bitField0_ & 0x00000100) != 0);
+    }
+    /**
+     * <code>optional sfixed32 optional_sfixed32 = 9;</code>
+     * @return The optionalSfixed32.
+     */
+    @java.lang.Override
+    public int getOptionalSfixed32() {
+      return optionalSfixed32_;
+    }
+
+    public static final int OPTIONAL_SFIXED64_FIELD_NUMBER = 10;
+    private long optionalSfixed64_ = 0L;
+    /**
+     * <code>optional sfixed64 optional_sfixed64 = 10;</code>
+     * @return Whether the optionalSfixed64 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalSfixed64() {
+      return ((bitField0_ & 0x00000200) != 0);
+    }
+    /**
+     * <code>optional sfixed64 optional_sfixed64 = 10;</code>
+     * @return The optionalSfixed64.
+     */
+    @java.lang.Override
+    public long getOptionalSfixed64() {
+      return optionalSfixed64_;
+    }
+
+    public static final int OPTIONAL_FLOAT_FIELD_NUMBER = 11;
+    private float optionalFloat_ = 0F;
+    /**
+     * <code>optional float optional_float = 11;</code>
+     * @return Whether the optionalFloat field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalFloat() {
+      return ((bitField0_ & 0x00000400) != 0);
+    }
+    /**
+     * <code>optional float optional_float = 11;</code>
+     * @return The optionalFloat.
+     */
+    @java.lang.Override
+    public float getOptionalFloat() {
+      return optionalFloat_;
+    }
+
+    public static final int OPTIONAL_DOUBLE_FIELD_NUMBER = 12;
+    private double optionalDouble_ = 0D;
+    /**
+     * <code>optional double optional_double = 12;</code>
+     * @return Whether the optionalDouble field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalDouble() {
+      return ((bitField0_ & 0x00000800) != 0);
+    }
+    /**
+     * <code>optional double optional_double = 12;</code>
+     * @return The optionalDouble.
+     */
+    @java.lang.Override
+    public double getOptionalDouble() {
+      return optionalDouble_;
+    }
+
+    public static final int OPTIONAL_BOOL_FIELD_NUMBER = 13;
+    private boolean optionalBool_ = false;
+    /**
+     * <code>optional bool optional_bool = 13;</code>
+     * @return Whether the optionalBool field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalBool() {
+      return ((bitField0_ & 0x00001000) != 0);
+    }
+    /**
+     * <code>optional bool optional_bool = 13;</code>
+     * @return The optionalBool.
+     */
+    @java.lang.Override
+    public boolean getOptionalBool() {
+      return optionalBool_;
+    }
+
+    public static final int OPTIONAL_STRING_FIELD_NUMBER = 14;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object optionalString_ = "";
+    /**
+     * <code>optional string optional_string = 14;</code>
+     * @return Whether the optionalString field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalString() {
+      return ((bitField0_ & 0x00002000) != 0);
+    }
+    /**
+     * <code>optional string optional_string = 14;</code>
+     * @return The optionalString.
+     */
+    @java.lang.Override
+    public java.lang.String getOptionalString() {
+      java.lang.Object ref = optionalString_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
+          optionalString_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     * <code>optional string optional_string = 14;</code>
+     * @return The bytes for optionalString.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getOptionalStringBytes() {
+      java.lang.Object ref = optionalString_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        optionalString_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int OPTIONAL_BYTES_FIELD_NUMBER = 15;
+    private com.google.protobuf.ByteString optionalBytes_ = com.google.protobuf.ByteString.EMPTY;
+    /**
+     * <code>optional bytes optional_bytes = 15;</code>
+     * @return Whether the optionalBytes field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalBytes() {
+      return ((bitField0_ & 0x00004000) != 0);
+    }
+    /**
+     * <code>optional bytes optional_bytes = 15;</code>
+     * @return The optionalBytes.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString getOptionalBytes() {
+      return optionalBytes_;
+    }
+
+    public static final int OPTIONAL_NESTED_MESSAGE_FIELD_NUMBER = 18;
+    private legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage optionalNestedMessage_;
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+     * @return Whether the optionalNestedMessage field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalNestedMessage() {
+      return ((bitField0_ & 0x00008000) != 0);
+    }
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+     * @return The optionalNestedMessage.
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getOptionalNestedMessage() {
+      return optionalNestedMessage_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance() : optionalNestedMessage_;
+    }
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder getOptionalNestedMessageOrBuilder() {
+      return optionalNestedMessage_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance() : optionalNestedMessage_;
+    }
+
+    public static final int OPTIONAL_FOREIGN_MESSAGE_FIELD_NUMBER = 19;
+    private legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage optionalForeignMessage_;
+    /**
+     * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+     * @return Whether the optionalForeignMessage field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalForeignMessage() {
+      return ((bitField0_ & 0x00010000) != 0);
+    }
+    /**
+     * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+     * @return The optionalForeignMessage.
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getOptionalForeignMessage() {
+      return optionalForeignMessage_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.getDefaultInstance() : optionalForeignMessage_;
+    }
+    /**
+     * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder getOptionalForeignMessageOrBuilder() {
+      return optionalForeignMessage_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.getDefaultInstance() : optionalForeignMessage_;
+    }
+
+    public static final int OPTIONAL_NESTED_ENUM_FIELD_NUMBER = 21;
+    private int optionalNestedEnum_ = 0;
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum optional_nested_enum = 21;</code>
+     * @return Whether the optionalNestedEnum field is set.
+     */
+    @java.lang.Override public boolean hasOptionalNestedEnum() {
+      return ((bitField0_ & 0x00020000) != 0);
+    }
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum optional_nested_enum = 21;</code>
+     * @return The optionalNestedEnum.
+     */
+    @java.lang.Override public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getOptionalNestedEnum() {
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(optionalNestedEnum_);
+      return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.FOO : result;
+    }
+
+    public static final int OPTIONAL_FOREIGN_ENUM_FIELD_NUMBER = 22;
+    private int optionalForeignEnum_ = 0;
+    /**
+     * <code>optional .legacy_gencode_test.proto2.ForeignEnum optional_foreign_enum = 22;</code>
+     * @return Whether the optionalForeignEnum field is set.
+     */
+    @java.lang.Override public boolean hasOptionalForeignEnum() {
+      return ((bitField0_ & 0x00040000) != 0);
+    }
+    /**
+     * <code>optional .legacy_gencode_test.proto2.ForeignEnum optional_foreign_enum = 22;</code>
+     * @return The optionalForeignEnum.
+     */
+    @java.lang.Override public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getOptionalForeignEnum() {
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.forNumber(optionalForeignEnum_);
+      return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.FOREIGN_FOO : result;
+    }
+
+    public static final int OPTIONAL_ALIASED_ENUM_FIELD_NUMBER = 23;
+    private int optionalAliasedEnum_ = 0;
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.AliasedEnum optional_aliased_enum = 23;</code>
+     * @return Whether the optionalAliasedEnum field is set.
+     */
+    @java.lang.Override public boolean hasOptionalAliasedEnum() {
+      return ((bitField0_ & 0x00080000) != 0);
+    }
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.AliasedEnum optional_aliased_enum = 23;</code>
+     * @return The optionalAliasedEnum.
+     */
+    @java.lang.Override public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum getOptionalAliasedEnum() {
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum.forNumber(optionalAliasedEnum_);
+      return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum.ALIAS_FOO : result;
+    }
+
+    public static final int RECURSIVE_MESSAGE_FIELD_NUMBER = 27;
+    private legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 recursiveMessage_;
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+     * @return Whether the recursiveMessage field is set.
+     */
+    @java.lang.Override
+    public boolean hasRecursiveMessage() {
+      return ((bitField0_ & 0x00100000) != 0);
+    }
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+     * @return The recursiveMessage.
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 getRecursiveMessage() {
+      return recursiveMessage_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance() : recursiveMessage_;
+    }
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder getRecursiveMessageOrBuilder() {
+      return recursiveMessage_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance() : recursiveMessage_;
+    }
+
+    public static final int REPEATED_INT32_FIELD_NUMBER = 31;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList repeatedInt32_ =
+        emptyIntList();
+    /**
+     * <pre>
+     * Repeated
+     * </pre>
+     *
+     * <code>repeated int32 repeated_int32 = 31;</code>
+     * @return A list containing the repeatedInt32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getRepeatedInt32List() {
+      return repeatedInt32_;
+    }
+    /**
+     * <pre>
+     * Repeated
+     * </pre>
+     *
+     * <code>repeated int32 repeated_int32 = 31;</code>
+     * @return The count of repeatedInt32.
+     */
+    public int getRepeatedInt32Count() {
+      return repeatedInt32_.size();
+    }
+    /**
+     * <pre>
+     * Repeated
+     * </pre>
+     *
+     * <code>repeated int32 repeated_int32 = 31;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedInt32 at the given index.
+     */
+    public int getRepeatedInt32(int index) {
+      return repeatedInt32_.getInt(index);
+    }
+
+    public static final int REPEATED_INT64_FIELD_NUMBER = 32;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList repeatedInt64_ =
+        emptyLongList();
+    /**
+     * <code>repeated int64 repeated_int64 = 32;</code>
+     * @return A list containing the repeatedInt64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getRepeatedInt64List() {
+      return repeatedInt64_;
+    }
+    /**
+     * <code>repeated int64 repeated_int64 = 32;</code>
+     * @return The count of repeatedInt64.
+     */
+    public int getRepeatedInt64Count() {
+      return repeatedInt64_.size();
+    }
+    /**
+     * <code>repeated int64 repeated_int64 = 32;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedInt64 at the given index.
+     */
+    public long getRepeatedInt64(int index) {
+      return repeatedInt64_.getLong(index);
+    }
+
+    public static final int REPEATED_UINT32_FIELD_NUMBER = 33;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList repeatedUint32_ =
+        emptyIntList();
+    /**
+     * <code>repeated uint32 repeated_uint32 = 33;</code>
+     * @return A list containing the repeatedUint32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getRepeatedUint32List() {
+      return repeatedUint32_;
+    }
+    /**
+     * <code>repeated uint32 repeated_uint32 = 33;</code>
+     * @return The count of repeatedUint32.
+     */
+    public int getRepeatedUint32Count() {
+      return repeatedUint32_.size();
+    }
+    /**
+     * <code>repeated uint32 repeated_uint32 = 33;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedUint32 at the given index.
+     */
+    public int getRepeatedUint32(int index) {
+      return repeatedUint32_.getInt(index);
+    }
+
+    public static final int REPEATED_UINT64_FIELD_NUMBER = 34;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList repeatedUint64_ =
+        emptyLongList();
+    /**
+     * <code>repeated uint64 repeated_uint64 = 34;</code>
+     * @return A list containing the repeatedUint64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getRepeatedUint64List() {
+      return repeatedUint64_;
+    }
+    /**
+     * <code>repeated uint64 repeated_uint64 = 34;</code>
+     * @return The count of repeatedUint64.
+     */
+    public int getRepeatedUint64Count() {
+      return repeatedUint64_.size();
+    }
+    /**
+     * <code>repeated uint64 repeated_uint64 = 34;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedUint64 at the given index.
+     */
+    public long getRepeatedUint64(int index) {
+      return repeatedUint64_.getLong(index);
+    }
+
+    public static final int REPEATED_SINT32_FIELD_NUMBER = 35;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList repeatedSint32_ =
+        emptyIntList();
+    /**
+     * <code>repeated sint32 repeated_sint32 = 35;</code>
+     * @return A list containing the repeatedSint32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getRepeatedSint32List() {
+      return repeatedSint32_;
+    }
+    /**
+     * <code>repeated sint32 repeated_sint32 = 35;</code>
+     * @return The count of repeatedSint32.
+     */
+    public int getRepeatedSint32Count() {
+      return repeatedSint32_.size();
+    }
+    /**
+     * <code>repeated sint32 repeated_sint32 = 35;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedSint32 at the given index.
+     */
+    public int getRepeatedSint32(int index) {
+      return repeatedSint32_.getInt(index);
+    }
+
+    public static final int REPEATED_SINT64_FIELD_NUMBER = 36;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList repeatedSint64_ =
+        emptyLongList();
+    /**
+     * <code>repeated sint64 repeated_sint64 = 36;</code>
+     * @return A list containing the repeatedSint64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getRepeatedSint64List() {
+      return repeatedSint64_;
+    }
+    /**
+     * <code>repeated sint64 repeated_sint64 = 36;</code>
+     * @return The count of repeatedSint64.
+     */
+    public int getRepeatedSint64Count() {
+      return repeatedSint64_.size();
+    }
+    /**
+     * <code>repeated sint64 repeated_sint64 = 36;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedSint64 at the given index.
+     */
+    public long getRepeatedSint64(int index) {
+      return repeatedSint64_.getLong(index);
+    }
+
+    public static final int REPEATED_FIXED32_FIELD_NUMBER = 37;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList repeatedFixed32_ =
+        emptyIntList();
+    /**
+     * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+     * @return A list containing the repeatedFixed32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getRepeatedFixed32List() {
+      return repeatedFixed32_;
+    }
+    /**
+     * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+     * @return The count of repeatedFixed32.
+     */
+    public int getRepeatedFixed32Count() {
+      return repeatedFixed32_.size();
+    }
+    /**
+     * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedFixed32 at the given index.
+     */
+    public int getRepeatedFixed32(int index) {
+      return repeatedFixed32_.getInt(index);
+    }
+
+    public static final int REPEATED_FIXED64_FIELD_NUMBER = 38;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList repeatedFixed64_ =
+        emptyLongList();
+    /**
+     * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+     * @return A list containing the repeatedFixed64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getRepeatedFixed64List() {
+      return repeatedFixed64_;
+    }
+    /**
+     * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+     * @return The count of repeatedFixed64.
+     */
+    public int getRepeatedFixed64Count() {
+      return repeatedFixed64_.size();
+    }
+    /**
+     * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedFixed64 at the given index.
+     */
+    public long getRepeatedFixed64(int index) {
+      return repeatedFixed64_.getLong(index);
+    }
+
+    public static final int REPEATED_SFIXED32_FIELD_NUMBER = 39;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList repeatedSfixed32_ =
+        emptyIntList();
+    /**
+     * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+     * @return A list containing the repeatedSfixed32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getRepeatedSfixed32List() {
+      return repeatedSfixed32_;
+    }
+    /**
+     * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+     * @return The count of repeatedSfixed32.
+     */
+    public int getRepeatedSfixed32Count() {
+      return repeatedSfixed32_.size();
+    }
+    /**
+     * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedSfixed32 at the given index.
+     */
+    public int getRepeatedSfixed32(int index) {
+      return repeatedSfixed32_.getInt(index);
+    }
+
+    public static final int REPEATED_SFIXED64_FIELD_NUMBER = 40;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList repeatedSfixed64_ =
+        emptyLongList();
+    /**
+     * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+     * @return A list containing the repeatedSfixed64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getRepeatedSfixed64List() {
+      return repeatedSfixed64_;
+    }
+    /**
+     * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+     * @return The count of repeatedSfixed64.
+     */
+    public int getRepeatedSfixed64Count() {
+      return repeatedSfixed64_.size();
+    }
+    /**
+     * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedSfixed64 at the given index.
+     */
+    public long getRepeatedSfixed64(int index) {
+      return repeatedSfixed64_.getLong(index);
+    }
+
+    public static final int REPEATED_FLOAT_FIELD_NUMBER = 41;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.FloatList repeatedFloat_ =
+        emptyFloatList();
+    /**
+     * <code>repeated float repeated_float = 41;</code>
+     * @return A list containing the repeatedFloat.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Float>
+        getRepeatedFloatList() {
+      return repeatedFloat_;
+    }
+    /**
+     * <code>repeated float repeated_float = 41;</code>
+     * @return The count of repeatedFloat.
+     */
+    public int getRepeatedFloatCount() {
+      return repeatedFloat_.size();
+    }
+    /**
+     * <code>repeated float repeated_float = 41;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedFloat at the given index.
+     */
+    public float getRepeatedFloat(int index) {
+      return repeatedFloat_.getFloat(index);
+    }
+
+    public static final int REPEATED_DOUBLE_FIELD_NUMBER = 42;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.DoubleList repeatedDouble_ =
+        emptyDoubleList();
+    /**
+     * <code>repeated double repeated_double = 42;</code>
+     * @return A list containing the repeatedDouble.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Double>
+        getRepeatedDoubleList() {
+      return repeatedDouble_;
+    }
+    /**
+     * <code>repeated double repeated_double = 42;</code>
+     * @return The count of repeatedDouble.
+     */
+    public int getRepeatedDoubleCount() {
+      return repeatedDouble_.size();
+    }
+    /**
+     * <code>repeated double repeated_double = 42;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedDouble at the given index.
+     */
+    public double getRepeatedDouble(int index) {
+      return repeatedDouble_.getDouble(index);
+    }
+
+    public static final int REPEATED_BOOL_FIELD_NUMBER = 43;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.BooleanList repeatedBool_ =
+        emptyBooleanList();
+    /**
+     * <code>repeated bool repeated_bool = 43;</code>
+     * @return A list containing the repeatedBool.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Boolean>
+        getRepeatedBoolList() {
+      return repeatedBool_;
+    }
+    /**
+     * <code>repeated bool repeated_bool = 43;</code>
+     * @return The count of repeatedBool.
+     */
+    public int getRepeatedBoolCount() {
+      return repeatedBool_.size();
+    }
+    /**
+     * <code>repeated bool repeated_bool = 43;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedBool at the given index.
+     */
+    public boolean getRepeatedBool(int index) {
+      return repeatedBool_.getBoolean(index);
+    }
+
+    public static final int REPEATED_STRING_FIELD_NUMBER = 44;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.LazyStringArrayList repeatedString_ =
+        com.google.protobuf.LazyStringArrayList.emptyList();
+    /**
+     * <code>repeated string repeated_string = 44;</code>
+     * @return A list containing the repeatedString.
+     */
+    public com.google.protobuf.ProtocolStringList
+        getRepeatedStringList() {
+      return repeatedString_;
+    }
+    /**
+     * <code>repeated string repeated_string = 44;</code>
+     * @return The count of repeatedString.
+     */
+    public int getRepeatedStringCount() {
+      return repeatedString_.size();
+    }
+    /**
+     * <code>repeated string repeated_string = 44;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedString at the given index.
+     */
+    public java.lang.String getRepeatedString(int index) {
+      return repeatedString_.get(index);
+    }
+    /**
+     * <code>repeated string repeated_string = 44;</code>
+     * @param index The index of the value to return.
+     * @return The bytes of the repeatedString at the given index.
+     */
+    public com.google.protobuf.ByteString
+        getRepeatedStringBytes(int index) {
+      return repeatedString_.getByteString(index);
+    }
+
+    public static final int REPEATED_BYTES_FIELD_NUMBER = 45;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.ProtobufList<com.google.protobuf.ByteString> repeatedBytes_ =
+        emptyList(com.google.protobuf.ByteString.class);
+    /**
+     * <code>repeated bytes repeated_bytes = 45;</code>
+     * @return A list containing the repeatedBytes.
+     */
+    @java.lang.Override
+    public java.util.List<com.google.protobuf.ByteString>
+        getRepeatedBytesList() {
+      return repeatedBytes_;
+    }
+    /**
+     * <code>repeated bytes repeated_bytes = 45;</code>
+     * @return The count of repeatedBytes.
+     */
+    public int getRepeatedBytesCount() {
+      return repeatedBytes_.size();
+    }
+    /**
+     * <code>repeated bytes repeated_bytes = 45;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedBytes at the given index.
+     */
+    public com.google.protobuf.ByteString getRepeatedBytes(int index) {
+      return repeatedBytes_.get(index);
+    }
+
+    public static final int REPEATED_NESTED_MESSAGE_FIELD_NUMBER = 48;
+    @SuppressWarnings("serial")
+    private java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> repeatedNestedMessage_;
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+     */
+    @java.lang.Override
+    public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> getRepeatedNestedMessageList() {
+      return repeatedNestedMessage_;
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> 
+        getRepeatedNestedMessageOrBuilderList() {
+      return repeatedNestedMessage_;
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+     */
+    @java.lang.Override
+    public int getRepeatedNestedMessageCount() {
+      return repeatedNestedMessage_.size();
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getRepeatedNestedMessage(int index) {
+      return repeatedNestedMessage_.get(index);
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder getRepeatedNestedMessageOrBuilder(
+        int index) {
+      return repeatedNestedMessage_.get(index);
+    }
+
+    public static final int REPEATED_FOREIGN_MESSAGE_FIELD_NUMBER = 49;
+    @SuppressWarnings("serial")
+    private java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> repeatedForeignMessage_;
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+     */
+    @java.lang.Override
+    public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> getRepeatedForeignMessageList() {
+      return repeatedForeignMessage_;
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder> 
+        getRepeatedForeignMessageOrBuilderList() {
+      return repeatedForeignMessage_;
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+     */
+    @java.lang.Override
+    public int getRepeatedForeignMessageCount() {
+      return repeatedForeignMessage_.size();
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getRepeatedForeignMessage(int index) {
+      return repeatedForeignMessage_.get(index);
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder getRepeatedForeignMessageOrBuilder(
+        int index) {
+      return repeatedForeignMessage_.get(index);
+    }
+
+    public static final int REPEATED_NESTED_ENUM_FIELD_NUMBER = 51;
+    @SuppressWarnings("serial")
+    private java.util.List<java.lang.Integer> repeatedNestedEnum_;
+    private static final com.google.protobuf.Internal.ListAdapter.Converter<
+        java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> repeatedNestedEnum_converter_ =
+            new com.google.protobuf.Internal.ListAdapter.Converter<
+                java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>() {
+              public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum convert(java.lang.Integer from) {
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(from);
+                return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.FOO : result;
+              }
+            };
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+     * @return A list containing the repeatedNestedEnum.
+     */
+    @java.lang.Override
+    public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> getRepeatedNestedEnumList() {
+      return new com.google.protobuf.Internal.ListAdapter<
+          java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>(repeatedNestedEnum_, repeatedNestedEnum_converter_);
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+     * @return The count of repeatedNestedEnum.
+     */
+    @java.lang.Override
+    public int getRepeatedNestedEnumCount() {
+      return repeatedNestedEnum_.size();
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedNestedEnum at the given index.
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getRepeatedNestedEnum(int index) {
+      return repeatedNestedEnum_converter_.convert(repeatedNestedEnum_.get(index));
+    }
+
+    public static final int REPEATED_FOREIGN_ENUM_FIELD_NUMBER = 52;
+    @SuppressWarnings("serial")
+    private java.util.List<java.lang.Integer> repeatedForeignEnum_;
+    private static final com.google.protobuf.Internal.ListAdapter.Converter<
+        java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum> repeatedForeignEnum_converter_ =
+            new com.google.protobuf.Internal.ListAdapter.Converter<
+                java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum>() {
+              public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum convert(java.lang.Integer from) {
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.forNumber(from);
+                return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.FOREIGN_FOO : result;
+              }
+            };
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+     * @return A list containing the repeatedForeignEnum.
+     */
+    @java.lang.Override
+    public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum> getRepeatedForeignEnumList() {
+      return new com.google.protobuf.Internal.ListAdapter<
+          java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum>(repeatedForeignEnum_, repeatedForeignEnum_converter_);
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+     * @return The count of repeatedForeignEnum.
+     */
+    @java.lang.Override
+    public int getRepeatedForeignEnumCount() {
+      return repeatedForeignEnum_.size();
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedForeignEnum at the given index.
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getRepeatedForeignEnum(int index) {
+      return repeatedForeignEnum_converter_.convert(repeatedForeignEnum_.get(index));
+    }
+
+    public static final int PACKED_INT32_FIELD_NUMBER = 75;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList packedInt32_ =
+        emptyIntList();
+    /**
+     * <pre>
+     * Packed
+     * </pre>
+     *
+     * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+     * @return A list containing the packedInt32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getPackedInt32List() {
+      return packedInt32_;
+    }
+    /**
+     * <pre>
+     * Packed
+     * </pre>
+     *
+     * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+     * @return The count of packedInt32.
+     */
+    public int getPackedInt32Count() {
+      return packedInt32_.size();
+    }
+    /**
+     * <pre>
+     * Packed
+     * </pre>
+     *
+     * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedInt32 at the given index.
+     */
+    public int getPackedInt32(int index) {
+      return packedInt32_.getInt(index);
+    }
+    private int packedInt32MemoizedSerializedSize = -1;
+
+    public static final int PACKED_INT64_FIELD_NUMBER = 76;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList packedInt64_ =
+        emptyLongList();
+    /**
+     * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+     * @return A list containing the packedInt64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getPackedInt64List() {
+      return packedInt64_;
+    }
+    /**
+     * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+     * @return The count of packedInt64.
+     */
+    public int getPackedInt64Count() {
+      return packedInt64_.size();
+    }
+    /**
+     * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedInt64 at the given index.
+     */
+    public long getPackedInt64(int index) {
+      return packedInt64_.getLong(index);
+    }
+    private int packedInt64MemoizedSerializedSize = -1;
+
+    public static final int PACKED_UINT32_FIELD_NUMBER = 77;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList packedUint32_ =
+        emptyIntList();
+    /**
+     * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+     * @return A list containing the packedUint32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getPackedUint32List() {
+      return packedUint32_;
+    }
+    /**
+     * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+     * @return The count of packedUint32.
+     */
+    public int getPackedUint32Count() {
+      return packedUint32_.size();
+    }
+    /**
+     * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedUint32 at the given index.
+     */
+    public int getPackedUint32(int index) {
+      return packedUint32_.getInt(index);
+    }
+    private int packedUint32MemoizedSerializedSize = -1;
+
+    public static final int PACKED_UINT64_FIELD_NUMBER = 78;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList packedUint64_ =
+        emptyLongList();
+    /**
+     * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+     * @return A list containing the packedUint64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getPackedUint64List() {
+      return packedUint64_;
+    }
+    /**
+     * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+     * @return The count of packedUint64.
+     */
+    public int getPackedUint64Count() {
+      return packedUint64_.size();
+    }
+    /**
+     * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedUint64 at the given index.
+     */
+    public long getPackedUint64(int index) {
+      return packedUint64_.getLong(index);
+    }
+    private int packedUint64MemoizedSerializedSize = -1;
+
+    public static final int PACKED_SINT32_FIELD_NUMBER = 79;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList packedSint32_ =
+        emptyIntList();
+    /**
+     * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+     * @return A list containing the packedSint32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getPackedSint32List() {
+      return packedSint32_;
+    }
+    /**
+     * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+     * @return The count of packedSint32.
+     */
+    public int getPackedSint32Count() {
+      return packedSint32_.size();
+    }
+    /**
+     * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedSint32 at the given index.
+     */
+    public int getPackedSint32(int index) {
+      return packedSint32_.getInt(index);
+    }
+    private int packedSint32MemoizedSerializedSize = -1;
+
+    public static final int PACKED_SINT64_FIELD_NUMBER = 80;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList packedSint64_ =
+        emptyLongList();
+    /**
+     * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+     * @return A list containing the packedSint64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getPackedSint64List() {
+      return packedSint64_;
+    }
+    /**
+     * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+     * @return The count of packedSint64.
+     */
+    public int getPackedSint64Count() {
+      return packedSint64_.size();
+    }
+    /**
+     * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedSint64 at the given index.
+     */
+    public long getPackedSint64(int index) {
+      return packedSint64_.getLong(index);
+    }
+    private int packedSint64MemoizedSerializedSize = -1;
+
+    public static final int PACKED_FIXED32_FIELD_NUMBER = 81;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList packedFixed32_ =
+        emptyIntList();
+    /**
+     * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+     * @return A list containing the packedFixed32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getPackedFixed32List() {
+      return packedFixed32_;
+    }
+    /**
+     * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+     * @return The count of packedFixed32.
+     */
+    public int getPackedFixed32Count() {
+      return packedFixed32_.size();
+    }
+    /**
+     * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedFixed32 at the given index.
+     */
+    public int getPackedFixed32(int index) {
+      return packedFixed32_.getInt(index);
+    }
+    private int packedFixed32MemoizedSerializedSize = -1;
+
+    public static final int PACKED_FIXED64_FIELD_NUMBER = 82;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList packedFixed64_ =
+        emptyLongList();
+    /**
+     * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+     * @return A list containing the packedFixed64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getPackedFixed64List() {
+      return packedFixed64_;
+    }
+    /**
+     * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+     * @return The count of packedFixed64.
+     */
+    public int getPackedFixed64Count() {
+      return packedFixed64_.size();
+    }
+    /**
+     * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedFixed64 at the given index.
+     */
+    public long getPackedFixed64(int index) {
+      return packedFixed64_.getLong(index);
+    }
+    private int packedFixed64MemoizedSerializedSize = -1;
+
+    public static final int PACKED_SFIXED32_FIELD_NUMBER = 83;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList packedSfixed32_ =
+        emptyIntList();
+    /**
+     * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+     * @return A list containing the packedSfixed32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getPackedSfixed32List() {
+      return packedSfixed32_;
+    }
+    /**
+     * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+     * @return The count of packedSfixed32.
+     */
+    public int getPackedSfixed32Count() {
+      return packedSfixed32_.size();
+    }
+    /**
+     * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedSfixed32 at the given index.
+     */
+    public int getPackedSfixed32(int index) {
+      return packedSfixed32_.getInt(index);
+    }
+    private int packedSfixed32MemoizedSerializedSize = -1;
+
+    public static final int PACKED_SFIXED64_FIELD_NUMBER = 84;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList packedSfixed64_ =
+        emptyLongList();
+    /**
+     * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+     * @return A list containing the packedSfixed64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getPackedSfixed64List() {
+      return packedSfixed64_;
+    }
+    /**
+     * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+     * @return The count of packedSfixed64.
+     */
+    public int getPackedSfixed64Count() {
+      return packedSfixed64_.size();
+    }
+    /**
+     * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedSfixed64 at the given index.
+     */
+    public long getPackedSfixed64(int index) {
+      return packedSfixed64_.getLong(index);
+    }
+    private int packedSfixed64MemoizedSerializedSize = -1;
+
+    public static final int PACKED_FLOAT_FIELD_NUMBER = 85;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.FloatList packedFloat_ =
+        emptyFloatList();
+    /**
+     * <code>repeated float packed_float = 85 [packed = true];</code>
+     * @return A list containing the packedFloat.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Float>
+        getPackedFloatList() {
+      return packedFloat_;
+    }
+    /**
+     * <code>repeated float packed_float = 85 [packed = true];</code>
+     * @return The count of packedFloat.
+     */
+    public int getPackedFloatCount() {
+      return packedFloat_.size();
+    }
+    /**
+     * <code>repeated float packed_float = 85 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedFloat at the given index.
+     */
+    public float getPackedFloat(int index) {
+      return packedFloat_.getFloat(index);
+    }
+    private int packedFloatMemoizedSerializedSize = -1;
+
+    public static final int PACKED_DOUBLE_FIELD_NUMBER = 86;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.DoubleList packedDouble_ =
+        emptyDoubleList();
+    /**
+     * <code>repeated double packed_double = 86 [packed = true];</code>
+     * @return A list containing the packedDouble.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Double>
+        getPackedDoubleList() {
+      return packedDouble_;
+    }
+    /**
+     * <code>repeated double packed_double = 86 [packed = true];</code>
+     * @return The count of packedDouble.
+     */
+    public int getPackedDoubleCount() {
+      return packedDouble_.size();
+    }
+    /**
+     * <code>repeated double packed_double = 86 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedDouble at the given index.
+     */
+    public double getPackedDouble(int index) {
+      return packedDouble_.getDouble(index);
+    }
+    private int packedDoubleMemoizedSerializedSize = -1;
+
+    public static final int PACKED_BOOL_FIELD_NUMBER = 87;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.BooleanList packedBool_ =
+        emptyBooleanList();
+    /**
+     * <code>repeated bool packed_bool = 87 [packed = true];</code>
+     * @return A list containing the packedBool.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Boolean>
+        getPackedBoolList() {
+      return packedBool_;
+    }
+    /**
+     * <code>repeated bool packed_bool = 87 [packed = true];</code>
+     * @return The count of packedBool.
+     */
+    public int getPackedBoolCount() {
+      return packedBool_.size();
+    }
+    /**
+     * <code>repeated bool packed_bool = 87 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedBool at the given index.
+     */
+    public boolean getPackedBool(int index) {
+      return packedBool_.getBoolean(index);
+    }
+    private int packedBoolMemoizedSerializedSize = -1;
+
+    public static final int PACKED_NESTED_ENUM_FIELD_NUMBER = 88;
+    @SuppressWarnings("serial")
+    private java.util.List<java.lang.Integer> packedNestedEnum_;
+    private static final com.google.protobuf.Internal.ListAdapter.Converter<
+        java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> packedNestedEnum_converter_ =
+            new com.google.protobuf.Internal.ListAdapter.Converter<
+                java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>() {
+              public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum convert(java.lang.Integer from) {
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(from);
+                return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.FOO : result;
+              }
+            };
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+     * @return A list containing the packedNestedEnum.
+     */
+    @java.lang.Override
+    public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> getPackedNestedEnumList() {
+      return new com.google.protobuf.Internal.ListAdapter<
+          java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>(packedNestedEnum_, packedNestedEnum_converter_);
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+     * @return The count of packedNestedEnum.
+     */
+    @java.lang.Override
+    public int getPackedNestedEnumCount() {
+      return packedNestedEnum_.size();
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedNestedEnum at the given index.
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getPackedNestedEnum(int index) {
+      return packedNestedEnum_converter_.convert(packedNestedEnum_.get(index));
+    }
+    private int packedNestedEnumMemoizedSerializedSize;
+
+    public static final int UNPACKED_INT32_FIELD_NUMBER = 89;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList unpackedInt32_ =
+        emptyIntList();
+    /**
+     * <pre>
+     * Unpacked
+     * </pre>
+     *
+     * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+     * @return A list containing the unpackedInt32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getUnpackedInt32List() {
+      return unpackedInt32_;
+    }
+    /**
+     * <pre>
+     * Unpacked
+     * </pre>
+     *
+     * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+     * @return The count of unpackedInt32.
+     */
+    public int getUnpackedInt32Count() {
+      return unpackedInt32_.size();
+    }
+    /**
+     * <pre>
+     * Unpacked
+     * </pre>
+     *
+     * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedInt32 at the given index.
+     */
+    public int getUnpackedInt32(int index) {
+      return unpackedInt32_.getInt(index);
+    }
+
+    public static final int UNPACKED_INT64_FIELD_NUMBER = 90;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList unpackedInt64_ =
+        emptyLongList();
+    /**
+     * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+     * @return A list containing the unpackedInt64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getUnpackedInt64List() {
+      return unpackedInt64_;
+    }
+    /**
+     * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+     * @return The count of unpackedInt64.
+     */
+    public int getUnpackedInt64Count() {
+      return unpackedInt64_.size();
+    }
+    /**
+     * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedInt64 at the given index.
+     */
+    public long getUnpackedInt64(int index) {
+      return unpackedInt64_.getLong(index);
+    }
+
+    public static final int UNPACKED_UINT32_FIELD_NUMBER = 91;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList unpackedUint32_ =
+        emptyIntList();
+    /**
+     * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+     * @return A list containing the unpackedUint32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getUnpackedUint32List() {
+      return unpackedUint32_;
+    }
+    /**
+     * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+     * @return The count of unpackedUint32.
+     */
+    public int getUnpackedUint32Count() {
+      return unpackedUint32_.size();
+    }
+    /**
+     * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedUint32 at the given index.
+     */
+    public int getUnpackedUint32(int index) {
+      return unpackedUint32_.getInt(index);
+    }
+
+    public static final int UNPACKED_UINT64_FIELD_NUMBER = 92;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList unpackedUint64_ =
+        emptyLongList();
+    /**
+     * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+     * @return A list containing the unpackedUint64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getUnpackedUint64List() {
+      return unpackedUint64_;
+    }
+    /**
+     * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+     * @return The count of unpackedUint64.
+     */
+    public int getUnpackedUint64Count() {
+      return unpackedUint64_.size();
+    }
+    /**
+     * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedUint64 at the given index.
+     */
+    public long getUnpackedUint64(int index) {
+      return unpackedUint64_.getLong(index);
+    }
+
+    public static final int UNPACKED_SINT32_FIELD_NUMBER = 93;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList unpackedSint32_ =
+        emptyIntList();
+    /**
+     * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+     * @return A list containing the unpackedSint32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getUnpackedSint32List() {
+      return unpackedSint32_;
+    }
+    /**
+     * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+     * @return The count of unpackedSint32.
+     */
+    public int getUnpackedSint32Count() {
+      return unpackedSint32_.size();
+    }
+    /**
+     * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedSint32 at the given index.
+     */
+    public int getUnpackedSint32(int index) {
+      return unpackedSint32_.getInt(index);
+    }
+
+    public static final int UNPACKED_SINT64_FIELD_NUMBER = 94;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList unpackedSint64_ =
+        emptyLongList();
+    /**
+     * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+     * @return A list containing the unpackedSint64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getUnpackedSint64List() {
+      return unpackedSint64_;
+    }
+    /**
+     * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+     * @return The count of unpackedSint64.
+     */
+    public int getUnpackedSint64Count() {
+      return unpackedSint64_.size();
+    }
+    /**
+     * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedSint64 at the given index.
+     */
+    public long getUnpackedSint64(int index) {
+      return unpackedSint64_.getLong(index);
+    }
+
+    public static final int UNPACKED_FIXED32_FIELD_NUMBER = 95;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList unpackedFixed32_ =
+        emptyIntList();
+    /**
+     * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+     * @return A list containing the unpackedFixed32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getUnpackedFixed32List() {
+      return unpackedFixed32_;
+    }
+    /**
+     * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+     * @return The count of unpackedFixed32.
+     */
+    public int getUnpackedFixed32Count() {
+      return unpackedFixed32_.size();
+    }
+    /**
+     * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedFixed32 at the given index.
+     */
+    public int getUnpackedFixed32(int index) {
+      return unpackedFixed32_.getInt(index);
+    }
+
+    public static final int UNPACKED_FIXED64_FIELD_NUMBER = 96;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList unpackedFixed64_ =
+        emptyLongList();
+    /**
+     * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+     * @return A list containing the unpackedFixed64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getUnpackedFixed64List() {
+      return unpackedFixed64_;
+    }
+    /**
+     * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+     * @return The count of unpackedFixed64.
+     */
+    public int getUnpackedFixed64Count() {
+      return unpackedFixed64_.size();
+    }
+    /**
+     * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedFixed64 at the given index.
+     */
+    public long getUnpackedFixed64(int index) {
+      return unpackedFixed64_.getLong(index);
+    }
+
+    public static final int UNPACKED_SFIXED32_FIELD_NUMBER = 97;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList unpackedSfixed32_ =
+        emptyIntList();
+    /**
+     * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+     * @return A list containing the unpackedSfixed32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getUnpackedSfixed32List() {
+      return unpackedSfixed32_;
+    }
+    /**
+     * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+     * @return The count of unpackedSfixed32.
+     */
+    public int getUnpackedSfixed32Count() {
+      return unpackedSfixed32_.size();
+    }
+    /**
+     * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedSfixed32 at the given index.
+     */
+    public int getUnpackedSfixed32(int index) {
+      return unpackedSfixed32_.getInt(index);
+    }
+
+    public static final int UNPACKED_SFIXED64_FIELD_NUMBER = 98;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList unpackedSfixed64_ =
+        emptyLongList();
+    /**
+     * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+     * @return A list containing the unpackedSfixed64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getUnpackedSfixed64List() {
+      return unpackedSfixed64_;
+    }
+    /**
+     * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+     * @return The count of unpackedSfixed64.
+     */
+    public int getUnpackedSfixed64Count() {
+      return unpackedSfixed64_.size();
+    }
+    /**
+     * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedSfixed64 at the given index.
+     */
+    public long getUnpackedSfixed64(int index) {
+      return unpackedSfixed64_.getLong(index);
+    }
+
+    public static final int UNPACKED_FLOAT_FIELD_NUMBER = 99;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.FloatList unpackedFloat_ =
+        emptyFloatList();
+    /**
+     * <code>repeated float unpacked_float = 99 [packed = false];</code>
+     * @return A list containing the unpackedFloat.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Float>
+        getUnpackedFloatList() {
+      return unpackedFloat_;
+    }
+    /**
+     * <code>repeated float unpacked_float = 99 [packed = false];</code>
+     * @return The count of unpackedFloat.
+     */
+    public int getUnpackedFloatCount() {
+      return unpackedFloat_.size();
+    }
+    /**
+     * <code>repeated float unpacked_float = 99 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedFloat at the given index.
+     */
+    public float getUnpackedFloat(int index) {
+      return unpackedFloat_.getFloat(index);
+    }
+
+    public static final int UNPACKED_DOUBLE_FIELD_NUMBER = 100;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.DoubleList unpackedDouble_ =
+        emptyDoubleList();
+    /**
+     * <code>repeated double unpacked_double = 100 [packed = false];</code>
+     * @return A list containing the unpackedDouble.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Double>
+        getUnpackedDoubleList() {
+      return unpackedDouble_;
+    }
+    /**
+     * <code>repeated double unpacked_double = 100 [packed = false];</code>
+     * @return The count of unpackedDouble.
+     */
+    public int getUnpackedDoubleCount() {
+      return unpackedDouble_.size();
+    }
+    /**
+     * <code>repeated double unpacked_double = 100 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedDouble at the given index.
+     */
+    public double getUnpackedDouble(int index) {
+      return unpackedDouble_.getDouble(index);
+    }
+
+    public static final int UNPACKED_BOOL_FIELD_NUMBER = 101;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.BooleanList unpackedBool_ =
+        emptyBooleanList();
+    /**
+     * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+     * @return A list containing the unpackedBool.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Boolean>
+        getUnpackedBoolList() {
+      return unpackedBool_;
+    }
+    /**
+     * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+     * @return The count of unpackedBool.
+     */
+    public int getUnpackedBoolCount() {
+      return unpackedBool_.size();
+    }
+    /**
+     * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedBool at the given index.
+     */
+    public boolean getUnpackedBool(int index) {
+      return unpackedBool_.getBoolean(index);
+    }
+
+    public static final int UNPACKED_NESTED_ENUM_FIELD_NUMBER = 102;
+    @SuppressWarnings("serial")
+    private java.util.List<java.lang.Integer> unpackedNestedEnum_;
+    private static final com.google.protobuf.Internal.ListAdapter.Converter<
+        java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> unpackedNestedEnum_converter_ =
+            new com.google.protobuf.Internal.ListAdapter.Converter<
+                java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>() {
+              public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum convert(java.lang.Integer from) {
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(from);
+                return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.FOO : result;
+              }
+            };
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+     * @return A list containing the unpackedNestedEnum.
+     */
+    @java.lang.Override
+    public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> getUnpackedNestedEnumList() {
+      return new com.google.protobuf.Internal.ListAdapter<
+          java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>(unpackedNestedEnum_, unpackedNestedEnum_converter_);
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+     * @return The count of unpackedNestedEnum.
+     */
+    @java.lang.Override
+    public int getUnpackedNestedEnumCount() {
+      return unpackedNestedEnum_.size();
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedNestedEnum at the given index.
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getUnpackedNestedEnum(int index) {
+      return unpackedNestedEnum_converter_.convert(unpackedNestedEnum_.get(index));
+    }
+
+    public static final int MAP_INT32_INT32_FIELD_NUMBER = 56;
+    private static final class MapInt32Int32DefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32Int32Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.INT32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.INT32,
+                  0);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Integer> mapInt32Int32_;
+    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+    internalGetMapInt32Int32() {
+      if (mapInt32Int32_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapInt32Int32DefaultEntryHolder.defaultEntry);
+      }
+      return mapInt32Int32_;
+    }
+    public int getMapInt32Int32Count() {
+      return internalGetMapInt32Int32().getMap().size();
+    }
+    /**
+     * <pre>
+     * Map
+     * </pre>
+     *
+     * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapInt32Int32(
+        int key) {
+
+      return internalGetMapInt32Int32().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapInt32Int32Map()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32() {
+      return getMapInt32Int32Map();
+    }
+    /**
+     * <pre>
+     * Map
+     * </pre>
+     *
+     * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32Map() {
+      return internalGetMapInt32Int32().getMap();
+    }
+    /**
+     * <pre>
+     * Map
+     * </pre>
+     *
+     * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+     */
+    @java.lang.Override
+    public int getMapInt32Int32OrDefault(
+        int key,
+        int defaultValue) {
+
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapInt32Int32().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <pre>
+     * Map
+     * </pre>
+     *
+     * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+     */
+    @java.lang.Override
+    public int getMapInt32Int32OrThrow(
+        int key) {
+
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapInt32Int32().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_INT64_INT64_FIELD_NUMBER = 57;
+    private static final class MapInt64Int64DefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Long, java.lang.Long> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Long, java.lang.Long>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt64Int64Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.INT64,
+                  0L,
+                  com.google.protobuf.WireFormat.FieldType.INT64,
+                  0L);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Long, java.lang.Long> mapInt64Int64_;
+    private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+    internalGetMapInt64Int64() {
+      if (mapInt64Int64_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapInt64Int64DefaultEntryHolder.defaultEntry);
+      }
+      return mapInt64Int64_;
+    }
+    public int getMapInt64Int64Count() {
+      return internalGetMapInt64Int64().getMap().size();
+    }
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapInt64Int64(
+        long key) {
+
+      return internalGetMapInt64Int64().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapInt64Int64Map()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Long, java.lang.Long> getMapInt64Int64() {
+      return getMapInt64Int64Map();
+    }
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Long, java.lang.Long> getMapInt64Int64Map() {
+      return internalGetMapInt64Int64().getMap();
+    }
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
+    @java.lang.Override
+    public long getMapInt64Int64OrDefault(
+        long key,
+        long defaultValue) {
+
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapInt64Int64().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
+    @java.lang.Override
+    public long getMapInt64Int64OrThrow(
+        long key) {
+
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapInt64Int64().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_UINT32_UINT32_FIELD_NUMBER = 58;
+    private static final class MapUint32Uint32DefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint32Uint32Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.UINT32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.UINT32,
+                  0);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Integer> mapUint32Uint32_;
+    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+    internalGetMapUint32Uint32() {
+      if (mapUint32Uint32_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapUint32Uint32DefaultEntryHolder.defaultEntry);
+      }
+      return mapUint32Uint32_;
+    }
+    public int getMapUint32Uint32Count() {
+      return internalGetMapUint32Uint32().getMap().size();
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapUint32Uint32(
+        int key) {
+
+      return internalGetMapUint32Uint32().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapUint32Uint32Map()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getMapUint32Uint32() {
+      return getMapUint32Uint32Map();
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getMapUint32Uint32Map() {
+      return internalGetMapUint32Uint32().getMap();
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
+    @java.lang.Override
+    public int getMapUint32Uint32OrDefault(
+        int key,
+        int defaultValue) {
+
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapUint32Uint32().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
+    @java.lang.Override
+    public int getMapUint32Uint32OrThrow(
+        int key) {
+
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapUint32Uint32().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_UINT64_UINT64_FIELD_NUMBER = 59;
+    private static final class MapUint64Uint64DefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Long, java.lang.Long> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Long, java.lang.Long>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint64Uint64Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.UINT64,
+                  0L,
+                  com.google.protobuf.WireFormat.FieldType.UINT64,
+                  0L);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Long, java.lang.Long> mapUint64Uint64_;
+    private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+    internalGetMapUint64Uint64() {
+      if (mapUint64Uint64_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapUint64Uint64DefaultEntryHolder.defaultEntry);
+      }
+      return mapUint64Uint64_;
+    }
+    public int getMapUint64Uint64Count() {
+      return internalGetMapUint64Uint64().getMap().size();
+    }
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapUint64Uint64(
+        long key) {
+
+      return internalGetMapUint64Uint64().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapUint64Uint64Map()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Long, java.lang.Long> getMapUint64Uint64() {
+      return getMapUint64Uint64Map();
+    }
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Long, java.lang.Long> getMapUint64Uint64Map() {
+      return internalGetMapUint64Uint64().getMap();
+    }
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
+    @java.lang.Override
+    public long getMapUint64Uint64OrDefault(
+        long key,
+        long defaultValue) {
+
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapUint64Uint64().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
+    @java.lang.Override
+    public long getMapUint64Uint64OrThrow(
+        long key) {
+
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapUint64Uint64().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_SINT32_SINT32_FIELD_NUMBER = 60;
+    private static final class MapSint32Sint32DefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint32Sint32Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.SINT32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.SINT32,
+                  0);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Integer> mapSint32Sint32_;
+    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+    internalGetMapSint32Sint32() {
+      if (mapSint32Sint32_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapSint32Sint32DefaultEntryHolder.defaultEntry);
+      }
+      return mapSint32Sint32_;
+    }
+    public int getMapSint32Sint32Count() {
+      return internalGetMapSint32Sint32().getMap().size();
+    }
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapSint32Sint32(
+        int key) {
+
+      return internalGetMapSint32Sint32().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapSint32Sint32Map()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSint32Sint32() {
+      return getMapSint32Sint32Map();
+    }
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSint32Sint32Map() {
+      return internalGetMapSint32Sint32().getMap();
+    }
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
+    @java.lang.Override
+    public int getMapSint32Sint32OrDefault(
+        int key,
+        int defaultValue) {
+
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapSint32Sint32().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
+    @java.lang.Override
+    public int getMapSint32Sint32OrThrow(
+        int key) {
+
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapSint32Sint32().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_SINT64_SINT64_FIELD_NUMBER = 61;
+    private static final class MapSint64Sint64DefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Long, java.lang.Long> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Long, java.lang.Long>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint64Sint64Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.SINT64,
+                  0L,
+                  com.google.protobuf.WireFormat.FieldType.SINT64,
+                  0L);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Long, java.lang.Long> mapSint64Sint64_;
+    private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+    internalGetMapSint64Sint64() {
+      if (mapSint64Sint64_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapSint64Sint64DefaultEntryHolder.defaultEntry);
+      }
+      return mapSint64Sint64_;
+    }
+    public int getMapSint64Sint64Count() {
+      return internalGetMapSint64Sint64().getMap().size();
+    }
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapSint64Sint64(
+        long key) {
+
+      return internalGetMapSint64Sint64().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapSint64Sint64Map()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Long, java.lang.Long> getMapSint64Sint64() {
+      return getMapSint64Sint64Map();
+    }
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Long, java.lang.Long> getMapSint64Sint64Map() {
+      return internalGetMapSint64Sint64().getMap();
+    }
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
+    @java.lang.Override
+    public long getMapSint64Sint64OrDefault(
+        long key,
+        long defaultValue) {
+
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapSint64Sint64().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
+    @java.lang.Override
+    public long getMapSint64Sint64OrThrow(
+        long key) {
+
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapSint64Sint64().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_FIXED32_FIXED32_FIELD_NUMBER = 62;
+    private static final class MapFixed32Fixed32DefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed32Fixed32Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.FIXED32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.FIXED32,
+                  0);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Integer> mapFixed32Fixed32_;
+    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+    internalGetMapFixed32Fixed32() {
+      if (mapFixed32Fixed32_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapFixed32Fixed32DefaultEntryHolder.defaultEntry);
+      }
+      return mapFixed32Fixed32_;
+    }
+    public int getMapFixed32Fixed32Count() {
+      return internalGetMapFixed32Fixed32().getMap().size();
+    }
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapFixed32Fixed32(
+        int key) {
+
+      return internalGetMapFixed32Fixed32().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapFixed32Fixed32Map()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getMapFixed32Fixed32() {
+      return getMapFixed32Fixed32Map();
+    }
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getMapFixed32Fixed32Map() {
+      return internalGetMapFixed32Fixed32().getMap();
+    }
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
+    @java.lang.Override
+    public int getMapFixed32Fixed32OrDefault(
+        int key,
+        int defaultValue) {
+
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapFixed32Fixed32().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
+    @java.lang.Override
+    public int getMapFixed32Fixed32OrThrow(
+        int key) {
+
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapFixed32Fixed32().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_FIXED64_FIXED64_FIELD_NUMBER = 63;
+    private static final class MapFixed64Fixed64DefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Long, java.lang.Long> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Long, java.lang.Long>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed64Fixed64Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.FIXED64,
+                  0L,
+                  com.google.protobuf.WireFormat.FieldType.FIXED64,
+                  0L);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Long, java.lang.Long> mapFixed64Fixed64_;
+    private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+    internalGetMapFixed64Fixed64() {
+      if (mapFixed64Fixed64_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapFixed64Fixed64DefaultEntryHolder.defaultEntry);
+      }
+      return mapFixed64Fixed64_;
+    }
+    public int getMapFixed64Fixed64Count() {
+      return internalGetMapFixed64Fixed64().getMap().size();
+    }
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapFixed64Fixed64(
+        long key) {
+
+      return internalGetMapFixed64Fixed64().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapFixed64Fixed64Map()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Long, java.lang.Long> getMapFixed64Fixed64() {
+      return getMapFixed64Fixed64Map();
+    }
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Long, java.lang.Long> getMapFixed64Fixed64Map() {
+      return internalGetMapFixed64Fixed64().getMap();
+    }
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
+    @java.lang.Override
+    public long getMapFixed64Fixed64OrDefault(
+        long key,
+        long defaultValue) {
+
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapFixed64Fixed64().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
+    @java.lang.Override
+    public long getMapFixed64Fixed64OrThrow(
+        long key) {
+
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapFixed64Fixed64().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_SFIXED32_SFIXED32_FIELD_NUMBER = 64;
+    private static final class MapSfixed32Sfixed32DefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed32Sfixed32Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.SFIXED32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.SFIXED32,
+                  0);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Integer> mapSfixed32Sfixed32_;
+    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+    internalGetMapSfixed32Sfixed32() {
+      if (mapSfixed32Sfixed32_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry);
+      }
+      return mapSfixed32Sfixed32_;
+    }
+    public int getMapSfixed32Sfixed32Count() {
+      return internalGetMapSfixed32Sfixed32().getMap().size();
+    }
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapSfixed32Sfixed32(
+        int key) {
+
+      return internalGetMapSfixed32Sfixed32().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapSfixed32Sfixed32Map()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSfixed32Sfixed32() {
+      return getMapSfixed32Sfixed32Map();
+    }
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSfixed32Sfixed32Map() {
+      return internalGetMapSfixed32Sfixed32().getMap();
+    }
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    @java.lang.Override
+    public int getMapSfixed32Sfixed32OrDefault(
+        int key,
+        int defaultValue) {
+
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapSfixed32Sfixed32().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    @java.lang.Override
+    public int getMapSfixed32Sfixed32OrThrow(
+        int key) {
+
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapSfixed32Sfixed32().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_SFIXED64_SFIXED64_FIELD_NUMBER = 65;
+    private static final class MapSfixed64Sfixed64DefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Long, java.lang.Long> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Long, java.lang.Long>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed64Sfixed64Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.SFIXED64,
+                  0L,
+                  com.google.protobuf.WireFormat.FieldType.SFIXED64,
+                  0L);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Long, java.lang.Long> mapSfixed64Sfixed64_;
+    private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+    internalGetMapSfixed64Sfixed64() {
+      if (mapSfixed64Sfixed64_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry);
+      }
+      return mapSfixed64Sfixed64_;
+    }
+    public int getMapSfixed64Sfixed64Count() {
+      return internalGetMapSfixed64Sfixed64().getMap().size();
+    }
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapSfixed64Sfixed64(
+        long key) {
+
+      return internalGetMapSfixed64Sfixed64().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapSfixed64Sfixed64Map()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Long, java.lang.Long> getMapSfixed64Sfixed64() {
+      return getMapSfixed64Sfixed64Map();
+    }
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Long, java.lang.Long> getMapSfixed64Sfixed64Map() {
+      return internalGetMapSfixed64Sfixed64().getMap();
+    }
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    @java.lang.Override
+    public long getMapSfixed64Sfixed64OrDefault(
+        long key,
+        long defaultValue) {
+
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapSfixed64Sfixed64().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    @java.lang.Override
+    public long getMapSfixed64Sfixed64OrThrow(
+        long key) {
+
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapSfixed64Sfixed64().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_INT32_FLOAT_FIELD_NUMBER = 66;
+    private static final class MapInt32FloatDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Float> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Float>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32FloatEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.INT32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.FLOAT,
+                  0F);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Float> mapInt32Float_;
+    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float>
+    internalGetMapInt32Float() {
+      if (mapInt32Float_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapInt32FloatDefaultEntryHolder.defaultEntry);
+      }
+      return mapInt32Float_;
+    }
+    public int getMapInt32FloatCount() {
+      return internalGetMapInt32Float().getMap().size();
+    }
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapInt32Float(
+        int key) {
+
+      return internalGetMapInt32Float().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapInt32FloatMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Integer, java.lang.Float> getMapInt32Float() {
+      return getMapInt32FloatMap();
+    }
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Integer, java.lang.Float> getMapInt32FloatMap() {
+      return internalGetMapInt32Float().getMap();
+    }
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    @java.lang.Override
+    public float getMapInt32FloatOrDefault(
+        int key,
+        float defaultValue) {
+
+      java.util.Map<java.lang.Integer, java.lang.Float> map =
+          internalGetMapInt32Float().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    @java.lang.Override
+    public float getMapInt32FloatOrThrow(
+        int key) {
+
+      java.util.Map<java.lang.Integer, java.lang.Float> map =
+          internalGetMapInt32Float().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_INT32_DOUBLE_FIELD_NUMBER = 67;
+    private static final class MapInt32DoubleDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Double> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Double>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32DoubleEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.INT32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.DOUBLE,
+                  0D);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Double> mapInt32Double_;
+    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Double>
+    internalGetMapInt32Double() {
+      if (mapInt32Double_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapInt32DoubleDefaultEntryHolder.defaultEntry);
+      }
+      return mapInt32Double_;
+    }
+    public int getMapInt32DoubleCount() {
+      return internalGetMapInt32Double().getMap().size();
+    }
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapInt32Double(
+        int key) {
+
+      return internalGetMapInt32Double().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapInt32DoubleMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Integer, java.lang.Double> getMapInt32Double() {
+      return getMapInt32DoubleMap();
+    }
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Integer, java.lang.Double> getMapInt32DoubleMap() {
+      return internalGetMapInt32Double().getMap();
+    }
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    @java.lang.Override
+    public double getMapInt32DoubleOrDefault(
+        int key,
+        double defaultValue) {
+
+      java.util.Map<java.lang.Integer, java.lang.Double> map =
+          internalGetMapInt32Double().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    @java.lang.Override
+    public double getMapInt32DoubleOrThrow(
+        int key) {
+
+      java.util.Map<java.lang.Integer, java.lang.Double> map =
+          internalGetMapInt32Double().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_BOOL_BOOL_FIELD_NUMBER = 68;
+    private static final class MapBoolBoolDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Boolean, java.lang.Boolean> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Boolean, java.lang.Boolean>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapBoolBoolEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.BOOL,
+                  false,
+                  com.google.protobuf.WireFormat.FieldType.BOOL,
+                  false);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Boolean, java.lang.Boolean> mapBoolBool_;
+    private com.google.protobuf.MapField<java.lang.Boolean, java.lang.Boolean>
+    internalGetMapBoolBool() {
+      if (mapBoolBool_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapBoolBoolDefaultEntryHolder.defaultEntry);
+      }
+      return mapBoolBool_;
+    }
+    public int getMapBoolBoolCount() {
+      return internalGetMapBoolBool().getMap().size();
+    }
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapBoolBool(
+        boolean key) {
+
+      return internalGetMapBoolBool().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapBoolBoolMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Boolean, java.lang.Boolean> getMapBoolBool() {
+      return getMapBoolBoolMap();
+    }
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Boolean, java.lang.Boolean> getMapBoolBoolMap() {
+      return internalGetMapBoolBool().getMap();
+    }
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    @java.lang.Override
+    public boolean getMapBoolBoolOrDefault(
+        boolean key,
+        boolean defaultValue) {
+
+      java.util.Map<java.lang.Boolean, java.lang.Boolean> map =
+          internalGetMapBoolBool().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    @java.lang.Override
+    public boolean getMapBoolBoolOrThrow(
+        boolean key) {
+
+      java.util.Map<java.lang.Boolean, java.lang.Boolean> map =
+          internalGetMapBoolBool().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_STRING_STRING_FIELD_NUMBER = 69;
+    private static final class MapStringStringDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.String, java.lang.String> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.String, java.lang.String>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringStringEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "");
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.String, java.lang.String> mapStringString_;
+    private com.google.protobuf.MapField<java.lang.String, java.lang.String>
+    internalGetMapStringString() {
+      if (mapStringString_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapStringStringDefaultEntryHolder.defaultEntry);
+      }
+      return mapStringString_;
+    }
+    public int getMapStringStringCount() {
+      return internalGetMapStringString().getMap().size();
+    }
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapStringString(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      return internalGetMapStringString().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapStringStringMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.String, java.lang.String> getMapStringString() {
+      return getMapStringStringMap();
+    }
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.String, java.lang.String> getMapStringStringMap() {
+      return internalGetMapStringString().getMap();
+    }
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    @java.lang.Override
+    public /* nullable */
+java.lang.String getMapStringStringOrDefault(
+        java.lang.String key,
+        /* nullable */
+java.lang.String defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, java.lang.String> map =
+          internalGetMapStringString().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    @java.lang.Override
+    public java.lang.String getMapStringStringOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, java.lang.String> map =
+          internalGetMapStringString().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_STRING_BYTES_FIELD_NUMBER = 70;
+    private static final class MapStringBytesDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.String, com.google.protobuf.ByteString> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.String, com.google.protobuf.ByteString>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringBytesEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.BYTES,
+                  com.google.protobuf.ByteString.EMPTY);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.String, com.google.protobuf.ByteString> mapStringBytes_;
+    private com.google.protobuf.MapField<java.lang.String, com.google.protobuf.ByteString>
+    internalGetMapStringBytes() {
+      if (mapStringBytes_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapStringBytesDefaultEntryHolder.defaultEntry);
+      }
+      return mapStringBytes_;
+    }
+    public int getMapStringBytesCount() {
+      return internalGetMapStringBytes().getMap().size();
+    }
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapStringBytes(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      return internalGetMapStringBytes().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapStringBytesMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.String, com.google.protobuf.ByteString> getMapStringBytes() {
+      return getMapStringBytesMap();
+    }
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.String, com.google.protobuf.ByteString> getMapStringBytesMap() {
+      return internalGetMapStringBytes().getMap();
+    }
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    @java.lang.Override
+    public /* nullable */
+com.google.protobuf.ByteString getMapStringBytesOrDefault(
+        java.lang.String key,
+        /* nullable */
+com.google.protobuf.ByteString defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, com.google.protobuf.ByteString> map =
+          internalGetMapStringBytes().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString getMapStringBytesOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, com.google.protobuf.ByteString> map =
+          internalGetMapStringBytes().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_STRING_NESTED_MESSAGE_FIELD_NUMBER = 71;
+    private static final class MapStringNestedMessageDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedMessageEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.MESSAGE,
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance());
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> mapStringNestedMessage_;
+    private com.google.protobuf.MapField<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage>
+    internalGetMapStringNestedMessage() {
+      if (mapStringNestedMessage_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapStringNestedMessageDefaultEntryHolder.defaultEntry);
+      }
+      return mapStringNestedMessage_;
+    }
+    public int getMapStringNestedMessageCount() {
+      return internalGetMapStringNestedMessage().getMap().size();
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapStringNestedMessage(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      return internalGetMapStringNestedMessage().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapStringNestedMessageMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> getMapStringNestedMessage() {
+      return getMapStringNestedMessageMap();
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> getMapStringNestedMessageMap() {
+      return internalGetMapStringNestedMessage().getMap();
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    @java.lang.Override
+    public /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getMapStringNestedMessageOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> map =
+          internalGetMapStringNestedMessage().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getMapStringNestedMessageOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> map =
+          internalGetMapStringNestedMessage().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_STRING_FOREIGN_MESSAGE_FIELD_NUMBER = 72;
+    private static final class MapStringForeignMessageDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignMessageEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.MESSAGE,
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.getDefaultInstance());
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> mapStringForeignMessage_;
+    private com.google.protobuf.MapField<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage>
+    internalGetMapStringForeignMessage() {
+      if (mapStringForeignMessage_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapStringForeignMessageDefaultEntryHolder.defaultEntry);
+      }
+      return mapStringForeignMessage_;
+    }
+    public int getMapStringForeignMessageCount() {
+      return internalGetMapStringForeignMessage().getMap().size();
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapStringForeignMessage(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      return internalGetMapStringForeignMessage().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapStringForeignMessageMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> getMapStringForeignMessage() {
+      return getMapStringForeignMessageMap();
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> getMapStringForeignMessageMap() {
+      return internalGetMapStringForeignMessage().getMap();
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    @java.lang.Override
+    public /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getMapStringForeignMessageOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> map =
+          internalGetMapStringForeignMessage().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getMapStringForeignMessageOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> map =
+          internalGetMapStringForeignMessage().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_STRING_NESTED_ENUM_FIELD_NUMBER = 73;
+    private static final class MapStringNestedEnumDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.String, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.String, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedEnumEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.ENUM,
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.FOO.getNumber());
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.String, java.lang.Integer> mapStringNestedEnum_;
+    private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
+    internalGetMapStringNestedEnum() {
+      if (mapStringNestedEnum_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapStringNestedEnumDefaultEntryHolder.defaultEntry);
+      }
+      return mapStringNestedEnum_;
+    }
+    private static final
+    com.google.protobuf.Internal.MapAdapter.Converter<
+        java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> mapStringNestedEnumValueConverter =
+            com.google.protobuf.Internal.MapAdapter.newEnumConverter(
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.internalGetValueMap(),
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.FOO);
+    private static final java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>
+    internalGetAdaptedMapStringNestedEnumMap(
+        java.util.Map<java.lang.String, java.lang.Integer> map) {
+      return new com.google.protobuf.Internal.MapAdapter<
+          java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum, java.lang.Integer>(
+              map, mapStringNestedEnumValueConverter);
+    }
+    public int getMapStringNestedEnumCount() {
+      return internalGetMapStringNestedEnum().getMap().size();
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapStringNestedEnum(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      return internalGetMapStringNestedEnum().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapStringNestedEnumMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>
+    getMapStringNestedEnum() {
+      return getMapStringNestedEnumMap();
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>
+    getMapStringNestedEnumMap() {
+      return internalGetAdaptedMapStringNestedEnumMap(
+          internalGetMapStringNestedEnum().getMap());}
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    @java.lang.Override
+    public /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getMapStringNestedEnumOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, java.lang.Integer> map =
+          internalGetMapStringNestedEnum().getMap();
+      return map.containsKey(key)
+             ? mapStringNestedEnumValueConverter.doForward(map.get(key))
+             : defaultValue;
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getMapStringNestedEnumOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, java.lang.Integer> map =
+          internalGetMapStringNestedEnum().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return mapStringNestedEnumValueConverter.doForward(map.get(key));
+    }
+
+    public static final int MAP_STRING_FOREIGN_ENUM_FIELD_NUMBER = 74;
+    private static final class MapStringForeignEnumDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.String, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.String, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignEnumEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.ENUM,
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.FOREIGN_FOO.getNumber());
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.String, java.lang.Integer> mapStringForeignEnum_;
+    private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
+    internalGetMapStringForeignEnum() {
+      if (mapStringForeignEnum_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapStringForeignEnumDefaultEntryHolder.defaultEntry);
+      }
+      return mapStringForeignEnum_;
+    }
+    private static final
+    com.google.protobuf.Internal.MapAdapter.Converter<
+        java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum> mapStringForeignEnumValueConverter =
+            com.google.protobuf.Internal.MapAdapter.newEnumConverter(
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.internalGetValueMap(),
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.FOREIGN_FOO);
+    private static final java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum>
+    internalGetAdaptedMapStringForeignEnumMap(
+        java.util.Map<java.lang.String, java.lang.Integer> map) {
+      return new com.google.protobuf.Internal.MapAdapter<
+          java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum, java.lang.Integer>(
+              map, mapStringForeignEnumValueConverter);
+    }
+    public int getMapStringForeignEnumCount() {
+      return internalGetMapStringForeignEnum().getMap().size();
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapStringForeignEnum(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      return internalGetMapStringForeignEnum().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapStringForeignEnumMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum>
+    getMapStringForeignEnum() {
+      return getMapStringForeignEnumMap();
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum>
+    getMapStringForeignEnumMap() {
+      return internalGetAdaptedMapStringForeignEnumMap(
+          internalGetMapStringForeignEnum().getMap());}
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    @java.lang.Override
+    public /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getMapStringForeignEnumOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, java.lang.Integer> map =
+          internalGetMapStringForeignEnum().getMap();
+      return map.containsKey(key)
+             ? mapStringForeignEnumValueConverter.doForward(map.get(key))
+             : defaultValue;
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getMapStringForeignEnumOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, java.lang.Integer> map =
+          internalGetMapStringForeignEnum().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return mapStringForeignEnumValueConverter.doForward(map.get(key));
+    }
+
+    public static final int ONEOF_UINT32_FIELD_NUMBER = 111;
+    /**
+     * <code>uint32 oneof_uint32 = 111;</code>
+     * @return Whether the oneofUint32 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOneofUint32() {
+      return oneofFieldCase_ == 111;
+    }
+    /**
+     * <code>uint32 oneof_uint32 = 111;</code>
+     * @return The oneofUint32.
+     */
+    @java.lang.Override
+    public int getOneofUint32() {
+      if (oneofFieldCase_ == 111) {
+        return (java.lang.Integer) oneofField_;
+      }
+      return 0;
+    }
+
+    public static final int ONEOF_NESTED_MESSAGE_FIELD_NUMBER = 112;
+    /**
+     * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+     * @return Whether the oneofNestedMessage field is set.
+     */
+    @java.lang.Override
+    public boolean hasOneofNestedMessage() {
+      return oneofFieldCase_ == 112;
+    }
+    /**
+     * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+     * @return The oneofNestedMessage.
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getOneofNestedMessage() {
+      if (oneofFieldCase_ == 112) {
+         return (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) oneofField_;
+      }
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance();
+    }
+    /**
+     * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder getOneofNestedMessageOrBuilder() {
+      if (oneofFieldCase_ == 112) {
+         return (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) oneofField_;
+      }
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance();
+    }
+
+    public static final int ONEOF_STRING_FIELD_NUMBER = 113;
+    /**
+     * <code>string oneof_string = 113;</code>
+     * @return Whether the oneofString field is set.
+     */
+    public boolean hasOneofString() {
+      return oneofFieldCase_ == 113;
+    }
+    /**
+     * <code>string oneof_string = 113;</code>
+     * @return The oneofString.
+     */
+    public java.lang.String getOneofString() {
+      java.lang.Object ref = "";
+      if (oneofFieldCase_ == 113) {
+        ref = oneofField_;
+      }
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8() && (oneofFieldCase_ == 113)) {
+          oneofField_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     * <code>string oneof_string = 113;</code>
+     * @return The bytes for oneofString.
+     */
+    public com.google.protobuf.ByteString
+        getOneofStringBytes() {
+      java.lang.Object ref = "";
+      if (oneofFieldCase_ == 113) {
+        ref = oneofField_;
+      }
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        if (oneofFieldCase_ == 113) {
+          oneofField_ = b;
+        }
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int ONEOF_BYTES_FIELD_NUMBER = 114;
+    /**
+     * <code>bytes oneof_bytes = 114;</code>
+     * @return Whether the oneofBytes field is set.
+     */
+    @java.lang.Override
+    public boolean hasOneofBytes() {
+      return oneofFieldCase_ == 114;
+    }
+    /**
+     * <code>bytes oneof_bytes = 114;</code>
+     * @return The oneofBytes.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString getOneofBytes() {
+      if (oneofFieldCase_ == 114) {
+        return (com.google.protobuf.ByteString) oneofField_;
+      }
+      return com.google.protobuf.ByteString.EMPTY;
+    }
+
+    public static final int ONEOF_BOOL_FIELD_NUMBER = 115;
+    /**
+     * <code>bool oneof_bool = 115;</code>
+     * @return Whether the oneofBool field is set.
+     */
+    @java.lang.Override
+    public boolean hasOneofBool() {
+      return oneofFieldCase_ == 115;
+    }
+    /**
+     * <code>bool oneof_bool = 115;</code>
+     * @return The oneofBool.
+     */
+    @java.lang.Override
+    public boolean getOneofBool() {
+      if (oneofFieldCase_ == 115) {
+        return (java.lang.Boolean) oneofField_;
+      }
+      return false;
+    }
+
+    public static final int ONEOF_UINT64_FIELD_NUMBER = 116;
+    /**
+     * <code>uint64 oneof_uint64 = 116;</code>
+     * @return Whether the oneofUint64 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOneofUint64() {
+      return oneofFieldCase_ == 116;
+    }
+    /**
+     * <code>uint64 oneof_uint64 = 116;</code>
+     * @return The oneofUint64.
+     */
+    @java.lang.Override
+    public long getOneofUint64() {
+      if (oneofFieldCase_ == 116) {
+        return (java.lang.Long) oneofField_;
+      }
+      return 0L;
+    }
+
+    public static final int ONEOF_FLOAT_FIELD_NUMBER = 117;
+    /**
+     * <code>float oneof_float = 117;</code>
+     * @return Whether the oneofFloat field is set.
+     */
+    @java.lang.Override
+    public boolean hasOneofFloat() {
+      return oneofFieldCase_ == 117;
+    }
+    /**
+     * <code>float oneof_float = 117;</code>
+     * @return The oneofFloat.
+     */
+    @java.lang.Override
+    public float getOneofFloat() {
+      if (oneofFieldCase_ == 117) {
+        return (java.lang.Float) oneofField_;
+      }
+      return 0F;
+    }
+
+    public static final int ONEOF_DOUBLE_FIELD_NUMBER = 118;
+    /**
+     * <code>double oneof_double = 118;</code>
+     * @return Whether the oneofDouble field is set.
+     */
+    @java.lang.Override
+    public boolean hasOneofDouble() {
+      return oneofFieldCase_ == 118;
+    }
+    /**
+     * <code>double oneof_double = 118;</code>
+     * @return The oneofDouble.
+     */
+    @java.lang.Override
+    public double getOneofDouble() {
+      if (oneofFieldCase_ == 118) {
+        return (java.lang.Double) oneofField_;
+      }
+      return 0D;
+    }
+
+    public static final int ONEOF_ENUM_FIELD_NUMBER = 119;
+    /**
+     * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum oneof_enum = 119;</code>
+     * @return Whether the oneofEnum field is set.
+     */
+    public boolean hasOneofEnum() {
+      return oneofFieldCase_ == 119;
+    }
+    /**
+     * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum oneof_enum = 119;</code>
+     * @return The oneofEnum.
+     */
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getOneofEnum() {
+      if (oneofFieldCase_ == 119) {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(
+            (java.lang.Integer) oneofField_);
+        return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.FOO : result;
+      }
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.FOO;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      if (hasOptionalNestedMessage()) {
+        if (!getOptionalNestedMessage().isInitialized()) {
+          memoizedIsInitialized = 0;
+          return false;
+        }
+      }
+      if (hasRecursiveMessage()) {
+        if (!getRecursiveMessage().isInitialized()) {
+          memoizedIsInitialized = 0;
+          return false;
+        }
+      }
+      for (int i = 0; i < getRepeatedNestedMessageCount(); i++) {
+        if (!getRepeatedNestedMessage(i).isInitialized()) {
+          memoizedIsInitialized = 0;
+          return false;
+        }
+      }
+      for (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage item : getMapStringNestedMessageMap().values()) {
+        if (!item.isInitialized()) {
+          memoizedIsInitialized = 0;
+          return false;
+        }
+      }
+      if (hasOneofNestedMessage()) {
+        if (!getOneofNestedMessage().isInitialized()) {
+          memoizedIsInitialized = 0;
+          return false;
+        }
+      }
+      if (!extensionsAreInitialized()) {
+        memoizedIsInitialized = 0;
+        return false;
+      }
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      getSerializedSize();
+      com.google.protobuf.GeneratedMessageV3
+        .ExtendableMessage<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2>.ExtensionWriter
+          extensionWriter = newExtensionWriter();
+      if (((bitField0_ & 0x00000001) != 0)) {
+        output.writeInt32(1, optionalInt32_);
+      }
+      if (((bitField0_ & 0x00000002) != 0)) {
+        output.writeInt64(2, optionalInt64_);
+      }
+      if (((bitField0_ & 0x00000004) != 0)) {
+        output.writeUInt32(3, optionalUint32_);
+      }
+      if (((bitField0_ & 0x00000008) != 0)) {
+        output.writeUInt64(4, optionalUint64_);
+      }
+      if (((bitField0_ & 0x00000010) != 0)) {
+        output.writeSInt32(5, optionalSint32_);
+      }
+      if (((bitField0_ & 0x00000020) != 0)) {
+        output.writeSInt64(6, optionalSint64_);
+      }
+      if (((bitField0_ & 0x00000040) != 0)) {
+        output.writeFixed32(7, optionalFixed32_);
+      }
+      if (((bitField0_ & 0x00000080) != 0)) {
+        output.writeFixed64(8, optionalFixed64_);
+      }
+      if (((bitField0_ & 0x00000100) != 0)) {
+        output.writeSFixed32(9, optionalSfixed32_);
+      }
+      if (((bitField0_ & 0x00000200) != 0)) {
+        output.writeSFixed64(10, optionalSfixed64_);
+      }
+      if (((bitField0_ & 0x00000400) != 0)) {
+        output.writeFloat(11, optionalFloat_);
+      }
+      if (((bitField0_ & 0x00000800) != 0)) {
+        output.writeDouble(12, optionalDouble_);
+      }
+      if (((bitField0_ & 0x00001000) != 0)) {
+        output.writeBool(13, optionalBool_);
+      }
+      if (((bitField0_ & 0x00002000) != 0)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 14, optionalString_);
+      }
+      if (((bitField0_ & 0x00004000) != 0)) {
+        output.writeBytes(15, optionalBytes_);
+      }
+      if (((bitField0_ & 0x00008000) != 0)) {
+        output.writeMessage(18, getOptionalNestedMessage());
+      }
+      if (((bitField0_ & 0x00010000) != 0)) {
+        output.writeMessage(19, getOptionalForeignMessage());
+      }
+      if (((bitField0_ & 0x00020000) != 0)) {
+        output.writeEnum(21, optionalNestedEnum_);
+      }
+      if (((bitField0_ & 0x00040000) != 0)) {
+        output.writeEnum(22, optionalForeignEnum_);
+      }
+      if (((bitField0_ & 0x00080000) != 0)) {
+        output.writeEnum(23, optionalAliasedEnum_);
+      }
+      if (((bitField0_ & 0x00100000) != 0)) {
+        output.writeMessage(27, getRecursiveMessage());
+      }
+      for (int i = 0; i < repeatedInt32_.size(); i++) {
+        output.writeInt32(31, repeatedInt32_.getInt(i));
+      }
+      for (int i = 0; i < repeatedInt64_.size(); i++) {
+        output.writeInt64(32, repeatedInt64_.getLong(i));
+      }
+      for (int i = 0; i < repeatedUint32_.size(); i++) {
+        output.writeUInt32(33, repeatedUint32_.getInt(i));
+      }
+      for (int i = 0; i < repeatedUint64_.size(); i++) {
+        output.writeUInt64(34, repeatedUint64_.getLong(i));
+      }
+      for (int i = 0; i < repeatedSint32_.size(); i++) {
+        output.writeSInt32(35, repeatedSint32_.getInt(i));
+      }
+      for (int i = 0; i < repeatedSint64_.size(); i++) {
+        output.writeSInt64(36, repeatedSint64_.getLong(i));
+      }
+      for (int i = 0; i < repeatedFixed32_.size(); i++) {
+        output.writeFixed32(37, repeatedFixed32_.getInt(i));
+      }
+      for (int i = 0; i < repeatedFixed64_.size(); i++) {
+        output.writeFixed64(38, repeatedFixed64_.getLong(i));
+      }
+      for (int i = 0; i < repeatedSfixed32_.size(); i++) {
+        output.writeSFixed32(39, repeatedSfixed32_.getInt(i));
+      }
+      for (int i = 0; i < repeatedSfixed64_.size(); i++) {
+        output.writeSFixed64(40, repeatedSfixed64_.getLong(i));
+      }
+      for (int i = 0; i < repeatedFloat_.size(); i++) {
+        output.writeFloat(41, repeatedFloat_.getFloat(i));
+      }
+      for (int i = 0; i < repeatedDouble_.size(); i++) {
+        output.writeDouble(42, repeatedDouble_.getDouble(i));
+      }
+      for (int i = 0; i < repeatedBool_.size(); i++) {
+        output.writeBool(43, repeatedBool_.getBoolean(i));
+      }
+      for (int i = 0; i < repeatedString_.size(); i++) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 44, repeatedString_.getRaw(i));
+      }
+      for (int i = 0; i < repeatedBytes_.size(); i++) {
+        output.writeBytes(45, repeatedBytes_.get(i));
+      }
+      for (int i = 0; i < repeatedNestedMessage_.size(); i++) {
+        output.writeMessage(48, repeatedNestedMessage_.get(i));
+      }
+      for (int i = 0; i < repeatedForeignMessage_.size(); i++) {
+        output.writeMessage(49, repeatedForeignMessage_.get(i));
+      }
+      for (int i = 0; i < repeatedNestedEnum_.size(); i++) {
+        output.writeEnum(51, repeatedNestedEnum_.get(i));
+      }
+      for (int i = 0; i < repeatedForeignEnum_.size(); i++) {
+        output.writeEnum(52, repeatedForeignEnum_.get(i));
+      }
+      com.google.protobuf.GeneratedMessageV3
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapInt32Int32(),
+          MapInt32Int32DefaultEntryHolder.defaultEntry,
+          56);
+      com.google.protobuf.GeneratedMessageV3
+        .serializeLongMapTo(
+          output,
+          internalGetMapInt64Int64(),
+          MapInt64Int64DefaultEntryHolder.defaultEntry,
+          57);
+      com.google.protobuf.GeneratedMessageV3
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapUint32Uint32(),
+          MapUint32Uint32DefaultEntryHolder.defaultEntry,
+          58);
+      com.google.protobuf.GeneratedMessageV3
+        .serializeLongMapTo(
+          output,
+          internalGetMapUint64Uint64(),
+          MapUint64Uint64DefaultEntryHolder.defaultEntry,
+          59);
+      com.google.protobuf.GeneratedMessageV3
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapSint32Sint32(),
+          MapSint32Sint32DefaultEntryHolder.defaultEntry,
+          60);
+      com.google.protobuf.GeneratedMessageV3
+        .serializeLongMapTo(
+          output,
+          internalGetMapSint64Sint64(),
+          MapSint64Sint64DefaultEntryHolder.defaultEntry,
+          61);
+      com.google.protobuf.GeneratedMessageV3
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapFixed32Fixed32(),
+          MapFixed32Fixed32DefaultEntryHolder.defaultEntry,
+          62);
+      com.google.protobuf.GeneratedMessageV3
+        .serializeLongMapTo(
+          output,
+          internalGetMapFixed64Fixed64(),
+          MapFixed64Fixed64DefaultEntryHolder.defaultEntry,
+          63);
+      com.google.protobuf.GeneratedMessageV3
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapSfixed32Sfixed32(),
+          MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry,
+          64);
+      com.google.protobuf.GeneratedMessageV3
+        .serializeLongMapTo(
+          output,
+          internalGetMapSfixed64Sfixed64(),
+          MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry,
+          65);
+      com.google.protobuf.GeneratedMessageV3
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapInt32Float(),
+          MapInt32FloatDefaultEntryHolder.defaultEntry,
+          66);
+      com.google.protobuf.GeneratedMessageV3
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapInt32Double(),
+          MapInt32DoubleDefaultEntryHolder.defaultEntry,
+          67);
+      com.google.protobuf.GeneratedMessageV3
+        .serializeBooleanMapTo(
+          output,
+          internalGetMapBoolBool(),
+          MapBoolBoolDefaultEntryHolder.defaultEntry,
+          68);
+      com.google.protobuf.GeneratedMessageV3
+        .serializeStringMapTo(
+          output,
+          internalGetMapStringString(),
+          MapStringStringDefaultEntryHolder.defaultEntry,
+          69);
+      com.google.protobuf.GeneratedMessageV3
+        .serializeStringMapTo(
+          output,
+          internalGetMapStringBytes(),
+          MapStringBytesDefaultEntryHolder.defaultEntry,
+          70);
+      com.google.protobuf.GeneratedMessageV3
+        .serializeStringMapTo(
+          output,
+          internalGetMapStringNestedMessage(),
+          MapStringNestedMessageDefaultEntryHolder.defaultEntry,
+          71);
+      com.google.protobuf.GeneratedMessageV3
+        .serializeStringMapTo(
+          output,
+          internalGetMapStringForeignMessage(),
+          MapStringForeignMessageDefaultEntryHolder.defaultEntry,
+          72);
+      com.google.protobuf.GeneratedMessageV3
+        .serializeStringMapTo(
+          output,
+          internalGetMapStringNestedEnum(),
+          MapStringNestedEnumDefaultEntryHolder.defaultEntry,
+          73);
+      com.google.protobuf.GeneratedMessageV3
+        .serializeStringMapTo(
+          output,
+          internalGetMapStringForeignEnum(),
+          MapStringForeignEnumDefaultEntryHolder.defaultEntry,
+          74);
+      if (getPackedInt32List().size() > 0) {
+        output.writeUInt32NoTag(602);
+        output.writeUInt32NoTag(packedInt32MemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedInt32_.size(); i++) {
+        output.writeInt32NoTag(packedInt32_.getInt(i));
+      }
+      if (getPackedInt64List().size() > 0) {
+        output.writeUInt32NoTag(610);
+        output.writeUInt32NoTag(packedInt64MemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedInt64_.size(); i++) {
+        output.writeInt64NoTag(packedInt64_.getLong(i));
+      }
+      if (getPackedUint32List().size() > 0) {
+        output.writeUInt32NoTag(618);
+        output.writeUInt32NoTag(packedUint32MemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedUint32_.size(); i++) {
+        output.writeUInt32NoTag(packedUint32_.getInt(i));
+      }
+      if (getPackedUint64List().size() > 0) {
+        output.writeUInt32NoTag(626);
+        output.writeUInt32NoTag(packedUint64MemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedUint64_.size(); i++) {
+        output.writeUInt64NoTag(packedUint64_.getLong(i));
+      }
+      if (getPackedSint32List().size() > 0) {
+        output.writeUInt32NoTag(634);
+        output.writeUInt32NoTag(packedSint32MemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedSint32_.size(); i++) {
+        output.writeSInt32NoTag(packedSint32_.getInt(i));
+      }
+      if (getPackedSint64List().size() > 0) {
+        output.writeUInt32NoTag(642);
+        output.writeUInt32NoTag(packedSint64MemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedSint64_.size(); i++) {
+        output.writeSInt64NoTag(packedSint64_.getLong(i));
+      }
+      if (getPackedFixed32List().size() > 0) {
+        output.writeUInt32NoTag(650);
+        output.writeUInt32NoTag(packedFixed32MemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedFixed32_.size(); i++) {
+        output.writeFixed32NoTag(packedFixed32_.getInt(i));
+      }
+      if (getPackedFixed64List().size() > 0) {
+        output.writeUInt32NoTag(658);
+        output.writeUInt32NoTag(packedFixed64MemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedFixed64_.size(); i++) {
+        output.writeFixed64NoTag(packedFixed64_.getLong(i));
+      }
+      if (getPackedSfixed32List().size() > 0) {
+        output.writeUInt32NoTag(666);
+        output.writeUInt32NoTag(packedSfixed32MemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedSfixed32_.size(); i++) {
+        output.writeSFixed32NoTag(packedSfixed32_.getInt(i));
+      }
+      if (getPackedSfixed64List().size() > 0) {
+        output.writeUInt32NoTag(674);
+        output.writeUInt32NoTag(packedSfixed64MemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedSfixed64_.size(); i++) {
+        output.writeSFixed64NoTag(packedSfixed64_.getLong(i));
+      }
+      if (getPackedFloatList().size() > 0) {
+        output.writeUInt32NoTag(682);
+        output.writeUInt32NoTag(packedFloatMemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedFloat_.size(); i++) {
+        output.writeFloatNoTag(packedFloat_.getFloat(i));
+      }
+      if (getPackedDoubleList().size() > 0) {
+        output.writeUInt32NoTag(690);
+        output.writeUInt32NoTag(packedDoubleMemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedDouble_.size(); i++) {
+        output.writeDoubleNoTag(packedDouble_.getDouble(i));
+      }
+      if (getPackedBoolList().size() > 0) {
+        output.writeUInt32NoTag(698);
+        output.writeUInt32NoTag(packedBoolMemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedBool_.size(); i++) {
+        output.writeBoolNoTag(packedBool_.getBoolean(i));
+      }
+      if (getPackedNestedEnumList().size() > 0) {
+        output.writeUInt32NoTag(706);
+        output.writeUInt32NoTag(packedNestedEnumMemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedNestedEnum_.size(); i++) {
+        output.writeEnumNoTag(packedNestedEnum_.get(i));
+      }
+      for (int i = 0; i < unpackedInt32_.size(); i++) {
+        output.writeInt32(89, unpackedInt32_.getInt(i));
+      }
+      for (int i = 0; i < unpackedInt64_.size(); i++) {
+        output.writeInt64(90, unpackedInt64_.getLong(i));
+      }
+      for (int i = 0; i < unpackedUint32_.size(); i++) {
+        output.writeUInt32(91, unpackedUint32_.getInt(i));
+      }
+      for (int i = 0; i < unpackedUint64_.size(); i++) {
+        output.writeUInt64(92, unpackedUint64_.getLong(i));
+      }
+      for (int i = 0; i < unpackedSint32_.size(); i++) {
+        output.writeSInt32(93, unpackedSint32_.getInt(i));
+      }
+      for (int i = 0; i < unpackedSint64_.size(); i++) {
+        output.writeSInt64(94, unpackedSint64_.getLong(i));
+      }
+      for (int i = 0; i < unpackedFixed32_.size(); i++) {
+        output.writeFixed32(95, unpackedFixed32_.getInt(i));
+      }
+      for (int i = 0; i < unpackedFixed64_.size(); i++) {
+        output.writeFixed64(96, unpackedFixed64_.getLong(i));
+      }
+      for (int i = 0; i < unpackedSfixed32_.size(); i++) {
+        output.writeSFixed32(97, unpackedSfixed32_.getInt(i));
+      }
+      for (int i = 0; i < unpackedSfixed64_.size(); i++) {
+        output.writeSFixed64(98, unpackedSfixed64_.getLong(i));
+      }
+      for (int i = 0; i < unpackedFloat_.size(); i++) {
+        output.writeFloat(99, unpackedFloat_.getFloat(i));
+      }
+      for (int i = 0; i < unpackedDouble_.size(); i++) {
+        output.writeDouble(100, unpackedDouble_.getDouble(i));
+      }
+      for (int i = 0; i < unpackedBool_.size(); i++) {
+        output.writeBool(101, unpackedBool_.getBoolean(i));
+      }
+      for (int i = 0; i < unpackedNestedEnum_.size(); i++) {
+        output.writeEnum(102, unpackedNestedEnum_.get(i));
+      }
+      if (oneofFieldCase_ == 111) {
+        output.writeUInt32(
+            111, (int)((java.lang.Integer) oneofField_));
+      }
+      if (oneofFieldCase_ == 112) {
+        output.writeMessage(112, (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) oneofField_);
+      }
+      if (oneofFieldCase_ == 113) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 113, oneofField_);
+      }
+      if (oneofFieldCase_ == 114) {
+        output.writeBytes(
+            114, (com.google.protobuf.ByteString) oneofField_);
+      }
+      if (oneofFieldCase_ == 115) {
+        output.writeBool(
+            115, (boolean)((java.lang.Boolean) oneofField_));
+      }
+      if (oneofFieldCase_ == 116) {
+        output.writeUInt64(
+            116, (long)((java.lang.Long) oneofField_));
+      }
+      if (oneofFieldCase_ == 117) {
+        output.writeFloat(
+            117, (float)((java.lang.Float) oneofField_));
+      }
+      if (oneofFieldCase_ == 118) {
+        output.writeDouble(
+            118, (double)((java.lang.Double) oneofField_));
+      }
+      if (oneofFieldCase_ == 119) {
+        output.writeEnum(119, ((java.lang.Integer) oneofField_));
+      }
+      extensionWriter.writeUntil(536870912, output);
+      getUnknownFields().writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(1, optionalInt32_);
+      }
+      if (((bitField0_ & 0x00000002) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt64Size(2, optionalInt64_);
+      }
+      if (((bitField0_ & 0x00000004) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(3, optionalUint32_);
+      }
+      if (((bitField0_ & 0x00000008) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(4, optionalUint64_);
+      }
+      if (((bitField0_ & 0x00000010) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeSInt32Size(5, optionalSint32_);
+      }
+      if (((bitField0_ & 0x00000020) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeSInt64Size(6, optionalSint64_);
+      }
+      if (((bitField0_ & 0x00000040) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeFixed32Size(7, optionalFixed32_);
+      }
+      if (((bitField0_ & 0x00000080) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeFixed64Size(8, optionalFixed64_);
+      }
+      if (((bitField0_ & 0x00000100) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeSFixed32Size(9, optionalSfixed32_);
+      }
+      if (((bitField0_ & 0x00000200) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeSFixed64Size(10, optionalSfixed64_);
+      }
+      if (((bitField0_ & 0x00000400) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeFloatSize(11, optionalFloat_);
+      }
+      if (((bitField0_ & 0x00000800) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeDoubleSize(12, optionalDouble_);
+      }
+      if (((bitField0_ & 0x00001000) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(13, optionalBool_);
+      }
+      if (((bitField0_ & 0x00002000) != 0)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(14, optionalString_);
+      }
+      if (((bitField0_ & 0x00004000) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(15, optionalBytes_);
+      }
+      if (((bitField0_ & 0x00008000) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(18, getOptionalNestedMessage());
+      }
+      if (((bitField0_ & 0x00010000) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(19, getOptionalForeignMessage());
+      }
+      if (((bitField0_ & 0x00020000) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(21, optionalNestedEnum_);
+      }
+      if (((bitField0_ & 0x00040000) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(22, optionalForeignEnum_);
+      }
+      if (((bitField0_ & 0x00080000) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(23, optionalAliasedEnum_);
+      }
+      if (((bitField0_ & 0x00100000) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(27, getRecursiveMessage());
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < repeatedInt32_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt32SizeNoTag(repeatedInt32_.getInt(i));
+        }
+        size += dataSize;
+        size += 2 * getRepeatedInt32List().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < repeatedInt64_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt64SizeNoTag(repeatedInt64_.getLong(i));
+        }
+        size += dataSize;
+        size += 2 * getRepeatedInt64List().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < repeatedUint32_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(repeatedUint32_.getInt(i));
+        }
+        size += dataSize;
+        size += 2 * getRepeatedUint32List().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < repeatedUint64_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt64SizeNoTag(repeatedUint64_.getLong(i));
+        }
+        size += dataSize;
+        size += 2 * getRepeatedUint64List().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < repeatedSint32_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt32SizeNoTag(repeatedSint32_.getInt(i));
+        }
+        size += dataSize;
+        size += 2 * getRepeatedSint32List().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < repeatedSint64_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt64SizeNoTag(repeatedSint64_.getLong(i));
+        }
+        size += dataSize;
+        size += 2 * getRepeatedSint64List().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 4 * getRepeatedFixed32List().size();
+        size += dataSize;
+        size += 2 * getRepeatedFixed32List().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 8 * getRepeatedFixed64List().size();
+        size += dataSize;
+        size += 2 * getRepeatedFixed64List().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 4 * getRepeatedSfixed32List().size();
+        size += dataSize;
+        size += 2 * getRepeatedSfixed32List().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 8 * getRepeatedSfixed64List().size();
+        size += dataSize;
+        size += 2 * getRepeatedSfixed64List().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 4 * getRepeatedFloatList().size();
+        size += dataSize;
+        size += 2 * getRepeatedFloatList().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 8 * getRepeatedDoubleList().size();
+        size += dataSize;
+        size += 2 * getRepeatedDoubleList().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 1 * getRepeatedBoolList().size();
+        size += dataSize;
+        size += 2 * getRepeatedBoolList().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < repeatedString_.size(); i++) {
+          dataSize += computeStringSizeNoTag(repeatedString_.getRaw(i));
+        }
+        size += dataSize;
+        size += 2 * getRepeatedStringList().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < repeatedBytes_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeBytesSizeNoTag(repeatedBytes_.get(i));
+        }
+        size += dataSize;
+        size += 2 * getRepeatedBytesList().size();
+      }
+      for (int i = 0; i < repeatedNestedMessage_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(48, repeatedNestedMessage_.get(i));
+      }
+      for (int i = 0; i < repeatedForeignMessage_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(49, repeatedForeignMessage_.get(i));
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < repeatedNestedEnum_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeEnumSizeNoTag(repeatedNestedEnum_.get(i));
+        }
+        size += dataSize;
+        size += 2 * repeatedNestedEnum_.size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < repeatedForeignEnum_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeEnumSizeNoTag(repeatedForeignEnum_.get(i));
+        }
+        size += dataSize;
+        size += 2 * repeatedForeignEnum_.size();
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetMapInt32Int32().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        mapInt32Int32__ = MapInt32Int32DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(56, mapInt32Int32__);
+      }
+      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry
+           : internalGetMapInt64Int64().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+        mapInt64Int64__ = MapInt64Int64DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(57, mapInt64Int64__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetMapUint32Uint32().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        mapUint32Uint32__ = MapUint32Uint32DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(58, mapUint32Uint32__);
+      }
+      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry
+           : internalGetMapUint64Uint64().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+        mapUint64Uint64__ = MapUint64Uint64DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(59, mapUint64Uint64__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetMapSint32Sint32().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        mapSint32Sint32__ = MapSint32Sint32DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(60, mapSint32Sint32__);
+      }
+      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry
+           : internalGetMapSint64Sint64().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+        mapSint64Sint64__ = MapSint64Sint64DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(61, mapSint64Sint64__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetMapFixed32Fixed32().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        mapFixed32Fixed32__ = MapFixed32Fixed32DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(62, mapFixed32Fixed32__);
+      }
+      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry
+           : internalGetMapFixed64Fixed64().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+        mapFixed64Fixed64__ = MapFixed64Fixed64DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(63, mapFixed64Fixed64__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetMapSfixed32Sfixed32().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        mapSfixed32Sfixed32__ = MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(64, mapSfixed32Sfixed32__);
+      }
+      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry
+           : internalGetMapSfixed64Sfixed64().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+        mapSfixed64Sfixed64__ = MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(65, mapSfixed64Sfixed64__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Float> entry
+           : internalGetMapInt32Float().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float>
+        mapInt32Float__ = MapInt32FloatDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(66, mapInt32Float__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Double> entry
+           : internalGetMapInt32Double().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Double>
+        mapInt32Double__ = MapInt32DoubleDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(67, mapInt32Double__);
+      }
+      for (java.util.Map.Entry<java.lang.Boolean, java.lang.Boolean> entry
+           : internalGetMapBoolBool().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Boolean, java.lang.Boolean>
+        mapBoolBool__ = MapBoolBoolDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(68, mapBoolBool__);
+      }
+      for (java.util.Map.Entry<java.lang.String, java.lang.String> entry
+           : internalGetMapStringString().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, java.lang.String>
+        mapStringString__ = MapStringStringDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(69, mapStringString__);
+      }
+      for (java.util.Map.Entry<java.lang.String, com.google.protobuf.ByteString> entry
+           : internalGetMapStringBytes().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, com.google.protobuf.ByteString>
+        mapStringBytes__ = MapStringBytesDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(70, mapStringBytes__);
+      }
+      for (java.util.Map.Entry<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> entry
+           : internalGetMapStringNestedMessage().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage>
+        mapStringNestedMessage__ = MapStringNestedMessageDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(71, mapStringNestedMessage__);
+      }
+      for (java.util.Map.Entry<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> entry
+           : internalGetMapStringForeignMessage().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage>
+        mapStringForeignMessage__ = MapStringForeignMessageDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(72, mapStringForeignMessage__);
+      }
+      for (java.util.Map.Entry<java.lang.String, java.lang.Integer> entry
+           : internalGetMapStringNestedEnum().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer>
+        mapStringNestedEnum__ = MapStringNestedEnumDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(73, mapStringNestedEnum__);
+      }
+      for (java.util.Map.Entry<java.lang.String, java.lang.Integer> entry
+           : internalGetMapStringForeignEnum().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer>
+        mapStringForeignEnum__ = MapStringForeignEnumDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(74, mapStringForeignEnum__);
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < packedInt32_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt32SizeNoTag(packedInt32_.getInt(i));
+        }
+        size += dataSize;
+        if (!getPackedInt32List().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedInt32MemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < packedInt64_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt64SizeNoTag(packedInt64_.getLong(i));
+        }
+        size += dataSize;
+        if (!getPackedInt64List().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedInt64MemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < packedUint32_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(packedUint32_.getInt(i));
+        }
+        size += dataSize;
+        if (!getPackedUint32List().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedUint32MemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < packedUint64_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt64SizeNoTag(packedUint64_.getLong(i));
+        }
+        size += dataSize;
+        if (!getPackedUint64List().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedUint64MemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < packedSint32_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt32SizeNoTag(packedSint32_.getInt(i));
+        }
+        size += dataSize;
+        if (!getPackedSint32List().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedSint32MemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < packedSint64_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt64SizeNoTag(packedSint64_.getLong(i));
+        }
+        size += dataSize;
+        if (!getPackedSint64List().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedSint64MemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        dataSize = 4 * getPackedFixed32List().size();
+        size += dataSize;
+        if (!getPackedFixed32List().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedFixed32MemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        dataSize = 8 * getPackedFixed64List().size();
+        size += dataSize;
+        if (!getPackedFixed64List().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedFixed64MemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        dataSize = 4 * getPackedSfixed32List().size();
+        size += dataSize;
+        if (!getPackedSfixed32List().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedSfixed32MemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        dataSize = 8 * getPackedSfixed64List().size();
+        size += dataSize;
+        if (!getPackedSfixed64List().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedSfixed64MemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        dataSize = 4 * getPackedFloatList().size();
+        size += dataSize;
+        if (!getPackedFloatList().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedFloatMemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        dataSize = 8 * getPackedDoubleList().size();
+        size += dataSize;
+        if (!getPackedDoubleList().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedDoubleMemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        dataSize = 1 * getPackedBoolList().size();
+        size += dataSize;
+        if (!getPackedBoolList().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedBoolMemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < packedNestedEnum_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeEnumSizeNoTag(packedNestedEnum_.get(i));
+        }
+        size += dataSize;
+        if (!getPackedNestedEnumList().isEmpty()) {  size += 2;
+          size += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(dataSize);
+        }packedNestedEnumMemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < unpackedInt32_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt32SizeNoTag(unpackedInt32_.getInt(i));
+        }
+        size += dataSize;
+        size += 2 * getUnpackedInt32List().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < unpackedInt64_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt64SizeNoTag(unpackedInt64_.getLong(i));
+        }
+        size += dataSize;
+        size += 2 * getUnpackedInt64List().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < unpackedUint32_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(unpackedUint32_.getInt(i));
+        }
+        size += dataSize;
+        size += 2 * getUnpackedUint32List().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < unpackedUint64_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt64SizeNoTag(unpackedUint64_.getLong(i));
+        }
+        size += dataSize;
+        size += 2 * getUnpackedUint64List().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < unpackedSint32_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt32SizeNoTag(unpackedSint32_.getInt(i));
+        }
+        size += dataSize;
+        size += 2 * getUnpackedSint32List().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < unpackedSint64_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt64SizeNoTag(unpackedSint64_.getLong(i));
+        }
+        size += dataSize;
+        size += 2 * getUnpackedSint64List().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 4 * getUnpackedFixed32List().size();
+        size += dataSize;
+        size += 2 * getUnpackedFixed32List().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 8 * getUnpackedFixed64List().size();
+        size += dataSize;
+        size += 2 * getUnpackedFixed64List().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 4 * getUnpackedSfixed32List().size();
+        size += dataSize;
+        size += 2 * getUnpackedSfixed32List().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 8 * getUnpackedSfixed64List().size();
+        size += dataSize;
+        size += 2 * getUnpackedSfixed64List().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 4 * getUnpackedFloatList().size();
+        size += dataSize;
+        size += 2 * getUnpackedFloatList().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 8 * getUnpackedDoubleList().size();
+        size += dataSize;
+        size += 2 * getUnpackedDoubleList().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 1 * getUnpackedBoolList().size();
+        size += dataSize;
+        size += 2 * getUnpackedBoolList().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < unpackedNestedEnum_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeEnumSizeNoTag(unpackedNestedEnum_.get(i));
+        }
+        size += dataSize;
+        size += 2 * unpackedNestedEnum_.size();
+      }
+      if (oneofFieldCase_ == 111) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(
+              111, (int)((java.lang.Integer) oneofField_));
+      }
+      if (oneofFieldCase_ == 112) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(112, (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) oneofField_);
+      }
+      if (oneofFieldCase_ == 113) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(113, oneofField_);
+      }
+      if (oneofFieldCase_ == 114) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(
+              114, (com.google.protobuf.ByteString) oneofField_);
+      }
+      if (oneofFieldCase_ == 115) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(
+              115, (boolean)((java.lang.Boolean) oneofField_));
+      }
+      if (oneofFieldCase_ == 116) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(
+              116, (long)((java.lang.Long) oneofField_));
+      }
+      if (oneofFieldCase_ == 117) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeFloatSize(
+              117, (float)((java.lang.Float) oneofField_));
+      }
+      if (oneofFieldCase_ == 118) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeDoubleSize(
+              118, (double)((java.lang.Double) oneofField_));
+      }
+      if (oneofFieldCase_ == 119) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(119, ((java.lang.Integer) oneofField_));
+      }
+      size += extensionsSerializedSize();
+      size += getUnknownFields().getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2)) {
+        return super.equals(obj);
+      }
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 other = (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2) obj;
+
+      if (hasOptionalInt32() != other.hasOptionalInt32()) return false;
+      if (hasOptionalInt32()) {
+        if (getOptionalInt32()
+            != other.getOptionalInt32()) return false;
+      }
+      if (hasOptionalInt64() != other.hasOptionalInt64()) return false;
+      if (hasOptionalInt64()) {
+        if (getOptionalInt64()
+            != other.getOptionalInt64()) return false;
+      }
+      if (hasOptionalUint32() != other.hasOptionalUint32()) return false;
+      if (hasOptionalUint32()) {
+        if (getOptionalUint32()
+            != other.getOptionalUint32()) return false;
+      }
+      if (hasOptionalUint64() != other.hasOptionalUint64()) return false;
+      if (hasOptionalUint64()) {
+        if (getOptionalUint64()
+            != other.getOptionalUint64()) return false;
+      }
+      if (hasOptionalSint32() != other.hasOptionalSint32()) return false;
+      if (hasOptionalSint32()) {
+        if (getOptionalSint32()
+            != other.getOptionalSint32()) return false;
+      }
+      if (hasOptionalSint64() != other.hasOptionalSint64()) return false;
+      if (hasOptionalSint64()) {
+        if (getOptionalSint64()
+            != other.getOptionalSint64()) return false;
+      }
+      if (hasOptionalFixed32() != other.hasOptionalFixed32()) return false;
+      if (hasOptionalFixed32()) {
+        if (getOptionalFixed32()
+            != other.getOptionalFixed32()) return false;
+      }
+      if (hasOptionalFixed64() != other.hasOptionalFixed64()) return false;
+      if (hasOptionalFixed64()) {
+        if (getOptionalFixed64()
+            != other.getOptionalFixed64()) return false;
+      }
+      if (hasOptionalSfixed32() != other.hasOptionalSfixed32()) return false;
+      if (hasOptionalSfixed32()) {
+        if (getOptionalSfixed32()
+            != other.getOptionalSfixed32()) return false;
+      }
+      if (hasOptionalSfixed64() != other.hasOptionalSfixed64()) return false;
+      if (hasOptionalSfixed64()) {
+        if (getOptionalSfixed64()
+            != other.getOptionalSfixed64()) return false;
+      }
+      if (hasOptionalFloat() != other.hasOptionalFloat()) return false;
+      if (hasOptionalFloat()) {
+        if (java.lang.Float.floatToIntBits(getOptionalFloat())
+            != java.lang.Float.floatToIntBits(
+                other.getOptionalFloat())) return false;
+      }
+      if (hasOptionalDouble() != other.hasOptionalDouble()) return false;
+      if (hasOptionalDouble()) {
+        if (java.lang.Double.doubleToLongBits(getOptionalDouble())
+            != java.lang.Double.doubleToLongBits(
+                other.getOptionalDouble())) return false;
+      }
+      if (hasOptionalBool() != other.hasOptionalBool()) return false;
+      if (hasOptionalBool()) {
+        if (getOptionalBool()
+            != other.getOptionalBool()) return false;
+      }
+      if (hasOptionalString() != other.hasOptionalString()) return false;
+      if (hasOptionalString()) {
+        if (!getOptionalString()
+            .equals(other.getOptionalString())) return false;
+      }
+      if (hasOptionalBytes() != other.hasOptionalBytes()) return false;
+      if (hasOptionalBytes()) {
+        if (!getOptionalBytes()
+            .equals(other.getOptionalBytes())) return false;
+      }
+      if (hasOptionalNestedMessage() != other.hasOptionalNestedMessage()) return false;
+      if (hasOptionalNestedMessage()) {
+        if (!getOptionalNestedMessage()
+            .equals(other.getOptionalNestedMessage())) return false;
+      }
+      if (hasOptionalForeignMessage() != other.hasOptionalForeignMessage()) return false;
+      if (hasOptionalForeignMessage()) {
+        if (!getOptionalForeignMessage()
+            .equals(other.getOptionalForeignMessage())) return false;
+      }
+      if (hasOptionalNestedEnum() != other.hasOptionalNestedEnum()) return false;
+      if (hasOptionalNestedEnum()) {
+        if (optionalNestedEnum_ != other.optionalNestedEnum_) return false;
+      }
+      if (hasOptionalForeignEnum() != other.hasOptionalForeignEnum()) return false;
+      if (hasOptionalForeignEnum()) {
+        if (optionalForeignEnum_ != other.optionalForeignEnum_) return false;
+      }
+      if (hasOptionalAliasedEnum() != other.hasOptionalAliasedEnum()) return false;
+      if (hasOptionalAliasedEnum()) {
+        if (optionalAliasedEnum_ != other.optionalAliasedEnum_) return false;
+      }
+      if (hasRecursiveMessage() != other.hasRecursiveMessage()) return false;
+      if (hasRecursiveMessage()) {
+        if (!getRecursiveMessage()
+            .equals(other.getRecursiveMessage())) return false;
+      }
+      if (!getRepeatedInt32List()
+          .equals(other.getRepeatedInt32List())) return false;
+      if (!getRepeatedInt64List()
+          .equals(other.getRepeatedInt64List())) return false;
+      if (!getRepeatedUint32List()
+          .equals(other.getRepeatedUint32List())) return false;
+      if (!getRepeatedUint64List()
+          .equals(other.getRepeatedUint64List())) return false;
+      if (!getRepeatedSint32List()
+          .equals(other.getRepeatedSint32List())) return false;
+      if (!getRepeatedSint64List()
+          .equals(other.getRepeatedSint64List())) return false;
+      if (!getRepeatedFixed32List()
+          .equals(other.getRepeatedFixed32List())) return false;
+      if (!getRepeatedFixed64List()
+          .equals(other.getRepeatedFixed64List())) return false;
+      if (!getRepeatedSfixed32List()
+          .equals(other.getRepeatedSfixed32List())) return false;
+      if (!getRepeatedSfixed64List()
+          .equals(other.getRepeatedSfixed64List())) return false;
+      if (!getRepeatedFloatList()
+          .equals(other.getRepeatedFloatList())) return false;
+      if (!getRepeatedDoubleList()
+          .equals(other.getRepeatedDoubleList())) return false;
+      if (!getRepeatedBoolList()
+          .equals(other.getRepeatedBoolList())) return false;
+      if (!getRepeatedStringList()
+          .equals(other.getRepeatedStringList())) return false;
+      if (!getRepeatedBytesList()
+          .equals(other.getRepeatedBytesList())) return false;
+      if (!getRepeatedNestedMessageList()
+          .equals(other.getRepeatedNestedMessageList())) return false;
+      if (!getRepeatedForeignMessageList()
+          .equals(other.getRepeatedForeignMessageList())) return false;
+      if (!repeatedNestedEnum_.equals(other.repeatedNestedEnum_)) return false;
+      if (!repeatedForeignEnum_.equals(other.repeatedForeignEnum_)) return false;
+      if (!getPackedInt32List()
+          .equals(other.getPackedInt32List())) return false;
+      if (!getPackedInt64List()
+          .equals(other.getPackedInt64List())) return false;
+      if (!getPackedUint32List()
+          .equals(other.getPackedUint32List())) return false;
+      if (!getPackedUint64List()
+          .equals(other.getPackedUint64List())) return false;
+      if (!getPackedSint32List()
+          .equals(other.getPackedSint32List())) return false;
+      if (!getPackedSint64List()
+          .equals(other.getPackedSint64List())) return false;
+      if (!getPackedFixed32List()
+          .equals(other.getPackedFixed32List())) return false;
+      if (!getPackedFixed64List()
+          .equals(other.getPackedFixed64List())) return false;
+      if (!getPackedSfixed32List()
+          .equals(other.getPackedSfixed32List())) return false;
+      if (!getPackedSfixed64List()
+          .equals(other.getPackedSfixed64List())) return false;
+      if (!getPackedFloatList()
+          .equals(other.getPackedFloatList())) return false;
+      if (!getPackedDoubleList()
+          .equals(other.getPackedDoubleList())) return false;
+      if (!getPackedBoolList()
+          .equals(other.getPackedBoolList())) return false;
+      if (!packedNestedEnum_.equals(other.packedNestedEnum_)) return false;
+      if (!getUnpackedInt32List()
+          .equals(other.getUnpackedInt32List())) return false;
+      if (!getUnpackedInt64List()
+          .equals(other.getUnpackedInt64List())) return false;
+      if (!getUnpackedUint32List()
+          .equals(other.getUnpackedUint32List())) return false;
+      if (!getUnpackedUint64List()
+          .equals(other.getUnpackedUint64List())) return false;
+      if (!getUnpackedSint32List()
+          .equals(other.getUnpackedSint32List())) return false;
+      if (!getUnpackedSint64List()
+          .equals(other.getUnpackedSint64List())) return false;
+      if (!getUnpackedFixed32List()
+          .equals(other.getUnpackedFixed32List())) return false;
+      if (!getUnpackedFixed64List()
+          .equals(other.getUnpackedFixed64List())) return false;
+      if (!getUnpackedSfixed32List()
+          .equals(other.getUnpackedSfixed32List())) return false;
+      if (!getUnpackedSfixed64List()
+          .equals(other.getUnpackedSfixed64List())) return false;
+      if (!getUnpackedFloatList()
+          .equals(other.getUnpackedFloatList())) return false;
+      if (!getUnpackedDoubleList()
+          .equals(other.getUnpackedDoubleList())) return false;
+      if (!getUnpackedBoolList()
+          .equals(other.getUnpackedBoolList())) return false;
+      if (!unpackedNestedEnum_.equals(other.unpackedNestedEnum_)) return false;
+      if (!internalGetMapInt32Int32().equals(
+          other.internalGetMapInt32Int32())) return false;
+      if (!internalGetMapInt64Int64().equals(
+          other.internalGetMapInt64Int64())) return false;
+      if (!internalGetMapUint32Uint32().equals(
+          other.internalGetMapUint32Uint32())) return false;
+      if (!internalGetMapUint64Uint64().equals(
+          other.internalGetMapUint64Uint64())) return false;
+      if (!internalGetMapSint32Sint32().equals(
+          other.internalGetMapSint32Sint32())) return false;
+      if (!internalGetMapSint64Sint64().equals(
+          other.internalGetMapSint64Sint64())) return false;
+      if (!internalGetMapFixed32Fixed32().equals(
+          other.internalGetMapFixed32Fixed32())) return false;
+      if (!internalGetMapFixed64Fixed64().equals(
+          other.internalGetMapFixed64Fixed64())) return false;
+      if (!internalGetMapSfixed32Sfixed32().equals(
+          other.internalGetMapSfixed32Sfixed32())) return false;
+      if (!internalGetMapSfixed64Sfixed64().equals(
+          other.internalGetMapSfixed64Sfixed64())) return false;
+      if (!internalGetMapInt32Float().equals(
+          other.internalGetMapInt32Float())) return false;
+      if (!internalGetMapInt32Double().equals(
+          other.internalGetMapInt32Double())) return false;
+      if (!internalGetMapBoolBool().equals(
+          other.internalGetMapBoolBool())) return false;
+      if (!internalGetMapStringString().equals(
+          other.internalGetMapStringString())) return false;
+      if (!internalGetMapStringBytes().equals(
+          other.internalGetMapStringBytes())) return false;
+      if (!internalGetMapStringNestedMessage().equals(
+          other.internalGetMapStringNestedMessage())) return false;
+      if (!internalGetMapStringForeignMessage().equals(
+          other.internalGetMapStringForeignMessage())) return false;
+      if (!internalGetMapStringNestedEnum().equals(
+          other.internalGetMapStringNestedEnum())) return false;
+      if (!internalGetMapStringForeignEnum().equals(
+          other.internalGetMapStringForeignEnum())) return false;
+      if (!getOneofFieldCase().equals(other.getOneofFieldCase())) return false;
+      switch (oneofFieldCase_) {
+        case 111:
+          if (getOneofUint32()
+              != other.getOneofUint32()) return false;
+          break;
+        case 112:
+          if (!getOneofNestedMessage()
+              .equals(other.getOneofNestedMessage())) return false;
+          break;
+        case 113:
+          if (!getOneofString()
+              .equals(other.getOneofString())) return false;
+          break;
+        case 114:
+          if (!getOneofBytes()
+              .equals(other.getOneofBytes())) return false;
+          break;
+        case 115:
+          if (getOneofBool()
+              != other.getOneofBool()) return false;
+          break;
+        case 116:
+          if (getOneofUint64()
+              != other.getOneofUint64()) return false;
+          break;
+        case 117:
+          if (java.lang.Float.floatToIntBits(getOneofFloat())
+              != java.lang.Float.floatToIntBits(
+                  other.getOneofFloat())) return false;
+          break;
+        case 118:
+          if (java.lang.Double.doubleToLongBits(getOneofDouble())
+              != java.lang.Double.doubleToLongBits(
+                  other.getOneofDouble())) return false;
+          break;
+        case 119:
+          if (!getOneofEnum()
+              .equals(other.getOneofEnum())) return false;
+          break;
+        case 0:
+        default:
+      }
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!getExtensionFields().equals(other.getExtensionFields()))
+        return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasOptionalInt32()) {
+        hash = (37 * hash) + OPTIONAL_INT32_FIELD_NUMBER;
+        hash = (53 * hash) + getOptionalInt32();
+      }
+      if (hasOptionalInt64()) {
+        hash = (37 * hash) + OPTIONAL_INT64_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getOptionalInt64());
+      }
+      if (hasOptionalUint32()) {
+        hash = (37 * hash) + OPTIONAL_UINT32_FIELD_NUMBER;
+        hash = (53 * hash) + getOptionalUint32();
+      }
+      if (hasOptionalUint64()) {
+        hash = (37 * hash) + OPTIONAL_UINT64_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getOptionalUint64());
+      }
+      if (hasOptionalSint32()) {
+        hash = (37 * hash) + OPTIONAL_SINT32_FIELD_NUMBER;
+        hash = (53 * hash) + getOptionalSint32();
+      }
+      if (hasOptionalSint64()) {
+        hash = (37 * hash) + OPTIONAL_SINT64_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getOptionalSint64());
+      }
+      if (hasOptionalFixed32()) {
+        hash = (37 * hash) + OPTIONAL_FIXED32_FIELD_NUMBER;
+        hash = (53 * hash) + getOptionalFixed32();
+      }
+      if (hasOptionalFixed64()) {
+        hash = (37 * hash) + OPTIONAL_FIXED64_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getOptionalFixed64());
+      }
+      if (hasOptionalSfixed32()) {
+        hash = (37 * hash) + OPTIONAL_SFIXED32_FIELD_NUMBER;
+        hash = (53 * hash) + getOptionalSfixed32();
+      }
+      if (hasOptionalSfixed64()) {
+        hash = (37 * hash) + OPTIONAL_SFIXED64_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getOptionalSfixed64());
+      }
+      if (hasOptionalFloat()) {
+        hash = (37 * hash) + OPTIONAL_FLOAT_FIELD_NUMBER;
+        hash = (53 * hash) + java.lang.Float.floatToIntBits(
+            getOptionalFloat());
+      }
+      if (hasOptionalDouble()) {
+        hash = (37 * hash) + OPTIONAL_DOUBLE_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            java.lang.Double.doubleToLongBits(getOptionalDouble()));
+      }
+      if (hasOptionalBool()) {
+        hash = (37 * hash) + OPTIONAL_BOOL_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+            getOptionalBool());
+      }
+      if (hasOptionalString()) {
+        hash = (37 * hash) + OPTIONAL_STRING_FIELD_NUMBER;
+        hash = (53 * hash) + getOptionalString().hashCode();
+      }
+      if (hasOptionalBytes()) {
+        hash = (37 * hash) + OPTIONAL_BYTES_FIELD_NUMBER;
+        hash = (53 * hash) + getOptionalBytes().hashCode();
+      }
+      if (hasOptionalNestedMessage()) {
+        hash = (37 * hash) + OPTIONAL_NESTED_MESSAGE_FIELD_NUMBER;
+        hash = (53 * hash) + getOptionalNestedMessage().hashCode();
+      }
+      if (hasOptionalForeignMessage()) {
+        hash = (37 * hash) + OPTIONAL_FOREIGN_MESSAGE_FIELD_NUMBER;
+        hash = (53 * hash) + getOptionalForeignMessage().hashCode();
+      }
+      if (hasOptionalNestedEnum()) {
+        hash = (37 * hash) + OPTIONAL_NESTED_ENUM_FIELD_NUMBER;
+        hash = (53 * hash) + optionalNestedEnum_;
+      }
+      if (hasOptionalForeignEnum()) {
+        hash = (37 * hash) + OPTIONAL_FOREIGN_ENUM_FIELD_NUMBER;
+        hash = (53 * hash) + optionalForeignEnum_;
+      }
+      if (hasOptionalAliasedEnum()) {
+        hash = (37 * hash) + OPTIONAL_ALIASED_ENUM_FIELD_NUMBER;
+        hash = (53 * hash) + optionalAliasedEnum_;
+      }
+      if (hasRecursiveMessage()) {
+        hash = (37 * hash) + RECURSIVE_MESSAGE_FIELD_NUMBER;
+        hash = (53 * hash) + getRecursiveMessage().hashCode();
+      }
+      if (getRepeatedInt32Count() > 0) {
+        hash = (37 * hash) + REPEATED_INT32_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedInt32List().hashCode();
+      }
+      if (getRepeatedInt64Count() > 0) {
+        hash = (37 * hash) + REPEATED_INT64_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedInt64List().hashCode();
+      }
+      if (getRepeatedUint32Count() > 0) {
+        hash = (37 * hash) + REPEATED_UINT32_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedUint32List().hashCode();
+      }
+      if (getRepeatedUint64Count() > 0) {
+        hash = (37 * hash) + REPEATED_UINT64_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedUint64List().hashCode();
+      }
+      if (getRepeatedSint32Count() > 0) {
+        hash = (37 * hash) + REPEATED_SINT32_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedSint32List().hashCode();
+      }
+      if (getRepeatedSint64Count() > 0) {
+        hash = (37 * hash) + REPEATED_SINT64_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedSint64List().hashCode();
+      }
+      if (getRepeatedFixed32Count() > 0) {
+        hash = (37 * hash) + REPEATED_FIXED32_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedFixed32List().hashCode();
+      }
+      if (getRepeatedFixed64Count() > 0) {
+        hash = (37 * hash) + REPEATED_FIXED64_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedFixed64List().hashCode();
+      }
+      if (getRepeatedSfixed32Count() > 0) {
+        hash = (37 * hash) + REPEATED_SFIXED32_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedSfixed32List().hashCode();
+      }
+      if (getRepeatedSfixed64Count() > 0) {
+        hash = (37 * hash) + REPEATED_SFIXED64_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedSfixed64List().hashCode();
+      }
+      if (getRepeatedFloatCount() > 0) {
+        hash = (37 * hash) + REPEATED_FLOAT_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedFloatList().hashCode();
+      }
+      if (getRepeatedDoubleCount() > 0) {
+        hash = (37 * hash) + REPEATED_DOUBLE_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedDoubleList().hashCode();
+      }
+      if (getRepeatedBoolCount() > 0) {
+        hash = (37 * hash) + REPEATED_BOOL_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedBoolList().hashCode();
+      }
+      if (getRepeatedStringCount() > 0) {
+        hash = (37 * hash) + REPEATED_STRING_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedStringList().hashCode();
+      }
+      if (getRepeatedBytesCount() > 0) {
+        hash = (37 * hash) + REPEATED_BYTES_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedBytesList().hashCode();
+      }
+      if (getRepeatedNestedMessageCount() > 0) {
+        hash = (37 * hash) + REPEATED_NESTED_MESSAGE_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedNestedMessageList().hashCode();
+      }
+      if (getRepeatedForeignMessageCount() > 0) {
+        hash = (37 * hash) + REPEATED_FOREIGN_MESSAGE_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedForeignMessageList().hashCode();
+      }
+      if (getRepeatedNestedEnumCount() > 0) {
+        hash = (37 * hash) + REPEATED_NESTED_ENUM_FIELD_NUMBER;
+        hash = (53 * hash) + repeatedNestedEnum_.hashCode();
+      }
+      if (getRepeatedForeignEnumCount() > 0) {
+        hash = (37 * hash) + REPEATED_FOREIGN_ENUM_FIELD_NUMBER;
+        hash = (53 * hash) + repeatedForeignEnum_.hashCode();
+      }
+      if (getPackedInt32Count() > 0) {
+        hash = (37 * hash) + PACKED_INT32_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedInt32List().hashCode();
+      }
+      if (getPackedInt64Count() > 0) {
+        hash = (37 * hash) + PACKED_INT64_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedInt64List().hashCode();
+      }
+      if (getPackedUint32Count() > 0) {
+        hash = (37 * hash) + PACKED_UINT32_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedUint32List().hashCode();
+      }
+      if (getPackedUint64Count() > 0) {
+        hash = (37 * hash) + PACKED_UINT64_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedUint64List().hashCode();
+      }
+      if (getPackedSint32Count() > 0) {
+        hash = (37 * hash) + PACKED_SINT32_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedSint32List().hashCode();
+      }
+      if (getPackedSint64Count() > 0) {
+        hash = (37 * hash) + PACKED_SINT64_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedSint64List().hashCode();
+      }
+      if (getPackedFixed32Count() > 0) {
+        hash = (37 * hash) + PACKED_FIXED32_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedFixed32List().hashCode();
+      }
+      if (getPackedFixed64Count() > 0) {
+        hash = (37 * hash) + PACKED_FIXED64_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedFixed64List().hashCode();
+      }
+      if (getPackedSfixed32Count() > 0) {
+        hash = (37 * hash) + PACKED_SFIXED32_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedSfixed32List().hashCode();
+      }
+      if (getPackedSfixed64Count() > 0) {
+        hash = (37 * hash) + PACKED_SFIXED64_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedSfixed64List().hashCode();
+      }
+      if (getPackedFloatCount() > 0) {
+        hash = (37 * hash) + PACKED_FLOAT_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedFloatList().hashCode();
+      }
+      if (getPackedDoubleCount() > 0) {
+        hash = (37 * hash) + PACKED_DOUBLE_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedDoubleList().hashCode();
+      }
+      if (getPackedBoolCount() > 0) {
+        hash = (37 * hash) + PACKED_BOOL_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedBoolList().hashCode();
+      }
+      if (getPackedNestedEnumCount() > 0) {
+        hash = (37 * hash) + PACKED_NESTED_ENUM_FIELD_NUMBER;
+        hash = (53 * hash) + packedNestedEnum_.hashCode();
+      }
+      if (getUnpackedInt32Count() > 0) {
+        hash = (37 * hash) + UNPACKED_INT32_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedInt32List().hashCode();
+      }
+      if (getUnpackedInt64Count() > 0) {
+        hash = (37 * hash) + UNPACKED_INT64_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedInt64List().hashCode();
+      }
+      if (getUnpackedUint32Count() > 0) {
+        hash = (37 * hash) + UNPACKED_UINT32_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedUint32List().hashCode();
+      }
+      if (getUnpackedUint64Count() > 0) {
+        hash = (37 * hash) + UNPACKED_UINT64_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedUint64List().hashCode();
+      }
+      if (getUnpackedSint32Count() > 0) {
+        hash = (37 * hash) + UNPACKED_SINT32_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedSint32List().hashCode();
+      }
+      if (getUnpackedSint64Count() > 0) {
+        hash = (37 * hash) + UNPACKED_SINT64_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedSint64List().hashCode();
+      }
+      if (getUnpackedFixed32Count() > 0) {
+        hash = (37 * hash) + UNPACKED_FIXED32_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedFixed32List().hashCode();
+      }
+      if (getUnpackedFixed64Count() > 0) {
+        hash = (37 * hash) + UNPACKED_FIXED64_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedFixed64List().hashCode();
+      }
+      if (getUnpackedSfixed32Count() > 0) {
+        hash = (37 * hash) + UNPACKED_SFIXED32_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedSfixed32List().hashCode();
+      }
+      if (getUnpackedSfixed64Count() > 0) {
+        hash = (37 * hash) + UNPACKED_SFIXED64_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedSfixed64List().hashCode();
+      }
+      if (getUnpackedFloatCount() > 0) {
+        hash = (37 * hash) + UNPACKED_FLOAT_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedFloatList().hashCode();
+      }
+      if (getUnpackedDoubleCount() > 0) {
+        hash = (37 * hash) + UNPACKED_DOUBLE_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedDoubleList().hashCode();
+      }
+      if (getUnpackedBoolCount() > 0) {
+        hash = (37 * hash) + UNPACKED_BOOL_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedBoolList().hashCode();
+      }
+      if (getUnpackedNestedEnumCount() > 0) {
+        hash = (37 * hash) + UNPACKED_NESTED_ENUM_FIELD_NUMBER;
+        hash = (53 * hash) + unpackedNestedEnum_.hashCode();
+      }
+      if (!internalGetMapInt32Int32().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_INT32_INT32_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapInt32Int32().hashCode();
+      }
+      if (!internalGetMapInt64Int64().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_INT64_INT64_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapInt64Int64().hashCode();
+      }
+      if (!internalGetMapUint32Uint32().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_UINT32_UINT32_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapUint32Uint32().hashCode();
+      }
+      if (!internalGetMapUint64Uint64().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_UINT64_UINT64_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapUint64Uint64().hashCode();
+      }
+      if (!internalGetMapSint32Sint32().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_SINT32_SINT32_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapSint32Sint32().hashCode();
+      }
+      if (!internalGetMapSint64Sint64().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_SINT64_SINT64_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapSint64Sint64().hashCode();
+      }
+      if (!internalGetMapFixed32Fixed32().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_FIXED32_FIXED32_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapFixed32Fixed32().hashCode();
+      }
+      if (!internalGetMapFixed64Fixed64().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_FIXED64_FIXED64_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapFixed64Fixed64().hashCode();
+      }
+      if (!internalGetMapSfixed32Sfixed32().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_SFIXED32_SFIXED32_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapSfixed32Sfixed32().hashCode();
+      }
+      if (!internalGetMapSfixed64Sfixed64().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_SFIXED64_SFIXED64_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapSfixed64Sfixed64().hashCode();
+      }
+      if (!internalGetMapInt32Float().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_INT32_FLOAT_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapInt32Float().hashCode();
+      }
+      if (!internalGetMapInt32Double().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_INT32_DOUBLE_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapInt32Double().hashCode();
+      }
+      if (!internalGetMapBoolBool().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_BOOL_BOOL_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapBoolBool().hashCode();
+      }
+      if (!internalGetMapStringString().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_STRING_STRING_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapStringString().hashCode();
+      }
+      if (!internalGetMapStringBytes().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_STRING_BYTES_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapStringBytes().hashCode();
+      }
+      if (!internalGetMapStringNestedMessage().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_STRING_NESTED_MESSAGE_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapStringNestedMessage().hashCode();
+      }
+      if (!internalGetMapStringForeignMessage().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_STRING_FOREIGN_MESSAGE_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapStringForeignMessage().hashCode();
+      }
+      if (!internalGetMapStringNestedEnum().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_STRING_NESTED_ENUM_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapStringNestedEnum().hashCode();
+      }
+      if (!internalGetMapStringForeignEnum().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_STRING_FOREIGN_ENUM_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapStringForeignEnum().hashCode();
+      }
+      switch (oneofFieldCase_) {
+        case 111:
+          hash = (37 * hash) + ONEOF_UINT32_FIELD_NUMBER;
+          hash = (53 * hash) + getOneofUint32();
+          break;
+        case 112:
+          hash = (37 * hash) + ONEOF_NESTED_MESSAGE_FIELD_NUMBER;
+          hash = (53 * hash) + getOneofNestedMessage().hashCode();
+          break;
+        case 113:
+          hash = (37 * hash) + ONEOF_STRING_FIELD_NUMBER;
+          hash = (53 * hash) + getOneofString().hashCode();
+          break;
+        case 114:
+          hash = (37 * hash) + ONEOF_BYTES_FIELD_NUMBER;
+          hash = (53 * hash) + getOneofBytes().hashCode();
+          break;
+        case 115:
+          hash = (37 * hash) + ONEOF_BOOL_FIELD_NUMBER;
+          hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+              getOneofBool());
+          break;
+        case 116:
+          hash = (37 * hash) + ONEOF_UINT64_FIELD_NUMBER;
+          hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+              getOneofUint64());
+          break;
+        case 117:
+          hash = (37 * hash) + ONEOF_FLOAT_FIELD_NUMBER;
+          hash = (53 * hash) + java.lang.Float.floatToIntBits(
+              getOneofFloat());
+          break;
+        case 118:
+          hash = (37 * hash) + ONEOF_DOUBLE_FIELD_NUMBER;
+          hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+              java.lang.Double.doubleToLongBits(getOneofDouble()));
+          break;
+        case 119:
+          hash = (37 * hash) + ONEOF_ENUM_FIELD_NUMBER;
+          hash = (53 * hash) + getOneofEnum().getNumber();
+          break;
+        case 0:
+        default:
+      }
+      hash = hashFields(hash, getExtensionFields());
+      hash = (29 * hash) + getUnknownFields().hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * <pre>
+     * Proto2 version of TestMostTypesProto3
+     * </pre>
+     *
+     * Protobuf type {@code legacy_gencode_test.proto2.TestMostTypesProto2}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.ExtendableBuilder<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2, Builder> implements
+        // @@protoc_insertion_point(builder_implements:legacy_gencode_test.proto2.TestMostTypesProto2)
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor;
+      }
+
+      @SuppressWarnings({"rawtypes"})
+      protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
+          int number) {
+        switch (number) {
+          case 56:
+            return internalGetMapInt32Int32();
+          case 57:
+            return internalGetMapInt64Int64();
+          case 58:
+            return internalGetMapUint32Uint32();
+          case 59:
+            return internalGetMapUint64Uint64();
+          case 60:
+            return internalGetMapSint32Sint32();
+          case 61:
+            return internalGetMapSint64Sint64();
+          case 62:
+            return internalGetMapFixed32Fixed32();
+          case 63:
+            return internalGetMapFixed64Fixed64();
+          case 64:
+            return internalGetMapSfixed32Sfixed32();
+          case 65:
+            return internalGetMapSfixed64Sfixed64();
+          case 66:
+            return internalGetMapInt32Float();
+          case 67:
+            return internalGetMapInt32Double();
+          case 68:
+            return internalGetMapBoolBool();
+          case 69:
+            return internalGetMapStringString();
+          case 70:
+            return internalGetMapStringBytes();
+          case 71:
+            return internalGetMapStringNestedMessage();
+          case 72:
+            return internalGetMapStringForeignMessage();
+          case 73:
+            return internalGetMapStringNestedEnum();
+          case 74:
+            return internalGetMapStringForeignEnum();
+          default:
+            throw new RuntimeException(
+                "Invalid map field number: " + number);
+        }
+      }
+      @SuppressWarnings({"rawtypes"})
+      protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
+          int number) {
+        switch (number) {
+          case 56:
+            return internalGetMutableMapInt32Int32();
+          case 57:
+            return internalGetMutableMapInt64Int64();
+          case 58:
+            return internalGetMutableMapUint32Uint32();
+          case 59:
+            return internalGetMutableMapUint64Uint64();
+          case 60:
+            return internalGetMutableMapSint32Sint32();
+          case 61:
+            return internalGetMutableMapSint64Sint64();
+          case 62:
+            return internalGetMutableMapFixed32Fixed32();
+          case 63:
+            return internalGetMutableMapFixed64Fixed64();
+          case 64:
+            return internalGetMutableMapSfixed32Sfixed32();
+          case 65:
+            return internalGetMutableMapSfixed64Sfixed64();
+          case 66:
+            return internalGetMutableMapInt32Float();
+          case 67:
+            return internalGetMutableMapInt32Double();
+          case 68:
+            return internalGetMutableMapBoolBool();
+          case 69:
+            return internalGetMutableMapStringString();
+          case 70:
+            return internalGetMutableMapStringBytes();
+          case 71:
+            return internalGetMutableMapStringNestedMessage();
+          case 72:
+            return internalGetMutableMapStringForeignMessage();
+          case 73:
+            return internalGetMutableMapStringNestedEnum();
+          case 74:
+            return internalGetMutableMapStringForeignEnum();
+          default:
+            throw new RuntimeException(
+                "Invalid map field number: " + number);
+        }
+      }
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.class, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder.class);
+      }
+
+      // Construct using legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+          getOptionalNestedMessageFieldBuilder();
+          getOptionalForeignMessageFieldBuilder();
+          getRecursiveMessageFieldBuilder();
+          getRepeatedNestedMessageFieldBuilder();
+          getRepeatedForeignMessageFieldBuilder();
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        bitField0_ = 0;
+        bitField1_ = 0;
+        bitField2_ = 0;
+        optionalInt32_ = 0;
+        optionalInt64_ = 0L;
+        optionalUint32_ = 0;
+        optionalUint64_ = 0L;
+        optionalSint32_ = 0;
+        optionalSint64_ = 0L;
+        optionalFixed32_ = 0;
+        optionalFixed64_ = 0L;
+        optionalSfixed32_ = 0;
+        optionalSfixed64_ = 0L;
+        optionalFloat_ = 0F;
+        optionalDouble_ = 0D;
+        optionalBool_ = false;
+        optionalString_ = "";
+        optionalBytes_ = com.google.protobuf.ByteString.EMPTY;
+        optionalNestedMessage_ = null;
+        if (optionalNestedMessageBuilder_ != null) {
+          optionalNestedMessageBuilder_.dispose();
+          optionalNestedMessageBuilder_ = null;
+        }
+        optionalForeignMessage_ = null;
+        if (optionalForeignMessageBuilder_ != null) {
+          optionalForeignMessageBuilder_.dispose();
+          optionalForeignMessageBuilder_ = null;
+        }
+        optionalNestedEnum_ = 0;
+        optionalForeignEnum_ = 0;
+        optionalAliasedEnum_ = 0;
+        recursiveMessage_ = null;
+        if (recursiveMessageBuilder_ != null) {
+          recursiveMessageBuilder_.dispose();
+          recursiveMessageBuilder_ = null;
+        }
+        repeatedInt32_ = emptyIntList();
+        repeatedInt64_ = emptyLongList();
+        repeatedUint32_ = emptyIntList();
+        repeatedUint64_ = emptyLongList();
+        repeatedSint32_ = emptyIntList();
+        repeatedSint64_ = emptyLongList();
+        repeatedFixed32_ = emptyIntList();
+        repeatedFixed64_ = emptyLongList();
+        repeatedSfixed32_ = emptyIntList();
+        repeatedSfixed64_ = emptyLongList();
+        repeatedFloat_ = emptyFloatList();
+        repeatedDouble_ = emptyDoubleList();
+        repeatedBool_ = emptyBooleanList();
+        repeatedString_ =
+            com.google.protobuf.LazyStringArrayList.emptyList();
+        repeatedBytes_ = emptyList(com.google.protobuf.ByteString.class);
+        if (repeatedNestedMessageBuilder_ == null) {
+          repeatedNestedMessage_ = java.util.Collections.emptyList();
+        } else {
+          repeatedNestedMessage_ = null;
+          repeatedNestedMessageBuilder_.clear();
+        }
+        bitField1_ = (bitField1_ & ~0x00000010);
+        if (repeatedForeignMessageBuilder_ == null) {
+          repeatedForeignMessage_ = java.util.Collections.emptyList();
+        } else {
+          repeatedForeignMessage_ = null;
+          repeatedForeignMessageBuilder_.clear();
+        }
+        bitField1_ = (bitField1_ & ~0x00000020);
+        repeatedNestedEnum_ = java.util.Collections.emptyList();
+        bitField1_ = (bitField1_ & ~0x00000040);
+        repeatedForeignEnum_ = java.util.Collections.emptyList();
+        bitField1_ = (bitField1_ & ~0x00000080);
+        packedInt32_ = emptyIntList();
+        packedInt64_ = emptyLongList();
+        packedUint32_ = emptyIntList();
+        packedUint64_ = emptyLongList();
+        packedSint32_ = emptyIntList();
+        packedSint64_ = emptyLongList();
+        packedFixed32_ = emptyIntList();
+        packedFixed64_ = emptyLongList();
+        packedSfixed32_ = emptyIntList();
+        packedSfixed64_ = emptyLongList();
+        packedFloat_ = emptyFloatList();
+        packedDouble_ = emptyDoubleList();
+        packedBool_ = emptyBooleanList();
+        packedNestedEnum_ = java.util.Collections.emptyList();
+        bitField1_ = (bitField1_ & ~0x00200000);
+        unpackedInt32_ = emptyIntList();
+        unpackedInt64_ = emptyLongList();
+        unpackedUint32_ = emptyIntList();
+        unpackedUint64_ = emptyLongList();
+        unpackedSint32_ = emptyIntList();
+        unpackedSint64_ = emptyLongList();
+        unpackedFixed32_ = emptyIntList();
+        unpackedFixed64_ = emptyLongList();
+        unpackedSfixed32_ = emptyIntList();
+        unpackedSfixed64_ = emptyLongList();
+        unpackedFloat_ = emptyFloatList();
+        unpackedDouble_ = emptyDoubleList();
+        unpackedBool_ = emptyBooleanList();
+        unpackedNestedEnum_ = java.util.Collections.emptyList();
+        bitField2_ = (bitField2_ & ~0x00000008);
+        internalGetMutableMapInt32Int32().clear();
+        internalGetMutableMapInt64Int64().clear();
+        internalGetMutableMapUint32Uint32().clear();
+        internalGetMutableMapUint64Uint64().clear();
+        internalGetMutableMapSint32Sint32().clear();
+        internalGetMutableMapSint64Sint64().clear();
+        internalGetMutableMapFixed32Fixed32().clear();
+        internalGetMutableMapFixed64Fixed64().clear();
+        internalGetMutableMapSfixed32Sfixed32().clear();
+        internalGetMutableMapSfixed64Sfixed64().clear();
+        internalGetMutableMapInt32Float().clear();
+        internalGetMutableMapInt32Double().clear();
+        internalGetMutableMapBoolBool().clear();
+        internalGetMutableMapStringString().clear();
+        internalGetMutableMapStringBytes().clear();
+        internalGetMutableMapStringNestedMessage().clear();
+        internalGetMutableMapStringForeignMessage().clear();
+        internalGetMutableMapStringNestedEnum().clear();
+        internalGetMutableMapStringForeignEnum().clear();
+        if (oneofNestedMessageBuilder_ != null) {
+          oneofNestedMessageBuilder_.clear();
+        }
+        oneofFieldCase_ = 0;
+        oneofField_ = null;
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor;
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 getDefaultInstanceForType() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 build() {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 buildPartial() {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 result = new legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2(this);
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        if (bitField1_ != 0) { buildPartial1(result); }
+        if (bitField2_ != 0) { buildPartial2(result); }
+        buildPartialOneofs(result);
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 result) {
+        if (repeatedNestedMessageBuilder_ == null) {
+          if (((bitField1_ & 0x00000010) != 0)) {
+            repeatedNestedMessage_ = java.util.Collections.unmodifiableList(repeatedNestedMessage_);
+            bitField1_ = (bitField1_ & ~0x00000010);
+          }
+          result.repeatedNestedMessage_ = repeatedNestedMessage_;
+        } else {
+          result.repeatedNestedMessage_ = repeatedNestedMessageBuilder_.build();
+        }
+        if (repeatedForeignMessageBuilder_ == null) {
+          if (((bitField1_ & 0x00000020) != 0)) {
+            repeatedForeignMessage_ = java.util.Collections.unmodifiableList(repeatedForeignMessage_);
+            bitField1_ = (bitField1_ & ~0x00000020);
+          }
+          result.repeatedForeignMessage_ = repeatedForeignMessage_;
+        } else {
+          result.repeatedForeignMessage_ = repeatedForeignMessageBuilder_.build();
+        }
+        if (((bitField1_ & 0x00000040) != 0)) {
+          repeatedNestedEnum_ = java.util.Collections.unmodifiableList(repeatedNestedEnum_);
+          bitField1_ = (bitField1_ & ~0x00000040);
+        }
+        result.repeatedNestedEnum_ = repeatedNestedEnum_;
+        if (((bitField1_ & 0x00000080) != 0)) {
+          repeatedForeignEnum_ = java.util.Collections.unmodifiableList(repeatedForeignEnum_);
+          bitField1_ = (bitField1_ & ~0x00000080);
+        }
+        result.repeatedForeignEnum_ = repeatedForeignEnum_;
+        if (((bitField1_ & 0x00200000) != 0)) {
+          packedNestedEnum_ = java.util.Collections.unmodifiableList(packedNestedEnum_);
+          bitField1_ = (bitField1_ & ~0x00200000);
+        }
+        result.packedNestedEnum_ = packedNestedEnum_;
+        if (((bitField2_ & 0x00000008) != 0)) {
+          unpackedNestedEnum_ = java.util.Collections.unmodifiableList(unpackedNestedEnum_);
+          bitField2_ = (bitField2_ & ~0x00000008);
+        }
+        result.unpackedNestedEnum_ = unpackedNestedEnum_;
+      }
+
+      private void buildPartial0(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 result) {
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.optionalInt32_ = optionalInt32_;
+          to_bitField0_ |= 0x00000001;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.optionalInt64_ = optionalInt64_;
+          to_bitField0_ |= 0x00000002;
+        }
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.optionalUint32_ = optionalUint32_;
+          to_bitField0_ |= 0x00000004;
+        }
+        if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.optionalUint64_ = optionalUint64_;
+          to_bitField0_ |= 0x00000008;
+        }
+        if (((from_bitField0_ & 0x00000010) != 0)) {
+          result.optionalSint32_ = optionalSint32_;
+          to_bitField0_ |= 0x00000010;
+        }
+        if (((from_bitField0_ & 0x00000020) != 0)) {
+          result.optionalSint64_ = optionalSint64_;
+          to_bitField0_ |= 0x00000020;
+        }
+        if (((from_bitField0_ & 0x00000040) != 0)) {
+          result.optionalFixed32_ = optionalFixed32_;
+          to_bitField0_ |= 0x00000040;
+        }
+        if (((from_bitField0_ & 0x00000080) != 0)) {
+          result.optionalFixed64_ = optionalFixed64_;
+          to_bitField0_ |= 0x00000080;
+        }
+        if (((from_bitField0_ & 0x00000100) != 0)) {
+          result.optionalSfixed32_ = optionalSfixed32_;
+          to_bitField0_ |= 0x00000100;
+        }
+        if (((from_bitField0_ & 0x00000200) != 0)) {
+          result.optionalSfixed64_ = optionalSfixed64_;
+          to_bitField0_ |= 0x00000200;
+        }
+        if (((from_bitField0_ & 0x00000400) != 0)) {
+          result.optionalFloat_ = optionalFloat_;
+          to_bitField0_ |= 0x00000400;
+        }
+        if (((from_bitField0_ & 0x00000800) != 0)) {
+          result.optionalDouble_ = optionalDouble_;
+          to_bitField0_ |= 0x00000800;
+        }
+        if (((from_bitField0_ & 0x00001000) != 0)) {
+          result.optionalBool_ = optionalBool_;
+          to_bitField0_ |= 0x00001000;
+        }
+        if (((from_bitField0_ & 0x00002000) != 0)) {
+          result.optionalString_ = optionalString_;
+          to_bitField0_ |= 0x00002000;
+        }
+        if (((from_bitField0_ & 0x00004000) != 0)) {
+          result.optionalBytes_ = optionalBytes_;
+          to_bitField0_ |= 0x00004000;
+        }
+        if (((from_bitField0_ & 0x00008000) != 0)) {
+          result.optionalNestedMessage_ = optionalNestedMessageBuilder_ == null
+              ? optionalNestedMessage_
+              : optionalNestedMessageBuilder_.build();
+          to_bitField0_ |= 0x00008000;
+        }
+        if (((from_bitField0_ & 0x00010000) != 0)) {
+          result.optionalForeignMessage_ = optionalForeignMessageBuilder_ == null
+              ? optionalForeignMessage_
+              : optionalForeignMessageBuilder_.build();
+          to_bitField0_ |= 0x00010000;
+        }
+        if (((from_bitField0_ & 0x00020000) != 0)) {
+          result.optionalNestedEnum_ = optionalNestedEnum_;
+          to_bitField0_ |= 0x00020000;
+        }
+        if (((from_bitField0_ & 0x00040000) != 0)) {
+          result.optionalForeignEnum_ = optionalForeignEnum_;
+          to_bitField0_ |= 0x00040000;
+        }
+        if (((from_bitField0_ & 0x00080000) != 0)) {
+          result.optionalAliasedEnum_ = optionalAliasedEnum_;
+          to_bitField0_ |= 0x00080000;
+        }
+        if (((from_bitField0_ & 0x00100000) != 0)) {
+          result.recursiveMessage_ = recursiveMessageBuilder_ == null
+              ? recursiveMessage_
+              : recursiveMessageBuilder_.build();
+          to_bitField0_ |= 0x00100000;
+        }
+        if (((from_bitField0_ & 0x00200000) != 0)) {
+          repeatedInt32_.makeImmutable();
+          result.repeatedInt32_ = repeatedInt32_;
+        }
+        if (((from_bitField0_ & 0x00400000) != 0)) {
+          repeatedInt64_.makeImmutable();
+          result.repeatedInt64_ = repeatedInt64_;
+        }
+        if (((from_bitField0_ & 0x00800000) != 0)) {
+          repeatedUint32_.makeImmutable();
+          result.repeatedUint32_ = repeatedUint32_;
+        }
+        if (((from_bitField0_ & 0x01000000) != 0)) {
+          repeatedUint64_.makeImmutable();
+          result.repeatedUint64_ = repeatedUint64_;
+        }
+        if (((from_bitField0_ & 0x02000000) != 0)) {
+          repeatedSint32_.makeImmutable();
+          result.repeatedSint32_ = repeatedSint32_;
+        }
+        if (((from_bitField0_ & 0x04000000) != 0)) {
+          repeatedSint64_.makeImmutable();
+          result.repeatedSint64_ = repeatedSint64_;
+        }
+        if (((from_bitField0_ & 0x08000000) != 0)) {
+          repeatedFixed32_.makeImmutable();
+          result.repeatedFixed32_ = repeatedFixed32_;
+        }
+        if (((from_bitField0_ & 0x10000000) != 0)) {
+          repeatedFixed64_.makeImmutable();
+          result.repeatedFixed64_ = repeatedFixed64_;
+        }
+        if (((from_bitField0_ & 0x20000000) != 0)) {
+          repeatedSfixed32_.makeImmutable();
+          result.repeatedSfixed32_ = repeatedSfixed32_;
+        }
+        if (((from_bitField0_ & 0x40000000) != 0)) {
+          repeatedSfixed64_.makeImmutable();
+          result.repeatedSfixed64_ = repeatedSfixed64_;
+        }
+        if (((from_bitField0_ & 0x80000000) != 0)) {
+          repeatedFloat_.makeImmutable();
+          result.repeatedFloat_ = repeatedFloat_;
+        }
+        result.bitField0_ |= to_bitField0_;
+      }
+
+      private void buildPartial1(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 result) {
+        int from_bitField1_ = bitField1_;
+        if (((from_bitField1_ & 0x00000001) != 0)) {
+          repeatedDouble_.makeImmutable();
+          result.repeatedDouble_ = repeatedDouble_;
+        }
+        if (((from_bitField1_ & 0x00000002) != 0)) {
+          repeatedBool_.makeImmutable();
+          result.repeatedBool_ = repeatedBool_;
+        }
+        if (((from_bitField1_ & 0x00000004) != 0)) {
+          repeatedString_.makeImmutable();
+          result.repeatedString_ = repeatedString_;
+        }
+        if (((from_bitField1_ & 0x00000008) != 0)) {
+          repeatedBytes_.makeImmutable();
+          result.repeatedBytes_ = repeatedBytes_;
+        }
+        if (((from_bitField1_ & 0x00000100) != 0)) {
+          packedInt32_.makeImmutable();
+          result.packedInt32_ = packedInt32_;
+        }
+        if (((from_bitField1_ & 0x00000200) != 0)) {
+          packedInt64_.makeImmutable();
+          result.packedInt64_ = packedInt64_;
+        }
+        if (((from_bitField1_ & 0x00000400) != 0)) {
+          packedUint32_.makeImmutable();
+          result.packedUint32_ = packedUint32_;
+        }
+        if (((from_bitField1_ & 0x00000800) != 0)) {
+          packedUint64_.makeImmutable();
+          result.packedUint64_ = packedUint64_;
+        }
+        if (((from_bitField1_ & 0x00001000) != 0)) {
+          packedSint32_.makeImmutable();
+          result.packedSint32_ = packedSint32_;
+        }
+        if (((from_bitField1_ & 0x00002000) != 0)) {
+          packedSint64_.makeImmutable();
+          result.packedSint64_ = packedSint64_;
+        }
+        if (((from_bitField1_ & 0x00004000) != 0)) {
+          packedFixed32_.makeImmutable();
+          result.packedFixed32_ = packedFixed32_;
+        }
+        if (((from_bitField1_ & 0x00008000) != 0)) {
+          packedFixed64_.makeImmutable();
+          result.packedFixed64_ = packedFixed64_;
+        }
+        if (((from_bitField1_ & 0x00010000) != 0)) {
+          packedSfixed32_.makeImmutable();
+          result.packedSfixed32_ = packedSfixed32_;
+        }
+        if (((from_bitField1_ & 0x00020000) != 0)) {
+          packedSfixed64_.makeImmutable();
+          result.packedSfixed64_ = packedSfixed64_;
+        }
+        if (((from_bitField1_ & 0x00040000) != 0)) {
+          packedFloat_.makeImmutable();
+          result.packedFloat_ = packedFloat_;
+        }
+        if (((from_bitField1_ & 0x00080000) != 0)) {
+          packedDouble_.makeImmutable();
+          result.packedDouble_ = packedDouble_;
+        }
+        if (((from_bitField1_ & 0x00100000) != 0)) {
+          packedBool_.makeImmutable();
+          result.packedBool_ = packedBool_;
+        }
+        if (((from_bitField1_ & 0x00400000) != 0)) {
+          unpackedInt32_.makeImmutable();
+          result.unpackedInt32_ = unpackedInt32_;
+        }
+        if (((from_bitField1_ & 0x00800000) != 0)) {
+          unpackedInt64_.makeImmutable();
+          result.unpackedInt64_ = unpackedInt64_;
+        }
+        if (((from_bitField1_ & 0x01000000) != 0)) {
+          unpackedUint32_.makeImmutable();
+          result.unpackedUint32_ = unpackedUint32_;
+        }
+        if (((from_bitField1_ & 0x02000000) != 0)) {
+          unpackedUint64_.makeImmutable();
+          result.unpackedUint64_ = unpackedUint64_;
+        }
+        if (((from_bitField1_ & 0x04000000) != 0)) {
+          unpackedSint32_.makeImmutable();
+          result.unpackedSint32_ = unpackedSint32_;
+        }
+        if (((from_bitField1_ & 0x08000000) != 0)) {
+          unpackedSint64_.makeImmutable();
+          result.unpackedSint64_ = unpackedSint64_;
+        }
+        if (((from_bitField1_ & 0x10000000) != 0)) {
+          unpackedFixed32_.makeImmutable();
+          result.unpackedFixed32_ = unpackedFixed32_;
+        }
+        if (((from_bitField1_ & 0x20000000) != 0)) {
+          unpackedFixed64_.makeImmutable();
+          result.unpackedFixed64_ = unpackedFixed64_;
+        }
+        if (((from_bitField1_ & 0x40000000) != 0)) {
+          unpackedSfixed32_.makeImmutable();
+          result.unpackedSfixed32_ = unpackedSfixed32_;
+        }
+        if (((from_bitField1_ & 0x80000000) != 0)) {
+          unpackedSfixed64_.makeImmutable();
+          result.unpackedSfixed64_ = unpackedSfixed64_;
+        }
+      }
+
+      private void buildPartial2(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 result) {
+        int from_bitField2_ = bitField2_;
+        if (((from_bitField2_ & 0x00000001) != 0)) {
+          unpackedFloat_.makeImmutable();
+          result.unpackedFloat_ = unpackedFloat_;
+        }
+        if (((from_bitField2_ & 0x00000002) != 0)) {
+          unpackedDouble_.makeImmutable();
+          result.unpackedDouble_ = unpackedDouble_;
+        }
+        if (((from_bitField2_ & 0x00000004) != 0)) {
+          unpackedBool_.makeImmutable();
+          result.unpackedBool_ = unpackedBool_;
+        }
+        if (((from_bitField2_ & 0x00000010) != 0)) {
+          result.mapInt32Int32_ = internalGetMapInt32Int32();
+          result.mapInt32Int32_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00000020) != 0)) {
+          result.mapInt64Int64_ = internalGetMapInt64Int64();
+          result.mapInt64Int64_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00000040) != 0)) {
+          result.mapUint32Uint32_ = internalGetMapUint32Uint32();
+          result.mapUint32Uint32_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00000080) != 0)) {
+          result.mapUint64Uint64_ = internalGetMapUint64Uint64();
+          result.mapUint64Uint64_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00000100) != 0)) {
+          result.mapSint32Sint32_ = internalGetMapSint32Sint32();
+          result.mapSint32Sint32_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00000200) != 0)) {
+          result.mapSint64Sint64_ = internalGetMapSint64Sint64();
+          result.mapSint64Sint64_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00000400) != 0)) {
+          result.mapFixed32Fixed32_ = internalGetMapFixed32Fixed32();
+          result.mapFixed32Fixed32_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00000800) != 0)) {
+          result.mapFixed64Fixed64_ = internalGetMapFixed64Fixed64();
+          result.mapFixed64Fixed64_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00001000) != 0)) {
+          result.mapSfixed32Sfixed32_ = internalGetMapSfixed32Sfixed32();
+          result.mapSfixed32Sfixed32_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00002000) != 0)) {
+          result.mapSfixed64Sfixed64_ = internalGetMapSfixed64Sfixed64();
+          result.mapSfixed64Sfixed64_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00004000) != 0)) {
+          result.mapInt32Float_ = internalGetMapInt32Float();
+          result.mapInt32Float_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00008000) != 0)) {
+          result.mapInt32Double_ = internalGetMapInt32Double();
+          result.mapInt32Double_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00010000) != 0)) {
+          result.mapBoolBool_ = internalGetMapBoolBool();
+          result.mapBoolBool_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00020000) != 0)) {
+          result.mapStringString_ = internalGetMapStringString();
+          result.mapStringString_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00040000) != 0)) {
+          result.mapStringBytes_ = internalGetMapStringBytes();
+          result.mapStringBytes_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00080000) != 0)) {
+          result.mapStringNestedMessage_ = internalGetMapStringNestedMessage().build(MapStringNestedMessageDefaultEntryHolder.defaultEntry);
+        }
+        if (((from_bitField2_ & 0x00100000) != 0)) {
+          result.mapStringForeignMessage_ = internalGetMapStringForeignMessage().build(MapStringForeignMessageDefaultEntryHolder.defaultEntry);
+        }
+        if (((from_bitField2_ & 0x00200000) != 0)) {
+          result.mapStringNestedEnum_ = internalGetMapStringNestedEnum();
+          result.mapStringNestedEnum_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00400000) != 0)) {
+          result.mapStringForeignEnum_ = internalGetMapStringForeignEnum();
+          result.mapStringForeignEnum_.makeImmutable();
+        }
+      }
+
+      private void buildPartialOneofs(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 result) {
+        result.oneofFieldCase_ = oneofFieldCase_;
+        result.oneofField_ = this.oneofField_;
+        if (oneofFieldCase_ == 112 &&
+            oneofNestedMessageBuilder_ != null) {
+          result.oneofField_ = oneofNestedMessageBuilder_.build();
+        }
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public <Type> Builder setExtension(
+          com.google.protobuf.GeneratedMessage.GeneratedExtension<
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2, Type> extension,
+          Type value) {
+        return super.setExtension(extension, value);
+      }
+      @java.lang.Override
+      public <Type> Builder setExtension(
+          com.google.protobuf.GeneratedMessage.GeneratedExtension<
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2, java.util.List<Type>> extension,
+          int index, Type value) {
+        return super.setExtension(extension, index, value);
+      }
+      @java.lang.Override
+      public <Type> Builder addExtension(
+          com.google.protobuf.GeneratedMessage.GeneratedExtension<
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2, java.util.List<Type>> extension,
+          Type value) {
+        return super.addExtension(extension, value);
+      }
+      @java.lang.Override
+      public <T> Builder clearExtension(
+          com.google.protobuf.GeneratedMessage.GeneratedExtension<
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2, T> extension) {
+        return super.clearExtension(extension);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2) {
+          return mergeFrom((legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 other) {
+        if (other == legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance()) return this;
+        if (other.hasOptionalInt32()) {
+          setOptionalInt32(other.getOptionalInt32());
+        }
+        if (other.hasOptionalInt64()) {
+          setOptionalInt64(other.getOptionalInt64());
+        }
+        if (other.hasOptionalUint32()) {
+          setOptionalUint32(other.getOptionalUint32());
+        }
+        if (other.hasOptionalUint64()) {
+          setOptionalUint64(other.getOptionalUint64());
+        }
+        if (other.hasOptionalSint32()) {
+          setOptionalSint32(other.getOptionalSint32());
+        }
+        if (other.hasOptionalSint64()) {
+          setOptionalSint64(other.getOptionalSint64());
+        }
+        if (other.hasOptionalFixed32()) {
+          setOptionalFixed32(other.getOptionalFixed32());
+        }
+        if (other.hasOptionalFixed64()) {
+          setOptionalFixed64(other.getOptionalFixed64());
+        }
+        if (other.hasOptionalSfixed32()) {
+          setOptionalSfixed32(other.getOptionalSfixed32());
+        }
+        if (other.hasOptionalSfixed64()) {
+          setOptionalSfixed64(other.getOptionalSfixed64());
+        }
+        if (other.hasOptionalFloat()) {
+          setOptionalFloat(other.getOptionalFloat());
+        }
+        if (other.hasOptionalDouble()) {
+          setOptionalDouble(other.getOptionalDouble());
+        }
+        if (other.hasOptionalBool()) {
+          setOptionalBool(other.getOptionalBool());
+        }
+        if (other.hasOptionalString()) {
+          optionalString_ = other.optionalString_;
+          bitField0_ |= 0x00002000;
+          onChanged();
+        }
+        if (other.hasOptionalBytes()) {
+          setOptionalBytes(other.getOptionalBytes());
+        }
+        if (other.hasOptionalNestedMessage()) {
+          mergeOptionalNestedMessage(other.getOptionalNestedMessage());
+        }
+        if (other.hasOptionalForeignMessage()) {
+          mergeOptionalForeignMessage(other.getOptionalForeignMessage());
+        }
+        if (other.hasOptionalNestedEnum()) {
+          setOptionalNestedEnum(other.getOptionalNestedEnum());
+        }
+        if (other.hasOptionalForeignEnum()) {
+          setOptionalForeignEnum(other.getOptionalForeignEnum());
+        }
+        if (other.hasOptionalAliasedEnum()) {
+          setOptionalAliasedEnum(other.getOptionalAliasedEnum());
+        }
+        if (other.hasRecursiveMessage()) {
+          mergeRecursiveMessage(other.getRecursiveMessage());
+        }
+        if (!other.repeatedInt32_.isEmpty()) {
+          if (repeatedInt32_.isEmpty()) {
+            repeatedInt32_ = other.repeatedInt32_;
+            repeatedInt32_.makeImmutable();
+            bitField0_ |= 0x00200000;
+          } else {
+            ensureRepeatedInt32IsMutable();
+            repeatedInt32_.addAll(other.repeatedInt32_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedInt64_.isEmpty()) {
+          if (repeatedInt64_.isEmpty()) {
+            repeatedInt64_ = other.repeatedInt64_;
+            repeatedInt64_.makeImmutable();
+            bitField0_ |= 0x00400000;
+          } else {
+            ensureRepeatedInt64IsMutable();
+            repeatedInt64_.addAll(other.repeatedInt64_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedUint32_.isEmpty()) {
+          if (repeatedUint32_.isEmpty()) {
+            repeatedUint32_ = other.repeatedUint32_;
+            repeatedUint32_.makeImmutable();
+            bitField0_ |= 0x00800000;
+          } else {
+            ensureRepeatedUint32IsMutable();
+            repeatedUint32_.addAll(other.repeatedUint32_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedUint64_.isEmpty()) {
+          if (repeatedUint64_.isEmpty()) {
+            repeatedUint64_ = other.repeatedUint64_;
+            repeatedUint64_.makeImmutable();
+            bitField0_ |= 0x01000000;
+          } else {
+            ensureRepeatedUint64IsMutable();
+            repeatedUint64_.addAll(other.repeatedUint64_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedSint32_.isEmpty()) {
+          if (repeatedSint32_.isEmpty()) {
+            repeatedSint32_ = other.repeatedSint32_;
+            repeatedSint32_.makeImmutable();
+            bitField0_ |= 0x02000000;
+          } else {
+            ensureRepeatedSint32IsMutable();
+            repeatedSint32_.addAll(other.repeatedSint32_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedSint64_.isEmpty()) {
+          if (repeatedSint64_.isEmpty()) {
+            repeatedSint64_ = other.repeatedSint64_;
+            repeatedSint64_.makeImmutable();
+            bitField0_ |= 0x04000000;
+          } else {
+            ensureRepeatedSint64IsMutable();
+            repeatedSint64_.addAll(other.repeatedSint64_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedFixed32_.isEmpty()) {
+          if (repeatedFixed32_.isEmpty()) {
+            repeatedFixed32_ = other.repeatedFixed32_;
+            repeatedFixed32_.makeImmutable();
+            bitField0_ |= 0x08000000;
+          } else {
+            ensureRepeatedFixed32IsMutable();
+            repeatedFixed32_.addAll(other.repeatedFixed32_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedFixed64_.isEmpty()) {
+          if (repeatedFixed64_.isEmpty()) {
+            repeatedFixed64_ = other.repeatedFixed64_;
+            repeatedFixed64_.makeImmutable();
+            bitField0_ |= 0x10000000;
+          } else {
+            ensureRepeatedFixed64IsMutable();
+            repeatedFixed64_.addAll(other.repeatedFixed64_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedSfixed32_.isEmpty()) {
+          if (repeatedSfixed32_.isEmpty()) {
+            repeatedSfixed32_ = other.repeatedSfixed32_;
+            repeatedSfixed32_.makeImmutable();
+            bitField0_ |= 0x20000000;
+          } else {
+            ensureRepeatedSfixed32IsMutable();
+            repeatedSfixed32_.addAll(other.repeatedSfixed32_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedSfixed64_.isEmpty()) {
+          if (repeatedSfixed64_.isEmpty()) {
+            repeatedSfixed64_ = other.repeatedSfixed64_;
+            repeatedSfixed64_.makeImmutable();
+            bitField0_ |= 0x40000000;
+          } else {
+            ensureRepeatedSfixed64IsMutable();
+            repeatedSfixed64_.addAll(other.repeatedSfixed64_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedFloat_.isEmpty()) {
+          if (repeatedFloat_.isEmpty()) {
+            repeatedFloat_ = other.repeatedFloat_;
+            repeatedFloat_.makeImmutable();
+            bitField0_ |= 0x80000000;
+          } else {
+            ensureRepeatedFloatIsMutable();
+            repeatedFloat_.addAll(other.repeatedFloat_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedDouble_.isEmpty()) {
+          if (repeatedDouble_.isEmpty()) {
+            repeatedDouble_ = other.repeatedDouble_;
+            repeatedDouble_.makeImmutable();
+            bitField1_ |= 0x00000001;
+          } else {
+            ensureRepeatedDoubleIsMutable();
+            repeatedDouble_.addAll(other.repeatedDouble_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedBool_.isEmpty()) {
+          if (repeatedBool_.isEmpty()) {
+            repeatedBool_ = other.repeatedBool_;
+            repeatedBool_.makeImmutable();
+            bitField1_ |= 0x00000002;
+          } else {
+            ensureRepeatedBoolIsMutable();
+            repeatedBool_.addAll(other.repeatedBool_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedString_.isEmpty()) {
+          if (repeatedString_.isEmpty()) {
+            repeatedString_ = other.repeatedString_;
+            bitField1_ |= 0x00000004;
+          } else {
+            ensureRepeatedStringIsMutable();
+            repeatedString_.addAll(other.repeatedString_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedBytes_.isEmpty()) {
+          if (repeatedBytes_.isEmpty()) {
+            repeatedBytes_ = other.repeatedBytes_;
+            repeatedBytes_.makeImmutable();
+            bitField1_ |= 0x00000008;
+          } else {
+            ensureRepeatedBytesIsMutable();
+            repeatedBytes_.addAll(other.repeatedBytes_);
+          }
+          onChanged();
+        }
+        if (repeatedNestedMessageBuilder_ == null) {
+          if (!other.repeatedNestedMessage_.isEmpty()) {
+            if (repeatedNestedMessage_.isEmpty()) {
+              repeatedNestedMessage_ = other.repeatedNestedMessage_;
+              bitField1_ = (bitField1_ & ~0x00000010);
+            } else {
+              ensureRepeatedNestedMessageIsMutable();
+              repeatedNestedMessage_.addAll(other.repeatedNestedMessage_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.repeatedNestedMessage_.isEmpty()) {
+            if (repeatedNestedMessageBuilder_.isEmpty()) {
+              repeatedNestedMessageBuilder_.dispose();
+              repeatedNestedMessageBuilder_ = null;
+              repeatedNestedMessage_ = other.repeatedNestedMessage_;
+              bitField1_ = (bitField1_ & ~0x00000010);
+              repeatedNestedMessageBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getRepeatedNestedMessageFieldBuilder() : null;
+            } else {
+              repeatedNestedMessageBuilder_.addAllMessages(other.repeatedNestedMessage_);
+            }
+          }
+        }
+        if (repeatedForeignMessageBuilder_ == null) {
+          if (!other.repeatedForeignMessage_.isEmpty()) {
+            if (repeatedForeignMessage_.isEmpty()) {
+              repeatedForeignMessage_ = other.repeatedForeignMessage_;
+              bitField1_ = (bitField1_ & ~0x00000020);
+            } else {
+              ensureRepeatedForeignMessageIsMutable();
+              repeatedForeignMessage_.addAll(other.repeatedForeignMessage_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.repeatedForeignMessage_.isEmpty()) {
+            if (repeatedForeignMessageBuilder_.isEmpty()) {
+              repeatedForeignMessageBuilder_.dispose();
+              repeatedForeignMessageBuilder_ = null;
+              repeatedForeignMessage_ = other.repeatedForeignMessage_;
+              bitField1_ = (bitField1_ & ~0x00000020);
+              repeatedForeignMessageBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getRepeatedForeignMessageFieldBuilder() : null;
+            } else {
+              repeatedForeignMessageBuilder_.addAllMessages(other.repeatedForeignMessage_);
+            }
+          }
+        }
+        if (!other.repeatedNestedEnum_.isEmpty()) {
+          if (repeatedNestedEnum_.isEmpty()) {
+            repeatedNestedEnum_ = other.repeatedNestedEnum_;
+            bitField1_ = (bitField1_ & ~0x00000040);
+          } else {
+            ensureRepeatedNestedEnumIsMutable();
+            repeatedNestedEnum_.addAll(other.repeatedNestedEnum_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedForeignEnum_.isEmpty()) {
+          if (repeatedForeignEnum_.isEmpty()) {
+            repeatedForeignEnum_ = other.repeatedForeignEnum_;
+            bitField1_ = (bitField1_ & ~0x00000080);
+          } else {
+            ensureRepeatedForeignEnumIsMutable();
+            repeatedForeignEnum_.addAll(other.repeatedForeignEnum_);
+          }
+          onChanged();
+        }
+        if (!other.packedInt32_.isEmpty()) {
+          if (packedInt32_.isEmpty()) {
+            packedInt32_ = other.packedInt32_;
+            packedInt32_.makeImmutable();
+            bitField1_ |= 0x00000100;
+          } else {
+            ensurePackedInt32IsMutable();
+            packedInt32_.addAll(other.packedInt32_);
+          }
+          onChanged();
+        }
+        if (!other.packedInt64_.isEmpty()) {
+          if (packedInt64_.isEmpty()) {
+            packedInt64_ = other.packedInt64_;
+            packedInt64_.makeImmutable();
+            bitField1_ |= 0x00000200;
+          } else {
+            ensurePackedInt64IsMutable();
+            packedInt64_.addAll(other.packedInt64_);
+          }
+          onChanged();
+        }
+        if (!other.packedUint32_.isEmpty()) {
+          if (packedUint32_.isEmpty()) {
+            packedUint32_ = other.packedUint32_;
+            packedUint32_.makeImmutable();
+            bitField1_ |= 0x00000400;
+          } else {
+            ensurePackedUint32IsMutable();
+            packedUint32_.addAll(other.packedUint32_);
+          }
+          onChanged();
+        }
+        if (!other.packedUint64_.isEmpty()) {
+          if (packedUint64_.isEmpty()) {
+            packedUint64_ = other.packedUint64_;
+            packedUint64_.makeImmutable();
+            bitField1_ |= 0x00000800;
+          } else {
+            ensurePackedUint64IsMutable();
+            packedUint64_.addAll(other.packedUint64_);
+          }
+          onChanged();
+        }
+        if (!other.packedSint32_.isEmpty()) {
+          if (packedSint32_.isEmpty()) {
+            packedSint32_ = other.packedSint32_;
+            packedSint32_.makeImmutable();
+            bitField1_ |= 0x00001000;
+          } else {
+            ensurePackedSint32IsMutable();
+            packedSint32_.addAll(other.packedSint32_);
+          }
+          onChanged();
+        }
+        if (!other.packedSint64_.isEmpty()) {
+          if (packedSint64_.isEmpty()) {
+            packedSint64_ = other.packedSint64_;
+            packedSint64_.makeImmutable();
+            bitField1_ |= 0x00002000;
+          } else {
+            ensurePackedSint64IsMutable();
+            packedSint64_.addAll(other.packedSint64_);
+          }
+          onChanged();
+        }
+        if (!other.packedFixed32_.isEmpty()) {
+          if (packedFixed32_.isEmpty()) {
+            packedFixed32_ = other.packedFixed32_;
+            packedFixed32_.makeImmutable();
+            bitField1_ |= 0x00004000;
+          } else {
+            ensurePackedFixed32IsMutable();
+            packedFixed32_.addAll(other.packedFixed32_);
+          }
+          onChanged();
+        }
+        if (!other.packedFixed64_.isEmpty()) {
+          if (packedFixed64_.isEmpty()) {
+            packedFixed64_ = other.packedFixed64_;
+            packedFixed64_.makeImmutable();
+            bitField1_ |= 0x00008000;
+          } else {
+            ensurePackedFixed64IsMutable();
+            packedFixed64_.addAll(other.packedFixed64_);
+          }
+          onChanged();
+        }
+        if (!other.packedSfixed32_.isEmpty()) {
+          if (packedSfixed32_.isEmpty()) {
+            packedSfixed32_ = other.packedSfixed32_;
+            packedSfixed32_.makeImmutable();
+            bitField1_ |= 0x00010000;
+          } else {
+            ensurePackedSfixed32IsMutable();
+            packedSfixed32_.addAll(other.packedSfixed32_);
+          }
+          onChanged();
+        }
+        if (!other.packedSfixed64_.isEmpty()) {
+          if (packedSfixed64_.isEmpty()) {
+            packedSfixed64_ = other.packedSfixed64_;
+            packedSfixed64_.makeImmutable();
+            bitField1_ |= 0x00020000;
+          } else {
+            ensurePackedSfixed64IsMutable();
+            packedSfixed64_.addAll(other.packedSfixed64_);
+          }
+          onChanged();
+        }
+        if (!other.packedFloat_.isEmpty()) {
+          if (packedFloat_.isEmpty()) {
+            packedFloat_ = other.packedFloat_;
+            packedFloat_.makeImmutable();
+            bitField1_ |= 0x00040000;
+          } else {
+            ensurePackedFloatIsMutable();
+            packedFloat_.addAll(other.packedFloat_);
+          }
+          onChanged();
+        }
+        if (!other.packedDouble_.isEmpty()) {
+          if (packedDouble_.isEmpty()) {
+            packedDouble_ = other.packedDouble_;
+            packedDouble_.makeImmutable();
+            bitField1_ |= 0x00080000;
+          } else {
+            ensurePackedDoubleIsMutable();
+            packedDouble_.addAll(other.packedDouble_);
+          }
+          onChanged();
+        }
+        if (!other.packedBool_.isEmpty()) {
+          if (packedBool_.isEmpty()) {
+            packedBool_ = other.packedBool_;
+            packedBool_.makeImmutable();
+            bitField1_ |= 0x00100000;
+          } else {
+            ensurePackedBoolIsMutable();
+            packedBool_.addAll(other.packedBool_);
+          }
+          onChanged();
+        }
+        if (!other.packedNestedEnum_.isEmpty()) {
+          if (packedNestedEnum_.isEmpty()) {
+            packedNestedEnum_ = other.packedNestedEnum_;
+            bitField1_ = (bitField1_ & ~0x00200000);
+          } else {
+            ensurePackedNestedEnumIsMutable();
+            packedNestedEnum_.addAll(other.packedNestedEnum_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedInt32_.isEmpty()) {
+          if (unpackedInt32_.isEmpty()) {
+            unpackedInt32_ = other.unpackedInt32_;
+            unpackedInt32_.makeImmutable();
+            bitField1_ |= 0x00400000;
+          } else {
+            ensureUnpackedInt32IsMutable();
+            unpackedInt32_.addAll(other.unpackedInt32_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedInt64_.isEmpty()) {
+          if (unpackedInt64_.isEmpty()) {
+            unpackedInt64_ = other.unpackedInt64_;
+            unpackedInt64_.makeImmutable();
+            bitField1_ |= 0x00800000;
+          } else {
+            ensureUnpackedInt64IsMutable();
+            unpackedInt64_.addAll(other.unpackedInt64_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedUint32_.isEmpty()) {
+          if (unpackedUint32_.isEmpty()) {
+            unpackedUint32_ = other.unpackedUint32_;
+            unpackedUint32_.makeImmutable();
+            bitField1_ |= 0x01000000;
+          } else {
+            ensureUnpackedUint32IsMutable();
+            unpackedUint32_.addAll(other.unpackedUint32_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedUint64_.isEmpty()) {
+          if (unpackedUint64_.isEmpty()) {
+            unpackedUint64_ = other.unpackedUint64_;
+            unpackedUint64_.makeImmutable();
+            bitField1_ |= 0x02000000;
+          } else {
+            ensureUnpackedUint64IsMutable();
+            unpackedUint64_.addAll(other.unpackedUint64_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedSint32_.isEmpty()) {
+          if (unpackedSint32_.isEmpty()) {
+            unpackedSint32_ = other.unpackedSint32_;
+            unpackedSint32_.makeImmutable();
+            bitField1_ |= 0x04000000;
+          } else {
+            ensureUnpackedSint32IsMutable();
+            unpackedSint32_.addAll(other.unpackedSint32_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedSint64_.isEmpty()) {
+          if (unpackedSint64_.isEmpty()) {
+            unpackedSint64_ = other.unpackedSint64_;
+            unpackedSint64_.makeImmutable();
+            bitField1_ |= 0x08000000;
+          } else {
+            ensureUnpackedSint64IsMutable();
+            unpackedSint64_.addAll(other.unpackedSint64_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedFixed32_.isEmpty()) {
+          if (unpackedFixed32_.isEmpty()) {
+            unpackedFixed32_ = other.unpackedFixed32_;
+            unpackedFixed32_.makeImmutable();
+            bitField1_ |= 0x10000000;
+          } else {
+            ensureUnpackedFixed32IsMutable();
+            unpackedFixed32_.addAll(other.unpackedFixed32_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedFixed64_.isEmpty()) {
+          if (unpackedFixed64_.isEmpty()) {
+            unpackedFixed64_ = other.unpackedFixed64_;
+            unpackedFixed64_.makeImmutable();
+            bitField1_ |= 0x20000000;
+          } else {
+            ensureUnpackedFixed64IsMutable();
+            unpackedFixed64_.addAll(other.unpackedFixed64_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedSfixed32_.isEmpty()) {
+          if (unpackedSfixed32_.isEmpty()) {
+            unpackedSfixed32_ = other.unpackedSfixed32_;
+            unpackedSfixed32_.makeImmutable();
+            bitField1_ |= 0x40000000;
+          } else {
+            ensureUnpackedSfixed32IsMutable();
+            unpackedSfixed32_.addAll(other.unpackedSfixed32_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedSfixed64_.isEmpty()) {
+          if (unpackedSfixed64_.isEmpty()) {
+            unpackedSfixed64_ = other.unpackedSfixed64_;
+            unpackedSfixed64_.makeImmutable();
+            bitField1_ |= 0x80000000;
+          } else {
+            ensureUnpackedSfixed64IsMutable();
+            unpackedSfixed64_.addAll(other.unpackedSfixed64_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedFloat_.isEmpty()) {
+          if (unpackedFloat_.isEmpty()) {
+            unpackedFloat_ = other.unpackedFloat_;
+            unpackedFloat_.makeImmutable();
+            bitField2_ |= 0x00000001;
+          } else {
+            ensureUnpackedFloatIsMutable();
+            unpackedFloat_.addAll(other.unpackedFloat_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedDouble_.isEmpty()) {
+          if (unpackedDouble_.isEmpty()) {
+            unpackedDouble_ = other.unpackedDouble_;
+            unpackedDouble_.makeImmutable();
+            bitField2_ |= 0x00000002;
+          } else {
+            ensureUnpackedDoubleIsMutable();
+            unpackedDouble_.addAll(other.unpackedDouble_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedBool_.isEmpty()) {
+          if (unpackedBool_.isEmpty()) {
+            unpackedBool_ = other.unpackedBool_;
+            unpackedBool_.makeImmutable();
+            bitField2_ |= 0x00000004;
+          } else {
+            ensureUnpackedBoolIsMutable();
+            unpackedBool_.addAll(other.unpackedBool_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedNestedEnum_.isEmpty()) {
+          if (unpackedNestedEnum_.isEmpty()) {
+            unpackedNestedEnum_ = other.unpackedNestedEnum_;
+            bitField2_ = (bitField2_ & ~0x00000008);
+          } else {
+            ensureUnpackedNestedEnumIsMutable();
+            unpackedNestedEnum_.addAll(other.unpackedNestedEnum_);
+          }
+          onChanged();
+        }
+        internalGetMutableMapInt32Int32().mergeFrom(
+            other.internalGetMapInt32Int32());
+        bitField2_ |= 0x00000010;
+        internalGetMutableMapInt64Int64().mergeFrom(
+            other.internalGetMapInt64Int64());
+        bitField2_ |= 0x00000020;
+        internalGetMutableMapUint32Uint32().mergeFrom(
+            other.internalGetMapUint32Uint32());
+        bitField2_ |= 0x00000040;
+        internalGetMutableMapUint64Uint64().mergeFrom(
+            other.internalGetMapUint64Uint64());
+        bitField2_ |= 0x00000080;
+        internalGetMutableMapSint32Sint32().mergeFrom(
+            other.internalGetMapSint32Sint32());
+        bitField2_ |= 0x00000100;
+        internalGetMutableMapSint64Sint64().mergeFrom(
+            other.internalGetMapSint64Sint64());
+        bitField2_ |= 0x00000200;
+        internalGetMutableMapFixed32Fixed32().mergeFrom(
+            other.internalGetMapFixed32Fixed32());
+        bitField2_ |= 0x00000400;
+        internalGetMutableMapFixed64Fixed64().mergeFrom(
+            other.internalGetMapFixed64Fixed64());
+        bitField2_ |= 0x00000800;
+        internalGetMutableMapSfixed32Sfixed32().mergeFrom(
+            other.internalGetMapSfixed32Sfixed32());
+        bitField2_ |= 0x00001000;
+        internalGetMutableMapSfixed64Sfixed64().mergeFrom(
+            other.internalGetMapSfixed64Sfixed64());
+        bitField2_ |= 0x00002000;
+        internalGetMutableMapInt32Float().mergeFrom(
+            other.internalGetMapInt32Float());
+        bitField2_ |= 0x00004000;
+        internalGetMutableMapInt32Double().mergeFrom(
+            other.internalGetMapInt32Double());
+        bitField2_ |= 0x00008000;
+        internalGetMutableMapBoolBool().mergeFrom(
+            other.internalGetMapBoolBool());
+        bitField2_ |= 0x00010000;
+        internalGetMutableMapStringString().mergeFrom(
+            other.internalGetMapStringString());
+        bitField2_ |= 0x00020000;
+        internalGetMutableMapStringBytes().mergeFrom(
+            other.internalGetMapStringBytes());
+        bitField2_ |= 0x00040000;
+        internalGetMutableMapStringNestedMessage().mergeFrom(
+            other.internalGetMapStringNestedMessage());
+        bitField2_ |= 0x00080000;
+        internalGetMutableMapStringForeignMessage().mergeFrom(
+            other.internalGetMapStringForeignMessage());
+        bitField2_ |= 0x00100000;
+        internalGetMutableMapStringNestedEnum().mergeFrom(
+            other.internalGetMapStringNestedEnum());
+        bitField2_ |= 0x00200000;
+        internalGetMutableMapStringForeignEnum().mergeFrom(
+            other.internalGetMapStringForeignEnum());
+        bitField2_ |= 0x00400000;
+        switch (other.getOneofFieldCase()) {
+          case ONEOF_UINT32: {
+            setOneofUint32(other.getOneofUint32());
+            break;
+          }
+          case ONEOF_NESTED_MESSAGE: {
+            mergeOneofNestedMessage(other.getOneofNestedMessage());
+            break;
+          }
+          case ONEOF_STRING: {
+            oneofFieldCase_ = 113;
+            oneofField_ = other.oneofField_;
+            onChanged();
+            break;
+          }
+          case ONEOF_BYTES: {
+            setOneofBytes(other.getOneofBytes());
+            break;
+          }
+          case ONEOF_BOOL: {
+            setOneofBool(other.getOneofBool());
+            break;
+          }
+          case ONEOF_UINT64: {
+            setOneofUint64(other.getOneofUint64());
+            break;
+          }
+          case ONEOF_FLOAT: {
+            setOneofFloat(other.getOneofFloat());
+            break;
+          }
+          case ONEOF_DOUBLE: {
+            setOneofDouble(other.getOneofDouble());
+            break;
+          }
+          case ONEOF_ENUM: {
+            setOneofEnum(other.getOneofEnum());
+            break;
+          }
+          case ONEOFFIELD_NOT_SET: {
+            break;
+          }
+        }
+        this.mergeExtensionFields(other);
+        this.mergeUnknownFields(other.getUnknownFields());
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        if (hasOptionalNestedMessage()) {
+          if (!getOptionalNestedMessage().isInitialized()) {
+            return false;
+          }
+        }
+        if (hasRecursiveMessage()) {
+          if (!getRecursiveMessage().isInitialized()) {
+            return false;
+          }
+        }
+        for (int i = 0; i < getRepeatedNestedMessageCount(); i++) {
+          if (!getRepeatedNestedMessage(i).isInitialized()) {
+            return false;
+          }
+        }
+        for (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage item : getMapStringNestedMessageMap().values()) {
+          if (!item.isInitialized()) {
+            return false;
+          }
+        }
+        if (hasOneofNestedMessage()) {
+          if (!getOneofNestedMessage().isInitialized()) {
+            return false;
+          }
+        }
+        if (!extensionsAreInitialized()) {
+          return false;
+        }
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
+        try {
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                optionalInt32_ = input.readInt32();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 16: {
+                optionalInt64_ = input.readInt64();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 24: {
+                optionalUint32_ = input.readUInt32();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              case 32: {
+                optionalUint64_ = input.readUInt64();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 32
+              case 40: {
+                optionalSint32_ = input.readSInt32();
+                bitField0_ |= 0x00000010;
+                break;
+              } // case 40
+              case 48: {
+                optionalSint64_ = input.readSInt64();
+                bitField0_ |= 0x00000020;
+                break;
+              } // case 48
+              case 61: {
+                optionalFixed32_ = input.readFixed32();
+                bitField0_ |= 0x00000040;
+                break;
+              } // case 61
+              case 65: {
+                optionalFixed64_ = input.readFixed64();
+                bitField0_ |= 0x00000080;
+                break;
+              } // case 65
+              case 77: {
+                optionalSfixed32_ = input.readSFixed32();
+                bitField0_ |= 0x00000100;
+                break;
+              } // case 77
+              case 81: {
+                optionalSfixed64_ = input.readSFixed64();
+                bitField0_ |= 0x00000200;
+                break;
+              } // case 81
+              case 93: {
+                optionalFloat_ = input.readFloat();
+                bitField0_ |= 0x00000400;
+                break;
+              } // case 93
+              case 97: {
+                optionalDouble_ = input.readDouble();
+                bitField0_ |= 0x00000800;
+                break;
+              } // case 97
+              case 104: {
+                optionalBool_ = input.readBool();
+                bitField0_ |= 0x00001000;
+                break;
+              } // case 104
+              case 114: {
+                optionalString_ = input.readBytes();
+                bitField0_ |= 0x00002000;
+                break;
+              } // case 114
+              case 122: {
+                optionalBytes_ = input.readBytes();
+                bitField0_ |= 0x00004000;
+                break;
+              } // case 122
+              case 146: {
+                input.readMessage(
+                    getOptionalNestedMessageFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00008000;
+                break;
+              } // case 146
+              case 154: {
+                input.readMessage(
+                    getOptionalForeignMessageFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00010000;
+                break;
+              } // case 154
+              case 168: {
+                int tmpRaw = input.readEnum();
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum tmpValue =
+                    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(tmpRaw);
+                if (tmpValue == null) {
+                  mergeUnknownVarintField(21, tmpRaw);
+                } else {
+                  optionalNestedEnum_ = tmpRaw;
+                  bitField0_ |= 0x00020000;
+                }
+                break;
+              } // case 168
+              case 176: {
+                int tmpRaw = input.readEnum();
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum tmpValue =
+                    legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.forNumber(tmpRaw);
+                if (tmpValue == null) {
+                  mergeUnknownVarintField(22, tmpRaw);
+                } else {
+                  optionalForeignEnum_ = tmpRaw;
+                  bitField0_ |= 0x00040000;
+                }
+                break;
+              } // case 176
+              case 184: {
+                int tmpRaw = input.readEnum();
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum tmpValue =
+                    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum.forNumber(tmpRaw);
+                if (tmpValue == null) {
+                  mergeUnknownVarintField(23, tmpRaw);
+                } else {
+                  optionalAliasedEnum_ = tmpRaw;
+                  bitField0_ |= 0x00080000;
+                }
+                break;
+              } // case 184
+              case 218: {
+                input.readMessage(
+                    getRecursiveMessageFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00100000;
+                break;
+              } // case 218
+              case 248: {
+                int v = input.readInt32();
+                ensureRepeatedInt32IsMutable();
+                repeatedInt32_.addInt(v);
+                break;
+              } // case 248
+              case 250: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedInt32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedInt32_.addInt(input.readInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 250
+              case 256: {
+                long v = input.readInt64();
+                ensureRepeatedInt64IsMutable();
+                repeatedInt64_.addLong(v);
+                break;
+              } // case 256
+              case 258: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedInt64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedInt64_.addLong(input.readInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 258
+              case 264: {
+                int v = input.readUInt32();
+                ensureRepeatedUint32IsMutable();
+                repeatedUint32_.addInt(v);
+                break;
+              } // case 264
+              case 266: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedUint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedUint32_.addInt(input.readUInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 266
+              case 272: {
+                long v = input.readUInt64();
+                ensureRepeatedUint64IsMutable();
+                repeatedUint64_.addLong(v);
+                break;
+              } // case 272
+              case 274: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedUint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedUint64_.addLong(input.readUInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 274
+              case 280: {
+                int v = input.readSInt32();
+                ensureRepeatedSint32IsMutable();
+                repeatedSint32_.addInt(v);
+                break;
+              } // case 280
+              case 282: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedSint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedSint32_.addInt(input.readSInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 282
+              case 288: {
+                long v = input.readSInt64();
+                ensureRepeatedSint64IsMutable();
+                repeatedSint64_.addLong(v);
+                break;
+              } // case 288
+              case 290: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedSint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedSint64_.addLong(input.readSInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 290
+              case 301: {
+                int v = input.readFixed32();
+                ensureRepeatedFixed32IsMutable();
+                repeatedFixed32_.addInt(v);
+                break;
+              } // case 301
+              case 298: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedFixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedFixed32_.addInt(input.readFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 298
+              case 305: {
+                long v = input.readFixed64();
+                ensureRepeatedFixed64IsMutable();
+                repeatedFixed64_.addLong(v);
+                break;
+              } // case 305
+              case 306: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedFixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedFixed64_.addLong(input.readFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 306
+              case 317: {
+                int v = input.readSFixed32();
+                ensureRepeatedSfixed32IsMutable();
+                repeatedSfixed32_.addInt(v);
+                break;
+              } // case 317
+              case 314: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedSfixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedSfixed32_.addInt(input.readSFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 314
+              case 321: {
+                long v = input.readSFixed64();
+                ensureRepeatedSfixed64IsMutable();
+                repeatedSfixed64_.addLong(v);
+                break;
+              } // case 321
+              case 322: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedSfixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedSfixed64_.addLong(input.readSFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 322
+              case 333: {
+                float v = input.readFloat();
+                ensureRepeatedFloatIsMutable();
+                repeatedFloat_.addFloat(v);
+                break;
+              } // case 333
+              case 330: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedFloatIsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedFloat_.addFloat(input.readFloat());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 330
+              case 337: {
+                double v = input.readDouble();
+                ensureRepeatedDoubleIsMutable();
+                repeatedDouble_.addDouble(v);
+                break;
+              } // case 337
+              case 338: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedDoubleIsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedDouble_.addDouble(input.readDouble());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 338
+              case 344: {
+                boolean v = input.readBool();
+                ensureRepeatedBoolIsMutable();
+                repeatedBool_.addBoolean(v);
+                break;
+              } // case 344
+              case 346: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedBoolIsMutable(alloc / 1);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedBool_.addBoolean(input.readBool());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 346
+              case 354: {
+                com.google.protobuf.ByteString bs = input.readBytes();
+                ensureRepeatedStringIsMutable();
+                repeatedString_.add(bs);
+                break;
+              } // case 354
+              case 362: {
+                com.google.protobuf.ByteString v = input.readBytes();
+                ensureRepeatedBytesIsMutable();
+                repeatedBytes_.add(v);
+                break;
+              } // case 362
+              case 386: {
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage m =
+                    input.readMessage(
+                        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.PARSER,
+                        extensionRegistry);
+                if (repeatedNestedMessageBuilder_ == null) {
+                  ensureRepeatedNestedMessageIsMutable();
+                  repeatedNestedMessage_.add(m);
+                } else {
+                  repeatedNestedMessageBuilder_.addMessage(m);
+                }
+                break;
+              } // case 386
+              case 394: {
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage m =
+                    input.readMessage(
+                        legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.PARSER,
+                        extensionRegistry);
+                if (repeatedForeignMessageBuilder_ == null) {
+                  ensureRepeatedForeignMessageIsMutable();
+                  repeatedForeignMessage_.add(m);
+                } else {
+                  repeatedForeignMessageBuilder_.addMessage(m);
+                }
+                break;
+              } // case 394
+              case 408: {
+                int tmpRaw = input.readEnum();
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum tmpValue =
+                    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(tmpRaw);
+                if (tmpValue == null) {
+                  mergeUnknownVarintField(51, tmpRaw);
+                } else {
+                  ensureRepeatedNestedEnumIsMutable();
+                  repeatedNestedEnum_.add(tmpRaw);
+                }
+                break;
+              } // case 408
+              case 410: {
+                int length = input.readRawVarint32();
+                int oldLimit = input.pushLimit(length);
+                while(input.getBytesUntilLimit() > 0) {
+                  int tmpRaw = input.readEnum();
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum tmpValue =
+                      legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(tmpRaw);
+                  if (tmpValue == null) {
+                    mergeUnknownVarintField(51, tmpRaw);
+                  } else {
+                    ensureRepeatedNestedEnumIsMutable();
+                    repeatedNestedEnum_.add(tmpRaw);
+                  }
+                }
+                input.popLimit(oldLimit);
+                break;
+              } // case 410
+              case 416: {
+                int tmpRaw = input.readEnum();
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum tmpValue =
+                    legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.forNumber(tmpRaw);
+                if (tmpValue == null) {
+                  mergeUnknownVarintField(52, tmpRaw);
+                } else {
+                  ensureRepeatedForeignEnumIsMutable();
+                  repeatedForeignEnum_.add(tmpRaw);
+                }
+                break;
+              } // case 416
+              case 418: {
+                int length = input.readRawVarint32();
+                int oldLimit = input.pushLimit(length);
+                while(input.getBytesUntilLimit() > 0) {
+                  int tmpRaw = input.readEnum();
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum tmpValue =
+                      legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.forNumber(tmpRaw);
+                  if (tmpValue == null) {
+                    mergeUnknownVarintField(52, tmpRaw);
+                  } else {
+                    ensureRepeatedForeignEnumIsMutable();
+                    repeatedForeignEnum_.add(tmpRaw);
+                  }
+                }
+                input.popLimit(oldLimit);
+                break;
+              } // case 418
+              case 450: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+                mapInt32Int32__ = input.readMessage(
+                    MapInt32Int32DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapInt32Int32().getMutableMap().put(
+                    mapInt32Int32__.getKey(), mapInt32Int32__.getValue());
+                bitField2_ |= 0x00000010;
+                break;
+              } // case 450
+              case 458: {
+                com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+                mapInt64Int64__ = input.readMessage(
+                    MapInt64Int64DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapInt64Int64().getMutableMap().put(
+                    mapInt64Int64__.getKey(), mapInt64Int64__.getValue());
+                bitField2_ |= 0x00000020;
+                break;
+              } // case 458
+              case 466: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+                mapUint32Uint32__ = input.readMessage(
+                    MapUint32Uint32DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapUint32Uint32().getMutableMap().put(
+                    mapUint32Uint32__.getKey(), mapUint32Uint32__.getValue());
+                bitField2_ |= 0x00000040;
+                break;
+              } // case 466
+              case 474: {
+                com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+                mapUint64Uint64__ = input.readMessage(
+                    MapUint64Uint64DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapUint64Uint64().getMutableMap().put(
+                    mapUint64Uint64__.getKey(), mapUint64Uint64__.getValue());
+                bitField2_ |= 0x00000080;
+                break;
+              } // case 474
+              case 482: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+                mapSint32Sint32__ = input.readMessage(
+                    MapSint32Sint32DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapSint32Sint32().getMutableMap().put(
+                    mapSint32Sint32__.getKey(), mapSint32Sint32__.getValue());
+                bitField2_ |= 0x00000100;
+                break;
+              } // case 482
+              case 490: {
+                com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+                mapSint64Sint64__ = input.readMessage(
+                    MapSint64Sint64DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapSint64Sint64().getMutableMap().put(
+                    mapSint64Sint64__.getKey(), mapSint64Sint64__.getValue());
+                bitField2_ |= 0x00000200;
+                break;
+              } // case 490
+              case 498: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+                mapFixed32Fixed32__ = input.readMessage(
+                    MapFixed32Fixed32DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapFixed32Fixed32().getMutableMap().put(
+                    mapFixed32Fixed32__.getKey(), mapFixed32Fixed32__.getValue());
+                bitField2_ |= 0x00000400;
+                break;
+              } // case 498
+              case 506: {
+                com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+                mapFixed64Fixed64__ = input.readMessage(
+                    MapFixed64Fixed64DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapFixed64Fixed64().getMutableMap().put(
+                    mapFixed64Fixed64__.getKey(), mapFixed64Fixed64__.getValue());
+                bitField2_ |= 0x00000800;
+                break;
+              } // case 506
+              case 514: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+                mapSfixed32Sfixed32__ = input.readMessage(
+                    MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapSfixed32Sfixed32().getMutableMap().put(
+                    mapSfixed32Sfixed32__.getKey(), mapSfixed32Sfixed32__.getValue());
+                bitField2_ |= 0x00001000;
+                break;
+              } // case 514
+              case 522: {
+                com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+                mapSfixed64Sfixed64__ = input.readMessage(
+                    MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapSfixed64Sfixed64().getMutableMap().put(
+                    mapSfixed64Sfixed64__.getKey(), mapSfixed64Sfixed64__.getValue());
+                bitField2_ |= 0x00002000;
+                break;
+              } // case 522
+              case 530: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float>
+                mapInt32Float__ = input.readMessage(
+                    MapInt32FloatDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapInt32Float().getMutableMap().put(
+                    mapInt32Float__.getKey(), mapInt32Float__.getValue());
+                bitField2_ |= 0x00004000;
+                break;
+              } // case 530
+              case 538: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Double>
+                mapInt32Double__ = input.readMessage(
+                    MapInt32DoubleDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapInt32Double().getMutableMap().put(
+                    mapInt32Double__.getKey(), mapInt32Double__.getValue());
+                bitField2_ |= 0x00008000;
+                break;
+              } // case 538
+              case 546: {
+                com.google.protobuf.MapEntry<java.lang.Boolean, java.lang.Boolean>
+                mapBoolBool__ = input.readMessage(
+                    MapBoolBoolDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapBoolBool().getMutableMap().put(
+                    mapBoolBool__.getKey(), mapBoolBool__.getValue());
+                bitField2_ |= 0x00010000;
+                break;
+              } // case 546
+              case 554: {
+                com.google.protobuf.MapEntry<java.lang.String, java.lang.String>
+                mapStringString__ = input.readMessage(
+                    MapStringStringDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapStringString().getMutableMap().put(
+                    mapStringString__.getKey(), mapStringString__.getValue());
+                bitField2_ |= 0x00020000;
+                break;
+              } // case 554
+              case 562: {
+                com.google.protobuf.MapEntry<java.lang.String, com.google.protobuf.ByteString>
+                mapStringBytes__ = input.readMessage(
+                    MapStringBytesDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapStringBytes().getMutableMap().put(
+                    mapStringBytes__.getKey(), mapStringBytes__.getValue());
+                bitField2_ |= 0x00040000;
+                break;
+              } // case 562
+              case 570: {
+                com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage>
+                mapStringNestedMessage__ = input.readMessage(
+                    MapStringNestedMessageDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapStringNestedMessage().ensureBuilderMap().put(
+                    mapStringNestedMessage__.getKey(), mapStringNestedMessage__.getValue());
+                bitField2_ |= 0x00080000;
+                break;
+              } // case 570
+              case 578: {
+                com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage>
+                mapStringForeignMessage__ = input.readMessage(
+                    MapStringForeignMessageDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapStringForeignMessage().ensureBuilderMap().put(
+                    mapStringForeignMessage__.getKey(), mapStringForeignMessage__.getValue());
+                bitField2_ |= 0x00100000;
+                break;
+              } // case 578
+              case 586: {
+                com.google.protobuf.ByteString bytes = input.readBytes();
+                com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer>
+                mapStringNestedEnum__ = MapStringNestedEnumDefaultEntryHolder.defaultEntry.getParserForType().parseFrom(bytes);
+                if (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(mapStringNestedEnum__.getValue()) == null) {
+                  mergeUnknownLengthDelimitedField(73, bytes);
+                } else {
+                  internalGetMutableMapStringNestedEnum().getMutableMap().put(
+                      mapStringNestedEnum__.getKey(), mapStringNestedEnum__.getValue());
+                  bitField2_ |= 0x00200000;
+                }
+                break;
+              } // case 586
+              case 594: {
+                com.google.protobuf.ByteString bytes = input.readBytes();
+                com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer>
+                mapStringForeignEnum__ = MapStringForeignEnumDefaultEntryHolder.defaultEntry.getParserForType().parseFrom(bytes);
+                if (legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.forNumber(mapStringForeignEnum__.getValue()) == null) {
+                  mergeUnknownLengthDelimitedField(74, bytes);
+                } else {
+                  internalGetMutableMapStringForeignEnum().getMutableMap().put(
+                      mapStringForeignEnum__.getKey(), mapStringForeignEnum__.getValue());
+                  bitField2_ |= 0x00400000;
+                }
+                break;
+              } // case 594
+              case 600: {
+                int v = input.readInt32();
+                ensurePackedInt32IsMutable();
+                packedInt32_.addInt(v);
+                break;
+              } // case 600
+              case 602: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedInt32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedInt32_.addInt(input.readInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 602
+              case 608: {
+                long v = input.readInt64();
+                ensurePackedInt64IsMutable();
+                packedInt64_.addLong(v);
+                break;
+              } // case 608
+              case 610: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedInt64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedInt64_.addLong(input.readInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 610
+              case 616: {
+                int v = input.readUInt32();
+                ensurePackedUint32IsMutable();
+                packedUint32_.addInt(v);
+                break;
+              } // case 616
+              case 618: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedUint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedUint32_.addInt(input.readUInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 618
+              case 624: {
+                long v = input.readUInt64();
+                ensurePackedUint64IsMutable();
+                packedUint64_.addLong(v);
+                break;
+              } // case 624
+              case 626: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedUint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedUint64_.addLong(input.readUInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 626
+              case 632: {
+                int v = input.readSInt32();
+                ensurePackedSint32IsMutable();
+                packedSint32_.addInt(v);
+                break;
+              } // case 632
+              case 634: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedSint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedSint32_.addInt(input.readSInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 634
+              case 640: {
+                long v = input.readSInt64();
+                ensurePackedSint64IsMutable();
+                packedSint64_.addLong(v);
+                break;
+              } // case 640
+              case 642: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedSint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedSint64_.addLong(input.readSInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 642
+              case 653: {
+                int v = input.readFixed32();
+                ensurePackedFixed32IsMutable();
+                packedFixed32_.addInt(v);
+                break;
+              } // case 653
+              case 650: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedFixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedFixed32_.addInt(input.readFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 650
+              case 657: {
+                long v = input.readFixed64();
+                ensurePackedFixed64IsMutable();
+                packedFixed64_.addLong(v);
+                break;
+              } // case 657
+              case 658: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedFixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedFixed64_.addLong(input.readFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 658
+              case 669: {
+                int v = input.readSFixed32();
+                ensurePackedSfixed32IsMutable();
+                packedSfixed32_.addInt(v);
+                break;
+              } // case 669
+              case 666: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedSfixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedSfixed32_.addInt(input.readSFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 666
+              case 673: {
+                long v = input.readSFixed64();
+                ensurePackedSfixed64IsMutable();
+                packedSfixed64_.addLong(v);
+                break;
+              } // case 673
+              case 674: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedSfixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedSfixed64_.addLong(input.readSFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 674
+              case 685: {
+                float v = input.readFloat();
+                ensurePackedFloatIsMutable();
+                packedFloat_.addFloat(v);
+                break;
+              } // case 685
+              case 682: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedFloatIsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedFloat_.addFloat(input.readFloat());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 682
+              case 689: {
+                double v = input.readDouble();
+                ensurePackedDoubleIsMutable();
+                packedDouble_.addDouble(v);
+                break;
+              } // case 689
+              case 690: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedDoubleIsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedDouble_.addDouble(input.readDouble());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 690
+              case 696: {
+                boolean v = input.readBool();
+                ensurePackedBoolIsMutable();
+                packedBool_.addBoolean(v);
+                break;
+              } // case 696
+              case 698: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedBoolIsMutable(alloc / 1);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedBool_.addBoolean(input.readBool());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 698
+              case 704: {
+                int tmpRaw = input.readEnum();
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum tmpValue =
+                    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(tmpRaw);
+                if (tmpValue == null) {
+                  mergeUnknownVarintField(88, tmpRaw);
+                } else {
+                  ensurePackedNestedEnumIsMutable();
+                  packedNestedEnum_.add(tmpRaw);
+                }
+                break;
+              } // case 704
+              case 706: {
+                int length = input.readRawVarint32();
+                int oldLimit = input.pushLimit(length);
+                while(input.getBytesUntilLimit() > 0) {
+                  int tmpRaw = input.readEnum();
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum tmpValue =
+                      legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(tmpRaw);
+                  if (tmpValue == null) {
+                    mergeUnknownVarintField(88, tmpRaw);
+                  } else {
+                    ensurePackedNestedEnumIsMutable();
+                    packedNestedEnum_.add(tmpRaw);
+                  }
+                }
+                input.popLimit(oldLimit);
+                break;
+              } // case 706
+              case 712: {
+                int v = input.readInt32();
+                ensureUnpackedInt32IsMutable();
+                unpackedInt32_.addInt(v);
+                break;
+              } // case 712
+              case 714: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedInt32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedInt32_.addInt(input.readInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 714
+              case 720: {
+                long v = input.readInt64();
+                ensureUnpackedInt64IsMutable();
+                unpackedInt64_.addLong(v);
+                break;
+              } // case 720
+              case 722: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedInt64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedInt64_.addLong(input.readInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 722
+              case 728: {
+                int v = input.readUInt32();
+                ensureUnpackedUint32IsMutable();
+                unpackedUint32_.addInt(v);
+                break;
+              } // case 728
+              case 730: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedUint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedUint32_.addInt(input.readUInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 730
+              case 736: {
+                long v = input.readUInt64();
+                ensureUnpackedUint64IsMutable();
+                unpackedUint64_.addLong(v);
+                break;
+              } // case 736
+              case 738: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedUint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedUint64_.addLong(input.readUInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 738
+              case 744: {
+                int v = input.readSInt32();
+                ensureUnpackedSint32IsMutable();
+                unpackedSint32_.addInt(v);
+                break;
+              } // case 744
+              case 746: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedSint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedSint32_.addInt(input.readSInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 746
+              case 752: {
+                long v = input.readSInt64();
+                ensureUnpackedSint64IsMutable();
+                unpackedSint64_.addLong(v);
+                break;
+              } // case 752
+              case 754: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedSint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedSint64_.addLong(input.readSInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 754
+              case 765: {
+                int v = input.readFixed32();
+                ensureUnpackedFixed32IsMutable();
+                unpackedFixed32_.addInt(v);
+                break;
+              } // case 765
+              case 762: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedFixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedFixed32_.addInt(input.readFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 762
+              case 769: {
+                long v = input.readFixed64();
+                ensureUnpackedFixed64IsMutable();
+                unpackedFixed64_.addLong(v);
+                break;
+              } // case 769
+              case 770: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedFixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedFixed64_.addLong(input.readFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 770
+              case 781: {
+                int v = input.readSFixed32();
+                ensureUnpackedSfixed32IsMutable();
+                unpackedSfixed32_.addInt(v);
+                break;
+              } // case 781
+              case 778: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedSfixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedSfixed32_.addInt(input.readSFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 778
+              case 785: {
+                long v = input.readSFixed64();
+                ensureUnpackedSfixed64IsMutable();
+                unpackedSfixed64_.addLong(v);
+                break;
+              } // case 785
+              case 786: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedSfixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedSfixed64_.addLong(input.readSFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 786
+              case 797: {
+                float v = input.readFloat();
+                ensureUnpackedFloatIsMutable();
+                unpackedFloat_.addFloat(v);
+                break;
+              } // case 797
+              case 794: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedFloatIsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedFloat_.addFloat(input.readFloat());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 794
+              case 801: {
+                double v = input.readDouble();
+                ensureUnpackedDoubleIsMutable();
+                unpackedDouble_.addDouble(v);
+                break;
+              } // case 801
+              case 802: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedDoubleIsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedDouble_.addDouble(input.readDouble());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 802
+              case 808: {
+                boolean v = input.readBool();
+                ensureUnpackedBoolIsMutable();
+                unpackedBool_.addBoolean(v);
+                break;
+              } // case 808
+              case 810: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedBoolIsMutable(alloc / 1);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedBool_.addBoolean(input.readBool());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 810
+              case 816: {
+                int tmpRaw = input.readEnum();
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum tmpValue =
+                    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(tmpRaw);
+                if (tmpValue == null) {
+                  mergeUnknownVarintField(102, tmpRaw);
+                } else {
+                  ensureUnpackedNestedEnumIsMutable();
+                  unpackedNestedEnum_.add(tmpRaw);
+                }
+                break;
+              } // case 816
+              case 818: {
+                int length = input.readRawVarint32();
+                int oldLimit = input.pushLimit(length);
+                while(input.getBytesUntilLimit() > 0) {
+                  int tmpRaw = input.readEnum();
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum tmpValue =
+                      legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(tmpRaw);
+                  if (tmpValue == null) {
+                    mergeUnknownVarintField(102, tmpRaw);
+                  } else {
+                    ensureUnpackedNestedEnumIsMutable();
+                    unpackedNestedEnum_.add(tmpRaw);
+                  }
+                }
+                input.popLimit(oldLimit);
+                break;
+              } // case 818
+              case 888: {
+                oneofField_ = input.readUInt32();
+                oneofFieldCase_ = 111;
+                break;
+              } // case 888
+              case 898: {
+                input.readMessage(
+                    getOneofNestedMessageFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                oneofFieldCase_ = 112;
+                break;
+              } // case 898
+              case 906: {
+                com.google.protobuf.ByteString bs = input.readBytes();
+                oneofFieldCase_ = 113;
+                oneofField_ = bs;
+                break;
+              } // case 906
+              case 914: {
+                oneofField_ = input.readBytes();
+                oneofFieldCase_ = 114;
+                break;
+              } // case 914
+              case 920: {
+                oneofField_ = input.readBool();
+                oneofFieldCase_ = 115;
+                break;
+              } // case 920
+              case 928: {
+                oneofField_ = input.readUInt64();
+                oneofFieldCase_ = 116;
+                break;
+              } // case 928
+              case 941: {
+                oneofField_ = input.readFloat();
+                oneofFieldCase_ = 117;
+                break;
+              } // case 941
+              case 945: {
+                oneofField_ = input.readDouble();
+                oneofFieldCase_ = 118;
+                break;
+              } // case 945
+              case 952: {
+                int rawValue = input.readEnum();
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value =
+                    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(rawValue);
+                if (value == null) {
+                  mergeUnknownVarintField(119, rawValue);
+                } else {
+                  oneofFieldCase_ = 119;
+                  oneofField_ = rawValue;
+                }
+                break;
+              } // case 952
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.unwrapIOException();
+        } finally {
+          onChanged();
+        } // finally
+        return this;
+      }
+      private int oneofFieldCase_ = 0;
+      private java.lang.Object oneofField_;
+      public OneofFieldCase
+          getOneofFieldCase() {
+        return OneofFieldCase.forNumber(
+            oneofFieldCase_);
+      }
+
+      public Builder clearOneofField() {
+        oneofFieldCase_ = 0;
+        oneofField_ = null;
+        onChanged();
+        return this;
+      }
+
+      private int bitField0_;
+      private int bitField1_;
+      private int bitField2_;
+
+      private int optionalInt32_ ;
+      /**
+       * <code>optional int32 optional_int32 = 1;</code>
+       * @return Whether the optionalInt32 field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalInt32() {
+        return ((bitField0_ & 0x00000001) != 0);
+      }
+      /**
+       * <code>optional int32 optional_int32 = 1;</code>
+       * @return The optionalInt32.
+       */
+      @java.lang.Override
+      public int getOptionalInt32() {
+        return optionalInt32_;
+      }
+      /**
+       * <code>optional int32 optional_int32 = 1;</code>
+       * @param value The optionalInt32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalInt32(int value) {
+
+        optionalInt32_ = value;
+        bitField0_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional int32 optional_int32 = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalInt32() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        optionalInt32_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private long optionalInt64_ ;
+      /**
+       * <code>optional int64 optional_int64 = 2;</code>
+       * @return Whether the optionalInt64 field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalInt64() {
+        return ((bitField0_ & 0x00000002) != 0);
+      }
+      /**
+       * <code>optional int64 optional_int64 = 2;</code>
+       * @return The optionalInt64.
+       */
+      @java.lang.Override
+      public long getOptionalInt64() {
+        return optionalInt64_;
+      }
+      /**
+       * <code>optional int64 optional_int64 = 2;</code>
+       * @param value The optionalInt64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalInt64(long value) {
+
+        optionalInt64_ = value;
+        bitField0_ |= 0x00000002;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional int64 optional_int64 = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalInt64() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        optionalInt64_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private int optionalUint32_ ;
+      /**
+       * <code>optional uint32 optional_uint32 = 3;</code>
+       * @return Whether the optionalUint32 field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalUint32() {
+        return ((bitField0_ & 0x00000004) != 0);
+      }
+      /**
+       * <code>optional uint32 optional_uint32 = 3;</code>
+       * @return The optionalUint32.
+       */
+      @java.lang.Override
+      public int getOptionalUint32() {
+        return optionalUint32_;
+      }
+      /**
+       * <code>optional uint32 optional_uint32 = 3;</code>
+       * @param value The optionalUint32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalUint32(int value) {
+
+        optionalUint32_ = value;
+        bitField0_ |= 0x00000004;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional uint32 optional_uint32 = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalUint32() {
+        bitField0_ = (bitField0_ & ~0x00000004);
+        optionalUint32_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private long optionalUint64_ ;
+      /**
+       * <code>optional uint64 optional_uint64 = 4;</code>
+       * @return Whether the optionalUint64 field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalUint64() {
+        return ((bitField0_ & 0x00000008) != 0);
+      }
+      /**
+       * <code>optional uint64 optional_uint64 = 4;</code>
+       * @return The optionalUint64.
+       */
+      @java.lang.Override
+      public long getOptionalUint64() {
+        return optionalUint64_;
+      }
+      /**
+       * <code>optional uint64 optional_uint64 = 4;</code>
+       * @param value The optionalUint64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalUint64(long value) {
+
+        optionalUint64_ = value;
+        bitField0_ |= 0x00000008;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional uint64 optional_uint64 = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalUint64() {
+        bitField0_ = (bitField0_ & ~0x00000008);
+        optionalUint64_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private int optionalSint32_ ;
+      /**
+       * <code>optional sint32 optional_sint32 = 5;</code>
+       * @return Whether the optionalSint32 field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalSint32() {
+        return ((bitField0_ & 0x00000010) != 0);
+      }
+      /**
+       * <code>optional sint32 optional_sint32 = 5;</code>
+       * @return The optionalSint32.
+       */
+      @java.lang.Override
+      public int getOptionalSint32() {
+        return optionalSint32_;
+      }
+      /**
+       * <code>optional sint32 optional_sint32 = 5;</code>
+       * @param value The optionalSint32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalSint32(int value) {
+
+        optionalSint32_ = value;
+        bitField0_ |= 0x00000010;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional sint32 optional_sint32 = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalSint32() {
+        bitField0_ = (bitField0_ & ~0x00000010);
+        optionalSint32_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private long optionalSint64_ ;
+      /**
+       * <code>optional sint64 optional_sint64 = 6;</code>
+       * @return Whether the optionalSint64 field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalSint64() {
+        return ((bitField0_ & 0x00000020) != 0);
+      }
+      /**
+       * <code>optional sint64 optional_sint64 = 6;</code>
+       * @return The optionalSint64.
+       */
+      @java.lang.Override
+      public long getOptionalSint64() {
+        return optionalSint64_;
+      }
+      /**
+       * <code>optional sint64 optional_sint64 = 6;</code>
+       * @param value The optionalSint64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalSint64(long value) {
+
+        optionalSint64_ = value;
+        bitField0_ |= 0x00000020;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional sint64 optional_sint64 = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalSint64() {
+        bitField0_ = (bitField0_ & ~0x00000020);
+        optionalSint64_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private int optionalFixed32_ ;
+      /**
+       * <code>optional fixed32 optional_fixed32 = 7;</code>
+       * @return Whether the optionalFixed32 field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalFixed32() {
+        return ((bitField0_ & 0x00000040) != 0);
+      }
+      /**
+       * <code>optional fixed32 optional_fixed32 = 7;</code>
+       * @return The optionalFixed32.
+       */
+      @java.lang.Override
+      public int getOptionalFixed32() {
+        return optionalFixed32_;
+      }
+      /**
+       * <code>optional fixed32 optional_fixed32 = 7;</code>
+       * @param value The optionalFixed32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalFixed32(int value) {
+
+        optionalFixed32_ = value;
+        bitField0_ |= 0x00000040;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional fixed32 optional_fixed32 = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalFixed32() {
+        bitField0_ = (bitField0_ & ~0x00000040);
+        optionalFixed32_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private long optionalFixed64_ ;
+      /**
+       * <code>optional fixed64 optional_fixed64 = 8;</code>
+       * @return Whether the optionalFixed64 field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalFixed64() {
+        return ((bitField0_ & 0x00000080) != 0);
+      }
+      /**
+       * <code>optional fixed64 optional_fixed64 = 8;</code>
+       * @return The optionalFixed64.
+       */
+      @java.lang.Override
+      public long getOptionalFixed64() {
+        return optionalFixed64_;
+      }
+      /**
+       * <code>optional fixed64 optional_fixed64 = 8;</code>
+       * @param value The optionalFixed64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalFixed64(long value) {
+
+        optionalFixed64_ = value;
+        bitField0_ |= 0x00000080;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional fixed64 optional_fixed64 = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalFixed64() {
+        bitField0_ = (bitField0_ & ~0x00000080);
+        optionalFixed64_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private int optionalSfixed32_ ;
+      /**
+       * <code>optional sfixed32 optional_sfixed32 = 9;</code>
+       * @return Whether the optionalSfixed32 field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalSfixed32() {
+        return ((bitField0_ & 0x00000100) != 0);
+      }
+      /**
+       * <code>optional sfixed32 optional_sfixed32 = 9;</code>
+       * @return The optionalSfixed32.
+       */
+      @java.lang.Override
+      public int getOptionalSfixed32() {
+        return optionalSfixed32_;
+      }
+      /**
+       * <code>optional sfixed32 optional_sfixed32 = 9;</code>
+       * @param value The optionalSfixed32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalSfixed32(int value) {
+
+        optionalSfixed32_ = value;
+        bitField0_ |= 0x00000100;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional sfixed32 optional_sfixed32 = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalSfixed32() {
+        bitField0_ = (bitField0_ & ~0x00000100);
+        optionalSfixed32_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private long optionalSfixed64_ ;
+      /**
+       * <code>optional sfixed64 optional_sfixed64 = 10;</code>
+       * @return Whether the optionalSfixed64 field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalSfixed64() {
+        return ((bitField0_ & 0x00000200) != 0);
+      }
+      /**
+       * <code>optional sfixed64 optional_sfixed64 = 10;</code>
+       * @return The optionalSfixed64.
+       */
+      @java.lang.Override
+      public long getOptionalSfixed64() {
+        return optionalSfixed64_;
+      }
+      /**
+       * <code>optional sfixed64 optional_sfixed64 = 10;</code>
+       * @param value The optionalSfixed64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalSfixed64(long value) {
+
+        optionalSfixed64_ = value;
+        bitField0_ |= 0x00000200;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional sfixed64 optional_sfixed64 = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalSfixed64() {
+        bitField0_ = (bitField0_ & ~0x00000200);
+        optionalSfixed64_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private float optionalFloat_ ;
+      /**
+       * <code>optional float optional_float = 11;</code>
+       * @return Whether the optionalFloat field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalFloat() {
+        return ((bitField0_ & 0x00000400) != 0);
+      }
+      /**
+       * <code>optional float optional_float = 11;</code>
+       * @return The optionalFloat.
+       */
+      @java.lang.Override
+      public float getOptionalFloat() {
+        return optionalFloat_;
+      }
+      /**
+       * <code>optional float optional_float = 11;</code>
+       * @param value The optionalFloat to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalFloat(float value) {
+
+        optionalFloat_ = value;
+        bitField0_ |= 0x00000400;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional float optional_float = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalFloat() {
+        bitField0_ = (bitField0_ & ~0x00000400);
+        optionalFloat_ = 0F;
+        onChanged();
+        return this;
+      }
+
+      private double optionalDouble_ ;
+      /**
+       * <code>optional double optional_double = 12;</code>
+       * @return Whether the optionalDouble field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalDouble() {
+        return ((bitField0_ & 0x00000800) != 0);
+      }
+      /**
+       * <code>optional double optional_double = 12;</code>
+       * @return The optionalDouble.
+       */
+      @java.lang.Override
+      public double getOptionalDouble() {
+        return optionalDouble_;
+      }
+      /**
+       * <code>optional double optional_double = 12;</code>
+       * @param value The optionalDouble to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalDouble(double value) {
+
+        optionalDouble_ = value;
+        bitField0_ |= 0x00000800;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional double optional_double = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalDouble() {
+        bitField0_ = (bitField0_ & ~0x00000800);
+        optionalDouble_ = 0D;
+        onChanged();
+        return this;
+      }
+
+      private boolean optionalBool_ ;
+      /**
+       * <code>optional bool optional_bool = 13;</code>
+       * @return Whether the optionalBool field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalBool() {
+        return ((bitField0_ & 0x00001000) != 0);
+      }
+      /**
+       * <code>optional bool optional_bool = 13;</code>
+       * @return The optionalBool.
+       */
+      @java.lang.Override
+      public boolean getOptionalBool() {
+        return optionalBool_;
+      }
+      /**
+       * <code>optional bool optional_bool = 13;</code>
+       * @param value The optionalBool to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalBool(boolean value) {
+
+        optionalBool_ = value;
+        bitField0_ |= 0x00001000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional bool optional_bool = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalBool() {
+        bitField0_ = (bitField0_ & ~0x00001000);
+        optionalBool_ = false;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object optionalString_ = "";
+      /**
+       * <code>optional string optional_string = 14;</code>
+       * @return Whether the optionalString field is set.
+       */
+      public boolean hasOptionalString() {
+        return ((bitField0_ & 0x00002000) != 0);
+      }
+      /**
+       * <code>optional string optional_string = 14;</code>
+       * @return The optionalString.
+       */
+      public java.lang.String getOptionalString() {
+        java.lang.Object ref = optionalString_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          if (bs.isValidUtf8()) {
+            optionalString_ = s;
+          }
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>optional string optional_string = 14;</code>
+       * @return The bytes for optionalString.
+       */
+      public com.google.protobuf.ByteString
+          getOptionalStringBytes() {
+        java.lang.Object ref = optionalString_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          optionalString_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>optional string optional_string = 14;</code>
+       * @param value The optionalString to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalString(
+          java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
+        optionalString_ = value;
+        bitField0_ |= 0x00002000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string optional_string = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalString() {
+        optionalString_ = getDefaultInstance().getOptionalString();
+        bitField0_ = (bitField0_ & ~0x00002000);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string optional_string = 14;</code>
+       * @param value The bytes for optionalString to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalStringBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
+        optionalString_ = value;
+        bitField0_ |= 0x00002000;
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.ByteString optionalBytes_ = com.google.protobuf.ByteString.EMPTY;
+      /**
+       * <code>optional bytes optional_bytes = 15;</code>
+       * @return Whether the optionalBytes field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalBytes() {
+        return ((bitField0_ & 0x00004000) != 0);
+      }
+      /**
+       * <code>optional bytes optional_bytes = 15;</code>
+       * @return The optionalBytes.
+       */
+      @java.lang.Override
+      public com.google.protobuf.ByteString getOptionalBytes() {
+        return optionalBytes_;
+      }
+      /**
+       * <code>optional bytes optional_bytes = 15;</code>
+       * @param value The optionalBytes to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalBytes(com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
+        optionalBytes_ = value;
+        bitField0_ |= 0x00004000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional bytes optional_bytes = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalBytes() {
+        bitField0_ = (bitField0_ & ~0x00004000);
+        optionalBytes_ = getDefaultInstance().getOptionalBytes();
+        onChanged();
+        return this;
+      }
+
+      private legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage optionalNestedMessage_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> optionalNestedMessageBuilder_;
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+       * @return Whether the optionalNestedMessage field is set.
+       */
+      public boolean hasOptionalNestedMessage() {
+        return ((bitField0_ & 0x00008000) != 0);
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+       * @return The optionalNestedMessage.
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getOptionalNestedMessage() {
+        if (optionalNestedMessageBuilder_ == null) {
+          return optionalNestedMessage_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance() : optionalNestedMessage_;
+        } else {
+          return optionalNestedMessageBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+       */
+      public Builder setOptionalNestedMessage(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage value) {
+        if (optionalNestedMessageBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          optionalNestedMessage_ = value;
+        } else {
+          optionalNestedMessageBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00008000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+       */
+      public Builder setOptionalNestedMessage(
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder builderForValue) {
+        if (optionalNestedMessageBuilder_ == null) {
+          optionalNestedMessage_ = builderForValue.build();
+        } else {
+          optionalNestedMessageBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00008000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+       */
+      public Builder mergeOptionalNestedMessage(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage value) {
+        if (optionalNestedMessageBuilder_ == null) {
+          if (((bitField0_ & 0x00008000) != 0) &&
+            optionalNestedMessage_ != null &&
+            optionalNestedMessage_ != legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance()) {
+            getOptionalNestedMessageBuilder().mergeFrom(value);
+          } else {
+            optionalNestedMessage_ = value;
+          }
+        } else {
+          optionalNestedMessageBuilder_.mergeFrom(value);
+        }
+        if (optionalNestedMessage_ != null) {
+          bitField0_ |= 0x00008000;
+          onChanged();
+        }
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+       */
+      public Builder clearOptionalNestedMessage() {
+        bitField0_ = (bitField0_ & ~0x00008000);
+        optionalNestedMessage_ = null;
+        if (optionalNestedMessageBuilder_ != null) {
+          optionalNestedMessageBuilder_.dispose();
+          optionalNestedMessageBuilder_ = null;
+        }
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder getOptionalNestedMessageBuilder() {
+        bitField0_ |= 0x00008000;
+        onChanged();
+        return getOptionalNestedMessageFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder getOptionalNestedMessageOrBuilder() {
+        if (optionalNestedMessageBuilder_ != null) {
+          return optionalNestedMessageBuilder_.getMessageOrBuilder();
+        } else {
+          return optionalNestedMessage_ == null ?
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance() : optionalNestedMessage_;
+        }
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> 
+          getOptionalNestedMessageFieldBuilder() {
+        if (optionalNestedMessageBuilder_ == null) {
+          optionalNestedMessageBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder>(
+                  getOptionalNestedMessage(),
+                  getParentForChildren(),
+                  isClean());
+          optionalNestedMessage_ = null;
+        }
+        return optionalNestedMessageBuilder_;
+      }
+
+      private legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage optionalForeignMessage_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder> optionalForeignMessageBuilder_;
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+       * @return Whether the optionalForeignMessage field is set.
+       */
+      public boolean hasOptionalForeignMessage() {
+        return ((bitField0_ & 0x00010000) != 0);
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+       * @return The optionalForeignMessage.
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getOptionalForeignMessage() {
+        if (optionalForeignMessageBuilder_ == null) {
+          return optionalForeignMessage_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.getDefaultInstance() : optionalForeignMessage_;
+        } else {
+          return optionalForeignMessageBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+       */
+      public Builder setOptionalForeignMessage(legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage value) {
+        if (optionalForeignMessageBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          optionalForeignMessage_ = value;
+        } else {
+          optionalForeignMessageBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00010000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+       */
+      public Builder setOptionalForeignMessage(
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder builderForValue) {
+        if (optionalForeignMessageBuilder_ == null) {
+          optionalForeignMessage_ = builderForValue.build();
+        } else {
+          optionalForeignMessageBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00010000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+       */
+      public Builder mergeOptionalForeignMessage(legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage value) {
+        if (optionalForeignMessageBuilder_ == null) {
+          if (((bitField0_ & 0x00010000) != 0) &&
+            optionalForeignMessage_ != null &&
+            optionalForeignMessage_ != legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.getDefaultInstance()) {
+            getOptionalForeignMessageBuilder().mergeFrom(value);
+          } else {
+            optionalForeignMessage_ = value;
+          }
+        } else {
+          optionalForeignMessageBuilder_.mergeFrom(value);
+        }
+        if (optionalForeignMessage_ != null) {
+          bitField0_ |= 0x00010000;
+          onChanged();
+        }
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+       */
+      public Builder clearOptionalForeignMessage() {
+        bitField0_ = (bitField0_ & ~0x00010000);
+        optionalForeignMessage_ = null;
+        if (optionalForeignMessageBuilder_ != null) {
+          optionalForeignMessageBuilder_.dispose();
+          optionalForeignMessageBuilder_ = null;
+        }
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder getOptionalForeignMessageBuilder() {
+        bitField0_ |= 0x00010000;
+        onChanged();
+        return getOptionalForeignMessageFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder getOptionalForeignMessageOrBuilder() {
+        if (optionalForeignMessageBuilder_ != null) {
+          return optionalForeignMessageBuilder_.getMessageOrBuilder();
+        } else {
+          return optionalForeignMessage_ == null ?
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.getDefaultInstance() : optionalForeignMessage_;
+        }
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder> 
+          getOptionalForeignMessageFieldBuilder() {
+        if (optionalForeignMessageBuilder_ == null) {
+          optionalForeignMessageBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder>(
+                  getOptionalForeignMessage(),
+                  getParentForChildren(),
+                  isClean());
+          optionalForeignMessage_ = null;
+        }
+        return optionalForeignMessageBuilder_;
+      }
+
+      private int optionalNestedEnum_ = 0;
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum optional_nested_enum = 21;</code>
+       * @return Whether the optionalNestedEnum field is set.
+       */
+      @java.lang.Override public boolean hasOptionalNestedEnum() {
+        return ((bitField0_ & 0x00020000) != 0);
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum optional_nested_enum = 21;</code>
+       * @return The optionalNestedEnum.
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getOptionalNestedEnum() {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(optionalNestedEnum_);
+        return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.FOO : result;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum optional_nested_enum = 21;</code>
+       * @param value The optionalNestedEnum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalNestedEnum(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        bitField0_ |= 0x00020000;
+        optionalNestedEnum_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum optional_nested_enum = 21;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalNestedEnum() {
+        bitField0_ = (bitField0_ & ~0x00020000);
+        optionalNestedEnum_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int optionalForeignEnum_ = 0;
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignEnum optional_foreign_enum = 22;</code>
+       * @return Whether the optionalForeignEnum field is set.
+       */
+      @java.lang.Override public boolean hasOptionalForeignEnum() {
+        return ((bitField0_ & 0x00040000) != 0);
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignEnum optional_foreign_enum = 22;</code>
+       * @return The optionalForeignEnum.
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getOptionalForeignEnum() {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.forNumber(optionalForeignEnum_);
+        return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.FOREIGN_FOO : result;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignEnum optional_foreign_enum = 22;</code>
+       * @param value The optionalForeignEnum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalForeignEnum(legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        bitField0_ |= 0x00040000;
+        optionalForeignEnum_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignEnum optional_foreign_enum = 22;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalForeignEnum() {
+        bitField0_ = (bitField0_ & ~0x00040000);
+        optionalForeignEnum_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int optionalAliasedEnum_ = 0;
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.AliasedEnum optional_aliased_enum = 23;</code>
+       * @return Whether the optionalAliasedEnum field is set.
+       */
+      @java.lang.Override public boolean hasOptionalAliasedEnum() {
+        return ((bitField0_ & 0x00080000) != 0);
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.AliasedEnum optional_aliased_enum = 23;</code>
+       * @return The optionalAliasedEnum.
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum getOptionalAliasedEnum() {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum.forNumber(optionalAliasedEnum_);
+        return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum.ALIAS_FOO : result;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.AliasedEnum optional_aliased_enum = 23;</code>
+       * @param value The optionalAliasedEnum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalAliasedEnum(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        bitField0_ |= 0x00080000;
+        optionalAliasedEnum_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.AliasedEnum optional_aliased_enum = 23;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalAliasedEnum() {
+        bitField0_ = (bitField0_ & ~0x00080000);
+        optionalAliasedEnum_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 recursiveMessage_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder> recursiveMessageBuilder_;
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+       * @return Whether the recursiveMessage field is set.
+       */
+      public boolean hasRecursiveMessage() {
+        return ((bitField0_ & 0x00100000) != 0);
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+       * @return The recursiveMessage.
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 getRecursiveMessage() {
+        if (recursiveMessageBuilder_ == null) {
+          return recursiveMessage_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance() : recursiveMessage_;
+        } else {
+          return recursiveMessageBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+       */
+      public Builder setRecursiveMessage(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 value) {
+        if (recursiveMessageBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          recursiveMessage_ = value;
+        } else {
+          recursiveMessageBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00100000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+       */
+      public Builder setRecursiveMessage(
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder builderForValue) {
+        if (recursiveMessageBuilder_ == null) {
+          recursiveMessage_ = builderForValue.build();
+        } else {
+          recursiveMessageBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00100000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+       */
+      public Builder mergeRecursiveMessage(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 value) {
+        if (recursiveMessageBuilder_ == null) {
+          if (((bitField0_ & 0x00100000) != 0) &&
+            recursiveMessage_ != null &&
+            recursiveMessage_ != legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance()) {
+            getRecursiveMessageBuilder().mergeFrom(value);
+          } else {
+            recursiveMessage_ = value;
+          }
+        } else {
+          recursiveMessageBuilder_.mergeFrom(value);
+        }
+        if (recursiveMessage_ != null) {
+          bitField0_ |= 0x00100000;
+          onChanged();
+        }
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+       */
+      public Builder clearRecursiveMessage() {
+        bitField0_ = (bitField0_ & ~0x00100000);
+        recursiveMessage_ = null;
+        if (recursiveMessageBuilder_ != null) {
+          recursiveMessageBuilder_.dispose();
+          recursiveMessageBuilder_ = null;
+        }
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder getRecursiveMessageBuilder() {
+        bitField0_ |= 0x00100000;
+        onChanged();
+        return getRecursiveMessageFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder getRecursiveMessageOrBuilder() {
+        if (recursiveMessageBuilder_ != null) {
+          return recursiveMessageBuilder_.getMessageOrBuilder();
+        } else {
+          return recursiveMessage_ == null ?
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance() : recursiveMessage_;
+        }
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder> 
+          getRecursiveMessageFieldBuilder() {
+        if (recursiveMessageBuilder_ == null) {
+          recursiveMessageBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder>(
+                  getRecursiveMessage(),
+                  getParentForChildren(),
+                  isClean());
+          recursiveMessage_ = null;
+        }
+        return recursiveMessageBuilder_;
+      }
+
+      private com.google.protobuf.Internal.IntList repeatedInt32_ = emptyIntList();
+      private void ensureRepeatedInt32IsMutable() {
+        if (!repeatedInt32_.isModifiable()) {
+          repeatedInt32_ = makeMutableCopy(repeatedInt32_);
+        }
+        bitField0_ |= 0x00200000;
+      }
+      /**
+       * <pre>
+       * Repeated
+       * </pre>
+       *
+       * <code>repeated int32 repeated_int32 = 31;</code>
+       * @return A list containing the repeatedInt32.
+       */
+      public java.util.List<java.lang.Integer>
+          getRepeatedInt32List() {
+        repeatedInt32_.makeImmutable();
+        return repeatedInt32_;
+      }
+      /**
+       * <pre>
+       * Repeated
+       * </pre>
+       *
+       * <code>repeated int32 repeated_int32 = 31;</code>
+       * @return The count of repeatedInt32.
+       */
+      public int getRepeatedInt32Count() {
+        return repeatedInt32_.size();
+      }
+      /**
+       * <pre>
+       * Repeated
+       * </pre>
+       *
+       * <code>repeated int32 repeated_int32 = 31;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedInt32 at the given index.
+       */
+      public int getRepeatedInt32(int index) {
+        return repeatedInt32_.getInt(index);
+      }
+      /**
+       * <pre>
+       * Repeated
+       * </pre>
+       *
+       * <code>repeated int32 repeated_int32 = 31;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedInt32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedInt32(
+          int index, int value) {
+
+        ensureRepeatedInt32IsMutable();
+        repeatedInt32_.setInt(index, value);
+        bitField0_ |= 0x00200000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Repeated
+       * </pre>
+       *
+       * <code>repeated int32 repeated_int32 = 31;</code>
+       * @param value The repeatedInt32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedInt32(int value) {
+
+        ensureRepeatedInt32IsMutable();
+        repeatedInt32_.addInt(value);
+        bitField0_ |= 0x00200000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Repeated
+       * </pre>
+       *
+       * <code>repeated int32 repeated_int32 = 31;</code>
+       * @param values The repeatedInt32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedInt32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureRepeatedInt32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedInt32_);
+        bitField0_ |= 0x00200000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Repeated
+       * </pre>
+       *
+       * <code>repeated int32 repeated_int32 = 31;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedInt32() {
+        repeatedInt32_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00200000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList repeatedInt64_ = emptyLongList();
+      private void ensureRepeatedInt64IsMutable() {
+        if (!repeatedInt64_.isModifiable()) {
+          repeatedInt64_ = makeMutableCopy(repeatedInt64_);
+        }
+        bitField0_ |= 0x00400000;
+      }
+      /**
+       * <code>repeated int64 repeated_int64 = 32;</code>
+       * @return A list containing the repeatedInt64.
+       */
+      public java.util.List<java.lang.Long>
+          getRepeatedInt64List() {
+        repeatedInt64_.makeImmutable();
+        return repeatedInt64_;
+      }
+      /**
+       * <code>repeated int64 repeated_int64 = 32;</code>
+       * @return The count of repeatedInt64.
+       */
+      public int getRepeatedInt64Count() {
+        return repeatedInt64_.size();
+      }
+      /**
+       * <code>repeated int64 repeated_int64 = 32;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedInt64 at the given index.
+       */
+      public long getRepeatedInt64(int index) {
+        return repeatedInt64_.getLong(index);
+      }
+      /**
+       * <code>repeated int64 repeated_int64 = 32;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedInt64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedInt64(
+          int index, long value) {
+
+        ensureRepeatedInt64IsMutable();
+        repeatedInt64_.setLong(index, value);
+        bitField0_ |= 0x00400000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int64 repeated_int64 = 32;</code>
+       * @param value The repeatedInt64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedInt64(long value) {
+
+        ensureRepeatedInt64IsMutable();
+        repeatedInt64_.addLong(value);
+        bitField0_ |= 0x00400000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int64 repeated_int64 = 32;</code>
+       * @param values The repeatedInt64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedInt64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureRepeatedInt64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedInt64_);
+        bitField0_ |= 0x00400000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int64 repeated_int64 = 32;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedInt64() {
+        repeatedInt64_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x00400000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList repeatedUint32_ = emptyIntList();
+      private void ensureRepeatedUint32IsMutable() {
+        if (!repeatedUint32_.isModifiable()) {
+          repeatedUint32_ = makeMutableCopy(repeatedUint32_);
+        }
+        bitField0_ |= 0x00800000;
+      }
+      /**
+       * <code>repeated uint32 repeated_uint32 = 33;</code>
+       * @return A list containing the repeatedUint32.
+       */
+      public java.util.List<java.lang.Integer>
+          getRepeatedUint32List() {
+        repeatedUint32_.makeImmutable();
+        return repeatedUint32_;
+      }
+      /**
+       * <code>repeated uint32 repeated_uint32 = 33;</code>
+       * @return The count of repeatedUint32.
+       */
+      public int getRepeatedUint32Count() {
+        return repeatedUint32_.size();
+      }
+      /**
+       * <code>repeated uint32 repeated_uint32 = 33;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedUint32 at the given index.
+       */
+      public int getRepeatedUint32(int index) {
+        return repeatedUint32_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 repeated_uint32 = 33;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedUint32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedUint32(
+          int index, int value) {
+
+        ensureRepeatedUint32IsMutable();
+        repeatedUint32_.setInt(index, value);
+        bitField0_ |= 0x00800000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 repeated_uint32 = 33;</code>
+       * @param value The repeatedUint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedUint32(int value) {
+
+        ensureRepeatedUint32IsMutable();
+        repeatedUint32_.addInt(value);
+        bitField0_ |= 0x00800000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 repeated_uint32 = 33;</code>
+       * @param values The repeatedUint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedUint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureRepeatedUint32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedUint32_);
+        bitField0_ |= 0x00800000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 repeated_uint32 = 33;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedUint32() {
+        repeatedUint32_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00800000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList repeatedUint64_ = emptyLongList();
+      private void ensureRepeatedUint64IsMutable() {
+        if (!repeatedUint64_.isModifiable()) {
+          repeatedUint64_ = makeMutableCopy(repeatedUint64_);
+        }
+        bitField0_ |= 0x01000000;
+      }
+      /**
+       * <code>repeated uint64 repeated_uint64 = 34;</code>
+       * @return A list containing the repeatedUint64.
+       */
+      public java.util.List<java.lang.Long>
+          getRepeatedUint64List() {
+        repeatedUint64_.makeImmutable();
+        return repeatedUint64_;
+      }
+      /**
+       * <code>repeated uint64 repeated_uint64 = 34;</code>
+       * @return The count of repeatedUint64.
+       */
+      public int getRepeatedUint64Count() {
+        return repeatedUint64_.size();
+      }
+      /**
+       * <code>repeated uint64 repeated_uint64 = 34;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedUint64 at the given index.
+       */
+      public long getRepeatedUint64(int index) {
+        return repeatedUint64_.getLong(index);
+      }
+      /**
+       * <code>repeated uint64 repeated_uint64 = 34;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedUint64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedUint64(
+          int index, long value) {
+
+        ensureRepeatedUint64IsMutable();
+        repeatedUint64_.setLong(index, value);
+        bitField0_ |= 0x01000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 repeated_uint64 = 34;</code>
+       * @param value The repeatedUint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedUint64(long value) {
+
+        ensureRepeatedUint64IsMutable();
+        repeatedUint64_.addLong(value);
+        bitField0_ |= 0x01000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 repeated_uint64 = 34;</code>
+       * @param values The repeatedUint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedUint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureRepeatedUint64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedUint64_);
+        bitField0_ |= 0x01000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 repeated_uint64 = 34;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedUint64() {
+        repeatedUint64_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x01000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList repeatedSint32_ = emptyIntList();
+      private void ensureRepeatedSint32IsMutable() {
+        if (!repeatedSint32_.isModifiable()) {
+          repeatedSint32_ = makeMutableCopy(repeatedSint32_);
+        }
+        bitField0_ |= 0x02000000;
+      }
+      /**
+       * <code>repeated sint32 repeated_sint32 = 35;</code>
+       * @return A list containing the repeatedSint32.
+       */
+      public java.util.List<java.lang.Integer>
+          getRepeatedSint32List() {
+        repeatedSint32_.makeImmutable();
+        return repeatedSint32_;
+      }
+      /**
+       * <code>repeated sint32 repeated_sint32 = 35;</code>
+       * @return The count of repeatedSint32.
+       */
+      public int getRepeatedSint32Count() {
+        return repeatedSint32_.size();
+      }
+      /**
+       * <code>repeated sint32 repeated_sint32 = 35;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedSint32 at the given index.
+       */
+      public int getRepeatedSint32(int index) {
+        return repeatedSint32_.getInt(index);
+      }
+      /**
+       * <code>repeated sint32 repeated_sint32 = 35;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedSint32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedSint32(
+          int index, int value) {
+
+        ensureRepeatedSint32IsMutable();
+        repeatedSint32_.setInt(index, value);
+        bitField0_ |= 0x02000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint32 repeated_sint32 = 35;</code>
+       * @param value The repeatedSint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedSint32(int value) {
+
+        ensureRepeatedSint32IsMutable();
+        repeatedSint32_.addInt(value);
+        bitField0_ |= 0x02000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint32 repeated_sint32 = 35;</code>
+       * @param values The repeatedSint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedSint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureRepeatedSint32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedSint32_);
+        bitField0_ |= 0x02000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint32 repeated_sint32 = 35;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedSint32() {
+        repeatedSint32_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x02000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList repeatedSint64_ = emptyLongList();
+      private void ensureRepeatedSint64IsMutable() {
+        if (!repeatedSint64_.isModifiable()) {
+          repeatedSint64_ = makeMutableCopy(repeatedSint64_);
+        }
+        bitField0_ |= 0x04000000;
+      }
+      /**
+       * <code>repeated sint64 repeated_sint64 = 36;</code>
+       * @return A list containing the repeatedSint64.
+       */
+      public java.util.List<java.lang.Long>
+          getRepeatedSint64List() {
+        repeatedSint64_.makeImmutable();
+        return repeatedSint64_;
+      }
+      /**
+       * <code>repeated sint64 repeated_sint64 = 36;</code>
+       * @return The count of repeatedSint64.
+       */
+      public int getRepeatedSint64Count() {
+        return repeatedSint64_.size();
+      }
+      /**
+       * <code>repeated sint64 repeated_sint64 = 36;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedSint64 at the given index.
+       */
+      public long getRepeatedSint64(int index) {
+        return repeatedSint64_.getLong(index);
+      }
+      /**
+       * <code>repeated sint64 repeated_sint64 = 36;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedSint64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedSint64(
+          int index, long value) {
+
+        ensureRepeatedSint64IsMutable();
+        repeatedSint64_.setLong(index, value);
+        bitField0_ |= 0x04000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint64 repeated_sint64 = 36;</code>
+       * @param value The repeatedSint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedSint64(long value) {
+
+        ensureRepeatedSint64IsMutable();
+        repeatedSint64_.addLong(value);
+        bitField0_ |= 0x04000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint64 repeated_sint64 = 36;</code>
+       * @param values The repeatedSint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedSint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureRepeatedSint64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedSint64_);
+        bitField0_ |= 0x04000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint64 repeated_sint64 = 36;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedSint64() {
+        repeatedSint64_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x04000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList repeatedFixed32_ = emptyIntList();
+      private void ensureRepeatedFixed32IsMutable() {
+        if (!repeatedFixed32_.isModifiable()) {
+          repeatedFixed32_ = makeMutableCopy(repeatedFixed32_);
+        }
+        bitField0_ |= 0x08000000;
+      }
+      private void ensureRepeatedFixed32IsMutable(int capacity) {
+        if (!repeatedFixed32_.isModifiable()) {
+          repeatedFixed32_ = makeMutableCopy(repeatedFixed32_, capacity);
+        }
+        bitField0_ |= 0x08000000;
+      }
+      /**
+       * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+       * @return A list containing the repeatedFixed32.
+       */
+      public java.util.List<java.lang.Integer>
+          getRepeatedFixed32List() {
+        repeatedFixed32_.makeImmutable();
+        return repeatedFixed32_;
+      }
+      /**
+       * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+       * @return The count of repeatedFixed32.
+       */
+      public int getRepeatedFixed32Count() {
+        return repeatedFixed32_.size();
+      }
+      /**
+       * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedFixed32 at the given index.
+       */
+      public int getRepeatedFixed32(int index) {
+        return repeatedFixed32_.getInt(index);
+      }
+      /**
+       * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedFixed32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedFixed32(
+          int index, int value) {
+
+        ensureRepeatedFixed32IsMutable();
+        repeatedFixed32_.setInt(index, value);
+        bitField0_ |= 0x08000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+       * @param value The repeatedFixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedFixed32(int value) {
+
+        ensureRepeatedFixed32IsMutable();
+        repeatedFixed32_.addInt(value);
+        bitField0_ |= 0x08000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+       * @param values The repeatedFixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedFixed32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureRepeatedFixed32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedFixed32_);
+        bitField0_ |= 0x08000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedFixed32() {
+        repeatedFixed32_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x08000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList repeatedFixed64_ = emptyLongList();
+      private void ensureRepeatedFixed64IsMutable() {
+        if (!repeatedFixed64_.isModifiable()) {
+          repeatedFixed64_ = makeMutableCopy(repeatedFixed64_);
+        }
+        bitField0_ |= 0x10000000;
+      }
+      private void ensureRepeatedFixed64IsMutable(int capacity) {
+        if (!repeatedFixed64_.isModifiable()) {
+          repeatedFixed64_ = makeMutableCopy(repeatedFixed64_, capacity);
+        }
+        bitField0_ |= 0x10000000;
+      }
+      /**
+       * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+       * @return A list containing the repeatedFixed64.
+       */
+      public java.util.List<java.lang.Long>
+          getRepeatedFixed64List() {
+        repeatedFixed64_.makeImmutable();
+        return repeatedFixed64_;
+      }
+      /**
+       * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+       * @return The count of repeatedFixed64.
+       */
+      public int getRepeatedFixed64Count() {
+        return repeatedFixed64_.size();
+      }
+      /**
+       * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedFixed64 at the given index.
+       */
+      public long getRepeatedFixed64(int index) {
+        return repeatedFixed64_.getLong(index);
+      }
+      /**
+       * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedFixed64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedFixed64(
+          int index, long value) {
+
+        ensureRepeatedFixed64IsMutable();
+        repeatedFixed64_.setLong(index, value);
+        bitField0_ |= 0x10000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+       * @param value The repeatedFixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedFixed64(long value) {
+
+        ensureRepeatedFixed64IsMutable();
+        repeatedFixed64_.addLong(value);
+        bitField0_ |= 0x10000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+       * @param values The repeatedFixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedFixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureRepeatedFixed64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedFixed64_);
+        bitField0_ |= 0x10000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedFixed64() {
+        repeatedFixed64_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x10000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList repeatedSfixed32_ = emptyIntList();
+      private void ensureRepeatedSfixed32IsMutable() {
+        if (!repeatedSfixed32_.isModifiable()) {
+          repeatedSfixed32_ = makeMutableCopy(repeatedSfixed32_);
+        }
+        bitField0_ |= 0x20000000;
+      }
+      private void ensureRepeatedSfixed32IsMutable(int capacity) {
+        if (!repeatedSfixed32_.isModifiable()) {
+          repeatedSfixed32_ = makeMutableCopy(repeatedSfixed32_, capacity);
+        }
+        bitField0_ |= 0x20000000;
+      }
+      /**
+       * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+       * @return A list containing the repeatedSfixed32.
+       */
+      public java.util.List<java.lang.Integer>
+          getRepeatedSfixed32List() {
+        repeatedSfixed32_.makeImmutable();
+        return repeatedSfixed32_;
+      }
+      /**
+       * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+       * @return The count of repeatedSfixed32.
+       */
+      public int getRepeatedSfixed32Count() {
+        return repeatedSfixed32_.size();
+      }
+      /**
+       * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedSfixed32 at the given index.
+       */
+      public int getRepeatedSfixed32(int index) {
+        return repeatedSfixed32_.getInt(index);
+      }
+      /**
+       * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedSfixed32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedSfixed32(
+          int index, int value) {
+
+        ensureRepeatedSfixed32IsMutable();
+        repeatedSfixed32_.setInt(index, value);
+        bitField0_ |= 0x20000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+       * @param value The repeatedSfixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedSfixed32(int value) {
+
+        ensureRepeatedSfixed32IsMutable();
+        repeatedSfixed32_.addInt(value);
+        bitField0_ |= 0x20000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+       * @param values The repeatedSfixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedSfixed32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureRepeatedSfixed32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedSfixed32_);
+        bitField0_ |= 0x20000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedSfixed32() {
+        repeatedSfixed32_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x20000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList repeatedSfixed64_ = emptyLongList();
+      private void ensureRepeatedSfixed64IsMutable() {
+        if (!repeatedSfixed64_.isModifiable()) {
+          repeatedSfixed64_ = makeMutableCopy(repeatedSfixed64_);
+        }
+        bitField0_ |= 0x40000000;
+      }
+      private void ensureRepeatedSfixed64IsMutable(int capacity) {
+        if (!repeatedSfixed64_.isModifiable()) {
+          repeatedSfixed64_ = makeMutableCopy(repeatedSfixed64_, capacity);
+        }
+        bitField0_ |= 0x40000000;
+      }
+      /**
+       * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+       * @return A list containing the repeatedSfixed64.
+       */
+      public java.util.List<java.lang.Long>
+          getRepeatedSfixed64List() {
+        repeatedSfixed64_.makeImmutable();
+        return repeatedSfixed64_;
+      }
+      /**
+       * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+       * @return The count of repeatedSfixed64.
+       */
+      public int getRepeatedSfixed64Count() {
+        return repeatedSfixed64_.size();
+      }
+      /**
+       * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedSfixed64 at the given index.
+       */
+      public long getRepeatedSfixed64(int index) {
+        return repeatedSfixed64_.getLong(index);
+      }
+      /**
+       * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedSfixed64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedSfixed64(
+          int index, long value) {
+
+        ensureRepeatedSfixed64IsMutable();
+        repeatedSfixed64_.setLong(index, value);
+        bitField0_ |= 0x40000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+       * @param value The repeatedSfixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedSfixed64(long value) {
+
+        ensureRepeatedSfixed64IsMutable();
+        repeatedSfixed64_.addLong(value);
+        bitField0_ |= 0x40000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+       * @param values The repeatedSfixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedSfixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureRepeatedSfixed64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedSfixed64_);
+        bitField0_ |= 0x40000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedSfixed64() {
+        repeatedSfixed64_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x40000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.FloatList repeatedFloat_ = emptyFloatList();
+      private void ensureRepeatedFloatIsMutable() {
+        if (!repeatedFloat_.isModifiable()) {
+          repeatedFloat_ = makeMutableCopy(repeatedFloat_);
+        }
+        bitField0_ |= 0x80000000;
+      }
+      private void ensureRepeatedFloatIsMutable(int capacity) {
+        if (!repeatedFloat_.isModifiable()) {
+          repeatedFloat_ = makeMutableCopy(repeatedFloat_, capacity);
+        }
+        bitField0_ |= 0x80000000;
+      }
+      /**
+       * <code>repeated float repeated_float = 41;</code>
+       * @return A list containing the repeatedFloat.
+       */
+      public java.util.List<java.lang.Float>
+          getRepeatedFloatList() {
+        repeatedFloat_.makeImmutable();
+        return repeatedFloat_;
+      }
+      /**
+       * <code>repeated float repeated_float = 41;</code>
+       * @return The count of repeatedFloat.
+       */
+      public int getRepeatedFloatCount() {
+        return repeatedFloat_.size();
+      }
+      /**
+       * <code>repeated float repeated_float = 41;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedFloat at the given index.
+       */
+      public float getRepeatedFloat(int index) {
+        return repeatedFloat_.getFloat(index);
+      }
+      /**
+       * <code>repeated float repeated_float = 41;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedFloat to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedFloat(
+          int index, float value) {
+
+        ensureRepeatedFloatIsMutable();
+        repeatedFloat_.setFloat(index, value);
+        bitField0_ |= 0x80000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated float repeated_float = 41;</code>
+       * @param value The repeatedFloat to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedFloat(float value) {
+
+        ensureRepeatedFloatIsMutable();
+        repeatedFloat_.addFloat(value);
+        bitField0_ |= 0x80000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated float repeated_float = 41;</code>
+       * @param values The repeatedFloat to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedFloat(
+          java.lang.Iterable<? extends java.lang.Float> values) {
+        ensureRepeatedFloatIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedFloat_);
+        bitField0_ |= 0x80000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated float repeated_float = 41;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedFloat() {
+        repeatedFloat_ = emptyFloatList();
+        bitField0_ = (bitField0_ & ~0x80000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.DoubleList repeatedDouble_ = emptyDoubleList();
+      private void ensureRepeatedDoubleIsMutable() {
+        if (!repeatedDouble_.isModifiable()) {
+          repeatedDouble_ = makeMutableCopy(repeatedDouble_);
+        }
+        bitField1_ |= 0x00000001;
+      }
+      private void ensureRepeatedDoubleIsMutable(int capacity) {
+        if (!repeatedDouble_.isModifiable()) {
+          repeatedDouble_ = makeMutableCopy(repeatedDouble_, capacity);
+        }
+        bitField1_ |= 0x00000001;
+      }
+      /**
+       * <code>repeated double repeated_double = 42;</code>
+       * @return A list containing the repeatedDouble.
+       */
+      public java.util.List<java.lang.Double>
+          getRepeatedDoubleList() {
+        repeatedDouble_.makeImmutable();
+        return repeatedDouble_;
+      }
+      /**
+       * <code>repeated double repeated_double = 42;</code>
+       * @return The count of repeatedDouble.
+       */
+      public int getRepeatedDoubleCount() {
+        return repeatedDouble_.size();
+      }
+      /**
+       * <code>repeated double repeated_double = 42;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedDouble at the given index.
+       */
+      public double getRepeatedDouble(int index) {
+        return repeatedDouble_.getDouble(index);
+      }
+      /**
+       * <code>repeated double repeated_double = 42;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedDouble to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedDouble(
+          int index, double value) {
+
+        ensureRepeatedDoubleIsMutable();
+        repeatedDouble_.setDouble(index, value);
+        bitField1_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated double repeated_double = 42;</code>
+       * @param value The repeatedDouble to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedDouble(double value) {
+
+        ensureRepeatedDoubleIsMutable();
+        repeatedDouble_.addDouble(value);
+        bitField1_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated double repeated_double = 42;</code>
+       * @param values The repeatedDouble to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedDouble(
+          java.lang.Iterable<? extends java.lang.Double> values) {
+        ensureRepeatedDoubleIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedDouble_);
+        bitField1_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated double repeated_double = 42;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedDouble() {
+        repeatedDouble_ = emptyDoubleList();
+        bitField1_ = (bitField1_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.BooleanList repeatedBool_ = emptyBooleanList();
+      private void ensureRepeatedBoolIsMutable() {
+        if (!repeatedBool_.isModifiable()) {
+          repeatedBool_ = makeMutableCopy(repeatedBool_);
+        }
+        bitField1_ |= 0x00000002;
+      }
+      private void ensureRepeatedBoolIsMutable(int capacity) {
+        if (!repeatedBool_.isModifiable()) {
+          repeatedBool_ = makeMutableCopy(repeatedBool_, capacity);
+        }
+        bitField1_ |= 0x00000002;
+      }
+      /**
+       * <code>repeated bool repeated_bool = 43;</code>
+       * @return A list containing the repeatedBool.
+       */
+      public java.util.List<java.lang.Boolean>
+          getRepeatedBoolList() {
+        repeatedBool_.makeImmutable();
+        return repeatedBool_;
+      }
+      /**
+       * <code>repeated bool repeated_bool = 43;</code>
+       * @return The count of repeatedBool.
+       */
+      public int getRepeatedBoolCount() {
+        return repeatedBool_.size();
+      }
+      /**
+       * <code>repeated bool repeated_bool = 43;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedBool at the given index.
+       */
+      public boolean getRepeatedBool(int index) {
+        return repeatedBool_.getBoolean(index);
+      }
+      /**
+       * <code>repeated bool repeated_bool = 43;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedBool to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedBool(
+          int index, boolean value) {
+
+        ensureRepeatedBoolIsMutable();
+        repeatedBool_.setBoolean(index, value);
+        bitField1_ |= 0x00000002;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bool repeated_bool = 43;</code>
+       * @param value The repeatedBool to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedBool(boolean value) {
+
+        ensureRepeatedBoolIsMutable();
+        repeatedBool_.addBoolean(value);
+        bitField1_ |= 0x00000002;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bool repeated_bool = 43;</code>
+       * @param values The repeatedBool to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedBool(
+          java.lang.Iterable<? extends java.lang.Boolean> values) {
+        ensureRepeatedBoolIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedBool_);
+        bitField1_ |= 0x00000002;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bool repeated_bool = 43;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedBool() {
+        repeatedBool_ = emptyBooleanList();
+        bitField1_ = (bitField1_ & ~0x00000002);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.LazyStringArrayList repeatedString_ =
+          com.google.protobuf.LazyStringArrayList.emptyList();
+      private void ensureRepeatedStringIsMutable() {
+        if (!repeatedString_.isModifiable()) {
+          repeatedString_ = new com.google.protobuf.LazyStringArrayList(repeatedString_);
+        }
+        bitField1_ |= 0x00000004;
+      }
+      /**
+       * <code>repeated string repeated_string = 44;</code>
+       * @return A list containing the repeatedString.
+       */
+      public com.google.protobuf.ProtocolStringList
+          getRepeatedStringList() {
+        repeatedString_.makeImmutable();
+        return repeatedString_;
+      }
+      /**
+       * <code>repeated string repeated_string = 44;</code>
+       * @return The count of repeatedString.
+       */
+      public int getRepeatedStringCount() {
+        return repeatedString_.size();
+      }
+      /**
+       * <code>repeated string repeated_string = 44;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedString at the given index.
+       */
+      public java.lang.String getRepeatedString(int index) {
+        return repeatedString_.get(index);
+      }
+      /**
+       * <code>repeated string repeated_string = 44;</code>
+       * @param index The index of the value to return.
+       * @return The bytes of the repeatedString at the given index.
+       */
+      public com.google.protobuf.ByteString
+          getRepeatedStringBytes(int index) {
+        return repeatedString_.getByteString(index);
+      }
+      /**
+       * <code>repeated string repeated_string = 44;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedString to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedString(
+          int index, java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
+        ensureRepeatedStringIsMutable();
+        repeatedString_.set(index, value);
+        bitField1_ |= 0x00000004;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated string repeated_string = 44;</code>
+       * @param value The repeatedString to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedString(
+          java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
+        ensureRepeatedStringIsMutable();
+        repeatedString_.add(value);
+        bitField1_ |= 0x00000004;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated string repeated_string = 44;</code>
+       * @param values The repeatedString to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedString(
+          java.lang.Iterable<java.lang.String> values) {
+        ensureRepeatedStringIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedString_);
+        bitField1_ |= 0x00000004;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated string repeated_string = 44;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedString() {
+        repeatedString_ =
+          com.google.protobuf.LazyStringArrayList.emptyList();
+        bitField1_ = (bitField1_ & ~0x00000004);;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated string repeated_string = 44;</code>
+       * @param value The bytes of the repeatedString to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedStringBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
+        ensureRepeatedStringIsMutable();
+        repeatedString_.add(value);
+        bitField1_ |= 0x00000004;
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.ProtobufList<com.google.protobuf.ByteString> repeatedBytes_ = emptyList(com.google.protobuf.ByteString.class);
+      private void ensureRepeatedBytesIsMutable() {
+        if (!repeatedBytes_.isModifiable()) {
+          repeatedBytes_ = makeMutableCopy(repeatedBytes_);
+        }
+        bitField1_ |= 0x00000008;
+      }
+      /**
+       * <code>repeated bytes repeated_bytes = 45;</code>
+       * @return A list containing the repeatedBytes.
+       */
+      public java.util.List<com.google.protobuf.ByteString>
+          getRepeatedBytesList() {
+        repeatedBytes_.makeImmutable();
+        return repeatedBytes_;
+      }
+      /**
+       * <code>repeated bytes repeated_bytes = 45;</code>
+       * @return The count of repeatedBytes.
+       */
+      public int getRepeatedBytesCount() {
+        return repeatedBytes_.size();
+      }
+      /**
+       * <code>repeated bytes repeated_bytes = 45;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedBytes at the given index.
+       */
+      public com.google.protobuf.ByteString getRepeatedBytes(int index) {
+        return repeatedBytes_.get(index);
+      }
+      /**
+       * <code>repeated bytes repeated_bytes = 45;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedBytes to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedBytes(
+          int index, com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
+        ensureRepeatedBytesIsMutable();
+        repeatedBytes_.set(index, value);
+        bitField1_ |= 0x00000008;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bytes repeated_bytes = 45;</code>
+       * @param value The repeatedBytes to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedBytes(com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
+        ensureRepeatedBytesIsMutable();
+        repeatedBytes_.add(value);
+        bitField1_ |= 0x00000008;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bytes repeated_bytes = 45;</code>
+       * @param values The repeatedBytes to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedBytes(
+          java.lang.Iterable<? extends com.google.protobuf.ByteString> values) {
+        ensureRepeatedBytesIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedBytes_);
+        bitField1_ |= 0x00000008;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bytes repeated_bytes = 45;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedBytes() {
+        repeatedBytes_ = emptyList(com.google.protobuf.ByteString.class);
+        bitField1_ = (bitField1_ & ~0x00000008);
+        onChanged();
+        return this;
+      }
+
+      private java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> repeatedNestedMessage_ =
+        java.util.Collections.emptyList();
+      private void ensureRepeatedNestedMessageIsMutable() {
+        if (!((bitField1_ & 0x00000010) != 0)) {
+          repeatedNestedMessage_ = new java.util.ArrayList<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage>(repeatedNestedMessage_);
+          bitField1_ |= 0x00000010;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> repeatedNestedMessageBuilder_;
+
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> getRepeatedNestedMessageList() {
+        if (repeatedNestedMessageBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(repeatedNestedMessage_);
+        } else {
+          return repeatedNestedMessageBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public int getRepeatedNestedMessageCount() {
+        if (repeatedNestedMessageBuilder_ == null) {
+          return repeatedNestedMessage_.size();
+        } else {
+          return repeatedNestedMessageBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getRepeatedNestedMessage(int index) {
+        if (repeatedNestedMessageBuilder_ == null) {
+          return repeatedNestedMessage_.get(index);
+        } else {
+          return repeatedNestedMessageBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public Builder setRepeatedNestedMessage(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage value) {
+        if (repeatedNestedMessageBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureRepeatedNestedMessageIsMutable();
+          repeatedNestedMessage_.set(index, value);
+          onChanged();
+        } else {
+          repeatedNestedMessageBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public Builder setRepeatedNestedMessage(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder builderForValue) {
+        if (repeatedNestedMessageBuilder_ == null) {
+          ensureRepeatedNestedMessageIsMutable();
+          repeatedNestedMessage_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          repeatedNestedMessageBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public Builder addRepeatedNestedMessage(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage value) {
+        if (repeatedNestedMessageBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureRepeatedNestedMessageIsMutable();
+          repeatedNestedMessage_.add(value);
+          onChanged();
+        } else {
+          repeatedNestedMessageBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public Builder addRepeatedNestedMessage(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage value) {
+        if (repeatedNestedMessageBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureRepeatedNestedMessageIsMutable();
+          repeatedNestedMessage_.add(index, value);
+          onChanged();
+        } else {
+          repeatedNestedMessageBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public Builder addRepeatedNestedMessage(
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder builderForValue) {
+        if (repeatedNestedMessageBuilder_ == null) {
+          ensureRepeatedNestedMessageIsMutable();
+          repeatedNestedMessage_.add(builderForValue.build());
+          onChanged();
+        } else {
+          repeatedNestedMessageBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public Builder addRepeatedNestedMessage(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder builderForValue) {
+        if (repeatedNestedMessageBuilder_ == null) {
+          ensureRepeatedNestedMessageIsMutable();
+          repeatedNestedMessage_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          repeatedNestedMessageBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public Builder addAllRepeatedNestedMessage(
+          java.lang.Iterable<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> values) {
+        if (repeatedNestedMessageBuilder_ == null) {
+          ensureRepeatedNestedMessageIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, repeatedNestedMessage_);
+          onChanged();
+        } else {
+          repeatedNestedMessageBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public Builder clearRepeatedNestedMessage() {
+        if (repeatedNestedMessageBuilder_ == null) {
+          repeatedNestedMessage_ = java.util.Collections.emptyList();
+          bitField1_ = (bitField1_ & ~0x00000010);
+          onChanged();
+        } else {
+          repeatedNestedMessageBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public Builder removeRepeatedNestedMessage(int index) {
+        if (repeatedNestedMessageBuilder_ == null) {
+          ensureRepeatedNestedMessageIsMutable();
+          repeatedNestedMessage_.remove(index);
+          onChanged();
+        } else {
+          repeatedNestedMessageBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder getRepeatedNestedMessageBuilder(
+          int index) {
+        return getRepeatedNestedMessageFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder getRepeatedNestedMessageOrBuilder(
+          int index) {
+        if (repeatedNestedMessageBuilder_ == null) {
+          return repeatedNestedMessage_.get(index);  } else {
+          return repeatedNestedMessageBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public java.util.List<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> 
+           getRepeatedNestedMessageOrBuilderList() {
+        if (repeatedNestedMessageBuilder_ != null) {
+          return repeatedNestedMessageBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(repeatedNestedMessage_);
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder addRepeatedNestedMessageBuilder() {
+        return getRepeatedNestedMessageFieldBuilder().addBuilder(
+            legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder addRepeatedNestedMessageBuilder(
+          int index) {
+        return getRepeatedNestedMessageFieldBuilder().addBuilder(
+            index, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder> 
+           getRepeatedNestedMessageBuilderList() {
+        return getRepeatedNestedMessageFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> 
+          getRepeatedNestedMessageFieldBuilder() {
+        if (repeatedNestedMessageBuilder_ == null) {
+          repeatedNestedMessageBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder>(
+                  repeatedNestedMessage_,
+                  ((bitField1_ & 0x00000010) != 0),
+                  getParentForChildren(),
+                  isClean());
+          repeatedNestedMessage_ = null;
+        }
+        return repeatedNestedMessageBuilder_;
+      }
+
+      private java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> repeatedForeignMessage_ =
+        java.util.Collections.emptyList();
+      private void ensureRepeatedForeignMessageIsMutable() {
+        if (!((bitField1_ & 0x00000020) != 0)) {
+          repeatedForeignMessage_ = new java.util.ArrayList<legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage>(repeatedForeignMessage_);
+          bitField1_ |= 0x00000020;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder> repeatedForeignMessageBuilder_;
+
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> getRepeatedForeignMessageList() {
+        if (repeatedForeignMessageBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(repeatedForeignMessage_);
+        } else {
+          return repeatedForeignMessageBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public int getRepeatedForeignMessageCount() {
+        if (repeatedForeignMessageBuilder_ == null) {
+          return repeatedForeignMessage_.size();
+        } else {
+          return repeatedForeignMessageBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getRepeatedForeignMessage(int index) {
+        if (repeatedForeignMessageBuilder_ == null) {
+          return repeatedForeignMessage_.get(index);
+        } else {
+          return repeatedForeignMessageBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public Builder setRepeatedForeignMessage(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage value) {
+        if (repeatedForeignMessageBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureRepeatedForeignMessageIsMutable();
+          repeatedForeignMessage_.set(index, value);
+          onChanged();
+        } else {
+          repeatedForeignMessageBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public Builder setRepeatedForeignMessage(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder builderForValue) {
+        if (repeatedForeignMessageBuilder_ == null) {
+          ensureRepeatedForeignMessageIsMutable();
+          repeatedForeignMessage_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          repeatedForeignMessageBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public Builder addRepeatedForeignMessage(legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage value) {
+        if (repeatedForeignMessageBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureRepeatedForeignMessageIsMutable();
+          repeatedForeignMessage_.add(value);
+          onChanged();
+        } else {
+          repeatedForeignMessageBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public Builder addRepeatedForeignMessage(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage value) {
+        if (repeatedForeignMessageBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureRepeatedForeignMessageIsMutable();
+          repeatedForeignMessage_.add(index, value);
+          onChanged();
+        } else {
+          repeatedForeignMessageBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public Builder addRepeatedForeignMessage(
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder builderForValue) {
+        if (repeatedForeignMessageBuilder_ == null) {
+          ensureRepeatedForeignMessageIsMutable();
+          repeatedForeignMessage_.add(builderForValue.build());
+          onChanged();
+        } else {
+          repeatedForeignMessageBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public Builder addRepeatedForeignMessage(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder builderForValue) {
+        if (repeatedForeignMessageBuilder_ == null) {
+          ensureRepeatedForeignMessageIsMutable();
+          repeatedForeignMessage_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          repeatedForeignMessageBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public Builder addAllRepeatedForeignMessage(
+          java.lang.Iterable<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> values) {
+        if (repeatedForeignMessageBuilder_ == null) {
+          ensureRepeatedForeignMessageIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, repeatedForeignMessage_);
+          onChanged();
+        } else {
+          repeatedForeignMessageBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public Builder clearRepeatedForeignMessage() {
+        if (repeatedForeignMessageBuilder_ == null) {
+          repeatedForeignMessage_ = java.util.Collections.emptyList();
+          bitField1_ = (bitField1_ & ~0x00000020);
+          onChanged();
+        } else {
+          repeatedForeignMessageBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public Builder removeRepeatedForeignMessage(int index) {
+        if (repeatedForeignMessageBuilder_ == null) {
+          ensureRepeatedForeignMessageIsMutable();
+          repeatedForeignMessage_.remove(index);
+          onChanged();
+        } else {
+          repeatedForeignMessageBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder getRepeatedForeignMessageBuilder(
+          int index) {
+        return getRepeatedForeignMessageFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder getRepeatedForeignMessageOrBuilder(
+          int index) {
+        if (repeatedForeignMessageBuilder_ == null) {
+          return repeatedForeignMessage_.get(index);  } else {
+          return repeatedForeignMessageBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public java.util.List<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder> 
+           getRepeatedForeignMessageOrBuilderList() {
+        if (repeatedForeignMessageBuilder_ != null) {
+          return repeatedForeignMessageBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(repeatedForeignMessage_);
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder addRepeatedForeignMessageBuilder() {
+        return getRepeatedForeignMessageFieldBuilder().addBuilder(
+            legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder addRepeatedForeignMessageBuilder(
+          int index) {
+        return getRepeatedForeignMessageFieldBuilder().addBuilder(
+            index, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder> 
+           getRepeatedForeignMessageBuilderList() {
+        return getRepeatedForeignMessageFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder> 
+          getRepeatedForeignMessageFieldBuilder() {
+        if (repeatedForeignMessageBuilder_ == null) {
+          repeatedForeignMessageBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder>(
+                  repeatedForeignMessage_,
+                  ((bitField1_ & 0x00000020) != 0),
+                  getParentForChildren(),
+                  isClean());
+          repeatedForeignMessage_ = null;
+        }
+        return repeatedForeignMessageBuilder_;
+      }
+
+      private java.util.List<java.lang.Integer> repeatedNestedEnum_ =
+        java.util.Collections.emptyList();
+      private void ensureRepeatedNestedEnumIsMutable() {
+        if (!((bitField1_ & 0x00000040) != 0)) {
+          repeatedNestedEnum_ = new java.util.ArrayList<java.lang.Integer>(repeatedNestedEnum_);
+          bitField1_ |= 0x00000040;
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+       * @return A list containing the repeatedNestedEnum.
+       */
+      public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> getRepeatedNestedEnumList() {
+        return new com.google.protobuf.Internal.ListAdapter<
+            java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>(repeatedNestedEnum_, repeatedNestedEnum_converter_);
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+       * @return The count of repeatedNestedEnum.
+       */
+      public int getRepeatedNestedEnumCount() {
+        return repeatedNestedEnum_.size();
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedNestedEnum at the given index.
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getRepeatedNestedEnum(int index) {
+        return repeatedNestedEnum_converter_.convert(repeatedNestedEnum_.get(index));
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedNestedEnum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedNestedEnum(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureRepeatedNestedEnumIsMutable();
+        repeatedNestedEnum_.set(index, value.getNumber());
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+       * @param value The repeatedNestedEnum to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedNestedEnum(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureRepeatedNestedEnumIsMutable();
+        repeatedNestedEnum_.add(value.getNumber());
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+       * @param values The repeatedNestedEnum to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedNestedEnum(
+          java.lang.Iterable<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> values) {
+        ensureRepeatedNestedEnumIsMutable();
+        for (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value : values) {
+          repeatedNestedEnum_.add(value.getNumber());
+        }
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedNestedEnum() {
+        repeatedNestedEnum_ = java.util.Collections.emptyList();
+        bitField1_ = (bitField1_ & ~0x00000040);
+        onChanged();
+        return this;
+      }
+
+      private java.util.List<java.lang.Integer> repeatedForeignEnum_ =
+        java.util.Collections.emptyList();
+      private void ensureRepeatedForeignEnumIsMutable() {
+        if (!((bitField1_ & 0x00000080) != 0)) {
+          repeatedForeignEnum_ = new java.util.ArrayList<java.lang.Integer>(repeatedForeignEnum_);
+          bitField1_ |= 0x00000080;
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+       * @return A list containing the repeatedForeignEnum.
+       */
+      public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum> getRepeatedForeignEnumList() {
+        return new com.google.protobuf.Internal.ListAdapter<
+            java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum>(repeatedForeignEnum_, repeatedForeignEnum_converter_);
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+       * @return The count of repeatedForeignEnum.
+       */
+      public int getRepeatedForeignEnumCount() {
+        return repeatedForeignEnum_.size();
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedForeignEnum at the given index.
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getRepeatedForeignEnum(int index) {
+        return repeatedForeignEnum_converter_.convert(repeatedForeignEnum_.get(index));
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedForeignEnum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedForeignEnum(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureRepeatedForeignEnumIsMutable();
+        repeatedForeignEnum_.set(index, value.getNumber());
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+       * @param value The repeatedForeignEnum to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedForeignEnum(legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureRepeatedForeignEnumIsMutable();
+        repeatedForeignEnum_.add(value.getNumber());
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+       * @param values The repeatedForeignEnum to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedForeignEnum(
+          java.lang.Iterable<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum> values) {
+        ensureRepeatedForeignEnumIsMutable();
+        for (legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum value : values) {
+          repeatedForeignEnum_.add(value.getNumber());
+        }
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedForeignEnum() {
+        repeatedForeignEnum_ = java.util.Collections.emptyList();
+        bitField1_ = (bitField1_ & ~0x00000080);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList packedInt32_ = emptyIntList();
+      private void ensurePackedInt32IsMutable() {
+        if (!packedInt32_.isModifiable()) {
+          packedInt32_ = makeMutableCopy(packedInt32_);
+        }
+        bitField1_ |= 0x00000100;
+      }
+      /**
+       * <pre>
+       * Packed
+       * </pre>
+       *
+       * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+       * @return A list containing the packedInt32.
+       */
+      public java.util.List<java.lang.Integer>
+          getPackedInt32List() {
+        packedInt32_.makeImmutable();
+        return packedInt32_;
+      }
+      /**
+       * <pre>
+       * Packed
+       * </pre>
+       *
+       * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+       * @return The count of packedInt32.
+       */
+      public int getPackedInt32Count() {
+        return packedInt32_.size();
+      }
+      /**
+       * <pre>
+       * Packed
+       * </pre>
+       *
+       * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedInt32 at the given index.
+       */
+      public int getPackedInt32(int index) {
+        return packedInt32_.getInt(index);
+      }
+      /**
+       * <pre>
+       * Packed
+       * </pre>
+       *
+       * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedInt32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedInt32(
+          int index, int value) {
+
+        ensurePackedInt32IsMutable();
+        packedInt32_.setInt(index, value);
+        bitField1_ |= 0x00000100;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Packed
+       * </pre>
+       *
+       * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+       * @param value The packedInt32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedInt32(int value) {
+
+        ensurePackedInt32IsMutable();
+        packedInt32_.addInt(value);
+        bitField1_ |= 0x00000100;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Packed
+       * </pre>
+       *
+       * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+       * @param values The packedInt32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedInt32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensurePackedInt32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedInt32_);
+        bitField1_ |= 0x00000100;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Packed
+       * </pre>
+       *
+       * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedInt32() {
+        packedInt32_ = emptyIntList();
+        bitField1_ = (bitField1_ & ~0x00000100);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList packedInt64_ = emptyLongList();
+      private void ensurePackedInt64IsMutable() {
+        if (!packedInt64_.isModifiable()) {
+          packedInt64_ = makeMutableCopy(packedInt64_);
+        }
+        bitField1_ |= 0x00000200;
+      }
+      /**
+       * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+       * @return A list containing the packedInt64.
+       */
+      public java.util.List<java.lang.Long>
+          getPackedInt64List() {
+        packedInt64_.makeImmutable();
+        return packedInt64_;
+      }
+      /**
+       * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+       * @return The count of packedInt64.
+       */
+      public int getPackedInt64Count() {
+        return packedInt64_.size();
+      }
+      /**
+       * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedInt64 at the given index.
+       */
+      public long getPackedInt64(int index) {
+        return packedInt64_.getLong(index);
+      }
+      /**
+       * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedInt64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedInt64(
+          int index, long value) {
+
+        ensurePackedInt64IsMutable();
+        packedInt64_.setLong(index, value);
+        bitField1_ |= 0x00000200;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+       * @param value The packedInt64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedInt64(long value) {
+
+        ensurePackedInt64IsMutable();
+        packedInt64_.addLong(value);
+        bitField1_ |= 0x00000200;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+       * @param values The packedInt64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedInt64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensurePackedInt64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedInt64_);
+        bitField1_ |= 0x00000200;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedInt64() {
+        packedInt64_ = emptyLongList();
+        bitField1_ = (bitField1_ & ~0x00000200);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList packedUint32_ = emptyIntList();
+      private void ensurePackedUint32IsMutable() {
+        if (!packedUint32_.isModifiable()) {
+          packedUint32_ = makeMutableCopy(packedUint32_);
+        }
+        bitField1_ |= 0x00000400;
+      }
+      /**
+       * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+       * @return A list containing the packedUint32.
+       */
+      public java.util.List<java.lang.Integer>
+          getPackedUint32List() {
+        packedUint32_.makeImmutable();
+        return packedUint32_;
+      }
+      /**
+       * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+       * @return The count of packedUint32.
+       */
+      public int getPackedUint32Count() {
+        return packedUint32_.size();
+      }
+      /**
+       * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedUint32 at the given index.
+       */
+      public int getPackedUint32(int index) {
+        return packedUint32_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedUint32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedUint32(
+          int index, int value) {
+
+        ensurePackedUint32IsMutable();
+        packedUint32_.setInt(index, value);
+        bitField1_ |= 0x00000400;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+       * @param value The packedUint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedUint32(int value) {
+
+        ensurePackedUint32IsMutable();
+        packedUint32_.addInt(value);
+        bitField1_ |= 0x00000400;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+       * @param values The packedUint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedUint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensurePackedUint32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedUint32_);
+        bitField1_ |= 0x00000400;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedUint32() {
+        packedUint32_ = emptyIntList();
+        bitField1_ = (bitField1_ & ~0x00000400);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList packedUint64_ = emptyLongList();
+      private void ensurePackedUint64IsMutable() {
+        if (!packedUint64_.isModifiable()) {
+          packedUint64_ = makeMutableCopy(packedUint64_);
+        }
+        bitField1_ |= 0x00000800;
+      }
+      /**
+       * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+       * @return A list containing the packedUint64.
+       */
+      public java.util.List<java.lang.Long>
+          getPackedUint64List() {
+        packedUint64_.makeImmutable();
+        return packedUint64_;
+      }
+      /**
+       * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+       * @return The count of packedUint64.
+       */
+      public int getPackedUint64Count() {
+        return packedUint64_.size();
+      }
+      /**
+       * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedUint64 at the given index.
+       */
+      public long getPackedUint64(int index) {
+        return packedUint64_.getLong(index);
+      }
+      /**
+       * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedUint64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedUint64(
+          int index, long value) {
+
+        ensurePackedUint64IsMutable();
+        packedUint64_.setLong(index, value);
+        bitField1_ |= 0x00000800;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+       * @param value The packedUint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedUint64(long value) {
+
+        ensurePackedUint64IsMutable();
+        packedUint64_.addLong(value);
+        bitField1_ |= 0x00000800;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+       * @param values The packedUint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedUint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensurePackedUint64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedUint64_);
+        bitField1_ |= 0x00000800;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedUint64() {
+        packedUint64_ = emptyLongList();
+        bitField1_ = (bitField1_ & ~0x00000800);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList packedSint32_ = emptyIntList();
+      private void ensurePackedSint32IsMutable() {
+        if (!packedSint32_.isModifiable()) {
+          packedSint32_ = makeMutableCopy(packedSint32_);
+        }
+        bitField1_ |= 0x00001000;
+      }
+      /**
+       * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+       * @return A list containing the packedSint32.
+       */
+      public java.util.List<java.lang.Integer>
+          getPackedSint32List() {
+        packedSint32_.makeImmutable();
+        return packedSint32_;
+      }
+      /**
+       * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+       * @return The count of packedSint32.
+       */
+      public int getPackedSint32Count() {
+        return packedSint32_.size();
+      }
+      /**
+       * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedSint32 at the given index.
+       */
+      public int getPackedSint32(int index) {
+        return packedSint32_.getInt(index);
+      }
+      /**
+       * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedSint32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedSint32(
+          int index, int value) {
+
+        ensurePackedSint32IsMutable();
+        packedSint32_.setInt(index, value);
+        bitField1_ |= 0x00001000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+       * @param value The packedSint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedSint32(int value) {
+
+        ensurePackedSint32IsMutable();
+        packedSint32_.addInt(value);
+        bitField1_ |= 0x00001000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+       * @param values The packedSint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedSint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensurePackedSint32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedSint32_);
+        bitField1_ |= 0x00001000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedSint32() {
+        packedSint32_ = emptyIntList();
+        bitField1_ = (bitField1_ & ~0x00001000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList packedSint64_ = emptyLongList();
+      private void ensurePackedSint64IsMutable() {
+        if (!packedSint64_.isModifiable()) {
+          packedSint64_ = makeMutableCopy(packedSint64_);
+        }
+        bitField1_ |= 0x00002000;
+      }
+      /**
+       * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+       * @return A list containing the packedSint64.
+       */
+      public java.util.List<java.lang.Long>
+          getPackedSint64List() {
+        packedSint64_.makeImmutable();
+        return packedSint64_;
+      }
+      /**
+       * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+       * @return The count of packedSint64.
+       */
+      public int getPackedSint64Count() {
+        return packedSint64_.size();
+      }
+      /**
+       * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedSint64 at the given index.
+       */
+      public long getPackedSint64(int index) {
+        return packedSint64_.getLong(index);
+      }
+      /**
+       * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedSint64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedSint64(
+          int index, long value) {
+
+        ensurePackedSint64IsMutable();
+        packedSint64_.setLong(index, value);
+        bitField1_ |= 0x00002000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+       * @param value The packedSint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedSint64(long value) {
+
+        ensurePackedSint64IsMutable();
+        packedSint64_.addLong(value);
+        bitField1_ |= 0x00002000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+       * @param values The packedSint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedSint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensurePackedSint64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedSint64_);
+        bitField1_ |= 0x00002000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedSint64() {
+        packedSint64_ = emptyLongList();
+        bitField1_ = (bitField1_ & ~0x00002000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList packedFixed32_ = emptyIntList();
+      private void ensurePackedFixed32IsMutable() {
+        if (!packedFixed32_.isModifiable()) {
+          packedFixed32_ = makeMutableCopy(packedFixed32_);
+        }
+        bitField1_ |= 0x00004000;
+      }
+      private void ensurePackedFixed32IsMutable(int capacity) {
+        if (!packedFixed32_.isModifiable()) {
+          packedFixed32_ = makeMutableCopy(packedFixed32_, capacity);
+        }
+        bitField1_ |= 0x00004000;
+      }
+      /**
+       * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+       * @return A list containing the packedFixed32.
+       */
+      public java.util.List<java.lang.Integer>
+          getPackedFixed32List() {
+        packedFixed32_.makeImmutable();
+        return packedFixed32_;
+      }
+      /**
+       * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+       * @return The count of packedFixed32.
+       */
+      public int getPackedFixed32Count() {
+        return packedFixed32_.size();
+      }
+      /**
+       * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedFixed32 at the given index.
+       */
+      public int getPackedFixed32(int index) {
+        return packedFixed32_.getInt(index);
+      }
+      /**
+       * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedFixed32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedFixed32(
+          int index, int value) {
+
+        ensurePackedFixed32IsMutable();
+        packedFixed32_.setInt(index, value);
+        bitField1_ |= 0x00004000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+       * @param value The packedFixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedFixed32(int value) {
+
+        ensurePackedFixed32IsMutable();
+        packedFixed32_.addInt(value);
+        bitField1_ |= 0x00004000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+       * @param values The packedFixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedFixed32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensurePackedFixed32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedFixed32_);
+        bitField1_ |= 0x00004000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedFixed32() {
+        packedFixed32_ = emptyIntList();
+        bitField1_ = (bitField1_ & ~0x00004000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList packedFixed64_ = emptyLongList();
+      private void ensurePackedFixed64IsMutable() {
+        if (!packedFixed64_.isModifiable()) {
+          packedFixed64_ = makeMutableCopy(packedFixed64_);
+        }
+        bitField1_ |= 0x00008000;
+      }
+      private void ensurePackedFixed64IsMutable(int capacity) {
+        if (!packedFixed64_.isModifiable()) {
+          packedFixed64_ = makeMutableCopy(packedFixed64_, capacity);
+        }
+        bitField1_ |= 0x00008000;
+      }
+      /**
+       * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+       * @return A list containing the packedFixed64.
+       */
+      public java.util.List<java.lang.Long>
+          getPackedFixed64List() {
+        packedFixed64_.makeImmutable();
+        return packedFixed64_;
+      }
+      /**
+       * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+       * @return The count of packedFixed64.
+       */
+      public int getPackedFixed64Count() {
+        return packedFixed64_.size();
+      }
+      /**
+       * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedFixed64 at the given index.
+       */
+      public long getPackedFixed64(int index) {
+        return packedFixed64_.getLong(index);
+      }
+      /**
+       * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedFixed64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedFixed64(
+          int index, long value) {
+
+        ensurePackedFixed64IsMutable();
+        packedFixed64_.setLong(index, value);
+        bitField1_ |= 0x00008000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+       * @param value The packedFixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedFixed64(long value) {
+
+        ensurePackedFixed64IsMutable();
+        packedFixed64_.addLong(value);
+        bitField1_ |= 0x00008000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+       * @param values The packedFixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedFixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensurePackedFixed64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedFixed64_);
+        bitField1_ |= 0x00008000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedFixed64() {
+        packedFixed64_ = emptyLongList();
+        bitField1_ = (bitField1_ & ~0x00008000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList packedSfixed32_ = emptyIntList();
+      private void ensurePackedSfixed32IsMutable() {
+        if (!packedSfixed32_.isModifiable()) {
+          packedSfixed32_ = makeMutableCopy(packedSfixed32_);
+        }
+        bitField1_ |= 0x00010000;
+      }
+      private void ensurePackedSfixed32IsMutable(int capacity) {
+        if (!packedSfixed32_.isModifiable()) {
+          packedSfixed32_ = makeMutableCopy(packedSfixed32_, capacity);
+        }
+        bitField1_ |= 0x00010000;
+      }
+      /**
+       * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+       * @return A list containing the packedSfixed32.
+       */
+      public java.util.List<java.lang.Integer>
+          getPackedSfixed32List() {
+        packedSfixed32_.makeImmutable();
+        return packedSfixed32_;
+      }
+      /**
+       * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+       * @return The count of packedSfixed32.
+       */
+      public int getPackedSfixed32Count() {
+        return packedSfixed32_.size();
+      }
+      /**
+       * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedSfixed32 at the given index.
+       */
+      public int getPackedSfixed32(int index) {
+        return packedSfixed32_.getInt(index);
+      }
+      /**
+       * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedSfixed32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedSfixed32(
+          int index, int value) {
+
+        ensurePackedSfixed32IsMutable();
+        packedSfixed32_.setInt(index, value);
+        bitField1_ |= 0x00010000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+       * @param value The packedSfixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedSfixed32(int value) {
+
+        ensurePackedSfixed32IsMutable();
+        packedSfixed32_.addInt(value);
+        bitField1_ |= 0x00010000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+       * @param values The packedSfixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedSfixed32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensurePackedSfixed32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedSfixed32_);
+        bitField1_ |= 0x00010000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedSfixed32() {
+        packedSfixed32_ = emptyIntList();
+        bitField1_ = (bitField1_ & ~0x00010000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList packedSfixed64_ = emptyLongList();
+      private void ensurePackedSfixed64IsMutable() {
+        if (!packedSfixed64_.isModifiable()) {
+          packedSfixed64_ = makeMutableCopy(packedSfixed64_);
+        }
+        bitField1_ |= 0x00020000;
+      }
+      private void ensurePackedSfixed64IsMutable(int capacity) {
+        if (!packedSfixed64_.isModifiable()) {
+          packedSfixed64_ = makeMutableCopy(packedSfixed64_, capacity);
+        }
+        bitField1_ |= 0x00020000;
+      }
+      /**
+       * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+       * @return A list containing the packedSfixed64.
+       */
+      public java.util.List<java.lang.Long>
+          getPackedSfixed64List() {
+        packedSfixed64_.makeImmutable();
+        return packedSfixed64_;
+      }
+      /**
+       * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+       * @return The count of packedSfixed64.
+       */
+      public int getPackedSfixed64Count() {
+        return packedSfixed64_.size();
+      }
+      /**
+       * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedSfixed64 at the given index.
+       */
+      public long getPackedSfixed64(int index) {
+        return packedSfixed64_.getLong(index);
+      }
+      /**
+       * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedSfixed64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedSfixed64(
+          int index, long value) {
+
+        ensurePackedSfixed64IsMutable();
+        packedSfixed64_.setLong(index, value);
+        bitField1_ |= 0x00020000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+       * @param value The packedSfixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedSfixed64(long value) {
+
+        ensurePackedSfixed64IsMutable();
+        packedSfixed64_.addLong(value);
+        bitField1_ |= 0x00020000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+       * @param values The packedSfixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedSfixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensurePackedSfixed64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedSfixed64_);
+        bitField1_ |= 0x00020000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedSfixed64() {
+        packedSfixed64_ = emptyLongList();
+        bitField1_ = (bitField1_ & ~0x00020000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.FloatList packedFloat_ = emptyFloatList();
+      private void ensurePackedFloatIsMutable() {
+        if (!packedFloat_.isModifiable()) {
+          packedFloat_ = makeMutableCopy(packedFloat_);
+        }
+        bitField1_ |= 0x00040000;
+      }
+      private void ensurePackedFloatIsMutable(int capacity) {
+        if (!packedFloat_.isModifiable()) {
+          packedFloat_ = makeMutableCopy(packedFloat_, capacity);
+        }
+        bitField1_ |= 0x00040000;
+      }
+      /**
+       * <code>repeated float packed_float = 85 [packed = true];</code>
+       * @return A list containing the packedFloat.
+       */
+      public java.util.List<java.lang.Float>
+          getPackedFloatList() {
+        packedFloat_.makeImmutable();
+        return packedFloat_;
+      }
+      /**
+       * <code>repeated float packed_float = 85 [packed = true];</code>
+       * @return The count of packedFloat.
+       */
+      public int getPackedFloatCount() {
+        return packedFloat_.size();
+      }
+      /**
+       * <code>repeated float packed_float = 85 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedFloat at the given index.
+       */
+      public float getPackedFloat(int index) {
+        return packedFloat_.getFloat(index);
+      }
+      /**
+       * <code>repeated float packed_float = 85 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedFloat to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedFloat(
+          int index, float value) {
+
+        ensurePackedFloatIsMutable();
+        packedFloat_.setFloat(index, value);
+        bitField1_ |= 0x00040000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated float packed_float = 85 [packed = true];</code>
+       * @param value The packedFloat to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedFloat(float value) {
+
+        ensurePackedFloatIsMutable();
+        packedFloat_.addFloat(value);
+        bitField1_ |= 0x00040000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated float packed_float = 85 [packed = true];</code>
+       * @param values The packedFloat to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedFloat(
+          java.lang.Iterable<? extends java.lang.Float> values) {
+        ensurePackedFloatIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedFloat_);
+        bitField1_ |= 0x00040000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated float packed_float = 85 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedFloat() {
+        packedFloat_ = emptyFloatList();
+        bitField1_ = (bitField1_ & ~0x00040000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.DoubleList packedDouble_ = emptyDoubleList();
+      private void ensurePackedDoubleIsMutable() {
+        if (!packedDouble_.isModifiable()) {
+          packedDouble_ = makeMutableCopy(packedDouble_);
+        }
+        bitField1_ |= 0x00080000;
+      }
+      private void ensurePackedDoubleIsMutable(int capacity) {
+        if (!packedDouble_.isModifiable()) {
+          packedDouble_ = makeMutableCopy(packedDouble_, capacity);
+        }
+        bitField1_ |= 0x00080000;
+      }
+      /**
+       * <code>repeated double packed_double = 86 [packed = true];</code>
+       * @return A list containing the packedDouble.
+       */
+      public java.util.List<java.lang.Double>
+          getPackedDoubleList() {
+        packedDouble_.makeImmutable();
+        return packedDouble_;
+      }
+      /**
+       * <code>repeated double packed_double = 86 [packed = true];</code>
+       * @return The count of packedDouble.
+       */
+      public int getPackedDoubleCount() {
+        return packedDouble_.size();
+      }
+      /**
+       * <code>repeated double packed_double = 86 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedDouble at the given index.
+       */
+      public double getPackedDouble(int index) {
+        return packedDouble_.getDouble(index);
+      }
+      /**
+       * <code>repeated double packed_double = 86 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedDouble to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedDouble(
+          int index, double value) {
+
+        ensurePackedDoubleIsMutable();
+        packedDouble_.setDouble(index, value);
+        bitField1_ |= 0x00080000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated double packed_double = 86 [packed = true];</code>
+       * @param value The packedDouble to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedDouble(double value) {
+
+        ensurePackedDoubleIsMutable();
+        packedDouble_.addDouble(value);
+        bitField1_ |= 0x00080000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated double packed_double = 86 [packed = true];</code>
+       * @param values The packedDouble to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedDouble(
+          java.lang.Iterable<? extends java.lang.Double> values) {
+        ensurePackedDoubleIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedDouble_);
+        bitField1_ |= 0x00080000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated double packed_double = 86 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedDouble() {
+        packedDouble_ = emptyDoubleList();
+        bitField1_ = (bitField1_ & ~0x00080000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.BooleanList packedBool_ = emptyBooleanList();
+      private void ensurePackedBoolIsMutable() {
+        if (!packedBool_.isModifiable()) {
+          packedBool_ = makeMutableCopy(packedBool_);
+        }
+        bitField1_ |= 0x00100000;
+      }
+      private void ensurePackedBoolIsMutable(int capacity) {
+        if (!packedBool_.isModifiable()) {
+          packedBool_ = makeMutableCopy(packedBool_, capacity);
+        }
+        bitField1_ |= 0x00100000;
+      }
+      /**
+       * <code>repeated bool packed_bool = 87 [packed = true];</code>
+       * @return A list containing the packedBool.
+       */
+      public java.util.List<java.lang.Boolean>
+          getPackedBoolList() {
+        packedBool_.makeImmutable();
+        return packedBool_;
+      }
+      /**
+       * <code>repeated bool packed_bool = 87 [packed = true];</code>
+       * @return The count of packedBool.
+       */
+      public int getPackedBoolCount() {
+        return packedBool_.size();
+      }
+      /**
+       * <code>repeated bool packed_bool = 87 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedBool at the given index.
+       */
+      public boolean getPackedBool(int index) {
+        return packedBool_.getBoolean(index);
+      }
+      /**
+       * <code>repeated bool packed_bool = 87 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedBool to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedBool(
+          int index, boolean value) {
+
+        ensurePackedBoolIsMutable();
+        packedBool_.setBoolean(index, value);
+        bitField1_ |= 0x00100000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bool packed_bool = 87 [packed = true];</code>
+       * @param value The packedBool to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedBool(boolean value) {
+
+        ensurePackedBoolIsMutable();
+        packedBool_.addBoolean(value);
+        bitField1_ |= 0x00100000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bool packed_bool = 87 [packed = true];</code>
+       * @param values The packedBool to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedBool(
+          java.lang.Iterable<? extends java.lang.Boolean> values) {
+        ensurePackedBoolIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedBool_);
+        bitField1_ |= 0x00100000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bool packed_bool = 87 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedBool() {
+        packedBool_ = emptyBooleanList();
+        bitField1_ = (bitField1_ & ~0x00100000);
+        onChanged();
+        return this;
+      }
+
+      private java.util.List<java.lang.Integer> packedNestedEnum_ =
+        java.util.Collections.emptyList();
+      private void ensurePackedNestedEnumIsMutable() {
+        if (!((bitField1_ & 0x00200000) != 0)) {
+          packedNestedEnum_ = new java.util.ArrayList<java.lang.Integer>(packedNestedEnum_);
+          bitField1_ |= 0x00200000;
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+       * @return A list containing the packedNestedEnum.
+       */
+      public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> getPackedNestedEnumList() {
+        return new com.google.protobuf.Internal.ListAdapter<
+            java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>(packedNestedEnum_, packedNestedEnum_converter_);
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+       * @return The count of packedNestedEnum.
+       */
+      public int getPackedNestedEnumCount() {
+        return packedNestedEnum_.size();
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedNestedEnum at the given index.
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getPackedNestedEnum(int index) {
+        return packedNestedEnum_converter_.convert(packedNestedEnum_.get(index));
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedNestedEnum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedNestedEnum(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensurePackedNestedEnumIsMutable();
+        packedNestedEnum_.set(index, value.getNumber());
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+       * @param value The packedNestedEnum to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedNestedEnum(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensurePackedNestedEnumIsMutable();
+        packedNestedEnum_.add(value.getNumber());
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+       * @param values The packedNestedEnum to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedNestedEnum(
+          java.lang.Iterable<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> values) {
+        ensurePackedNestedEnumIsMutable();
+        for (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value : values) {
+          packedNestedEnum_.add(value.getNumber());
+        }
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedNestedEnum() {
+        packedNestedEnum_ = java.util.Collections.emptyList();
+        bitField1_ = (bitField1_ & ~0x00200000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList unpackedInt32_ = emptyIntList();
+      private void ensureUnpackedInt32IsMutable() {
+        if (!unpackedInt32_.isModifiable()) {
+          unpackedInt32_ = makeMutableCopy(unpackedInt32_);
+        }
+        bitField1_ |= 0x00400000;
+      }
+      /**
+       * <pre>
+       * Unpacked
+       * </pre>
+       *
+       * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+       * @return A list containing the unpackedInt32.
+       */
+      public java.util.List<java.lang.Integer>
+          getUnpackedInt32List() {
+        unpackedInt32_.makeImmutable();
+        return unpackedInt32_;
+      }
+      /**
+       * <pre>
+       * Unpacked
+       * </pre>
+       *
+       * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+       * @return The count of unpackedInt32.
+       */
+      public int getUnpackedInt32Count() {
+        return unpackedInt32_.size();
+      }
+      /**
+       * <pre>
+       * Unpacked
+       * </pre>
+       *
+       * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedInt32 at the given index.
+       */
+      public int getUnpackedInt32(int index) {
+        return unpackedInt32_.getInt(index);
+      }
+      /**
+       * <pre>
+       * Unpacked
+       * </pre>
+       *
+       * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedInt32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedInt32(
+          int index, int value) {
+
+        ensureUnpackedInt32IsMutable();
+        unpackedInt32_.setInt(index, value);
+        bitField1_ |= 0x00400000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Unpacked
+       * </pre>
+       *
+       * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+       * @param value The unpackedInt32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedInt32(int value) {
+
+        ensureUnpackedInt32IsMutable();
+        unpackedInt32_.addInt(value);
+        bitField1_ |= 0x00400000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Unpacked
+       * </pre>
+       *
+       * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+       * @param values The unpackedInt32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedInt32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureUnpackedInt32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedInt32_);
+        bitField1_ |= 0x00400000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Unpacked
+       * </pre>
+       *
+       * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedInt32() {
+        unpackedInt32_ = emptyIntList();
+        bitField1_ = (bitField1_ & ~0x00400000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList unpackedInt64_ = emptyLongList();
+      private void ensureUnpackedInt64IsMutable() {
+        if (!unpackedInt64_.isModifiable()) {
+          unpackedInt64_ = makeMutableCopy(unpackedInt64_);
+        }
+        bitField1_ |= 0x00800000;
+      }
+      /**
+       * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+       * @return A list containing the unpackedInt64.
+       */
+      public java.util.List<java.lang.Long>
+          getUnpackedInt64List() {
+        unpackedInt64_.makeImmutable();
+        return unpackedInt64_;
+      }
+      /**
+       * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+       * @return The count of unpackedInt64.
+       */
+      public int getUnpackedInt64Count() {
+        return unpackedInt64_.size();
+      }
+      /**
+       * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedInt64 at the given index.
+       */
+      public long getUnpackedInt64(int index) {
+        return unpackedInt64_.getLong(index);
+      }
+      /**
+       * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedInt64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedInt64(
+          int index, long value) {
+
+        ensureUnpackedInt64IsMutable();
+        unpackedInt64_.setLong(index, value);
+        bitField1_ |= 0x00800000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+       * @param value The unpackedInt64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedInt64(long value) {
+
+        ensureUnpackedInt64IsMutable();
+        unpackedInt64_.addLong(value);
+        bitField1_ |= 0x00800000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+       * @param values The unpackedInt64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedInt64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureUnpackedInt64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedInt64_);
+        bitField1_ |= 0x00800000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedInt64() {
+        unpackedInt64_ = emptyLongList();
+        bitField1_ = (bitField1_ & ~0x00800000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList unpackedUint32_ = emptyIntList();
+      private void ensureUnpackedUint32IsMutable() {
+        if (!unpackedUint32_.isModifiable()) {
+          unpackedUint32_ = makeMutableCopy(unpackedUint32_);
+        }
+        bitField1_ |= 0x01000000;
+      }
+      /**
+       * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+       * @return A list containing the unpackedUint32.
+       */
+      public java.util.List<java.lang.Integer>
+          getUnpackedUint32List() {
+        unpackedUint32_.makeImmutable();
+        return unpackedUint32_;
+      }
+      /**
+       * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+       * @return The count of unpackedUint32.
+       */
+      public int getUnpackedUint32Count() {
+        return unpackedUint32_.size();
+      }
+      /**
+       * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedUint32 at the given index.
+       */
+      public int getUnpackedUint32(int index) {
+        return unpackedUint32_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedUint32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedUint32(
+          int index, int value) {
+
+        ensureUnpackedUint32IsMutable();
+        unpackedUint32_.setInt(index, value);
+        bitField1_ |= 0x01000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+       * @param value The unpackedUint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedUint32(int value) {
+
+        ensureUnpackedUint32IsMutable();
+        unpackedUint32_.addInt(value);
+        bitField1_ |= 0x01000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+       * @param values The unpackedUint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedUint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureUnpackedUint32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedUint32_);
+        bitField1_ |= 0x01000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedUint32() {
+        unpackedUint32_ = emptyIntList();
+        bitField1_ = (bitField1_ & ~0x01000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList unpackedUint64_ = emptyLongList();
+      private void ensureUnpackedUint64IsMutable() {
+        if (!unpackedUint64_.isModifiable()) {
+          unpackedUint64_ = makeMutableCopy(unpackedUint64_);
+        }
+        bitField1_ |= 0x02000000;
+      }
+      /**
+       * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+       * @return A list containing the unpackedUint64.
+       */
+      public java.util.List<java.lang.Long>
+          getUnpackedUint64List() {
+        unpackedUint64_.makeImmutable();
+        return unpackedUint64_;
+      }
+      /**
+       * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+       * @return The count of unpackedUint64.
+       */
+      public int getUnpackedUint64Count() {
+        return unpackedUint64_.size();
+      }
+      /**
+       * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedUint64 at the given index.
+       */
+      public long getUnpackedUint64(int index) {
+        return unpackedUint64_.getLong(index);
+      }
+      /**
+       * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedUint64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedUint64(
+          int index, long value) {
+
+        ensureUnpackedUint64IsMutable();
+        unpackedUint64_.setLong(index, value);
+        bitField1_ |= 0x02000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+       * @param value The unpackedUint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedUint64(long value) {
+
+        ensureUnpackedUint64IsMutable();
+        unpackedUint64_.addLong(value);
+        bitField1_ |= 0x02000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+       * @param values The unpackedUint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedUint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureUnpackedUint64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedUint64_);
+        bitField1_ |= 0x02000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedUint64() {
+        unpackedUint64_ = emptyLongList();
+        bitField1_ = (bitField1_ & ~0x02000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList unpackedSint32_ = emptyIntList();
+      private void ensureUnpackedSint32IsMutable() {
+        if (!unpackedSint32_.isModifiable()) {
+          unpackedSint32_ = makeMutableCopy(unpackedSint32_);
+        }
+        bitField1_ |= 0x04000000;
+      }
+      /**
+       * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+       * @return A list containing the unpackedSint32.
+       */
+      public java.util.List<java.lang.Integer>
+          getUnpackedSint32List() {
+        unpackedSint32_.makeImmutable();
+        return unpackedSint32_;
+      }
+      /**
+       * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+       * @return The count of unpackedSint32.
+       */
+      public int getUnpackedSint32Count() {
+        return unpackedSint32_.size();
+      }
+      /**
+       * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedSint32 at the given index.
+       */
+      public int getUnpackedSint32(int index) {
+        return unpackedSint32_.getInt(index);
+      }
+      /**
+       * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedSint32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedSint32(
+          int index, int value) {
+
+        ensureUnpackedSint32IsMutable();
+        unpackedSint32_.setInt(index, value);
+        bitField1_ |= 0x04000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+       * @param value The unpackedSint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedSint32(int value) {
+
+        ensureUnpackedSint32IsMutable();
+        unpackedSint32_.addInt(value);
+        bitField1_ |= 0x04000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+       * @param values The unpackedSint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedSint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureUnpackedSint32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedSint32_);
+        bitField1_ |= 0x04000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedSint32() {
+        unpackedSint32_ = emptyIntList();
+        bitField1_ = (bitField1_ & ~0x04000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList unpackedSint64_ = emptyLongList();
+      private void ensureUnpackedSint64IsMutable() {
+        if (!unpackedSint64_.isModifiable()) {
+          unpackedSint64_ = makeMutableCopy(unpackedSint64_);
+        }
+        bitField1_ |= 0x08000000;
+      }
+      /**
+       * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+       * @return A list containing the unpackedSint64.
+       */
+      public java.util.List<java.lang.Long>
+          getUnpackedSint64List() {
+        unpackedSint64_.makeImmutable();
+        return unpackedSint64_;
+      }
+      /**
+       * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+       * @return The count of unpackedSint64.
+       */
+      public int getUnpackedSint64Count() {
+        return unpackedSint64_.size();
+      }
+      /**
+       * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedSint64 at the given index.
+       */
+      public long getUnpackedSint64(int index) {
+        return unpackedSint64_.getLong(index);
+      }
+      /**
+       * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedSint64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedSint64(
+          int index, long value) {
+
+        ensureUnpackedSint64IsMutable();
+        unpackedSint64_.setLong(index, value);
+        bitField1_ |= 0x08000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+       * @param value The unpackedSint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedSint64(long value) {
+
+        ensureUnpackedSint64IsMutable();
+        unpackedSint64_.addLong(value);
+        bitField1_ |= 0x08000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+       * @param values The unpackedSint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedSint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureUnpackedSint64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedSint64_);
+        bitField1_ |= 0x08000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedSint64() {
+        unpackedSint64_ = emptyLongList();
+        bitField1_ = (bitField1_ & ~0x08000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList unpackedFixed32_ = emptyIntList();
+      private void ensureUnpackedFixed32IsMutable() {
+        if (!unpackedFixed32_.isModifiable()) {
+          unpackedFixed32_ = makeMutableCopy(unpackedFixed32_);
+        }
+        bitField1_ |= 0x10000000;
+      }
+      private void ensureUnpackedFixed32IsMutable(int capacity) {
+        if (!unpackedFixed32_.isModifiable()) {
+          unpackedFixed32_ = makeMutableCopy(unpackedFixed32_, capacity);
+        }
+        bitField1_ |= 0x10000000;
+      }
+      /**
+       * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+       * @return A list containing the unpackedFixed32.
+       */
+      public java.util.List<java.lang.Integer>
+          getUnpackedFixed32List() {
+        unpackedFixed32_.makeImmutable();
+        return unpackedFixed32_;
+      }
+      /**
+       * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+       * @return The count of unpackedFixed32.
+       */
+      public int getUnpackedFixed32Count() {
+        return unpackedFixed32_.size();
+      }
+      /**
+       * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedFixed32 at the given index.
+       */
+      public int getUnpackedFixed32(int index) {
+        return unpackedFixed32_.getInt(index);
+      }
+      /**
+       * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedFixed32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedFixed32(
+          int index, int value) {
+
+        ensureUnpackedFixed32IsMutable();
+        unpackedFixed32_.setInt(index, value);
+        bitField1_ |= 0x10000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+       * @param value The unpackedFixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedFixed32(int value) {
+
+        ensureUnpackedFixed32IsMutable();
+        unpackedFixed32_.addInt(value);
+        bitField1_ |= 0x10000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+       * @param values The unpackedFixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedFixed32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureUnpackedFixed32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedFixed32_);
+        bitField1_ |= 0x10000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedFixed32() {
+        unpackedFixed32_ = emptyIntList();
+        bitField1_ = (bitField1_ & ~0x10000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList unpackedFixed64_ = emptyLongList();
+      private void ensureUnpackedFixed64IsMutable() {
+        if (!unpackedFixed64_.isModifiable()) {
+          unpackedFixed64_ = makeMutableCopy(unpackedFixed64_);
+        }
+        bitField1_ |= 0x20000000;
+      }
+      private void ensureUnpackedFixed64IsMutable(int capacity) {
+        if (!unpackedFixed64_.isModifiable()) {
+          unpackedFixed64_ = makeMutableCopy(unpackedFixed64_, capacity);
+        }
+        bitField1_ |= 0x20000000;
+      }
+      /**
+       * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+       * @return A list containing the unpackedFixed64.
+       */
+      public java.util.List<java.lang.Long>
+          getUnpackedFixed64List() {
+        unpackedFixed64_.makeImmutable();
+        return unpackedFixed64_;
+      }
+      /**
+       * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+       * @return The count of unpackedFixed64.
+       */
+      public int getUnpackedFixed64Count() {
+        return unpackedFixed64_.size();
+      }
+      /**
+       * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedFixed64 at the given index.
+       */
+      public long getUnpackedFixed64(int index) {
+        return unpackedFixed64_.getLong(index);
+      }
+      /**
+       * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedFixed64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedFixed64(
+          int index, long value) {
+
+        ensureUnpackedFixed64IsMutable();
+        unpackedFixed64_.setLong(index, value);
+        bitField1_ |= 0x20000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+       * @param value The unpackedFixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedFixed64(long value) {
+
+        ensureUnpackedFixed64IsMutable();
+        unpackedFixed64_.addLong(value);
+        bitField1_ |= 0x20000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+       * @param values The unpackedFixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedFixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureUnpackedFixed64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedFixed64_);
+        bitField1_ |= 0x20000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedFixed64() {
+        unpackedFixed64_ = emptyLongList();
+        bitField1_ = (bitField1_ & ~0x20000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList unpackedSfixed32_ = emptyIntList();
+      private void ensureUnpackedSfixed32IsMutable() {
+        if (!unpackedSfixed32_.isModifiable()) {
+          unpackedSfixed32_ = makeMutableCopy(unpackedSfixed32_);
+        }
+        bitField1_ |= 0x40000000;
+      }
+      private void ensureUnpackedSfixed32IsMutable(int capacity) {
+        if (!unpackedSfixed32_.isModifiable()) {
+          unpackedSfixed32_ = makeMutableCopy(unpackedSfixed32_, capacity);
+        }
+        bitField1_ |= 0x40000000;
+      }
+      /**
+       * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+       * @return A list containing the unpackedSfixed32.
+       */
+      public java.util.List<java.lang.Integer>
+          getUnpackedSfixed32List() {
+        unpackedSfixed32_.makeImmutable();
+        return unpackedSfixed32_;
+      }
+      /**
+       * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+       * @return The count of unpackedSfixed32.
+       */
+      public int getUnpackedSfixed32Count() {
+        return unpackedSfixed32_.size();
+      }
+      /**
+       * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedSfixed32 at the given index.
+       */
+      public int getUnpackedSfixed32(int index) {
+        return unpackedSfixed32_.getInt(index);
+      }
+      /**
+       * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedSfixed32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedSfixed32(
+          int index, int value) {
+
+        ensureUnpackedSfixed32IsMutable();
+        unpackedSfixed32_.setInt(index, value);
+        bitField1_ |= 0x40000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+       * @param value The unpackedSfixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedSfixed32(int value) {
+
+        ensureUnpackedSfixed32IsMutable();
+        unpackedSfixed32_.addInt(value);
+        bitField1_ |= 0x40000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+       * @param values The unpackedSfixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedSfixed32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureUnpackedSfixed32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedSfixed32_);
+        bitField1_ |= 0x40000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedSfixed32() {
+        unpackedSfixed32_ = emptyIntList();
+        bitField1_ = (bitField1_ & ~0x40000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList unpackedSfixed64_ = emptyLongList();
+      private void ensureUnpackedSfixed64IsMutable() {
+        if (!unpackedSfixed64_.isModifiable()) {
+          unpackedSfixed64_ = makeMutableCopy(unpackedSfixed64_);
+        }
+        bitField1_ |= 0x80000000;
+      }
+      private void ensureUnpackedSfixed64IsMutable(int capacity) {
+        if (!unpackedSfixed64_.isModifiable()) {
+          unpackedSfixed64_ = makeMutableCopy(unpackedSfixed64_, capacity);
+        }
+        bitField1_ |= 0x80000000;
+      }
+      /**
+       * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+       * @return A list containing the unpackedSfixed64.
+       */
+      public java.util.List<java.lang.Long>
+          getUnpackedSfixed64List() {
+        unpackedSfixed64_.makeImmutable();
+        return unpackedSfixed64_;
+      }
+      /**
+       * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+       * @return The count of unpackedSfixed64.
+       */
+      public int getUnpackedSfixed64Count() {
+        return unpackedSfixed64_.size();
+      }
+      /**
+       * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedSfixed64 at the given index.
+       */
+      public long getUnpackedSfixed64(int index) {
+        return unpackedSfixed64_.getLong(index);
+      }
+      /**
+       * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedSfixed64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedSfixed64(
+          int index, long value) {
+
+        ensureUnpackedSfixed64IsMutable();
+        unpackedSfixed64_.setLong(index, value);
+        bitField1_ |= 0x80000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+       * @param value The unpackedSfixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedSfixed64(long value) {
+
+        ensureUnpackedSfixed64IsMutable();
+        unpackedSfixed64_.addLong(value);
+        bitField1_ |= 0x80000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+       * @param values The unpackedSfixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedSfixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureUnpackedSfixed64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedSfixed64_);
+        bitField1_ |= 0x80000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedSfixed64() {
+        unpackedSfixed64_ = emptyLongList();
+        bitField1_ = (bitField1_ & ~0x80000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.FloatList unpackedFloat_ = emptyFloatList();
+      private void ensureUnpackedFloatIsMutable() {
+        if (!unpackedFloat_.isModifiable()) {
+          unpackedFloat_ = makeMutableCopy(unpackedFloat_);
+        }
+        bitField2_ |= 0x00000001;
+      }
+      private void ensureUnpackedFloatIsMutable(int capacity) {
+        if (!unpackedFloat_.isModifiable()) {
+          unpackedFloat_ = makeMutableCopy(unpackedFloat_, capacity);
+        }
+        bitField2_ |= 0x00000001;
+      }
+      /**
+       * <code>repeated float unpacked_float = 99 [packed = false];</code>
+       * @return A list containing the unpackedFloat.
+       */
+      public java.util.List<java.lang.Float>
+          getUnpackedFloatList() {
+        unpackedFloat_.makeImmutable();
+        return unpackedFloat_;
+      }
+      /**
+       * <code>repeated float unpacked_float = 99 [packed = false];</code>
+       * @return The count of unpackedFloat.
+       */
+      public int getUnpackedFloatCount() {
+        return unpackedFloat_.size();
+      }
+      /**
+       * <code>repeated float unpacked_float = 99 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedFloat at the given index.
+       */
+      public float getUnpackedFloat(int index) {
+        return unpackedFloat_.getFloat(index);
+      }
+      /**
+       * <code>repeated float unpacked_float = 99 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedFloat to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedFloat(
+          int index, float value) {
+
+        ensureUnpackedFloatIsMutable();
+        unpackedFloat_.setFloat(index, value);
+        bitField2_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated float unpacked_float = 99 [packed = false];</code>
+       * @param value The unpackedFloat to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedFloat(float value) {
+
+        ensureUnpackedFloatIsMutable();
+        unpackedFloat_.addFloat(value);
+        bitField2_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated float unpacked_float = 99 [packed = false];</code>
+       * @param values The unpackedFloat to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedFloat(
+          java.lang.Iterable<? extends java.lang.Float> values) {
+        ensureUnpackedFloatIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedFloat_);
+        bitField2_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated float unpacked_float = 99 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedFloat() {
+        unpackedFloat_ = emptyFloatList();
+        bitField2_ = (bitField2_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.DoubleList unpackedDouble_ = emptyDoubleList();
+      private void ensureUnpackedDoubleIsMutable() {
+        if (!unpackedDouble_.isModifiable()) {
+          unpackedDouble_ = makeMutableCopy(unpackedDouble_);
+        }
+        bitField2_ |= 0x00000002;
+      }
+      private void ensureUnpackedDoubleIsMutable(int capacity) {
+        if (!unpackedDouble_.isModifiable()) {
+          unpackedDouble_ = makeMutableCopy(unpackedDouble_, capacity);
+        }
+        bitField2_ |= 0x00000002;
+      }
+      /**
+       * <code>repeated double unpacked_double = 100 [packed = false];</code>
+       * @return A list containing the unpackedDouble.
+       */
+      public java.util.List<java.lang.Double>
+          getUnpackedDoubleList() {
+        unpackedDouble_.makeImmutable();
+        return unpackedDouble_;
+      }
+      /**
+       * <code>repeated double unpacked_double = 100 [packed = false];</code>
+       * @return The count of unpackedDouble.
+       */
+      public int getUnpackedDoubleCount() {
+        return unpackedDouble_.size();
+      }
+      /**
+       * <code>repeated double unpacked_double = 100 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedDouble at the given index.
+       */
+      public double getUnpackedDouble(int index) {
+        return unpackedDouble_.getDouble(index);
+      }
+      /**
+       * <code>repeated double unpacked_double = 100 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedDouble to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedDouble(
+          int index, double value) {
+
+        ensureUnpackedDoubleIsMutable();
+        unpackedDouble_.setDouble(index, value);
+        bitField2_ |= 0x00000002;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated double unpacked_double = 100 [packed = false];</code>
+       * @param value The unpackedDouble to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedDouble(double value) {
+
+        ensureUnpackedDoubleIsMutable();
+        unpackedDouble_.addDouble(value);
+        bitField2_ |= 0x00000002;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated double unpacked_double = 100 [packed = false];</code>
+       * @param values The unpackedDouble to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedDouble(
+          java.lang.Iterable<? extends java.lang.Double> values) {
+        ensureUnpackedDoubleIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedDouble_);
+        bitField2_ |= 0x00000002;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated double unpacked_double = 100 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedDouble() {
+        unpackedDouble_ = emptyDoubleList();
+        bitField2_ = (bitField2_ & ~0x00000002);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.BooleanList unpackedBool_ = emptyBooleanList();
+      private void ensureUnpackedBoolIsMutable() {
+        if (!unpackedBool_.isModifiable()) {
+          unpackedBool_ = makeMutableCopy(unpackedBool_);
+        }
+        bitField2_ |= 0x00000004;
+      }
+      private void ensureUnpackedBoolIsMutable(int capacity) {
+        if (!unpackedBool_.isModifiable()) {
+          unpackedBool_ = makeMutableCopy(unpackedBool_, capacity);
+        }
+        bitField2_ |= 0x00000004;
+      }
+      /**
+       * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+       * @return A list containing the unpackedBool.
+       */
+      public java.util.List<java.lang.Boolean>
+          getUnpackedBoolList() {
+        unpackedBool_.makeImmutable();
+        return unpackedBool_;
+      }
+      /**
+       * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+       * @return The count of unpackedBool.
+       */
+      public int getUnpackedBoolCount() {
+        return unpackedBool_.size();
+      }
+      /**
+       * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedBool at the given index.
+       */
+      public boolean getUnpackedBool(int index) {
+        return unpackedBool_.getBoolean(index);
+      }
+      /**
+       * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedBool to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedBool(
+          int index, boolean value) {
+
+        ensureUnpackedBoolIsMutable();
+        unpackedBool_.setBoolean(index, value);
+        bitField2_ |= 0x00000004;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+       * @param value The unpackedBool to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedBool(boolean value) {
+
+        ensureUnpackedBoolIsMutable();
+        unpackedBool_.addBoolean(value);
+        bitField2_ |= 0x00000004;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+       * @param values The unpackedBool to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedBool(
+          java.lang.Iterable<? extends java.lang.Boolean> values) {
+        ensureUnpackedBoolIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedBool_);
+        bitField2_ |= 0x00000004;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedBool() {
+        unpackedBool_ = emptyBooleanList();
+        bitField2_ = (bitField2_ & ~0x00000004);
+        onChanged();
+        return this;
+      }
+
+      private java.util.List<java.lang.Integer> unpackedNestedEnum_ =
+        java.util.Collections.emptyList();
+      private void ensureUnpackedNestedEnumIsMutable() {
+        if (!((bitField2_ & 0x00000008) != 0)) {
+          unpackedNestedEnum_ = new java.util.ArrayList<java.lang.Integer>(unpackedNestedEnum_);
+          bitField2_ |= 0x00000008;
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+       * @return A list containing the unpackedNestedEnum.
+       */
+      public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> getUnpackedNestedEnumList() {
+        return new com.google.protobuf.Internal.ListAdapter<
+            java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>(unpackedNestedEnum_, unpackedNestedEnum_converter_);
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+       * @return The count of unpackedNestedEnum.
+       */
+      public int getUnpackedNestedEnumCount() {
+        return unpackedNestedEnum_.size();
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedNestedEnum at the given index.
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getUnpackedNestedEnum(int index) {
+        return unpackedNestedEnum_converter_.convert(unpackedNestedEnum_.get(index));
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedNestedEnum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedNestedEnum(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureUnpackedNestedEnumIsMutable();
+        unpackedNestedEnum_.set(index, value.getNumber());
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+       * @param value The unpackedNestedEnum to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedNestedEnum(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureUnpackedNestedEnumIsMutable();
+        unpackedNestedEnum_.add(value.getNumber());
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+       * @param values The unpackedNestedEnum to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedNestedEnum(
+          java.lang.Iterable<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> values) {
+        ensureUnpackedNestedEnumIsMutable();
+        for (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value : values) {
+          unpackedNestedEnum_.add(value.getNumber());
+        }
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedNestedEnum() {
+        unpackedNestedEnum_ = java.util.Collections.emptyList();
+        bitField2_ = (bitField2_ & ~0x00000008);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> mapInt32Int32_;
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+          internalGetMapInt32Int32() {
+        if (mapInt32Int32_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapInt32Int32DefaultEntryHolder.defaultEntry);
+        }
+        return mapInt32Int32_;
+      }
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+          internalGetMutableMapInt32Int32() {
+        if (mapInt32Int32_ == null) {
+          mapInt32Int32_ = com.google.protobuf.MapField.newMapField(
+              MapInt32Int32DefaultEntryHolder.defaultEntry);
+        }
+        if (!mapInt32Int32_.isMutable()) {
+          mapInt32Int32_ = mapInt32Int32_.copy();
+        }
+        bitField2_ |= 0x00000010;
+        onChanged();
+        return mapInt32Int32_;
+      }
+      public int getMapInt32Int32Count() {
+        return internalGetMapInt32Int32().getMap().size();
+      }
+      /**
+       * <pre>
+       * Map
+       * </pre>
+       *
+       * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapInt32Int32(
+          int key) {
+
+        return internalGetMapInt32Int32().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapInt32Int32Map()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32() {
+        return getMapInt32Int32Map();
+      }
+      /**
+       * <pre>
+       * Map
+       * </pre>
+       *
+       * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32Map() {
+        return internalGetMapInt32Int32().getMap();
+      }
+      /**
+       * <pre>
+       * Map
+       * </pre>
+       *
+       * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+       */
+      @java.lang.Override
+      public int getMapInt32Int32OrDefault(
+          int key,
+          int defaultValue) {
+
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetMapInt32Int32().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <pre>
+       * Map
+       * </pre>
+       *
+       * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+       */
+      @java.lang.Override
+      public int getMapInt32Int32OrThrow(
+          int key) {
+
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetMapInt32Int32().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapInt32Int32() {
+        bitField2_ = (bitField2_ & ~0x00000010);
+        internalGetMutableMapInt32Int32().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <pre>
+       * Map
+       * </pre>
+       *
+       * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+       */
+      public Builder removeMapInt32Int32(
+          int key) {
+
+        internalGetMutableMapInt32Int32().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+          getMutableMapInt32Int32() {
+        bitField2_ |= 0x00000010;
+        return internalGetMutableMapInt32Int32().getMutableMap();
+      }
+      /**
+       * <pre>
+       * Map
+       * </pre>
+       *
+       * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+       */
+      public Builder putMapInt32Int32(
+          int key,
+          int value) {
+
+
+        internalGetMutableMapInt32Int32().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00000010;
+        return this;
+      }
+      /**
+       * <pre>
+       * Map
+       * </pre>
+       *
+       * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+       */
+      public Builder putAllMapInt32Int32(
+          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
+        internalGetMutableMapInt32Int32().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00000010;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Long, java.lang.Long> mapInt64Int64_;
+      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+          internalGetMapInt64Int64() {
+        if (mapInt64Int64_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapInt64Int64DefaultEntryHolder.defaultEntry);
+        }
+        return mapInt64Int64_;
+      }
+      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+          internalGetMutableMapInt64Int64() {
+        if (mapInt64Int64_ == null) {
+          mapInt64Int64_ = com.google.protobuf.MapField.newMapField(
+              MapInt64Int64DefaultEntryHolder.defaultEntry);
+        }
+        if (!mapInt64Int64_.isMutable()) {
+          mapInt64Int64_ = mapInt64Int64_.copy();
+        }
+        bitField2_ |= 0x00000020;
+        onChanged();
+        return mapInt64Int64_;
+      }
+      public int getMapInt64Int64Count() {
+        return internalGetMapInt64Int64().getMap().size();
+      }
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapInt64Int64(
+          long key) {
+
+        return internalGetMapInt64Int64().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapInt64Int64Map()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Long, java.lang.Long> getMapInt64Int64() {
+        return getMapInt64Int64Map();
+      }
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Long, java.lang.Long> getMapInt64Int64Map() {
+        return internalGetMapInt64Int64().getMap();
+      }
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
+      @java.lang.Override
+      public long getMapInt64Int64OrDefault(
+          long key,
+          long defaultValue) {
+
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapInt64Int64().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
+      @java.lang.Override
+      public long getMapInt64Int64OrThrow(
+          long key) {
+
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapInt64Int64().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapInt64Int64() {
+        bitField2_ = (bitField2_ & ~0x00000020);
+        internalGetMutableMapInt64Int64().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
+      public Builder removeMapInt64Int64(
+          long key) {
+
+        internalGetMutableMapInt64Int64().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Long, java.lang.Long>
+          getMutableMapInt64Int64() {
+        bitField2_ |= 0x00000020;
+        return internalGetMutableMapInt64Int64().getMutableMap();
+      }
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
+      public Builder putMapInt64Int64(
+          long key,
+          long value) {
+
+
+        internalGetMutableMapInt64Int64().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00000020;
+        return this;
+      }
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
+      public Builder putAllMapInt64Int64(
+          java.util.Map<java.lang.Long, java.lang.Long> values) {
+        internalGetMutableMapInt64Int64().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00000020;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> mapUint32Uint32_;
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+          internalGetMapUint32Uint32() {
+        if (mapUint32Uint32_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapUint32Uint32DefaultEntryHolder.defaultEntry);
+        }
+        return mapUint32Uint32_;
+      }
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+          internalGetMutableMapUint32Uint32() {
+        if (mapUint32Uint32_ == null) {
+          mapUint32Uint32_ = com.google.protobuf.MapField.newMapField(
+              MapUint32Uint32DefaultEntryHolder.defaultEntry);
+        }
+        if (!mapUint32Uint32_.isMutable()) {
+          mapUint32Uint32_ = mapUint32Uint32_.copy();
+        }
+        bitField2_ |= 0x00000040;
+        onChanged();
+        return mapUint32Uint32_;
+      }
+      public int getMapUint32Uint32Count() {
+        return internalGetMapUint32Uint32().getMap().size();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapUint32Uint32(
+          int key) {
+
+        return internalGetMapUint32Uint32().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapUint32Uint32Map()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getMapUint32Uint32() {
+        return getMapUint32Uint32Map();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getMapUint32Uint32Map() {
+        return internalGetMapUint32Uint32().getMap();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
+      @java.lang.Override
+      public int getMapUint32Uint32OrDefault(
+          int key,
+          int defaultValue) {
+
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetMapUint32Uint32().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
+      @java.lang.Override
+      public int getMapUint32Uint32OrThrow(
+          int key) {
+
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetMapUint32Uint32().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapUint32Uint32() {
+        bitField2_ = (bitField2_ & ~0x00000040);
+        internalGetMutableMapUint32Uint32().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
+      public Builder removeMapUint32Uint32(
+          int key) {
+
+        internalGetMutableMapUint32Uint32().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+          getMutableMapUint32Uint32() {
+        bitField2_ |= 0x00000040;
+        return internalGetMutableMapUint32Uint32().getMutableMap();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
+      public Builder putMapUint32Uint32(
+          int key,
+          int value) {
+
+
+        internalGetMutableMapUint32Uint32().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00000040;
+        return this;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
+      public Builder putAllMapUint32Uint32(
+          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
+        internalGetMutableMapUint32Uint32().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00000040;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Long, java.lang.Long> mapUint64Uint64_;
+      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+          internalGetMapUint64Uint64() {
+        if (mapUint64Uint64_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapUint64Uint64DefaultEntryHolder.defaultEntry);
+        }
+        return mapUint64Uint64_;
+      }
+      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+          internalGetMutableMapUint64Uint64() {
+        if (mapUint64Uint64_ == null) {
+          mapUint64Uint64_ = com.google.protobuf.MapField.newMapField(
+              MapUint64Uint64DefaultEntryHolder.defaultEntry);
+        }
+        if (!mapUint64Uint64_.isMutable()) {
+          mapUint64Uint64_ = mapUint64Uint64_.copy();
+        }
+        bitField2_ |= 0x00000080;
+        onChanged();
+        return mapUint64Uint64_;
+      }
+      public int getMapUint64Uint64Count() {
+        return internalGetMapUint64Uint64().getMap().size();
+      }
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapUint64Uint64(
+          long key) {
+
+        return internalGetMapUint64Uint64().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapUint64Uint64Map()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Long, java.lang.Long> getMapUint64Uint64() {
+        return getMapUint64Uint64Map();
+      }
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Long, java.lang.Long> getMapUint64Uint64Map() {
+        return internalGetMapUint64Uint64().getMap();
+      }
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
+      @java.lang.Override
+      public long getMapUint64Uint64OrDefault(
+          long key,
+          long defaultValue) {
+
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapUint64Uint64().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
+      @java.lang.Override
+      public long getMapUint64Uint64OrThrow(
+          long key) {
+
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapUint64Uint64().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapUint64Uint64() {
+        bitField2_ = (bitField2_ & ~0x00000080);
+        internalGetMutableMapUint64Uint64().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
+      public Builder removeMapUint64Uint64(
+          long key) {
+
+        internalGetMutableMapUint64Uint64().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Long, java.lang.Long>
+          getMutableMapUint64Uint64() {
+        bitField2_ |= 0x00000080;
+        return internalGetMutableMapUint64Uint64().getMutableMap();
+      }
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
+      public Builder putMapUint64Uint64(
+          long key,
+          long value) {
+
+
+        internalGetMutableMapUint64Uint64().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00000080;
+        return this;
+      }
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
+      public Builder putAllMapUint64Uint64(
+          java.util.Map<java.lang.Long, java.lang.Long> values) {
+        internalGetMutableMapUint64Uint64().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00000080;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> mapSint32Sint32_;
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+          internalGetMapSint32Sint32() {
+        if (mapSint32Sint32_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapSint32Sint32DefaultEntryHolder.defaultEntry);
+        }
+        return mapSint32Sint32_;
+      }
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+          internalGetMutableMapSint32Sint32() {
+        if (mapSint32Sint32_ == null) {
+          mapSint32Sint32_ = com.google.protobuf.MapField.newMapField(
+              MapSint32Sint32DefaultEntryHolder.defaultEntry);
+        }
+        if (!mapSint32Sint32_.isMutable()) {
+          mapSint32Sint32_ = mapSint32Sint32_.copy();
+        }
+        bitField2_ |= 0x00000100;
+        onChanged();
+        return mapSint32Sint32_;
+      }
+      public int getMapSint32Sint32Count() {
+        return internalGetMapSint32Sint32().getMap().size();
+      }
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapSint32Sint32(
+          int key) {
+
+        return internalGetMapSint32Sint32().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapSint32Sint32Map()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSint32Sint32() {
+        return getMapSint32Sint32Map();
+      }
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSint32Sint32Map() {
+        return internalGetMapSint32Sint32().getMap();
+      }
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
+      @java.lang.Override
+      public int getMapSint32Sint32OrDefault(
+          int key,
+          int defaultValue) {
+
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetMapSint32Sint32().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
+      @java.lang.Override
+      public int getMapSint32Sint32OrThrow(
+          int key) {
+
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetMapSint32Sint32().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapSint32Sint32() {
+        bitField2_ = (bitField2_ & ~0x00000100);
+        internalGetMutableMapSint32Sint32().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
+      public Builder removeMapSint32Sint32(
+          int key) {
+
+        internalGetMutableMapSint32Sint32().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+          getMutableMapSint32Sint32() {
+        bitField2_ |= 0x00000100;
+        return internalGetMutableMapSint32Sint32().getMutableMap();
+      }
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
+      public Builder putMapSint32Sint32(
+          int key,
+          int value) {
+
+
+        internalGetMutableMapSint32Sint32().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00000100;
+        return this;
+      }
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
+      public Builder putAllMapSint32Sint32(
+          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
+        internalGetMutableMapSint32Sint32().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00000100;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Long, java.lang.Long> mapSint64Sint64_;
+      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+          internalGetMapSint64Sint64() {
+        if (mapSint64Sint64_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapSint64Sint64DefaultEntryHolder.defaultEntry);
+        }
+        return mapSint64Sint64_;
+      }
+      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+          internalGetMutableMapSint64Sint64() {
+        if (mapSint64Sint64_ == null) {
+          mapSint64Sint64_ = com.google.protobuf.MapField.newMapField(
+              MapSint64Sint64DefaultEntryHolder.defaultEntry);
+        }
+        if (!mapSint64Sint64_.isMutable()) {
+          mapSint64Sint64_ = mapSint64Sint64_.copy();
+        }
+        bitField2_ |= 0x00000200;
+        onChanged();
+        return mapSint64Sint64_;
+      }
+      public int getMapSint64Sint64Count() {
+        return internalGetMapSint64Sint64().getMap().size();
+      }
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapSint64Sint64(
+          long key) {
+
+        return internalGetMapSint64Sint64().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapSint64Sint64Map()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Long, java.lang.Long> getMapSint64Sint64() {
+        return getMapSint64Sint64Map();
+      }
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Long, java.lang.Long> getMapSint64Sint64Map() {
+        return internalGetMapSint64Sint64().getMap();
+      }
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
+      @java.lang.Override
+      public long getMapSint64Sint64OrDefault(
+          long key,
+          long defaultValue) {
+
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapSint64Sint64().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
+      @java.lang.Override
+      public long getMapSint64Sint64OrThrow(
+          long key) {
+
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapSint64Sint64().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapSint64Sint64() {
+        bitField2_ = (bitField2_ & ~0x00000200);
+        internalGetMutableMapSint64Sint64().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
+      public Builder removeMapSint64Sint64(
+          long key) {
+
+        internalGetMutableMapSint64Sint64().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Long, java.lang.Long>
+          getMutableMapSint64Sint64() {
+        bitField2_ |= 0x00000200;
+        return internalGetMutableMapSint64Sint64().getMutableMap();
+      }
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
+      public Builder putMapSint64Sint64(
+          long key,
+          long value) {
+
+
+        internalGetMutableMapSint64Sint64().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00000200;
+        return this;
+      }
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
+      public Builder putAllMapSint64Sint64(
+          java.util.Map<java.lang.Long, java.lang.Long> values) {
+        internalGetMutableMapSint64Sint64().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00000200;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> mapFixed32Fixed32_;
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+          internalGetMapFixed32Fixed32() {
+        if (mapFixed32Fixed32_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapFixed32Fixed32DefaultEntryHolder.defaultEntry);
+        }
+        return mapFixed32Fixed32_;
+      }
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+          internalGetMutableMapFixed32Fixed32() {
+        if (mapFixed32Fixed32_ == null) {
+          mapFixed32Fixed32_ = com.google.protobuf.MapField.newMapField(
+              MapFixed32Fixed32DefaultEntryHolder.defaultEntry);
+        }
+        if (!mapFixed32Fixed32_.isMutable()) {
+          mapFixed32Fixed32_ = mapFixed32Fixed32_.copy();
+        }
+        bitField2_ |= 0x00000400;
+        onChanged();
+        return mapFixed32Fixed32_;
+      }
+      public int getMapFixed32Fixed32Count() {
+        return internalGetMapFixed32Fixed32().getMap().size();
+      }
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapFixed32Fixed32(
+          int key) {
+
+        return internalGetMapFixed32Fixed32().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapFixed32Fixed32Map()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getMapFixed32Fixed32() {
+        return getMapFixed32Fixed32Map();
+      }
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getMapFixed32Fixed32Map() {
+        return internalGetMapFixed32Fixed32().getMap();
+      }
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
+      @java.lang.Override
+      public int getMapFixed32Fixed32OrDefault(
+          int key,
+          int defaultValue) {
+
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetMapFixed32Fixed32().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
+      @java.lang.Override
+      public int getMapFixed32Fixed32OrThrow(
+          int key) {
+
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetMapFixed32Fixed32().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapFixed32Fixed32() {
+        bitField2_ = (bitField2_ & ~0x00000400);
+        internalGetMutableMapFixed32Fixed32().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
+      public Builder removeMapFixed32Fixed32(
+          int key) {
+
+        internalGetMutableMapFixed32Fixed32().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+          getMutableMapFixed32Fixed32() {
+        bitField2_ |= 0x00000400;
+        return internalGetMutableMapFixed32Fixed32().getMutableMap();
+      }
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
+      public Builder putMapFixed32Fixed32(
+          int key,
+          int value) {
+
+
+        internalGetMutableMapFixed32Fixed32().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00000400;
+        return this;
+      }
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
+      public Builder putAllMapFixed32Fixed32(
+          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
+        internalGetMutableMapFixed32Fixed32().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00000400;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Long, java.lang.Long> mapFixed64Fixed64_;
+      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+          internalGetMapFixed64Fixed64() {
+        if (mapFixed64Fixed64_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapFixed64Fixed64DefaultEntryHolder.defaultEntry);
+        }
+        return mapFixed64Fixed64_;
+      }
+      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+          internalGetMutableMapFixed64Fixed64() {
+        if (mapFixed64Fixed64_ == null) {
+          mapFixed64Fixed64_ = com.google.protobuf.MapField.newMapField(
+              MapFixed64Fixed64DefaultEntryHolder.defaultEntry);
+        }
+        if (!mapFixed64Fixed64_.isMutable()) {
+          mapFixed64Fixed64_ = mapFixed64Fixed64_.copy();
+        }
+        bitField2_ |= 0x00000800;
+        onChanged();
+        return mapFixed64Fixed64_;
+      }
+      public int getMapFixed64Fixed64Count() {
+        return internalGetMapFixed64Fixed64().getMap().size();
+      }
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapFixed64Fixed64(
+          long key) {
+
+        return internalGetMapFixed64Fixed64().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapFixed64Fixed64Map()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Long, java.lang.Long> getMapFixed64Fixed64() {
+        return getMapFixed64Fixed64Map();
+      }
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Long, java.lang.Long> getMapFixed64Fixed64Map() {
+        return internalGetMapFixed64Fixed64().getMap();
+      }
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
+      @java.lang.Override
+      public long getMapFixed64Fixed64OrDefault(
+          long key,
+          long defaultValue) {
+
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapFixed64Fixed64().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
+      @java.lang.Override
+      public long getMapFixed64Fixed64OrThrow(
+          long key) {
+
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapFixed64Fixed64().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapFixed64Fixed64() {
+        bitField2_ = (bitField2_ & ~0x00000800);
+        internalGetMutableMapFixed64Fixed64().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
+      public Builder removeMapFixed64Fixed64(
+          long key) {
+
+        internalGetMutableMapFixed64Fixed64().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Long, java.lang.Long>
+          getMutableMapFixed64Fixed64() {
+        bitField2_ |= 0x00000800;
+        return internalGetMutableMapFixed64Fixed64().getMutableMap();
+      }
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
+      public Builder putMapFixed64Fixed64(
+          long key,
+          long value) {
+
+
+        internalGetMutableMapFixed64Fixed64().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00000800;
+        return this;
+      }
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
+      public Builder putAllMapFixed64Fixed64(
+          java.util.Map<java.lang.Long, java.lang.Long> values) {
+        internalGetMutableMapFixed64Fixed64().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00000800;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> mapSfixed32Sfixed32_;
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+          internalGetMapSfixed32Sfixed32() {
+        if (mapSfixed32Sfixed32_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry);
+        }
+        return mapSfixed32Sfixed32_;
+      }
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+          internalGetMutableMapSfixed32Sfixed32() {
+        if (mapSfixed32Sfixed32_ == null) {
+          mapSfixed32Sfixed32_ = com.google.protobuf.MapField.newMapField(
+              MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry);
+        }
+        if (!mapSfixed32Sfixed32_.isMutable()) {
+          mapSfixed32Sfixed32_ = mapSfixed32Sfixed32_.copy();
+        }
+        bitField2_ |= 0x00001000;
+        onChanged();
+        return mapSfixed32Sfixed32_;
+      }
+      public int getMapSfixed32Sfixed32Count() {
+        return internalGetMapSfixed32Sfixed32().getMap().size();
+      }
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapSfixed32Sfixed32(
+          int key) {
+
+        return internalGetMapSfixed32Sfixed32().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapSfixed32Sfixed32Map()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSfixed32Sfixed32() {
+        return getMapSfixed32Sfixed32Map();
+      }
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSfixed32Sfixed32Map() {
+        return internalGetMapSfixed32Sfixed32().getMap();
+      }
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
+      @java.lang.Override
+      public int getMapSfixed32Sfixed32OrDefault(
+          int key,
+          int defaultValue) {
+
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetMapSfixed32Sfixed32().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
+      @java.lang.Override
+      public int getMapSfixed32Sfixed32OrThrow(
+          int key) {
+
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetMapSfixed32Sfixed32().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapSfixed32Sfixed32() {
+        bitField2_ = (bitField2_ & ~0x00001000);
+        internalGetMutableMapSfixed32Sfixed32().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
+      public Builder removeMapSfixed32Sfixed32(
+          int key) {
+
+        internalGetMutableMapSfixed32Sfixed32().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+          getMutableMapSfixed32Sfixed32() {
+        bitField2_ |= 0x00001000;
+        return internalGetMutableMapSfixed32Sfixed32().getMutableMap();
+      }
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
+      public Builder putMapSfixed32Sfixed32(
+          int key,
+          int value) {
+
+
+        internalGetMutableMapSfixed32Sfixed32().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00001000;
+        return this;
+      }
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
+      public Builder putAllMapSfixed32Sfixed32(
+          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
+        internalGetMutableMapSfixed32Sfixed32().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00001000;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Long, java.lang.Long> mapSfixed64Sfixed64_;
+      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+          internalGetMapSfixed64Sfixed64() {
+        if (mapSfixed64Sfixed64_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry);
+        }
+        return mapSfixed64Sfixed64_;
+      }
+      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+          internalGetMutableMapSfixed64Sfixed64() {
+        if (mapSfixed64Sfixed64_ == null) {
+          mapSfixed64Sfixed64_ = com.google.protobuf.MapField.newMapField(
+              MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry);
+        }
+        if (!mapSfixed64Sfixed64_.isMutable()) {
+          mapSfixed64Sfixed64_ = mapSfixed64Sfixed64_.copy();
+        }
+        bitField2_ |= 0x00002000;
+        onChanged();
+        return mapSfixed64Sfixed64_;
+      }
+      public int getMapSfixed64Sfixed64Count() {
+        return internalGetMapSfixed64Sfixed64().getMap().size();
+      }
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapSfixed64Sfixed64(
+          long key) {
+
+        return internalGetMapSfixed64Sfixed64().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapSfixed64Sfixed64Map()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Long, java.lang.Long> getMapSfixed64Sfixed64() {
+        return getMapSfixed64Sfixed64Map();
+      }
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Long, java.lang.Long> getMapSfixed64Sfixed64Map() {
+        return internalGetMapSfixed64Sfixed64().getMap();
+      }
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
+      @java.lang.Override
+      public long getMapSfixed64Sfixed64OrDefault(
+          long key,
+          long defaultValue) {
+
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapSfixed64Sfixed64().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
+      @java.lang.Override
+      public long getMapSfixed64Sfixed64OrThrow(
+          long key) {
+
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapSfixed64Sfixed64().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapSfixed64Sfixed64() {
+        bitField2_ = (bitField2_ & ~0x00002000);
+        internalGetMutableMapSfixed64Sfixed64().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
+      public Builder removeMapSfixed64Sfixed64(
+          long key) {
+
+        internalGetMutableMapSfixed64Sfixed64().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Long, java.lang.Long>
+          getMutableMapSfixed64Sfixed64() {
+        bitField2_ |= 0x00002000;
+        return internalGetMutableMapSfixed64Sfixed64().getMutableMap();
+      }
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
+      public Builder putMapSfixed64Sfixed64(
+          long key,
+          long value) {
+
+
+        internalGetMutableMapSfixed64Sfixed64().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00002000;
+        return this;
+      }
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
+      public Builder putAllMapSfixed64Sfixed64(
+          java.util.Map<java.lang.Long, java.lang.Long> values) {
+        internalGetMutableMapSfixed64Sfixed64().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00002000;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Float> mapInt32Float_;
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float>
+          internalGetMapInt32Float() {
+        if (mapInt32Float_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapInt32FloatDefaultEntryHolder.defaultEntry);
+        }
+        return mapInt32Float_;
+      }
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float>
+          internalGetMutableMapInt32Float() {
+        if (mapInt32Float_ == null) {
+          mapInt32Float_ = com.google.protobuf.MapField.newMapField(
+              MapInt32FloatDefaultEntryHolder.defaultEntry);
+        }
+        if (!mapInt32Float_.isMutable()) {
+          mapInt32Float_ = mapInt32Float_.copy();
+        }
+        bitField2_ |= 0x00004000;
+        onChanged();
+        return mapInt32Float_;
+      }
+      public int getMapInt32FloatCount() {
+        return internalGetMapInt32Float().getMap().size();
+      }
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapInt32Float(
+          int key) {
+
+        return internalGetMapInt32Float().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapInt32FloatMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Float> getMapInt32Float() {
+        return getMapInt32FloatMap();
+      }
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Integer, java.lang.Float> getMapInt32FloatMap() {
+        return internalGetMapInt32Float().getMap();
+      }
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
+      @java.lang.Override
+      public float getMapInt32FloatOrDefault(
+          int key,
+          float defaultValue) {
+
+        java.util.Map<java.lang.Integer, java.lang.Float> map =
+            internalGetMapInt32Float().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
+      @java.lang.Override
+      public float getMapInt32FloatOrThrow(
+          int key) {
+
+        java.util.Map<java.lang.Integer, java.lang.Float> map =
+            internalGetMapInt32Float().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapInt32Float() {
+        bitField2_ = (bitField2_ & ~0x00004000);
+        internalGetMutableMapInt32Float().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
+      public Builder removeMapInt32Float(
+          int key) {
+
+        internalGetMutableMapInt32Float().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Float>
+          getMutableMapInt32Float() {
+        bitField2_ |= 0x00004000;
+        return internalGetMutableMapInt32Float().getMutableMap();
+      }
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
+      public Builder putMapInt32Float(
+          int key,
+          float value) {
+
+
+        internalGetMutableMapInt32Float().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00004000;
+        return this;
+      }
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
+      public Builder putAllMapInt32Float(
+          java.util.Map<java.lang.Integer, java.lang.Float> values) {
+        internalGetMutableMapInt32Float().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00004000;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Double> mapInt32Double_;
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Double>
+          internalGetMapInt32Double() {
+        if (mapInt32Double_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapInt32DoubleDefaultEntryHolder.defaultEntry);
+        }
+        return mapInt32Double_;
+      }
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Double>
+          internalGetMutableMapInt32Double() {
+        if (mapInt32Double_ == null) {
+          mapInt32Double_ = com.google.protobuf.MapField.newMapField(
+              MapInt32DoubleDefaultEntryHolder.defaultEntry);
+        }
+        if (!mapInt32Double_.isMutable()) {
+          mapInt32Double_ = mapInt32Double_.copy();
+        }
+        bitField2_ |= 0x00008000;
+        onChanged();
+        return mapInt32Double_;
+      }
+      public int getMapInt32DoubleCount() {
+        return internalGetMapInt32Double().getMap().size();
+      }
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapInt32Double(
+          int key) {
+
+        return internalGetMapInt32Double().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapInt32DoubleMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Double> getMapInt32Double() {
+        return getMapInt32DoubleMap();
+      }
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Integer, java.lang.Double> getMapInt32DoubleMap() {
+        return internalGetMapInt32Double().getMap();
+      }
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
+      @java.lang.Override
+      public double getMapInt32DoubleOrDefault(
+          int key,
+          double defaultValue) {
+
+        java.util.Map<java.lang.Integer, java.lang.Double> map =
+            internalGetMapInt32Double().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
+      @java.lang.Override
+      public double getMapInt32DoubleOrThrow(
+          int key) {
+
+        java.util.Map<java.lang.Integer, java.lang.Double> map =
+            internalGetMapInt32Double().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapInt32Double() {
+        bitField2_ = (bitField2_ & ~0x00008000);
+        internalGetMutableMapInt32Double().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
+      public Builder removeMapInt32Double(
+          int key) {
+
+        internalGetMutableMapInt32Double().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Double>
+          getMutableMapInt32Double() {
+        bitField2_ |= 0x00008000;
+        return internalGetMutableMapInt32Double().getMutableMap();
+      }
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
+      public Builder putMapInt32Double(
+          int key,
+          double value) {
+
+
+        internalGetMutableMapInt32Double().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00008000;
+        return this;
+      }
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
+      public Builder putAllMapInt32Double(
+          java.util.Map<java.lang.Integer, java.lang.Double> values) {
+        internalGetMutableMapInt32Double().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00008000;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Boolean, java.lang.Boolean> mapBoolBool_;
+      private com.google.protobuf.MapField<java.lang.Boolean, java.lang.Boolean>
+          internalGetMapBoolBool() {
+        if (mapBoolBool_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapBoolBoolDefaultEntryHolder.defaultEntry);
+        }
+        return mapBoolBool_;
+      }
+      private com.google.protobuf.MapField<java.lang.Boolean, java.lang.Boolean>
+          internalGetMutableMapBoolBool() {
+        if (mapBoolBool_ == null) {
+          mapBoolBool_ = com.google.protobuf.MapField.newMapField(
+              MapBoolBoolDefaultEntryHolder.defaultEntry);
+        }
+        if (!mapBoolBool_.isMutable()) {
+          mapBoolBool_ = mapBoolBool_.copy();
+        }
+        bitField2_ |= 0x00010000;
+        onChanged();
+        return mapBoolBool_;
+      }
+      public int getMapBoolBoolCount() {
+        return internalGetMapBoolBool().getMap().size();
+      }
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapBoolBool(
+          boolean key) {
+
+        return internalGetMapBoolBool().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapBoolBoolMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Boolean, java.lang.Boolean> getMapBoolBool() {
+        return getMapBoolBoolMap();
+      }
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Boolean, java.lang.Boolean> getMapBoolBoolMap() {
+        return internalGetMapBoolBool().getMap();
+      }
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
+      @java.lang.Override
+      public boolean getMapBoolBoolOrDefault(
+          boolean key,
+          boolean defaultValue) {
+
+        java.util.Map<java.lang.Boolean, java.lang.Boolean> map =
+            internalGetMapBoolBool().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
+      @java.lang.Override
+      public boolean getMapBoolBoolOrThrow(
+          boolean key) {
+
+        java.util.Map<java.lang.Boolean, java.lang.Boolean> map =
+            internalGetMapBoolBool().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapBoolBool() {
+        bitField2_ = (bitField2_ & ~0x00010000);
+        internalGetMutableMapBoolBool().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
+      public Builder removeMapBoolBool(
+          boolean key) {
+
+        internalGetMutableMapBoolBool().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Boolean, java.lang.Boolean>
+          getMutableMapBoolBool() {
+        bitField2_ |= 0x00010000;
+        return internalGetMutableMapBoolBool().getMutableMap();
+      }
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
+      public Builder putMapBoolBool(
+          boolean key,
+          boolean value) {
+
+
+        internalGetMutableMapBoolBool().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00010000;
+        return this;
+      }
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
+      public Builder putAllMapBoolBool(
+          java.util.Map<java.lang.Boolean, java.lang.Boolean> values) {
+        internalGetMutableMapBoolBool().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00010000;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.String, java.lang.String> mapStringString_;
+      private com.google.protobuf.MapField<java.lang.String, java.lang.String>
+          internalGetMapStringString() {
+        if (mapStringString_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapStringStringDefaultEntryHolder.defaultEntry);
+        }
+        return mapStringString_;
+      }
+      private com.google.protobuf.MapField<java.lang.String, java.lang.String>
+          internalGetMutableMapStringString() {
+        if (mapStringString_ == null) {
+          mapStringString_ = com.google.protobuf.MapField.newMapField(
+              MapStringStringDefaultEntryHolder.defaultEntry);
+        }
+        if (!mapStringString_.isMutable()) {
+          mapStringString_ = mapStringString_.copy();
+        }
+        bitField2_ |= 0x00020000;
+        onChanged();
+        return mapStringString_;
+      }
+      public int getMapStringStringCount() {
+        return internalGetMapStringString().getMap().size();
+      }
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapStringString(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        return internalGetMapStringString().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapStringStringMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, java.lang.String> getMapStringString() {
+        return getMapStringStringMap();
+      }
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.String, java.lang.String> getMapStringStringMap() {
+        return internalGetMapStringString().getMap();
+      }
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
+      @java.lang.Override
+      public /* nullable */
+java.lang.String getMapStringStringOrDefault(
+          java.lang.String key,
+          /* nullable */
+java.lang.String defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, java.lang.String> map =
+            internalGetMapStringString().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
+      @java.lang.Override
+      public java.lang.String getMapStringStringOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, java.lang.String> map =
+            internalGetMapStringString().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapStringString() {
+        bitField2_ = (bitField2_ & ~0x00020000);
+        internalGetMutableMapStringString().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
+      public Builder removeMapStringString(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringString().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, java.lang.String>
+          getMutableMapStringString() {
+        bitField2_ |= 0x00020000;
+        return internalGetMutableMapStringString().getMutableMap();
+      }
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
+      public Builder putMapStringString(
+          java.lang.String key,
+          java.lang.String value) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        if (value == null) { throw new NullPointerException("map value"); }
+        internalGetMutableMapStringString().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00020000;
+        return this;
+      }
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
+      public Builder putAllMapStringString(
+          java.util.Map<java.lang.String, java.lang.String> values) {
+        internalGetMutableMapStringString().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00020000;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.String, com.google.protobuf.ByteString> mapStringBytes_;
+      private com.google.protobuf.MapField<java.lang.String, com.google.protobuf.ByteString>
+          internalGetMapStringBytes() {
+        if (mapStringBytes_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapStringBytesDefaultEntryHolder.defaultEntry);
+        }
+        return mapStringBytes_;
+      }
+      private com.google.protobuf.MapField<java.lang.String, com.google.protobuf.ByteString>
+          internalGetMutableMapStringBytes() {
+        if (mapStringBytes_ == null) {
+          mapStringBytes_ = com.google.protobuf.MapField.newMapField(
+              MapStringBytesDefaultEntryHolder.defaultEntry);
+        }
+        if (!mapStringBytes_.isMutable()) {
+          mapStringBytes_ = mapStringBytes_.copy();
+        }
+        bitField2_ |= 0x00040000;
+        onChanged();
+        return mapStringBytes_;
+      }
+      public int getMapStringBytesCount() {
+        return internalGetMapStringBytes().getMap().size();
+      }
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapStringBytes(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        return internalGetMapStringBytes().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapStringBytesMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, com.google.protobuf.ByteString> getMapStringBytes() {
+        return getMapStringBytesMap();
+      }
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.String, com.google.protobuf.ByteString> getMapStringBytesMap() {
+        return internalGetMapStringBytes().getMap();
+      }
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
+      @java.lang.Override
+      public /* nullable */
+com.google.protobuf.ByteString getMapStringBytesOrDefault(
+          java.lang.String key,
+          /* nullable */
+com.google.protobuf.ByteString defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, com.google.protobuf.ByteString> map =
+            internalGetMapStringBytes().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
+      @java.lang.Override
+      public com.google.protobuf.ByteString getMapStringBytesOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, com.google.protobuf.ByteString> map =
+            internalGetMapStringBytes().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapStringBytes() {
+        bitField2_ = (bitField2_ & ~0x00040000);
+        internalGetMutableMapStringBytes().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
+      public Builder removeMapStringBytes(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringBytes().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, com.google.protobuf.ByteString>
+          getMutableMapStringBytes() {
+        bitField2_ |= 0x00040000;
+        return internalGetMutableMapStringBytes().getMutableMap();
+      }
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
+      public Builder putMapStringBytes(
+          java.lang.String key,
+          com.google.protobuf.ByteString value) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        if (value == null) { throw new NullPointerException("map value"); }
+        internalGetMutableMapStringBytes().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00040000;
+        return this;
+      }
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
+      public Builder putAllMapStringBytes(
+          java.util.Map<java.lang.String, com.google.protobuf.ByteString> values) {
+        internalGetMutableMapStringBytes().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00040000;
+        return this;
+      }
+
+      private static final class MapStringNestedMessageConverter implements com.google.protobuf.MapFieldBuilder.Converter<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> {
+        @java.lang.Override
+        public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage build(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder val) {
+          if (val instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) { return (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) val; }
+          return ((legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder) val).build();
+        }
+
+        @java.lang.Override
+        public com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> defaultEntry() {
+          return MapStringNestedMessageDefaultEntryHolder.defaultEntry;
+        }
+      };
+      private static final MapStringNestedMessageConverter mapStringNestedMessageConverter = new MapStringNestedMessageConverter();
+
+      private com.google.protobuf.MapFieldBuilder<
+          java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder> mapStringNestedMessage_;
+      private com.google.protobuf.MapFieldBuilder<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder>
+          internalGetMapStringNestedMessage() {
+        if (mapStringNestedMessage_ == null) {
+          return new com.google.protobuf.MapFieldBuilder<>(mapStringNestedMessageConverter);
+        }
+        return mapStringNestedMessage_;
+      }
+      private com.google.protobuf.MapFieldBuilder<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder>
+          internalGetMutableMapStringNestedMessage() {
+        if (mapStringNestedMessage_ == null) {
+          mapStringNestedMessage_ = new com.google.protobuf.MapFieldBuilder<>(mapStringNestedMessageConverter);
+        }
+        bitField2_ |= 0x00080000;
+        onChanged();
+        return mapStringNestedMessage_;
+      }
+      public int getMapStringNestedMessageCount() {
+        return internalGetMapStringNestedMessage().ensureBuilderMap().size();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapStringNestedMessage(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        return internalGetMapStringNestedMessage().ensureBuilderMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapStringNestedMessageMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> getMapStringNestedMessage() {
+        return getMapStringNestedMessageMap();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> getMapStringNestedMessageMap() {
+        return internalGetMapStringNestedMessage().getImmutableMap();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+       */
+      @java.lang.Override
+      public /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getMapStringNestedMessageOrDefault(
+          java.lang.String key,
+          /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> map = internalGetMutableMapStringNestedMessage().ensureBuilderMap();
+        return map.containsKey(key) ? mapStringNestedMessageConverter.build(map.get(key)) : defaultValue;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getMapStringNestedMessageOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> map = internalGetMutableMapStringNestedMessage().ensureBuilderMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return mapStringNestedMessageConverter.build(map.get(key));
+      }
+      public Builder clearMapStringNestedMessage() {
+        bitField2_ = (bitField2_ & ~0x00080000);
+        internalGetMutableMapStringNestedMessage().clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+       */
+      public Builder removeMapStringNestedMessage(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringNestedMessage().ensureBuilderMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage>
+          getMutableMapStringNestedMessage() {
+        bitField2_ |= 0x00080000;
+        return internalGetMutableMapStringNestedMessage().ensureMessageMap();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+       */
+      public Builder putMapStringNestedMessage(
+          java.lang.String key,
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage value) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        if (value == null) { throw new NullPointerException("map value"); }
+        internalGetMutableMapStringNestedMessage().ensureBuilderMap()
+            .put(key, value);
+        bitField2_ |= 0x00080000;
+        return this;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+       */
+      public Builder putAllMapStringNestedMessage(
+          java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> values) {
+        for (java.util.Map.Entry<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> e : values.entrySet()) {
+          if (e.getKey() == null || e.getValue() == null) {
+            throw new NullPointerException();
+          }
+        }
+        internalGetMutableMapStringNestedMessage().ensureBuilderMap()
+            .putAll(values);
+        bitField2_ |= 0x00080000;
+        return this;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder putMapStringNestedMessageBuilderIfAbsent(
+          java.lang.String key) {
+        java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> builderMap = internalGetMutableMapStringNestedMessage().ensureBuilderMap();
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder entry = builderMap.get(key);
+        if (entry == null) {
+          entry = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.newBuilder();
+          builderMap.put(key, entry);
+        }
+        if (entry instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) {
+          entry = ((legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) entry).toBuilder();
+          builderMap.put(key, entry);
+        }
+        return (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder) entry;
+      }
+
+      private static final class MapStringForeignMessageConverter implements com.google.protobuf.MapFieldBuilder.Converter<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> {
+        @java.lang.Override
+        public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage build(legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder val) {
+          if (val instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage) { return (legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage) val; }
+          return ((legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder) val).build();
+        }
+
+        @java.lang.Override
+        public com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> defaultEntry() {
+          return MapStringForeignMessageDefaultEntryHolder.defaultEntry;
+        }
+      };
+      private static final MapStringForeignMessageConverter mapStringForeignMessageConverter = new MapStringForeignMessageConverter();
+
+      private com.google.protobuf.MapFieldBuilder<
+          java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder> mapStringForeignMessage_;
+      private com.google.protobuf.MapFieldBuilder<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder>
+          internalGetMapStringForeignMessage() {
+        if (mapStringForeignMessage_ == null) {
+          return new com.google.protobuf.MapFieldBuilder<>(mapStringForeignMessageConverter);
+        }
+        return mapStringForeignMessage_;
+      }
+      private com.google.protobuf.MapFieldBuilder<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder>
+          internalGetMutableMapStringForeignMessage() {
+        if (mapStringForeignMessage_ == null) {
+          mapStringForeignMessage_ = new com.google.protobuf.MapFieldBuilder<>(mapStringForeignMessageConverter);
+        }
+        bitField2_ |= 0x00100000;
+        onChanged();
+        return mapStringForeignMessage_;
+      }
+      public int getMapStringForeignMessageCount() {
+        return internalGetMapStringForeignMessage().ensureBuilderMap().size();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapStringForeignMessage(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        return internalGetMapStringForeignMessage().ensureBuilderMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapStringForeignMessageMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> getMapStringForeignMessage() {
+        return getMapStringForeignMessageMap();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> getMapStringForeignMessageMap() {
+        return internalGetMapStringForeignMessage().getImmutableMap();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+       */
+      @java.lang.Override
+      public /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getMapStringForeignMessageOrDefault(
+          java.lang.String key,
+          /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder> map = internalGetMutableMapStringForeignMessage().ensureBuilderMap();
+        return map.containsKey(key) ? mapStringForeignMessageConverter.build(map.get(key)) : defaultValue;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getMapStringForeignMessageOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder> map = internalGetMutableMapStringForeignMessage().ensureBuilderMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return mapStringForeignMessageConverter.build(map.get(key));
+      }
+      public Builder clearMapStringForeignMessage() {
+        bitField2_ = (bitField2_ & ~0x00100000);
+        internalGetMutableMapStringForeignMessage().clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+       */
+      public Builder removeMapStringForeignMessage(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringForeignMessage().ensureBuilderMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage>
+          getMutableMapStringForeignMessage() {
+        bitField2_ |= 0x00100000;
+        return internalGetMutableMapStringForeignMessage().ensureMessageMap();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+       */
+      public Builder putMapStringForeignMessage(
+          java.lang.String key,
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage value) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        if (value == null) { throw new NullPointerException("map value"); }
+        internalGetMutableMapStringForeignMessage().ensureBuilderMap()
+            .put(key, value);
+        bitField2_ |= 0x00100000;
+        return this;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+       */
+      public Builder putAllMapStringForeignMessage(
+          java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> values) {
+        for (java.util.Map.Entry<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> e : values.entrySet()) {
+          if (e.getKey() == null || e.getValue() == null) {
+            throw new NullPointerException();
+          }
+        }
+        internalGetMutableMapStringForeignMessage().ensureBuilderMap()
+            .putAll(values);
+        bitField2_ |= 0x00100000;
+        return this;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder putMapStringForeignMessageBuilderIfAbsent(
+          java.lang.String key) {
+        java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder> builderMap = internalGetMutableMapStringForeignMessage().ensureBuilderMap();
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder entry = builderMap.get(key);
+        if (entry == null) {
+          entry = legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.newBuilder();
+          builderMap.put(key, entry);
+        }
+        if (entry instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage) {
+          entry = ((legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage) entry).toBuilder();
+          builderMap.put(key, entry);
+        }
+        return (legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder) entry;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.String, java.lang.Integer> mapStringNestedEnum_;
+      private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
+          internalGetMapStringNestedEnum() {
+        if (mapStringNestedEnum_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapStringNestedEnumDefaultEntryHolder.defaultEntry);
+        }
+        return mapStringNestedEnum_;
+      }
+      private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
+          internalGetMutableMapStringNestedEnum() {
+        if (mapStringNestedEnum_ == null) {
+          mapStringNestedEnum_ = com.google.protobuf.MapField.newMapField(
+              MapStringNestedEnumDefaultEntryHolder.defaultEntry);
+        }
+        if (!mapStringNestedEnum_.isMutable()) {
+          mapStringNestedEnum_ = mapStringNestedEnum_.copy();
+        }
+        bitField2_ |= 0x00200000;
+        onChanged();
+        return mapStringNestedEnum_;
+      }
+      public int getMapStringNestedEnumCount() {
+        return internalGetMapStringNestedEnum().getMap().size();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapStringNestedEnum(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        return internalGetMapStringNestedEnum().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapStringNestedEnumMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>
+      getMapStringNestedEnum() {
+        return getMapStringNestedEnumMap();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>
+      getMapStringNestedEnumMap() {
+        return internalGetAdaptedMapStringNestedEnumMap(
+            internalGetMapStringNestedEnum().getMap());}
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+       */
+      @java.lang.Override
+      public /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getMapStringNestedEnumOrDefault(
+          java.lang.String key,
+          /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, java.lang.Integer> map =
+            internalGetMapStringNestedEnum().getMap();
+        return map.containsKey(key)
+               ? mapStringNestedEnumValueConverter.doForward(map.get(key))
+               : defaultValue;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getMapStringNestedEnumOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, java.lang.Integer> map =
+            internalGetMapStringNestedEnum().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return mapStringNestedEnumValueConverter.doForward(map.get(key));
+      }
+      public Builder clearMapStringNestedEnum() {
+        bitField2_ = (bitField2_ & ~0x00200000);
+        internalGetMutableMapStringNestedEnum().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+       */
+      public Builder removeMapStringNestedEnum(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringNestedEnum().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>
+          getMutableMapStringNestedEnum() {
+        bitField2_ |= 0x00200000;
+        return internalGetAdaptedMapStringNestedEnumMap(
+             internalGetMutableMapStringNestedEnum().getMutableMap());
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+       */
+      public Builder putMapStringNestedEnum(
+          java.lang.String key,
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value) {
+        if (key == null) { throw new NullPointerException("map key"); }
+
+        internalGetMutableMapStringNestedEnum().getMutableMap()
+            .put(key, mapStringNestedEnumValueConverter.doBackward(value));
+        bitField2_ |= 0x00200000;
+        return this;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+       */
+      public Builder putAllMapStringNestedEnum(
+          java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> values) {
+        internalGetAdaptedMapStringNestedEnumMap(
+            internalGetMutableMapStringNestedEnum().getMutableMap())
+                .putAll(values);
+        bitField2_ |= 0x00200000;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.String, java.lang.Integer> mapStringForeignEnum_;
+      private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
+          internalGetMapStringForeignEnum() {
+        if (mapStringForeignEnum_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapStringForeignEnumDefaultEntryHolder.defaultEntry);
+        }
+        return mapStringForeignEnum_;
+      }
+      private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
+          internalGetMutableMapStringForeignEnum() {
+        if (mapStringForeignEnum_ == null) {
+          mapStringForeignEnum_ = com.google.protobuf.MapField.newMapField(
+              MapStringForeignEnumDefaultEntryHolder.defaultEntry);
+        }
+        if (!mapStringForeignEnum_.isMutable()) {
+          mapStringForeignEnum_ = mapStringForeignEnum_.copy();
+        }
+        bitField2_ |= 0x00400000;
+        onChanged();
+        return mapStringForeignEnum_;
+      }
+      public int getMapStringForeignEnumCount() {
+        return internalGetMapStringForeignEnum().getMap().size();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapStringForeignEnum(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        return internalGetMapStringForeignEnum().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapStringForeignEnumMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum>
+      getMapStringForeignEnum() {
+        return getMapStringForeignEnumMap();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum>
+      getMapStringForeignEnumMap() {
+        return internalGetAdaptedMapStringForeignEnumMap(
+            internalGetMapStringForeignEnum().getMap());}
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+       */
+      @java.lang.Override
+      public /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getMapStringForeignEnumOrDefault(
+          java.lang.String key,
+          /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, java.lang.Integer> map =
+            internalGetMapStringForeignEnum().getMap();
+        return map.containsKey(key)
+               ? mapStringForeignEnumValueConverter.doForward(map.get(key))
+               : defaultValue;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getMapStringForeignEnumOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, java.lang.Integer> map =
+            internalGetMapStringForeignEnum().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return mapStringForeignEnumValueConverter.doForward(map.get(key));
+      }
+      public Builder clearMapStringForeignEnum() {
+        bitField2_ = (bitField2_ & ~0x00400000);
+        internalGetMutableMapStringForeignEnum().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+       */
+      public Builder removeMapStringForeignEnum(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringForeignEnum().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum>
+          getMutableMapStringForeignEnum() {
+        bitField2_ |= 0x00400000;
+        return internalGetAdaptedMapStringForeignEnumMap(
+             internalGetMutableMapStringForeignEnum().getMutableMap());
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+       */
+      public Builder putMapStringForeignEnum(
+          java.lang.String key,
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum value) {
+        if (key == null) { throw new NullPointerException("map key"); }
+
+        internalGetMutableMapStringForeignEnum().getMutableMap()
+            .put(key, mapStringForeignEnumValueConverter.doBackward(value));
+        bitField2_ |= 0x00400000;
+        return this;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+       */
+      public Builder putAllMapStringForeignEnum(
+          java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum> values) {
+        internalGetAdaptedMapStringForeignEnumMap(
+            internalGetMutableMapStringForeignEnum().getMutableMap())
+                .putAll(values);
+        bitField2_ |= 0x00400000;
+        return this;
+      }
+
+      /**
+       * <code>uint32 oneof_uint32 = 111;</code>
+       * @return Whether the oneofUint32 field is set.
+       */
+      public boolean hasOneofUint32() {
+        return oneofFieldCase_ == 111;
+      }
+      /**
+       * <code>uint32 oneof_uint32 = 111;</code>
+       * @return The oneofUint32.
+       */
+      public int getOneofUint32() {
+        if (oneofFieldCase_ == 111) {
+          return (java.lang.Integer) oneofField_;
+        }
+        return 0;
+      }
+      /**
+       * <code>uint32 oneof_uint32 = 111;</code>
+       * @param value The oneofUint32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOneofUint32(int value) {
+
+        oneofFieldCase_ = 111;
+        oneofField_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 oneof_uint32 = 111;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOneofUint32() {
+        if (oneofFieldCase_ == 111) {
+          oneofFieldCase_ = 0;
+          oneofField_ = null;
+          onChanged();
+        }
+        return this;
+      }
+
+      private com.google.protobuf.SingleFieldBuilderV3<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> oneofNestedMessageBuilder_;
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+       * @return Whether the oneofNestedMessage field is set.
+       */
+      @java.lang.Override
+      public boolean hasOneofNestedMessage() {
+        return oneofFieldCase_ == 112;
+      }
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+       * @return The oneofNestedMessage.
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getOneofNestedMessage() {
+        if (oneofNestedMessageBuilder_ == null) {
+          if (oneofFieldCase_ == 112) {
+            return (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) oneofField_;
+          }
+          return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance();
+        } else {
+          if (oneofFieldCase_ == 112) {
+            return oneofNestedMessageBuilder_.getMessage();
+          }
+          return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance();
+        }
+      }
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+       */
+      public Builder setOneofNestedMessage(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage value) {
+        if (oneofNestedMessageBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          oneofField_ = value;
+          onChanged();
+        } else {
+          oneofNestedMessageBuilder_.setMessage(value);
+        }
+        oneofFieldCase_ = 112;
+        return this;
+      }
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+       */
+      public Builder setOneofNestedMessage(
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder builderForValue) {
+        if (oneofNestedMessageBuilder_ == null) {
+          oneofField_ = builderForValue.build();
+          onChanged();
+        } else {
+          oneofNestedMessageBuilder_.setMessage(builderForValue.build());
+        }
+        oneofFieldCase_ = 112;
+        return this;
+      }
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+       */
+      public Builder mergeOneofNestedMessage(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage value) {
+        if (oneofNestedMessageBuilder_ == null) {
+          if (oneofFieldCase_ == 112 &&
+              oneofField_ != legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance()) {
+            oneofField_ = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.newBuilder((legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) oneofField_)
+                .mergeFrom(value).buildPartial();
+          } else {
+            oneofField_ = value;
+          }
+          onChanged();
+        } else {
+          if (oneofFieldCase_ == 112) {
+            oneofNestedMessageBuilder_.mergeFrom(value);
+          } else {
+            oneofNestedMessageBuilder_.setMessage(value);
+          }
+        }
+        oneofFieldCase_ = 112;
+        return this;
+      }
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+       */
+      public Builder clearOneofNestedMessage() {
+        if (oneofNestedMessageBuilder_ == null) {
+          if (oneofFieldCase_ == 112) {
+            oneofFieldCase_ = 0;
+            oneofField_ = null;
+            onChanged();
+          }
+        } else {
+          if (oneofFieldCase_ == 112) {
+            oneofFieldCase_ = 0;
+            oneofField_ = null;
+          }
+          oneofNestedMessageBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder getOneofNestedMessageBuilder() {
+        return getOneofNestedMessageFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder getOneofNestedMessageOrBuilder() {
+        if ((oneofFieldCase_ == 112) && (oneofNestedMessageBuilder_ != null)) {
+          return oneofNestedMessageBuilder_.getMessageOrBuilder();
+        } else {
+          if (oneofFieldCase_ == 112) {
+            return (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) oneofField_;
+          }
+          return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance();
+        }
+      }
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> 
+          getOneofNestedMessageFieldBuilder() {
+        if (oneofNestedMessageBuilder_ == null) {
+          if (!(oneofFieldCase_ == 112)) {
+            oneofField_ = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance();
+          }
+          oneofNestedMessageBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder>(
+                  (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) oneofField_,
+                  getParentForChildren(),
+                  isClean());
+          oneofField_ = null;
+        }
+        oneofFieldCase_ = 112;
+        onChanged();
+        return oneofNestedMessageBuilder_;
+      }
+
+      /**
+       * <code>string oneof_string = 113;</code>
+       * @return Whether the oneofString field is set.
+       */
+      @java.lang.Override
+      public boolean hasOneofString() {
+        return oneofFieldCase_ == 113;
+      }
+      /**
+       * <code>string oneof_string = 113;</code>
+       * @return The oneofString.
+       */
+      @java.lang.Override
+      public java.lang.String getOneofString() {
+        java.lang.Object ref = "";
+        if (oneofFieldCase_ == 113) {
+          ref = oneofField_;
+        }
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          if (oneofFieldCase_ == 113) {
+            if (bs.isValidUtf8()) {
+              oneofField_ = s;
+            }
+          }
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string oneof_string = 113;</code>
+       * @return The bytes for oneofString.
+       */
+      @java.lang.Override
+      public com.google.protobuf.ByteString
+          getOneofStringBytes() {
+        java.lang.Object ref = "";
+        if (oneofFieldCase_ == 113) {
+          ref = oneofField_;
+        }
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          if (oneofFieldCase_ == 113) {
+            oneofField_ = b;
+          }
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string oneof_string = 113;</code>
+       * @param value The oneofString to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOneofString(
+          java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
+        oneofFieldCase_ = 113;
+        oneofField_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string oneof_string = 113;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOneofString() {
+        if (oneofFieldCase_ == 113) {
+          oneofFieldCase_ = 0;
+          oneofField_ = null;
+          onChanged();
+        }
+        return this;
+      }
+      /**
+       * <code>string oneof_string = 113;</code>
+       * @param value The bytes for oneofString to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOneofStringBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
+        oneofFieldCase_ = 113;
+        oneofField_ = value;
+        onChanged();
+        return this;
+      }
+
+      /**
+       * <code>bytes oneof_bytes = 114;</code>
+       * @return Whether the oneofBytes field is set.
+       */
+      public boolean hasOneofBytes() {
+        return oneofFieldCase_ == 114;
+      }
+      /**
+       * <code>bytes oneof_bytes = 114;</code>
+       * @return The oneofBytes.
+       */
+      public com.google.protobuf.ByteString getOneofBytes() {
+        if (oneofFieldCase_ == 114) {
+          return (com.google.protobuf.ByteString) oneofField_;
+        }
+        return com.google.protobuf.ByteString.EMPTY;
+      }
+      /**
+       * <code>bytes oneof_bytes = 114;</code>
+       * @param value The oneofBytes to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOneofBytes(com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
+        oneofFieldCase_ = 114;
+        oneofField_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bytes oneof_bytes = 114;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOneofBytes() {
+        if (oneofFieldCase_ == 114) {
+          oneofFieldCase_ = 0;
+          oneofField_ = null;
+          onChanged();
+        }
+        return this;
+      }
+
+      /**
+       * <code>bool oneof_bool = 115;</code>
+       * @return Whether the oneofBool field is set.
+       */
+      public boolean hasOneofBool() {
+        return oneofFieldCase_ == 115;
+      }
+      /**
+       * <code>bool oneof_bool = 115;</code>
+       * @return The oneofBool.
+       */
+      public boolean getOneofBool() {
+        if (oneofFieldCase_ == 115) {
+          return (java.lang.Boolean) oneofField_;
+        }
+        return false;
+      }
+      /**
+       * <code>bool oneof_bool = 115;</code>
+       * @param value The oneofBool to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOneofBool(boolean value) {
+
+        oneofFieldCase_ = 115;
+        oneofField_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool oneof_bool = 115;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOneofBool() {
+        if (oneofFieldCase_ == 115) {
+          oneofFieldCase_ = 0;
+          oneofField_ = null;
+          onChanged();
+        }
+        return this;
+      }
+
+      /**
+       * <code>uint64 oneof_uint64 = 116;</code>
+       * @return Whether the oneofUint64 field is set.
+       */
+      public boolean hasOneofUint64() {
+        return oneofFieldCase_ == 116;
+      }
+      /**
+       * <code>uint64 oneof_uint64 = 116;</code>
+       * @return The oneofUint64.
+       */
+      public long getOneofUint64() {
+        if (oneofFieldCase_ == 116) {
+          return (java.lang.Long) oneofField_;
+        }
+        return 0L;
+      }
+      /**
+       * <code>uint64 oneof_uint64 = 116;</code>
+       * @param value The oneofUint64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOneofUint64(long value) {
+
+        oneofFieldCase_ = 116;
+        oneofField_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 oneof_uint64 = 116;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOneofUint64() {
+        if (oneofFieldCase_ == 116) {
+          oneofFieldCase_ = 0;
+          oneofField_ = null;
+          onChanged();
+        }
+        return this;
+      }
+
+      /**
+       * <code>float oneof_float = 117;</code>
+       * @return Whether the oneofFloat field is set.
+       */
+      public boolean hasOneofFloat() {
+        return oneofFieldCase_ == 117;
+      }
+      /**
+       * <code>float oneof_float = 117;</code>
+       * @return The oneofFloat.
+       */
+      public float getOneofFloat() {
+        if (oneofFieldCase_ == 117) {
+          return (java.lang.Float) oneofField_;
+        }
+        return 0F;
+      }
+      /**
+       * <code>float oneof_float = 117;</code>
+       * @param value The oneofFloat to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOneofFloat(float value) {
+
+        oneofFieldCase_ = 117;
+        oneofField_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>float oneof_float = 117;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOneofFloat() {
+        if (oneofFieldCase_ == 117) {
+          oneofFieldCase_ = 0;
+          oneofField_ = null;
+          onChanged();
+        }
+        return this;
+      }
+
+      /**
+       * <code>double oneof_double = 118;</code>
+       * @return Whether the oneofDouble field is set.
+       */
+      public boolean hasOneofDouble() {
+        return oneofFieldCase_ == 118;
+      }
+      /**
+       * <code>double oneof_double = 118;</code>
+       * @return The oneofDouble.
+       */
+      public double getOneofDouble() {
+        if (oneofFieldCase_ == 118) {
+          return (java.lang.Double) oneofField_;
+        }
+        return 0D;
+      }
+      /**
+       * <code>double oneof_double = 118;</code>
+       * @param value The oneofDouble to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOneofDouble(double value) {
+
+        oneofFieldCase_ = 118;
+        oneofField_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>double oneof_double = 118;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOneofDouble() {
+        if (oneofFieldCase_ == 118) {
+          oneofFieldCase_ = 0;
+          oneofField_ = null;
+          onChanged();
+        }
+        return this;
+      }
+
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum oneof_enum = 119;</code>
+       * @return Whether the oneofEnum field is set.
+       */
+      @java.lang.Override
+      public boolean hasOneofEnum() {
+        return oneofFieldCase_ == 119;
+      }
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum oneof_enum = 119;</code>
+       * @return The oneofEnum.
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getOneofEnum() {
+        if (oneofFieldCase_ == 119) {
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(
+              (java.lang.Integer) oneofField_);
+          return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.FOO : result;
+        }
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.FOO;
+      }
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum oneof_enum = 119;</code>
+       * @param value The oneofEnum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOneofEnum(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        oneofFieldCase_ = 119;
+        oneofField_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum oneof_enum = 119;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOneofEnum() {
+        if (oneofFieldCase_ == 119) {
+          oneofFieldCase_ = 0;
+          oneofField_ = null;
+          onChanged();
+        }
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:legacy_gencode_test.proto2.TestMostTypesProto2)
+    }
+
+    // @@protoc_insertion_point(class_scope:legacy_gencode_test.proto2.TestMostTypesProto2)
+    private static final legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2();
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<TestMostTypesProto2>
+        PARSER = new com.google.protobuf.AbstractParser<TestMostTypesProto2>() {
+      @java.lang.Override
+      public TestMostTypesProto2 parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (com.google.protobuf.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new com.google.protobuf.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
+      }
+    };
+
+    public static com.google.protobuf.Parser<TestMostTypesProto2> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<TestMostTypesProto2> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  public interface ForeignMessageOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:legacy_gencode_test.proto2.ForeignMessage)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>optional int32 c = 1;</code>
+     * @return Whether the c field is set.
+     */
+    boolean hasC();
+    /**
+     * <code>optional int32 c = 1;</code>
+     * @return The c.
+     */
+    int getC();
+  }
+  /**
+   * Protobuf type {@code legacy_gencode_test.proto2.ForeignMessage}
+   */
+  public static final class ForeignMessage extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:legacy_gencode_test.proto2.ForeignMessage)
+      ForeignMessageOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use ForeignMessage.newBuilder() to construct.
+    private ForeignMessage(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private ForeignMessage() {
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new ForeignMessage();
+    }
+
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_ForeignMessage_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_ForeignMessage_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.class, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder.class);
+    }
+
+    private int bitField0_;
+    public static final int C_FIELD_NUMBER = 1;
+    private int c_ = 0;
+    /**
+     * <code>optional int32 c = 1;</code>
+     * @return Whether the c field is set.
+     */
+    @java.lang.Override
+    public boolean hasC() {
+      return ((bitField0_ & 0x00000001) != 0);
+    }
+    /**
+     * <code>optional int32 c = 1;</code>
+     * @return The c.
+     */
+    @java.lang.Override
+    public int getC() {
+      return c_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (((bitField0_ & 0x00000001) != 0)) {
+        output.writeInt32(1, c_);
+      }
+      getUnknownFields().writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(1, c_);
+      }
+      size += getUnknownFields().getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage)) {
+        return super.equals(obj);
+      }
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage other = (legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage) obj;
+
+      if (hasC() != other.hasC()) return false;
+      if (hasC()) {
+        if (getC()
+            != other.getC()) return false;
+      }
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasC()) {
+        hash = (37 * hash) + C_FIELD_NUMBER;
+        hash = (53 * hash) + getC();
+      }
+      hash = (29 * hash) + getUnknownFields().hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code legacy_gencode_test.proto2.ForeignMessage}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:legacy_gencode_test.proto2.ForeignMessage)
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_ForeignMessage_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_ForeignMessage_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.class, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder.class);
+      }
+
+      // Construct using legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.newBuilder()
+      private Builder() {
+
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        bitField0_ = 0;
+        c_ = 0;
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_ForeignMessage_descriptor;
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getDefaultInstanceForType() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage build() {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage buildPartial() {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage result = new legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage result) {
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.c_ = c_;
+          to_bitField0_ |= 0x00000001;
+        }
+        result.bitField0_ |= to_bitField0_;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage) {
+          return mergeFrom((legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage other) {
+        if (other == legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.getDefaultInstance()) return this;
+        if (other.hasC()) {
+          setC(other.getC());
+        }
+        this.mergeUnknownFields(other.getUnknownFields());
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
+        try {
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                c_ = input.readInt32();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.unwrapIOException();
+        } finally {
+          onChanged();
+        } // finally
+        return this;
+      }
+      private int bitField0_;
+
+      private int c_ ;
+      /**
+       * <code>optional int32 c = 1;</code>
+       * @return Whether the c field is set.
+       */
+      @java.lang.Override
+      public boolean hasC() {
+        return ((bitField0_ & 0x00000001) != 0);
+      }
+      /**
+       * <code>optional int32 c = 1;</code>
+       * @return The c.
+       */
+      @java.lang.Override
+      public int getC() {
+        return c_;
+      }
+      /**
+       * <code>optional int32 c = 1;</code>
+       * @param value The c to set.
+       * @return This builder for chaining.
+       */
+      public Builder setC(int value) {
+
+        c_ = value;
+        bitField0_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional int32 c = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearC() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        c_ = 0;
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:legacy_gencode_test.proto2.ForeignMessage)
+    }
+
+    // @@protoc_insertion_point(class_scope:legacy_gencode_test.proto2.ForeignMessage)
+    private static final legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage();
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<ForeignMessage>
+        PARSER = new com.google.protobuf.AbstractParser<ForeignMessage>() {
+      @java.lang.Override
+      public ForeignMessage parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (com.google.protobuf.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new com.google.protobuf.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
+      }
+    };
+
+    public static com.google.protobuf.Parser<ForeignMessage> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<ForeignMessage> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  public static final int EXTENSION_INT32_FIELD_NUMBER = 1001;
+  /**
+   * <code>extend .legacy_gencode_test.proto2.TestMostTypesProto2 { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2,
+      java.lang.Integer> extensionInt32 = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        java.lang.Integer.class,
+        null);
+  public static final int EXTENSION_MESSAGE_FIELD_NUMBER = 1002;
+  /**
+   * <code>extend .legacy_gencode_test.proto2.TestMostTypesProto2 { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2,
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> extensionMessage = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.class,
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.getDefaultInstance());
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMessage_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMessage_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_NestedTestMessage_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_NestedTestMessage_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_NestedMessage_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_NestedMessage_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32Int32Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32Int32Entry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt64Int64Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt64Int64Entry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint32Uint32Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint32Uint32Entry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint64Uint64Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint64Uint64Entry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint32Sint32Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint32Sint32Entry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint64Sint64Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint64Sint64Entry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed32Fixed32Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed32Fixed32Entry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed64Fixed64Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed64Fixed64Entry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed32Sfixed32Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed32Sfixed32Entry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed64Sfixed64Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed64Sfixed64Entry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32FloatEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32FloatEntry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32DoubleEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32DoubleEntry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapBoolBoolEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapBoolBoolEntry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringStringEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringStringEntry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringBytesEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringBytesEntry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedMessageEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedMessageEntry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignMessageEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignMessageEntry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedEnumEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedEnumEntry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignEnumEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignEnumEntry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_ForeignMessage_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_ForeignMessage_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\031proto2_gencode_test.proto\022\032legacy_genc" +
+      "ode_test.proto2\"R\n\013TestMessage\022\t\n\001x\030\002 \001(" +
+      "\t\0228\n\001y\030\003 \001(\0132-.legacy_gencode_test.proto" +
+      "2.NestedTestMessage\"\036\n\021NestedTestMessage" +
+      "\022\t\n\001z\030\001 \003(\005\"\2751\n\023TestMostTypesProto2\022\026\n\016o" +
+      "ptional_int32\030\001 \001(\005\022\026\n\016optional_int64\030\002 " +
+      "\001(\003\022\027\n\017optional_uint32\030\003 \001(\r\022\027\n\017optional" +
+      "_uint64\030\004 \001(\004\022\027\n\017optional_sint32\030\005 \001(\021\022\027" +
+      "\n\017optional_sint64\030\006 \001(\022\022\030\n\020optional_fixe" +
+      "d32\030\007 \001(\007\022\030\n\020optional_fixed64\030\010 \001(\006\022\031\n\021o" +
+      "ptional_sfixed32\030\t \001(\017\022\031\n\021optional_sfixe" +
+      "d64\030\n \001(\020\022\026\n\016optional_float\030\013 \001(\002\022\027\n\017opt" +
+      "ional_double\030\014 \001(\001\022\025\n\roptional_bool\030\r \001(" +
+      "\010\022\027\n\017optional_string\030\016 \001(\t\022\026\n\016optional_b" +
+      "ytes\030\017 \001(\014\022^\n\027optional_nested_message\030\022 " +
+      "\001(\0132=.legacy_gencode_test.proto2.TestMos" +
+      "tTypesProto2.NestedMessage\022L\n\030optional_f" +
+      "oreign_message\030\023 \001(\0132*.legacy_gencode_te" +
+      "st.proto2.ForeignMessage\022X\n\024optional_nes" +
+      "ted_enum\030\025 \001(\0162:.legacy_gencode_test.pro" +
+      "to2.TestMostTypesProto2.NestedEnum\022F\n\025op" +
+      "tional_foreign_enum\030\026 \001(\0162\'.legacy_genco" +
+      "de_test.proto2.ForeignEnum\022Z\n\025optional_a" +
+      "liased_enum\030\027 \001(\0162;.legacy_gencode_test." +
+      "proto2.TestMostTypesProto2.AliasedEnum\022J" +
+      "\n\021recursive_message\030\033 \001(\0132/.legacy_genco" +
+      "de_test.proto2.TestMostTypesProto2\022\026\n\016re" +
+      "peated_int32\030\037 \003(\005\022\026\n\016repeated_int64\030  \003" +
+      "(\003\022\027\n\017repeated_uint32\030! \003(\r\022\027\n\017repeated_" +
+      "uint64\030\" \003(\004\022\027\n\017repeated_sint32\030# \003(\021\022\027\n" +
+      "\017repeated_sint64\030$ \003(\022\022\030\n\020repeated_fixed" +
+      "32\030% \003(\007\022\030\n\020repeated_fixed64\030& \003(\006\022\031\n\021re" +
+      "peated_sfixed32\030\' \003(\017\022\031\n\021repeated_sfixed" +
+      "64\030( \003(\020\022\026\n\016repeated_float\030) \003(\002\022\027\n\017repe" +
+      "ated_double\030* \003(\001\022\025\n\rrepeated_bool\030+ \003(\010" +
+      "\022\027\n\017repeated_string\030, \003(\t\022\026\n\016repeated_by" +
+      "tes\030- \003(\014\022^\n\027repeated_nested_message\0300 \003" +
+      "(\0132=.legacy_gencode_test.proto2.TestMost" +
+      "TypesProto2.NestedMessage\022L\n\030repeated_fo" +
+      "reign_message\0301 \003(\0132*.legacy_gencode_tes" +
+      "t.proto2.ForeignMessage\022X\n\024repeated_nest" +
+      "ed_enum\0303 \003(\0162:.legacy_gencode_test.prot" +
+      "o2.TestMostTypesProto2.NestedEnum\022F\n\025rep" +
+      "eated_foreign_enum\0304 \003(\0162\'.legacy_gencod" +
+      "e_test.proto2.ForeignEnum\022\030\n\014packed_int3" +
+      "2\030K \003(\005B\002\020\001\022\030\n\014packed_int64\030L \003(\003B\002\020\001\022\031\n" +
+      "\rpacked_uint32\030M \003(\rB\002\020\001\022\031\n\rpacked_uint6" +
+      "4\030N \003(\004B\002\020\001\022\031\n\rpacked_sint32\030O \003(\021B\002\020\001\022\031" +
+      "\n\rpacked_sint64\030P \003(\022B\002\020\001\022\032\n\016packed_fixe" +
+      "d32\030Q \003(\007B\002\020\001\022\032\n\016packed_fixed64\030R \003(\006B\002\020" +
+      "\001\022\033\n\017packed_sfixed32\030S \003(\017B\002\020\001\022\033\n\017packed" +
+      "_sfixed64\030T \003(\020B\002\020\001\022\030\n\014packed_float\030U \003(" +
+      "\002B\002\020\001\022\031\n\rpacked_double\030V \003(\001B\002\020\001\022\027\n\013pack" +
+      "ed_bool\030W \003(\010B\002\020\001\022Z\n\022packed_nested_enum\030" +
+      "X \003(\0162:.legacy_gencode_test.proto2.TestM" +
+      "ostTypesProto2.NestedEnumB\002\020\001\022\032\n\016unpacke" +
+      "d_int32\030Y \003(\005B\002\020\000\022\032\n\016unpacked_int64\030Z \003(" +
+      "\003B\002\020\000\022\033\n\017unpacked_uint32\030[ \003(\rB\002\020\000\022\033\n\017un" +
+      "packed_uint64\030\\ \003(\004B\002\020\000\022\033\n\017unpacked_sint" +
+      "32\030] \003(\021B\002\020\000\022\033\n\017unpacked_sint64\030^ \003(\022B\002\020" +
+      "\000\022\034\n\020unpacked_fixed32\030_ \003(\007B\002\020\000\022\034\n\020unpac" +
+      "ked_fixed64\030` \003(\006B\002\020\000\022\035\n\021unpacked_sfixed" +
+      "32\030a \003(\017B\002\020\000\022\035\n\021unpacked_sfixed64\030b \003(\020B" +
+      "\002\020\000\022\032\n\016unpacked_float\030c \003(\002B\002\020\000\022\033\n\017unpac" +
+      "ked_double\030d \003(\001B\002\020\000\022\031\n\runpacked_bool\030e " +
+      "\003(\010B\002\020\000\022\\\n\024unpacked_nested_enum\030f \003(\0162:." +
+      "legacy_gencode_test.proto2.TestMostTypes" +
+      "Proto2.NestedEnumB\002\020\000\022[\n\017map_int32_int32" +
+      "\0308 \003(\0132B.legacy_gencode_test.proto2.Test" +
+      "MostTypesProto2.MapInt32Int32Entry\022[\n\017ma" +
+      "p_int64_int64\0309 \003(\0132B.legacy_gencode_tes" +
+      "t.proto2.TestMostTypesProto2.MapInt64Int" +
+      "64Entry\022_\n\021map_uint32_uint32\030: \003(\0132D.leg" +
+      "acy_gencode_test.proto2.TestMostTypesPro" +
+      "to2.MapUint32Uint32Entry\022_\n\021map_uint64_u" +
+      "int64\030; \003(\0132D.legacy_gencode_test.proto2" +
+      ".TestMostTypesProto2.MapUint64Uint64Entr" +
+      "y\022_\n\021map_sint32_sint32\030< \003(\0132D.legacy_ge" +
+      "ncode_test.proto2.TestMostTypesProto2.Ma" +
+      "pSint32Sint32Entry\022_\n\021map_sint64_sint64\030" +
+      "= \003(\0132D.legacy_gencode_test.proto2.TestM" +
+      "ostTypesProto2.MapSint64Sint64Entry\022c\n\023m" +
+      "ap_fixed32_fixed32\030> \003(\0132F.legacy_gencod" +
+      "e_test.proto2.TestMostTypesProto2.MapFix" +
+      "ed32Fixed32Entry\022c\n\023map_fixed64_fixed64\030" +
+      "? \003(\0132F.legacy_gencode_test.proto2.TestM" +
+      "ostTypesProto2.MapFixed64Fixed64Entry\022g\n" +
+      "\025map_sfixed32_sfixed32\030@ \003(\0132H.legacy_ge" +
+      "ncode_test.proto2.TestMostTypesProto2.Ma" +
+      "pSfixed32Sfixed32Entry\022g\n\025map_sfixed64_s" +
+      "fixed64\030A \003(\0132H.legacy_gencode_test.prot" +
+      "o2.TestMostTypesProto2.MapSfixed64Sfixed" +
+      "64Entry\022[\n\017map_int32_float\030B \003(\0132B.legac" +
+      "y_gencode_test.proto2.TestMostTypesProto" +
+      "2.MapInt32FloatEntry\022]\n\020map_int32_double" +
+      "\030C \003(\0132C.legacy_gencode_test.proto2.Test" +
+      "MostTypesProto2.MapInt32DoubleEntry\022W\n\rm" +
+      "ap_bool_bool\030D \003(\0132@.legacy_gencode_test" +
+      ".proto2.TestMostTypesProto2.MapBoolBoolE" +
+      "ntry\022_\n\021map_string_string\030E \003(\0132D.legacy" +
+      "_gencode_test.proto2.TestMostTypesProto2" +
+      ".MapStringStringEntry\022]\n\020map_string_byte" +
+      "s\030F \003(\0132C.legacy_gencode_test.proto2.Tes" +
+      "tMostTypesProto2.MapStringBytesEntry\022n\n\031" +
+      "map_string_nested_message\030G \003(\0132K.legacy" +
+      "_gencode_test.proto2.TestMostTypesProto2" +
+      ".MapStringNestedMessageEntry\022p\n\032map_stri" +
+      "ng_foreign_message\030H \003(\0132L.legacy_gencod" +
+      "e_test.proto2.TestMostTypesProto2.MapStr" +
+      "ingForeignMessageEntry\022h\n\026map_string_nes" +
+      "ted_enum\030I \003(\0132H.legacy_gencode_test.pro" +
+      "to2.TestMostTypesProto2.MapStringNestedE" +
+      "numEntry\022j\n\027map_string_foreign_enum\030J \003(" +
+      "\0132I.legacy_gencode_test.proto2.TestMostT" +
+      "ypesProto2.MapStringForeignEnumEntry\022\026\n\014" +
+      "oneof_uint32\030o \001(\rH\000\022]\n\024oneof_nested_mes" +
+      "sage\030p \001(\0132=.legacy_gencode_test.proto2." +
+      "TestMostTypesProto2.NestedMessageH\000\022\026\n\014o" +
+      "neof_string\030q \001(\tH\000\022\025\n\013oneof_bytes\030r \001(\014" +
+      "H\000\022\024\n\noneof_bool\030s \001(\010H\000\022\026\n\014oneof_uint64" +
+      "\030t \001(\004H\000\022\025\n\013oneof_float\030u \001(\002H\000\022\026\n\014oneof" +
+      "_double\030v \001(\001H\000\022P\n\noneof_enum\030w \001(\0162:.le" +
+      "gacy_gencode_test.proto2.TestMostTypesPr" +
+      "oto2.NestedEnumH\000\032`\n\rNestedMessage\022\t\n\001a\030" +
+      "\001 \001(\005\022D\n\013corecursive\030\002 \001(\0132/.legacy_genc" +
+      "ode_test.proto2.TestMostTypesProto2\0324\n\022M" +
+      "apInt32Int32Entry\022\013\n\003key\030\001 \001(\005\022\r\n\005value\030" +
+      "\002 \001(\005:\0028\001\0324\n\022MapInt64Int64Entry\022\013\n\003key\030\001" +
+      " \001(\003\022\r\n\005value\030\002 \001(\003:\0028\001\0326\n\024MapUint32Uint" +
+      "32Entry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001\032" +
+      "6\n\024MapUint64Uint64Entry\022\013\n\003key\030\001 \001(\004\022\r\n\005" +
+      "value\030\002 \001(\004:\0028\001\0326\n\024MapSint32Sint32Entry\022" +
+      "\013\n\003key\030\001 \001(\021\022\r\n\005value\030\002 \001(\021:\0028\001\0326\n\024MapSi" +
+      "nt64Sint64Entry\022\013\n\003key\030\001 \001(\022\022\r\n\005value\030\002 " +
+      "\001(\022:\0028\001\0328\n\026MapFixed32Fixed32Entry\022\013\n\003key" +
+      "\030\001 \001(\007\022\r\n\005value\030\002 \001(\007:\0028\001\0328\n\026MapFixed64F" +
+      "ixed64Entry\022\013\n\003key\030\001 \001(\006\022\r\n\005value\030\002 \001(\006:" +
+      "\0028\001\032:\n\030MapSfixed32Sfixed32Entry\022\013\n\003key\030\001" +
+      " \001(\017\022\r\n\005value\030\002 \001(\017:\0028\001\032:\n\030MapSfixed64Sf" +
+      "ixed64Entry\022\013\n\003key\030\001 \001(\020\022\r\n\005value\030\002 \001(\020:" +
+      "\0028\001\0324\n\022MapInt32FloatEntry\022\013\n\003key\030\001 \001(\005\022\r" +
+      "\n\005value\030\002 \001(\002:\0028\001\0325\n\023MapInt32DoubleEntry" +
+      "\022\013\n\003key\030\001 \001(\005\022\r\n\005value\030\002 \001(\001:\0028\001\0322\n\020MapB" +
+      "oolBoolEntry\022\013\n\003key\030\001 \001(\010\022\r\n\005value\030\002 \001(\010" +
+      ":\0028\001\0326\n\024MapStringStringEntry\022\013\n\003key\030\001 \001(" +
+      "\t\022\r\n\005value\030\002 \001(\t:\0028\001\0325\n\023MapStringBytesEn" +
+      "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\014:\0028\001\032|\n\033M" +
+      "apStringNestedMessageEntry\022\013\n\003key\030\001 \001(\t\022" +
+      "L\n\005value\030\002 \001(\0132=.legacy_gencode_test.pro" +
+      "to2.TestMostTypesProto2.NestedMessage:\0028" +
+      "\001\032j\n\034MapStringForeignMessageEntry\022\013\n\003key" +
+      "\030\001 \001(\t\0229\n\005value\030\002 \001(\0132*.legacy_gencode_t" +
+      "est.proto2.ForeignMessage:\0028\001\032v\n\030MapStri" +
+      "ngNestedEnumEntry\022\013\n\003key\030\001 \001(\t\022I\n\005value\030" +
+      "\002 \001(\0162:.legacy_gencode_test.proto2.TestM" +
+      "ostTypesProto2.NestedEnum:\0028\001\032d\n\031MapStri" +
+      "ngForeignEnumEntry\022\013\n\003key\030\001 \001(\t\0226\n\005value" +
+      "\030\002 \001(\0162\'.legacy_gencode_test.proto2.Fore" +
+      "ignEnum:\0028\001\"9\n\nNestedEnum\022\007\n\003FOO\020\000\022\007\n\003BA" +
+      "R\020\001\022\007\n\003BAZ\020\002\022\020\n\003NEG\020\377\377\377\377\377\377\377\377\377\001\"Y\n\013Aliase" +
+      "dEnum\022\r\n\tALIAS_FOO\020\000\022\r\n\tALIAS_BAR\020\001\022\r\n\tA" +
+      "LIAS_BAZ\020\002\022\007\n\003MOO\020\002\022\007\n\003moo\020\002\022\007\n\003bAz\020\002\032\002\020" +
+      "\001*\t\010\350\007\020\200\200\200\200\002B\r\n\013oneof_field\"\033\n\016ForeignMe" +
+      "ssage\022\t\n\001c\030\001 \001(\005*@\n\013ForeignEnum\022\017\n\013FOREI" +
+      "GN_FOO\020\000\022\017\n\013FOREIGN_BAR\020\001\022\017\n\013FOREIGN_BAZ" +
+      "\020\002:I\n\017extension_int32\022/.legacy_gencode_t" +
+      "est.proto2.TestMostTypesProto2\030\351\007 \001(\005:w\n" +
+      "\021extension_message\022/.legacy_gencode_test" +
+      ".proto2.TestMostTypesProto2\030\352\007 \001(\0132*.leg" +
+      "acy_gencode_test.proto2.ForeignMessageB\030" +
+      "B\026Proto2GencodeTestProto"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_legacy_gencode_test_proto2_TestMessage_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_legacy_gencode_test_proto2_TestMessage_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMessage_descriptor,
+        new java.lang.String[] { "X", "Y", });
+    internal_static_legacy_gencode_test_proto2_NestedTestMessage_descriptor =
+      getDescriptor().getMessageTypes().get(1);
+    internal_static_legacy_gencode_test_proto2_NestedTestMessage_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_NestedTestMessage_descriptor,
+        new java.lang.String[] { "Z", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor =
+      getDescriptor().getMessageTypes().get(2);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor,
+        new java.lang.String[] { "OptionalInt32", "OptionalInt64", "OptionalUint32", "OptionalUint64", "OptionalSint32", "OptionalSint64", "OptionalFixed32", "OptionalFixed64", "OptionalSfixed32", "OptionalSfixed64", "OptionalFloat", "OptionalDouble", "OptionalBool", "OptionalString", "OptionalBytes", "OptionalNestedMessage", "OptionalForeignMessage", "OptionalNestedEnum", "OptionalForeignEnum", "OptionalAliasedEnum", "RecursiveMessage", "RepeatedInt32", "RepeatedInt64", "RepeatedUint32", "RepeatedUint64", "RepeatedSint32", "RepeatedSint64", "RepeatedFixed32", "RepeatedFixed64", "RepeatedSfixed32", "RepeatedSfixed64", "RepeatedFloat", "RepeatedDouble", "RepeatedBool", "RepeatedString", "RepeatedBytes", "RepeatedNestedMessage", "RepeatedForeignMessage", "RepeatedNestedEnum", "RepeatedForeignEnum", "PackedInt32", "PackedInt64", "PackedUint32", "PackedUint64", "PackedSint32", "PackedSint64", "PackedFixed32", "PackedFixed64", "PackedSfixed32", "PackedSfixed64", "PackedFloat", "PackedDouble", "PackedBool", "PackedNestedEnum", "UnpackedInt32", "UnpackedInt64", "UnpackedUint32", "UnpackedUint64", "UnpackedSint32", "UnpackedSint64", "UnpackedFixed32", "UnpackedFixed64", "UnpackedSfixed32", "UnpackedSfixed64", "UnpackedFloat", "UnpackedDouble", "UnpackedBool", "UnpackedNestedEnum", "MapInt32Int32", "MapInt64Int64", "MapUint32Uint32", "MapUint64Uint64", "MapSint32Sint32", "MapSint64Sint64", "MapFixed32Fixed32", "MapFixed64Fixed64", "MapSfixed32Sfixed32", "MapSfixed64Sfixed64", "MapInt32Float", "MapInt32Double", "MapBoolBool", "MapStringString", "MapStringBytes", "MapStringNestedMessage", "MapStringForeignMessage", "MapStringNestedEnum", "MapStringForeignEnum", "OneofUint32", "OneofNestedMessage", "OneofString", "OneofBytes", "OneofBool", "OneofUint64", "OneofFloat", "OneofDouble", "OneofEnum", "OneofField", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_NestedMessage_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(0);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_NestedMessage_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_NestedMessage_descriptor,
+        new java.lang.String[] { "A", "Corecursive", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32Int32Entry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(1);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32Int32Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32Int32Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt64Int64Entry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(2);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt64Int64Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt64Int64Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint32Uint32Entry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(3);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint32Uint32Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint32Uint32Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint64Uint64Entry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(4);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint64Uint64Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint64Uint64Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint32Sint32Entry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(5);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint32Sint32Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint32Sint32Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint64Sint64Entry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(6);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint64Sint64Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint64Sint64Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed32Fixed32Entry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(7);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed32Fixed32Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed32Fixed32Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed64Fixed64Entry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(8);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed64Fixed64Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed64Fixed64Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed32Sfixed32Entry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(9);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed32Sfixed32Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed32Sfixed32Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed64Sfixed64Entry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(10);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed64Sfixed64Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed64Sfixed64Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32FloatEntry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(11);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32FloatEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32FloatEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32DoubleEntry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(12);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32DoubleEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32DoubleEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapBoolBoolEntry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(13);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapBoolBoolEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapBoolBoolEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringStringEntry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(14);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringStringEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringStringEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringBytesEntry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(15);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringBytesEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringBytesEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedMessageEntry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(16);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedMessageEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedMessageEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignMessageEntry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(17);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignMessageEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignMessageEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedEnumEntry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(18);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedEnumEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedEnumEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignEnumEntry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(19);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignEnumEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignEnumEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_ForeignMessage_descriptor =
+      getDescriptor().getMessageTypes().get(3);
+    internal_static_legacy_gencode_test_proto2_ForeignMessage_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_ForeignMessage_descriptor,
+        new java.lang.String[] { "C", });
+    extensionInt32.internalInit(descriptor.getExtensions().get(0));
+    extensionMessage.internalInit(descriptor.getExtensions().get(1));
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/compatibility/smoke/v25.8/legacy_gencode_test/proto3/Proto3GencodeTestProto.java b/compatibility/smoke/v25.8/legacy_gencode_test/proto3/Proto3GencodeTestProto.java
index cb9032e897d1f..31525c3e2214c 100644
--- a/compatibility/smoke/v25.8/legacy_gencode_test/proto3/Proto3GencodeTestProto.java
+++ b/compatibility/smoke/v25.8/legacy_gencode_test/proto3/Proto3GencodeTestProto.java
@@ -6,33 +6,49 @@
 
 public final class Proto3GencodeTestProto {
   private Proto3GencodeTestProto() {}
-
-  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {}
-
-  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
   }
 
-  /** Protobuf enum {@code legacy_gencode_test.proto3.ForeignEnum} */
-  public enum ForeignEnum implements com.google.protobuf.ProtocolMessageEnum {
-    /** <code>FOREIGN_FOO = 0;</code> */
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  /**
+   * Protobuf enum {@code legacy_gencode_test.proto3.ForeignEnum}
+   */
+  public enum ForeignEnum
+      implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     * <code>FOREIGN_FOO = 0;</code>
+     */
     FOREIGN_FOO(0),
-    /** <code>FOREIGN_BAR = 1;</code> */
+    /**
+     * <code>FOREIGN_BAR = 1;</code>
+     */
     FOREIGN_BAR(1),
-    /** <code>FOREIGN_BAZ = 2;</code> */
+    /**
+     * <code>FOREIGN_BAZ = 2;</code>
+     */
     FOREIGN_BAZ(2),
     UNRECOGNIZED(-1),
     ;
 
-    /** <code>FOREIGN_FOO = 0;</code> */
+    /**
+     * <code>FOREIGN_FOO = 0;</code>
+     */
     public static final int FOREIGN_FOO_VALUE = 0;
-
-    /** <code>FOREIGN_BAR = 1;</code> */
+    /**
+     * <code>FOREIGN_BAR = 1;</code>
+     */
     public static final int FOREIGN_BAR_VALUE = 1;
-
-    /** <code>FOREIGN_BAZ = 2;</code> */
+    /**
+     * <code>FOREIGN_BAZ = 2;</code>
+     */
     public static final int FOREIGN_BAZ_VALUE = 2;
 
+
     public final int getNumber() {
       if (this == UNRECOGNIZED) {
         throw new java.lang.IllegalArgumentException(
@@ -57,51 +73,49 @@ public static ForeignEnum valueOf(int value) {
      */
     public static ForeignEnum forNumber(int value) {
       switch (value) {
-        case 0:
-          return FOREIGN_FOO;
-        case 1:
-          return FOREIGN_BAR;
-        case 2:
-          return FOREIGN_BAZ;
-        default:
-          return null;
+        case 0: return FOREIGN_FOO;
+        case 1: return FOREIGN_BAR;
+        case 2: return FOREIGN_BAZ;
+        default: return null;
       }
     }
 
-    public static com.google.protobuf.Internal.EnumLiteMap<ForeignEnum> internalGetValueMap() {
+    public static com.google.protobuf.Internal.EnumLiteMap<ForeignEnum>
+        internalGetValueMap() {
       return internalValueMap;
     }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        ForeignEnum> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap<ForeignEnum>() {
+            public ForeignEnum findValueByNumber(int number) {
+              return ForeignEnum.forNumber(number);
+            }
+          };
 
-    private static final com.google.protobuf.Internal.EnumLiteMap<ForeignEnum> internalValueMap =
-        new com.google.protobuf.Internal.EnumLiteMap<ForeignEnum>() {
-          public ForeignEnum findValueByNumber(int number) {
-            return ForeignEnum.forNumber(number);
-          }
-        };
-
-    public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
       if (this == UNRECOGNIZED) {
         throw new java.lang.IllegalStateException(
             "Can't get the descriptor of an unrecognized enum value.");
       }
       return getDescriptor().getValues().get(ordinal());
     }
-
-    public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
       return getDescriptor();
     }
-
-    public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
-      return legacy_gencode_test.proto3.Proto3GencodeTestProto.getDescriptor()
-          .getEnumTypes()
-          .get(0);
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
+      return legacy_gencode_test.proto3.Proto3GencodeTestProto.getDescriptor().getEnumTypes().get(0);
     }
 
     private static final ForeignEnum[] VALUES = values();
 
-    public static ForeignEnum valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+    public static ForeignEnum valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
       if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
       }
       if (desc.getIndex() == -1) {
         return UNRECOGNIZED;
@@ -118,8 +132,7 @@ private ForeignEnum(int value) {
     // @@protoc_insertion_point(enum_scope:legacy_gencode_test.proto3.ForeignEnum)
   }
 
-  public interface TestMessageOrBuilder
-      extends
+  public interface TestMessageOrBuilder extends
       // @@protoc_insertion_point(interface_extends:legacy_gencode_test.proto3.TestMessage)
       com.google.protobuf.MessageOrBuilder {
 
@@ -128,13 +141,12 @@ public interface TestMessageOrBuilder
      * @return The x.
      */
     java.lang.String getX();
-
     /**
      * <code>string x = 2;</code>
-     *
      * @return The bytes for x.
      */
-    com.google.protobuf.ByteString getXBytes();
+    com.google.protobuf.ByteString
+        getXBytes();
 
     /**
      * <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code>
@@ -146,18 +158,19 @@ public interface TestMessageOrBuilder
      * @return The y.
      */
     legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage getY();
-
-    /** <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code> */
+    /**
+     * <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code>
+     */
     legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder getYOrBuilder();
   }
-
-  /** Protobuf type {@code legacy_gencode_test.proto3.TestMessage} */
-  public static final class TestMessage extends com.google.protobuf.GeneratedMessageV3
-      implements
+  /**
+   * Protobuf type {@code legacy_gencode_test.proto3.TestMessage}
+   */
+  public static final class TestMessage extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:legacy_gencode_test.proto3.TestMessage)
       TestMessageOrBuilder {
-    private static final long serialVersionUID = 0L;
-
+  private static final long serialVersionUID = 0L;
     // Use TestMessage.newBuilder() to construct.
     private TestMessage(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -168,23 +181,22 @@ private TestMessage() {
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
-    protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
       return new TestMessage();
     }
 
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return legacy_gencode_test.proto3.Proto3GencodeTestProto
-          .internal_static_legacy_gencode_test_proto3_TestMessage_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMessage_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return legacy_gencode_test.proto3.Proto3GencodeTestProto
-          .internal_static_legacy_gencode_test_proto3_TestMessage_fieldAccessorTable
+      return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMessage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.class,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.Builder.class);
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.class, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.Builder.class);
     }
 
     private int bitField0_;
@@ -201,24 +213,25 @@ public java.lang.String getX() {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         x_ = s;
         return s;
       }
     }
-
     /**
      * <code>string x = 2;</code>
-     *
      * @return The bytes for x.
      */
     @java.lang.Override
-    public com.google.protobuf.ByteString getXBytes() {
+    public com.google.protobuf.ByteString
+        getXBytes() {
       java.lang.Object ref = x_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
         x_ = b;
         return b;
       } else {
@@ -242,18 +255,14 @@ public boolean hasY() {
      */
     @java.lang.Override
     public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage getY() {
-      return y_ == null
-          ? legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.getDefaultInstance()
-          : y_;
+      return y_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.getDefaultInstance() : y_;
     }
-
-    /** <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code> */
+    /**
+     * <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code>
+     */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder
-        getYOrBuilder() {
-      return y_ == null
-          ? legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.getDefaultInstance()
-          : y_;
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder getYOrBuilder() {
+      return y_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.getDefaultInstance() : y_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -268,7 +277,8 @@ public final boolean isInitialized() {
     }
 
     @java.lang.Override
-    public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(x_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 2, x_);
       }
@@ -288,7 +298,8 @@ public int getSerializedSize() {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, x_);
       }
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getY());
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(3, getY());
       }
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
@@ -298,18 +309,19 @@ public int getSerializedSize() {
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
-        return true;
+       return true;
       }
       if (!(obj instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage)) {
         return super.equals(obj);
       }
-      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage other =
-          (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage) obj;
+      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage other = (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage) obj;
 
-      if (!getX().equals(other.getX())) return false;
+      if (!getX()
+          .equals(other.getX())) return false;
       if (hasY() != other.hasY()) return false;
       if (hasY()) {
-        if (!getY().equals(other.getY())) return false;
+        if (!getY()
+            .equals(other.getY())) return false;
       }
       if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
@@ -334,12 +346,13 @@ public int hashCode() {
     }
 
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseFrom(
-        java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseFrom(
-        java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
@@ -354,70 +367,68 @@ public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage pars
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseFrom(
-        byte[] data) throws com.google.protobuf.InvalidProtocolBufferException {
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseFrom(
-        byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseFrom(
-        java.io.InputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseFrom(
-        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseDelimitedFrom(
-        java.io.InputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
 
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseDelimitedFrom(
-        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseFrom(
-        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
     @java.lang.Override
-    public Builder newBuilderForType() {
-      return newBuilder();
-    }
-
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-
-    public static Builder newBuilder(
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage prototype) {
+    public static Builder newBuilder(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
     public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
 
     @java.lang.Override
@@ -426,26 +437,24 @@ protected Builder newBuilderForType(
       Builder builder = new Builder(parent);
       return builder;
     }
-
-    /** Protobuf type {@code legacy_gencode_test.proto3.TestMessage} */
-    public static final class Builder
-        extends com.google.protobuf.GeneratedMessageV3.Builder<Builder>
-        implements
+    /**
+     * Protobuf type {@code legacy_gencode_test.proto3.TestMessage}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:legacy_gencode_test.proto3.TestMessage)
         legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessageOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_TestMessage_descriptor;
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMessage_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_TestMessage_fieldAccessorTable
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.class,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.Builder.class);
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.class, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.Builder.class);
       }
 
       // Construct using legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.newBuilder()
@@ -453,12 +462,14 @@ private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
           getYFieldBuilder();
         }
       }
@@ -476,14 +487,13 @@ public Builder clear() {
       }
 
       @java.lang.Override
-      public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_TestMessage_descriptor;
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMessage_descriptor;
       }
 
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage
-          getDefaultInstanceForType() {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage getDefaultInstanceForType() {
         return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.getDefaultInstance();
       }
 
@@ -498,24 +508,22 @@ public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage build() {
 
       @java.lang.Override
       public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage buildPartial() {
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage result =
-            new legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage result = new legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage result) {
+      private void buildPartial0(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.x_ = x_;
         }
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.y_ = yBuilder_ == null ? y_ : yBuilder_.build();
+          result.y_ = yBuilder_ == null
+              ? y_
+              : yBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         result.bitField0_ |= to_bitField0_;
@@ -525,51 +533,46 @@ private void buildPartial0(
       public Builder clone() {
         return super.clone();
       }
-
       @java.lang.Override
       public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.setField(field, value);
       }
-
       @java.lang.Override
-      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
-
       @java.lang.Override
-      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
-
       @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index,
-          java.lang.Object value) {
+          int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
-
       @java.lang.Override
       public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage) {
-          return mergeFrom((legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage) other);
+          return mergeFrom((legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage other) {
-        if (other
-            == legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.getDefaultInstance())
-          return this;
+      public Builder mergeFrom(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage other) {
+        if (other == legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.getDefaultInstance()) return this;
         if (!other.getX().isEmpty()) {
           x_ = other.x_;
           bitField0_ |= 0x00000001;
@@ -604,25 +607,24 @@ public Builder mergeFrom(
               case 0:
                 done = true;
                 break;
-              case 18:
-                {
-                  x_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000001;
-                  break;
-                } // case 18
-              case 26:
-                {
-                  input.readMessage(getYFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000002;
-                  break;
-                } // case 26
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
+              case 18: {
+                x_ = input.readStringRequireUtf8();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 18
+              case 26: {
+                input.readMessage(
+                    getYFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 26
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
             } // switch (tag)
           } // while (!done)
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -642,7 +644,8 @@ public Builder mergeFrom(
       public java.lang.String getX() {
         java.lang.Object ref = x_;
         if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           x_ = s;
           return s;
@@ -650,34 +653,31 @@ public java.lang.String getX() {
           return (java.lang.String) ref;
         }
       }
-
       /**
        * <code>string x = 2;</code>
-       *
        * @return The bytes for x.
        */
-      public com.google.protobuf.ByteString getXBytes() {
+      public com.google.protobuf.ByteString
+          getXBytes() {
         java.lang.Object ref = x_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
-              com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
           x_ = b;
           return b;
         } else {
           return (com.google.protobuf.ByteString) ref;
         }
       }
-
       /**
        * <code>string x = 2;</code>
-       *
        * @param value The x to set.
        * @return This builder for chaining.
        */
-      public Builder setX(java.lang.String value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setX(
+          java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
         x_ = value;
         bitField0_ |= 0x00000001;
         onChanged();
@@ -693,17 +693,14 @@ public Builder clearX() {
         onChanged();
         return this;
       }
-
       /**
        * <code>string x = 2;</code>
-       *
        * @param value The bytes for x to set.
        * @return This builder for chaining.
        */
-      public Builder setXBytes(com.google.protobuf.ByteString value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setXBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
         checkByteStringIsUtf8(value);
         x_ = value;
         bitField0_ |= 0x00000001;
@@ -713,11 +710,7 @@ public Builder setXBytes(com.google.protobuf.ByteString value) {
 
       private legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage y_;
       private com.google.protobuf.SingleFieldBuilderV3<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder>
-          yBuilder_;
-
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder> yBuilder_;
       /**
        * <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code>
        * @return Whether the y field is set.
@@ -731,18 +724,15 @@ public boolean hasY() {
        */
       public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage getY() {
         if (yBuilder_ == null) {
-          return y_ == null
-              ? legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage
-                  .getDefaultInstance()
-              : y_;
+          return y_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.getDefaultInstance() : y_;
         } else {
           return yBuilder_.getMessage();
         }
       }
-
-      /** <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code> */
-      public Builder setY(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage value) {
+      /**
+       * <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code>
+       */
+      public Builder setY(legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage value) {
         if (yBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -755,11 +745,11 @@ public Builder setY(
         onChanged();
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code> */
+      /**
+       * <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code>
+       */
       public Builder setY(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder
-              builderForValue) {
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder builderForValue) {
         if (yBuilder_ == null) {
           y_ = builderForValue.build();
         } else {
@@ -769,16 +759,14 @@ public Builder setY(
         onChanged();
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code> */
-      public Builder mergeY(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage value) {
+      /**
+       * <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code>
+       */
+      public Builder mergeY(legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage value) {
         if (yBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) != 0)
-              && y_ != null
-              && y_
-                  != legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage
-                      .getDefaultInstance()) {
+          if (((bitField0_ & 0x00000002) != 0) &&
+            y_ != null &&
+            y_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.getDefaultInstance()) {
             getYBuilder().mergeFrom(value);
           } else {
             y_ = value;
@@ -792,8 +780,9 @@ public Builder mergeY(
         }
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code> */
+      /**
+       * <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code>
+       */
       public Builder clearY() {
         bitField0_ = (bitField0_ & ~0x00000002);
         y_ = null;
@@ -804,41 +793,37 @@ public Builder clearY() {
         onChanged();
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code> */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder
-          getYBuilder() {
+      /**
+       * <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code>
+       */
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder getYBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getYFieldBuilder().getBuilder();
       }
-
-      /** <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code> */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder
-          getYOrBuilder() {
+      /**
+       * <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code>
+       */
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder getYOrBuilder() {
         if (yBuilder_ != null) {
           return yBuilder_.getMessageOrBuilder();
         } else {
-          return y_ == null
-              ? legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage
-                  .getDefaultInstance()
-              : y_;
+          return y_ == null ?
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.getDefaultInstance() : y_;
         }
       }
-
-      /** <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code> */
+      /**
+       * <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code>
+       */
       private com.google.protobuf.SingleFieldBuilderV3<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder>
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder> 
           getYFieldBuilder() {
         if (yBuilder_ == null) {
-          yBuilder_ =
-              new com.google.protobuf.SingleFieldBuilderV3<
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder>(
-                  getY(), getParentForChildren(), isClean());
+          yBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder>(
+                  getY(),
+                  getParentForChildren(),
+                  isClean());
           y_ = null;
         }
         return yBuilder_;
@@ -860,40 +845,36 @@ public final Builder mergeUnknownFields(
     }
 
     // @@protoc_insertion_point(class_scope:legacy_gencode_test.proto3.TestMessage)
-    private static final legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage
-        DEFAULT_INSTANCE;
-
+    private static final legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage DEFAULT_INSTANCE;
     static {
       DEFAULT_INSTANCE = new legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage();
     }
 
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage
-        getDefaultInstance() {
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    private static final com.google.protobuf.Parser<TestMessage> PARSER =
-        new com.google.protobuf.AbstractParser<TestMessage>() {
-          @java.lang.Override
-          public TestMessage parsePartialFrom(
-              com.google.protobuf.CodedInputStream input,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
-          }
-        };
+    private static final com.google.protobuf.Parser<TestMessage>
+        PARSER = new com.google.protobuf.AbstractParser<TestMessage>() {
+      @java.lang.Override
+      public TestMessage parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (com.google.protobuf.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new com.google.protobuf.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
+      }
+    };
 
     public static com.google.protobuf.Parser<TestMessage> parser() {
       return PARSER;
@@ -905,15 +886,13 @@ public com.google.protobuf.Parser<TestMessage> getParserForType() {
     }
 
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage
-        getDefaultInstanceForType() {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
-  public interface NestedTestMessageOrBuilder
-      extends
+  public interface NestedTestMessageOrBuilder extends
       // @@protoc_insertion_point(interface_extends:legacy_gencode_test.proto3.NestedTestMessage)
       com.google.protobuf.MessageOrBuilder {
 
@@ -934,14 +913,14 @@ public interface NestedTestMessageOrBuilder
      */
     int getZ(int index);
   }
-
-  /** Protobuf type {@code legacy_gencode_test.proto3.NestedTestMessage} */
-  public static final class NestedTestMessage extends com.google.protobuf.GeneratedMessageV3
-      implements
+  /**
+   * Protobuf type {@code legacy_gencode_test.proto3.NestedTestMessage}
+   */
+  public static final class NestedTestMessage extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:legacy_gencode_test.proto3.NestedTestMessage)
       NestedTestMessageOrBuilder {
-    private static final long serialVersionUID = 0L;
-
+  private static final long serialVersionUID = 0L;
     // Use NestedTestMessage.newBuilder() to construct.
     private NestedTestMessage(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -952,37 +931,35 @@ private NestedTestMessage() {
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
-    protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
       return new NestedTestMessage();
     }
 
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return legacy_gencode_test.proto3.Proto3GencodeTestProto
-          .internal_static_legacy_gencode_test_proto3_NestedTestMessage_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_NestedTestMessage_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return legacy_gencode_test.proto3.Proto3GencodeTestProto
-          .internal_static_legacy_gencode_test_proto3_NestedTestMessage_fieldAccessorTable
+      return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_NestedTestMessage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.class,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder.class);
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.class, legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder.class);
     }
 
     public static final int Z_FIELD_NUMBER = 1;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList z_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList z_ =
+        emptyIntList();
     /**
      * <code>repeated int32 z = 1;</code>
-     *
      * @return A list containing the z.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getZList() {
+    public java.util.List<java.lang.Integer>
+        getZList() {
       return z_;
     }
     /**
@@ -1014,7 +991,8 @@ public final boolean isInitialized() {
     }
 
     @java.lang.Override
-    public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
       getSerializedSize();
       if (getZList().size() > 0) {
         output.writeUInt32NoTag(10);
@@ -1035,12 +1013,14 @@ public int getSerializedSize() {
       {
         int dataSize = 0;
         for (int i = 0; i < z_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(z_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt32SizeNoTag(z_.getInt(i));
         }
         size += dataSize;
         if (!getZList().isEmpty()) {
           size += 1;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         zMemoizedSerializedSize = dataSize;
       }
@@ -1052,15 +1032,15 @@ public int getSerializedSize() {
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
-        return true;
+       return true;
       }
       if (!(obj instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage)) {
         return super.equals(obj);
       }
-      legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage other =
-          (legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage) obj;
+      legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage other = (legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage) obj;
 
-      if (!getZList().equals(other.getZList())) return false;
+      if (!getZList()
+          .equals(other.getZList())) return false;
       if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
@@ -1082,12 +1062,13 @@ public int hashCode() {
     }
 
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseFrom(
-        java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseFrom(
-        java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
@@ -1102,71 +1083,68 @@ public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessag
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseFrom(
-        byte[] data) throws com.google.protobuf.InvalidProtocolBufferException {
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseFrom(
-        byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseFrom(
-        java.io.InputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseFrom(
-        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage
-        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage
-        parseDelimitedFrom(
-            java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-          PARSER, input, extensionRegistry);
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseFrom(
-        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
     @java.lang.Override
-    public Builder newBuilderForType() {
-      return newBuilder();
-    }
-
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-
-    public static Builder newBuilder(
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage prototype) {
+    public static Builder newBuilder(legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
     public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
 
     @java.lang.Override
@@ -1175,33 +1153,33 @@ protected Builder newBuilderForType(
       Builder builder = new Builder(parent);
       return builder;
     }
-
-    /** Protobuf type {@code legacy_gencode_test.proto3.NestedTestMessage} */
-    public static final class Builder
-        extends com.google.protobuf.GeneratedMessageV3.Builder<Builder>
-        implements
+    /**
+     * Protobuf type {@code legacy_gencode_test.proto3.NestedTestMessage}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:legacy_gencode_test.proto3.NestedTestMessage)
         legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_NestedTestMessage_descriptor;
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_NestedTestMessage_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_NestedTestMessage_fieldAccessorTable
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_NestedTestMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.class,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder.class);
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.class, legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder.class);
       }
 
-      // Construct using
-      // legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.newBuilder()
-      private Builder() {}
+      // Construct using legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.newBuilder()
+      private Builder() {
+
+      }
 
-      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
 
       }
@@ -1214,16 +1192,14 @@ public Builder clear() {
       }
 
       @java.lang.Override
-      public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_NestedTestMessage_descriptor;
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_NestedTestMessage_descriptor;
       }
 
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage
-          getDefaultInstanceForType() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage
-            .getDefaultInstance();
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage getDefaultInstanceForType() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.getDefaultInstance();
       }
 
       @java.lang.Override
@@ -1237,17 +1213,13 @@ public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage build
 
       @java.lang.Override
       public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage buildPartial() {
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage result =
-            new legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage result = new legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage result) {
+      private void buildPartial0(legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           z_.makeImmutable();
@@ -1259,52 +1231,46 @@ private void buildPartial0(
       public Builder clone() {
         return super.clone();
       }
-
       @java.lang.Override
       public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.setField(field, value);
       }
-
       @java.lang.Override
-      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
-
       @java.lang.Override
-      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
-
       @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index,
-          java.lang.Object value) {
+          int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
-
       @java.lang.Override
       public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage) {
-          return mergeFrom(
-              (legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage) other);
+          return mergeFrom((legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage other) {
-        if (other
-            == legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage
-                .getDefaultInstance()) return this;
+      public Builder mergeFrom(legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage other) {
+        if (other == legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.getDefaultInstance()) return this;
         if (!other.z_.isEmpty()) {
           if (z_.isEmpty()) {
             z_ = other.z_;
@@ -1342,31 +1308,28 @@ public Builder mergeFrom(
               case 0:
                 done = true;
                 break;
-              case 8:
-                {
-                  int v = input.readInt32();
-                  ensureZIsMutable();
-                  z_.addInt(v);
-                  break;
-                } // case 8
-              case 10:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureZIsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    z_.addInt(input.readInt32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 10
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
+              case 8: {
+                int v = input.readInt32();
+                ensureZIsMutable();
+                z_.addInt(v);
+                break;
+              } // case 8
+              case 10: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureZIsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  z_.addInt(input.readInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
             } // switch (tag)
           } // while (!done)
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1385,13 +1348,12 @@ private void ensureZIsMutable() {
         }
         bitField0_ |= 0x00000001;
       }
-
       /**
        * <code>repeated int32 z = 1;</code>
-       *
        * @return A list containing the z.
        */
-      public java.util.List<java.lang.Integer> getZList() {
+      public java.util.List<java.lang.Integer>
+          getZList() {
         z_.makeImmutable();
         return z_;
       }
@@ -1410,15 +1372,14 @@ public int getZCount() {
       public int getZ(int index) {
         return z_.getInt(index);
       }
-
       /**
        * <code>repeated int32 z = 1;</code>
-       *
        * @param index The index to set the value at.
        * @param value The z to set.
        * @return This builder for chaining.
        */
-      public Builder setZ(int index, int value) {
+      public Builder setZ(
+          int index, int value) {
 
         ensureZIsMutable();
         z_.setInt(index, value);
@@ -1439,16 +1400,16 @@ public Builder addZ(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated int32 z = 1;</code>
-       *
        * @param values The z to add.
        * @return This builder for chaining.
        */
-      public Builder addAllZ(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllZ(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureZIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, z_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, z_);
         bitField0_ |= 0x00000001;
         onChanged();
         return this;
@@ -1480,40 +1441,36 @@ public final Builder mergeUnknownFields(
     }
 
     // @@protoc_insertion_point(class_scope:legacy_gencode_test.proto3.NestedTestMessage)
-    private static final legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage
-        DEFAULT_INSTANCE;
-
+    private static final legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage DEFAULT_INSTANCE;
     static {
       DEFAULT_INSTANCE = new legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage();
     }
 
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage
-        getDefaultInstance() {
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    private static final com.google.protobuf.Parser<NestedTestMessage> PARSER =
-        new com.google.protobuf.AbstractParser<NestedTestMessage>() {
-          @java.lang.Override
-          public NestedTestMessage parsePartialFrom(
-              com.google.protobuf.CodedInputStream input,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
-          }
-        };
+    private static final com.google.protobuf.Parser<NestedTestMessage>
+        PARSER = new com.google.protobuf.AbstractParser<NestedTestMessage>() {
+      @java.lang.Override
+      public NestedTestMessage parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (com.google.protobuf.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new com.google.protobuf.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
+      }
+    };
 
     public static com.google.protobuf.Parser<NestedTestMessage> parser() {
       return PARSER;
@@ -1525,275 +1482,214 @@ public com.google.protobuf.Parser<NestedTestMessage> getParserForType() {
     }
 
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage
-        getDefaultInstanceForType() {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
+
   }
 
-  public interface TestMostTypesProto3OrBuilder
-      extends
+  public interface TestMostTypesProto3OrBuilder extends
       // @@protoc_insertion_point(interface_extends:legacy_gencode_test.proto3.TestMostTypesProto3)
       com.google.protobuf.MessageOrBuilder {
 
     /**
      * <code>int32 optional_int32 = 1;</code>
-     *
      * @return The optionalInt32.
      */
     int getOptionalInt32();
 
     /**
      * <code>int64 optional_int64 = 2;</code>
-     *
      * @return The optionalInt64.
      */
     long getOptionalInt64();
 
     /**
      * <code>uint32 optional_uint32 = 3;</code>
-     *
      * @return The optionalUint32.
      */
     int getOptionalUint32();
 
     /**
      * <code>uint64 optional_uint64 = 4;</code>
-     *
      * @return The optionalUint64.
      */
     long getOptionalUint64();
 
     /**
      * <code>sint32 optional_sint32 = 5;</code>
-     *
      * @return The optionalSint32.
      */
     int getOptionalSint32();
 
     /**
      * <code>sint64 optional_sint64 = 6;</code>
-     *
      * @return The optionalSint64.
      */
     long getOptionalSint64();
 
     /**
      * <code>fixed32 optional_fixed32 = 7;</code>
-     *
      * @return The optionalFixed32.
      */
     int getOptionalFixed32();
 
     /**
      * <code>fixed64 optional_fixed64 = 8;</code>
-     *
      * @return The optionalFixed64.
      */
     long getOptionalFixed64();
 
     /**
      * <code>sfixed32 optional_sfixed32 = 9;</code>
-     *
      * @return The optionalSfixed32.
      */
     int getOptionalSfixed32();
 
     /**
      * <code>sfixed64 optional_sfixed64 = 10;</code>
-     *
      * @return The optionalSfixed64.
      */
     long getOptionalSfixed64();
 
     /**
      * <code>float optional_float = 11;</code>
-     *
      * @return The optionalFloat.
      */
     float getOptionalFloat();
 
     /**
      * <code>double optional_double = 12;</code>
-     *
      * @return The optionalDouble.
      */
     double getOptionalDouble();
 
     /**
      * <code>bool optional_bool = 13;</code>
-     *
      * @return The optionalBool.
      */
     boolean getOptionalBool();
 
     /**
      * <code>string optional_string = 14;</code>
-     *
      * @return The optionalString.
      */
     java.lang.String getOptionalString();
-
     /**
      * <code>string optional_string = 14;</code>
-     *
      * @return The bytes for optionalString.
      */
-    com.google.protobuf.ByteString getOptionalStringBytes();
+    com.google.protobuf.ByteString
+        getOptionalStringBytes();
 
     /**
      * <code>bytes optional_bytes = 15;</code>
-     *
      * @return The optionalBytes.
      */
     com.google.protobuf.ByteString getOptionalBytes();
 
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
      * @return Whether the optionalNestedMessage field is set.
      */
     boolean hasOptionalNestedMessage();
-
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
      * @return The optionalNestedMessage.
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-        getOptionalNestedMessage();
-
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getOptionalNestedMessage();
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-     * </code>
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder
-        getOptionalNestedMessageOrBuilder();
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder getOptionalNestedMessageOrBuilder();
 
     /**
      * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
-     *
      * @return Whether the optionalForeignMessage field is set.
      */
     boolean hasOptionalForeignMessage();
-
     /**
      * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
-     *
      * @return The optionalForeignMessage.
      */
     legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getOptionalForeignMessage();
-
-    /** <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code> */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder
-        getOptionalForeignMessageOrBuilder();
+    /**
+     * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
+     */
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder getOptionalForeignMessageOrBuilder();
 
     /**
-     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;</code>
      * @return The enum numeric value on the wire for optionalNestedEnum.
      */
     int getOptionalNestedEnumValue();
-
     /**
-     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;</code>
      * @return The optionalNestedEnum.
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getOptionalNestedEnum();
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getOptionalNestedEnum();
 
     /**
      * <code>.legacy_gencode_test.proto3.ForeignEnum optional_foreign_enum = 22;</code>
-     *
      * @return The enum numeric value on the wire for optionalForeignEnum.
      */
     int getOptionalForeignEnumValue();
-
     /**
      * <code>.legacy_gencode_test.proto3.ForeignEnum optional_foreign_enum = 22;</code>
-     *
      * @return The optionalForeignEnum.
      */
     legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getOptionalForeignEnum();
 
     /**
-     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;</code>
      * @return The enum numeric value on the wire for optionalAliasedEnum.
      */
     int getOptionalAliasedEnumValue();
-
     /**
-     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;</code>
      * @return The optionalAliasedEnum.
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum
-        getOptionalAliasedEnum();
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum getOptionalAliasedEnum();
 
     /**
      * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
-     *
      * @return Whether the recursiveMessage field is set.
      */
     boolean hasRecursiveMessage();
-
     /**
      * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
-     *
      * @return The recursiveMessage.
      */
     legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 getRecursiveMessage();
-
-    /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code> */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder
-        getRecursiveMessageOrBuilder();
+    /**
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
+     */
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder getRecursiveMessageOrBuilder();
 
     /**
-     *
-     *
      * <pre>
      * Repeated
      * </pre>
      *
      * <code>repeated int32 repeated_int32 = 31;</code>
-     *
      * @return A list containing the repeatedInt32.
      */
     java.util.List<java.lang.Integer> getRepeatedInt32List();
-
     /**
-     *
-     *
      * <pre>
      * Repeated
      * </pre>
      *
      * <code>repeated int32 repeated_int32 = 31;</code>
-     *
      * @return The count of repeatedInt32.
      */
     int getRepeatedInt32Count();
-
     /**
-     *
-     *
      * <pre>
      * Repeated
      * </pre>
      *
      * <code>repeated int32 repeated_int32 = 31;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedInt32 at the given index.
      */
@@ -1801,21 +1697,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated int64 repeated_int64 = 32;</code>
-     *
      * @return A list containing the repeatedInt64.
      */
     java.util.List<java.lang.Long> getRepeatedInt64List();
-
     /**
      * <code>repeated int64 repeated_int64 = 32;</code>
-     *
      * @return The count of repeatedInt64.
      */
     int getRepeatedInt64Count();
-
     /**
      * <code>repeated int64 repeated_int64 = 32;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedInt64 at the given index.
      */
@@ -1823,21 +1714,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated uint32 repeated_uint32 = 33;</code>
-     *
      * @return A list containing the repeatedUint32.
      */
     java.util.List<java.lang.Integer> getRepeatedUint32List();
-
     /**
      * <code>repeated uint32 repeated_uint32 = 33;</code>
-     *
      * @return The count of repeatedUint32.
      */
     int getRepeatedUint32Count();
-
     /**
      * <code>repeated uint32 repeated_uint32 = 33;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedUint32 at the given index.
      */
@@ -1845,21 +1731,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated uint64 repeated_uint64 = 34;</code>
-     *
      * @return A list containing the repeatedUint64.
      */
     java.util.List<java.lang.Long> getRepeatedUint64List();
-
     /**
      * <code>repeated uint64 repeated_uint64 = 34;</code>
-     *
      * @return The count of repeatedUint64.
      */
     int getRepeatedUint64Count();
-
     /**
      * <code>repeated uint64 repeated_uint64 = 34;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedUint64 at the given index.
      */
@@ -1867,21 +1748,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated sint32 repeated_sint32 = 35;</code>
-     *
      * @return A list containing the repeatedSint32.
      */
     java.util.List<java.lang.Integer> getRepeatedSint32List();
-
     /**
      * <code>repeated sint32 repeated_sint32 = 35;</code>
-     *
      * @return The count of repeatedSint32.
      */
     int getRepeatedSint32Count();
-
     /**
      * <code>repeated sint32 repeated_sint32 = 35;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedSint32 at the given index.
      */
@@ -1889,21 +1765,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated sint64 repeated_sint64 = 36;</code>
-     *
      * @return A list containing the repeatedSint64.
      */
     java.util.List<java.lang.Long> getRepeatedSint64List();
-
     /**
      * <code>repeated sint64 repeated_sint64 = 36;</code>
-     *
      * @return The count of repeatedSint64.
      */
     int getRepeatedSint64Count();
-
     /**
      * <code>repeated sint64 repeated_sint64 = 36;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedSint64 at the given index.
      */
@@ -1911,21 +1782,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-     *
      * @return A list containing the repeatedFixed32.
      */
     java.util.List<java.lang.Integer> getRepeatedFixed32List();
-
     /**
      * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-     *
      * @return The count of repeatedFixed32.
      */
     int getRepeatedFixed32Count();
-
     /**
      * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedFixed32 at the given index.
      */
@@ -1933,21 +1799,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-     *
      * @return A list containing the repeatedFixed64.
      */
     java.util.List<java.lang.Long> getRepeatedFixed64List();
-
     /**
      * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-     *
      * @return The count of repeatedFixed64.
      */
     int getRepeatedFixed64Count();
-
     /**
      * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedFixed64 at the given index.
      */
@@ -1955,21 +1816,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-     *
      * @return A list containing the repeatedSfixed32.
      */
     java.util.List<java.lang.Integer> getRepeatedSfixed32List();
-
     /**
      * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-     *
      * @return The count of repeatedSfixed32.
      */
     int getRepeatedSfixed32Count();
-
     /**
      * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedSfixed32 at the given index.
      */
@@ -1977,21 +1833,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-     *
      * @return A list containing the repeatedSfixed64.
      */
     java.util.List<java.lang.Long> getRepeatedSfixed64List();
-
     /**
      * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-     *
      * @return The count of repeatedSfixed64.
      */
     int getRepeatedSfixed64Count();
-
     /**
      * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedSfixed64 at the given index.
      */
@@ -1999,21 +1850,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated float repeated_float = 41;</code>
-     *
      * @return A list containing the repeatedFloat.
      */
     java.util.List<java.lang.Float> getRepeatedFloatList();
-
     /**
      * <code>repeated float repeated_float = 41;</code>
-     *
      * @return The count of repeatedFloat.
      */
     int getRepeatedFloatCount();
-
     /**
      * <code>repeated float repeated_float = 41;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedFloat at the given index.
      */
@@ -2021,21 +1867,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated double repeated_double = 42;</code>
-     *
      * @return A list containing the repeatedDouble.
      */
     java.util.List<java.lang.Double> getRepeatedDoubleList();
-
     /**
      * <code>repeated double repeated_double = 42;</code>
-     *
      * @return The count of repeatedDouble.
      */
     int getRepeatedDoubleCount();
-
     /**
      * <code>repeated double repeated_double = 42;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedDouble at the given index.
      */
@@ -2043,21 +1884,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated bool repeated_bool = 43;</code>
-     *
      * @return A list containing the repeatedBool.
      */
     java.util.List<java.lang.Boolean> getRepeatedBoolList();
-
     /**
      * <code>repeated bool repeated_bool = 43;</code>
-     *
      * @return The count of repeatedBool.
      */
     int getRepeatedBoolCount();
-
     /**
      * <code>repeated bool repeated_bool = 43;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedBool at the given index.
      */
@@ -2065,178 +1901,118 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated string repeated_string = 44;</code>
-     *
      * @return A list containing the repeatedString.
      */
-    java.util.List<java.lang.String> getRepeatedStringList();
-
+    java.util.List<java.lang.String>
+        getRepeatedStringList();
     /**
      * <code>repeated string repeated_string = 44;</code>
-     *
      * @return The count of repeatedString.
      */
     int getRepeatedStringCount();
-
     /**
      * <code>repeated string repeated_string = 44;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedString at the given index.
      */
     java.lang.String getRepeatedString(int index);
-
     /**
      * <code>repeated string repeated_string = 44;</code>
-     *
      * @param index The index of the value to return.
      * @return The bytes of the repeatedString at the given index.
      */
-    com.google.protobuf.ByteString getRepeatedStringBytes(int index);
+    com.google.protobuf.ByteString
+        getRepeatedStringBytes(int index);
 
     /**
      * <code>repeated bytes repeated_bytes = 45;</code>
-     *
      * @return A list containing the repeatedBytes.
      */
     java.util.List<com.google.protobuf.ByteString> getRepeatedBytesList();
-
     /**
      * <code>repeated bytes repeated_bytes = 45;</code>
-     *
      * @return The count of repeatedBytes.
      */
     int getRepeatedBytesCount();
-
     /**
      * <code>repeated bytes repeated_bytes = 45;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedBytes at the given index.
      */
     com.google.protobuf.ByteString getRepeatedBytes(int index);
 
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
      */
-    java.util.List<
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
+    java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> 
         getRepeatedNestedMessageList();
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-        getRepeatedNestedMessage(int index);
-
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getRepeatedNestedMessage(int index);
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
      */
     int getRepeatedNestedMessageCount();
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
      */
-    java.util.List<
-            ? extends
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .NestedMessageOrBuilder>
+    java.util.List<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> 
         getRepeatedNestedMessageOrBuilderList();
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder
-        getRepeatedNestedMessageOrBuilder(int index);
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder getRepeatedNestedMessageOrBuilder(
+        int index);
 
     /**
-     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
      */
-    java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
+    java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> 
         getRepeatedForeignMessageList();
-
     /**
-     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedForeignMessage(
-        int index);
-
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedForeignMessage(int index);
     /**
-     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
      */
     int getRepeatedForeignMessageCount();
-
     /**
-     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
      */
-    java.util.List<
-            ? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>
+    java.util.List<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder> 
         getRepeatedForeignMessageOrBuilderList();
-
     /**
-     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder
-        getRepeatedForeignMessageOrBuilder(int index);
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder getRepeatedForeignMessageOrBuilder(
+        int index);
 
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
      * @return A list containing the repeatedNestedEnum.
      */
-    java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        getRepeatedNestedEnumList();
-
+    java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> getRepeatedNestedEnumList();
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
      * @return The count of repeatedNestedEnum.
      */
     int getRepeatedNestedEnumCount();
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
      * @param index The index of the element to return.
      * @return The repeatedNestedEnum at the given index.
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getRepeatedNestedEnum(int index);
-
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getRepeatedNestedEnum(int index);
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
      * @return A list containing the enum numeric values on the wire for repeatedNestedEnum.
      */
-    java.util.List<java.lang.Integer> getRepeatedNestedEnumValueList();
-
+    java.util.List<java.lang.Integer>
+    getRepeatedNestedEnumValueList();
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
      * @param index The index of the value to return.
      * @return The enum numeric value on the wire of repeatedNestedEnum at the given index.
      */
@@ -2244,77 +2020,57 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-     *
      * @return A list containing the repeatedForeignEnum.
      */
-    java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-        getRepeatedForeignEnumList();
-
+    java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum> getRepeatedForeignEnumList();
     /**
      * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-     *
      * @return The count of repeatedForeignEnum.
      */
     int getRepeatedForeignEnumCount();
-
     /**
      * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedForeignEnum at the given index.
      */
     legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getRepeatedForeignEnum(int index);
-
     /**
      * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-     *
      * @return A list containing the enum numeric values on the wire for repeatedForeignEnum.
      */
-    java.util.List<java.lang.Integer> getRepeatedForeignEnumValueList();
-
+    java.util.List<java.lang.Integer>
+    getRepeatedForeignEnumValueList();
     /**
      * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-     *
      * @param index The index of the value to return.
      * @return The enum numeric value on the wire of repeatedForeignEnum at the given index.
      */
     int getRepeatedForeignEnumValue(int index);
 
     /**
-     *
-     *
      * <pre>
      * Packed
      * </pre>
      *
      * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-     *
      * @return A list containing the packedInt32.
      */
     java.util.List<java.lang.Integer> getPackedInt32List();
-
     /**
-     *
-     *
      * <pre>
      * Packed
      * </pre>
      *
      * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-     *
      * @return The count of packedInt32.
      */
     int getPackedInt32Count();
-
     /**
-     *
-     *
      * <pre>
      * Packed
      * </pre>
      *
      * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedInt32 at the given index.
      */
@@ -2322,21 +2078,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-     *
      * @return A list containing the packedInt64.
      */
     java.util.List<java.lang.Long> getPackedInt64List();
-
     /**
      * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-     *
      * @return The count of packedInt64.
      */
     int getPackedInt64Count();
-
     /**
      * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedInt64 at the given index.
      */
@@ -2344,21 +2095,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-     *
      * @return A list containing the packedUint32.
      */
     java.util.List<java.lang.Integer> getPackedUint32List();
-
     /**
      * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-     *
      * @return The count of packedUint32.
      */
     int getPackedUint32Count();
-
     /**
      * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedUint32 at the given index.
      */
@@ -2366,21 +2112,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-     *
      * @return A list containing the packedUint64.
      */
     java.util.List<java.lang.Long> getPackedUint64List();
-
     /**
      * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-     *
      * @return The count of packedUint64.
      */
     int getPackedUint64Count();
-
     /**
      * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedUint64 at the given index.
      */
@@ -2388,21 +2129,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-     *
      * @return A list containing the packedSint32.
      */
     java.util.List<java.lang.Integer> getPackedSint32List();
-
     /**
      * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-     *
      * @return The count of packedSint32.
      */
     int getPackedSint32Count();
-
     /**
      * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedSint32 at the given index.
      */
@@ -2410,21 +2146,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-     *
      * @return A list containing the packedSint64.
      */
     java.util.List<java.lang.Long> getPackedSint64List();
-
     /**
      * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-     *
      * @return The count of packedSint64.
      */
     int getPackedSint64Count();
-
     /**
      * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedSint64 at the given index.
      */
@@ -2432,21 +2163,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-     *
      * @return A list containing the packedFixed32.
      */
     java.util.List<java.lang.Integer> getPackedFixed32List();
-
     /**
      * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-     *
      * @return The count of packedFixed32.
      */
     int getPackedFixed32Count();
-
     /**
      * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedFixed32 at the given index.
      */
@@ -2454,21 +2180,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-     *
      * @return A list containing the packedFixed64.
      */
     java.util.List<java.lang.Long> getPackedFixed64List();
-
     /**
      * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-     *
      * @return The count of packedFixed64.
      */
     int getPackedFixed64Count();
-
     /**
      * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedFixed64 at the given index.
      */
@@ -2476,21 +2197,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-     *
      * @return A list containing the packedSfixed32.
      */
     java.util.List<java.lang.Integer> getPackedSfixed32List();
-
     /**
      * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-     *
      * @return The count of packedSfixed32.
      */
     int getPackedSfixed32Count();
-
     /**
      * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedSfixed32 at the given index.
      */
@@ -2498,21 +2214,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-     *
      * @return A list containing the packedSfixed64.
      */
     java.util.List<java.lang.Long> getPackedSfixed64List();
-
     /**
      * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-     *
      * @return The count of packedSfixed64.
      */
     int getPackedSfixed64Count();
-
     /**
      * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedSfixed64 at the given index.
      */
@@ -2520,21 +2231,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated float packed_float = 85 [packed = true];</code>
-     *
      * @return A list containing the packedFloat.
      */
     java.util.List<java.lang.Float> getPackedFloatList();
-
     /**
      * <code>repeated float packed_float = 85 [packed = true];</code>
-     *
      * @return The count of packedFloat.
      */
     int getPackedFloatCount();
-
     /**
      * <code>repeated float packed_float = 85 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedFloat at the given index.
      */
@@ -2542,21 +2248,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated double packed_double = 86 [packed = true];</code>
-     *
      * @return A list containing the packedDouble.
      */
     java.util.List<java.lang.Double> getPackedDoubleList();
-
     /**
      * <code>repeated double packed_double = 86 [packed = true];</code>
-     *
      * @return The count of packedDouble.
      */
     int getPackedDoubleCount();
-
     /**
      * <code>repeated double packed_double = 86 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedDouble at the given index.
      */
@@ -2564,110 +2265,74 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated bool packed_bool = 87 [packed = true];</code>
-     *
      * @return A list containing the packedBool.
      */
     java.util.List<java.lang.Boolean> getPackedBoolList();
-
     /**
      * <code>repeated bool packed_bool = 87 [packed = true];</code>
-     *
      * @return The count of packedBool.
      */
     int getPackedBoolCount();
-
     /**
      * <code>repeated bool packed_bool = 87 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedBool at the given index.
      */
     boolean getPackedBool(int index);
 
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
      * @return A list containing the packedNestedEnum.
      */
-    java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        getPackedNestedEnumList();
-
+    java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> getPackedNestedEnumList();
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
      * @return The count of packedNestedEnum.
      */
     int getPackedNestedEnumCount();
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
      * @param index The index of the element to return.
      * @return The packedNestedEnum at the given index.
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getPackedNestedEnum(int index);
-
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getPackedNestedEnum(int index);
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
      * @return A list containing the enum numeric values on the wire for packedNestedEnum.
      */
-    java.util.List<java.lang.Integer> getPackedNestedEnumValueList();
-
+    java.util.List<java.lang.Integer>
+    getPackedNestedEnumValueList();
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
      * @param index The index of the value to return.
      * @return The enum numeric value on the wire of packedNestedEnum at the given index.
      */
     int getPackedNestedEnumValue(int index);
 
     /**
-     *
-     *
      * <pre>
      * Unpacked
      * </pre>
      *
      * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-     *
      * @return A list containing the unpackedInt32.
      */
     java.util.List<java.lang.Integer> getUnpackedInt32List();
-
     /**
-     *
-     *
      * <pre>
      * Unpacked
      * </pre>
      *
      * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-     *
      * @return The count of unpackedInt32.
      */
     int getUnpackedInt32Count();
-
     /**
-     *
-     *
      * <pre>
      * Unpacked
      * </pre>
      *
      * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedInt32 at the given index.
      */
@@ -2675,21 +2340,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-     *
      * @return A list containing the unpackedInt64.
      */
     java.util.List<java.lang.Long> getUnpackedInt64List();
-
     /**
      * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-     *
      * @return The count of unpackedInt64.
      */
     int getUnpackedInt64Count();
-
     /**
      * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedInt64 at the given index.
      */
@@ -2697,21 +2357,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-     *
      * @return A list containing the unpackedUint32.
      */
     java.util.List<java.lang.Integer> getUnpackedUint32List();
-
     /**
      * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-     *
      * @return The count of unpackedUint32.
      */
     int getUnpackedUint32Count();
-
     /**
      * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedUint32 at the given index.
      */
@@ -2719,21 +2374,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-     *
      * @return A list containing the unpackedUint64.
      */
     java.util.List<java.lang.Long> getUnpackedUint64List();
-
     /**
      * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-     *
      * @return The count of unpackedUint64.
      */
     int getUnpackedUint64Count();
-
     /**
      * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedUint64 at the given index.
      */
@@ -2741,21 +2391,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-     *
      * @return A list containing the unpackedSint32.
      */
     java.util.List<java.lang.Integer> getUnpackedSint32List();
-
     /**
      * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-     *
      * @return The count of unpackedSint32.
      */
     int getUnpackedSint32Count();
-
     /**
      * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedSint32 at the given index.
      */
@@ -2763,21 +2408,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-     *
      * @return A list containing the unpackedSint64.
      */
     java.util.List<java.lang.Long> getUnpackedSint64List();
-
     /**
      * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-     *
      * @return The count of unpackedSint64.
      */
     int getUnpackedSint64Count();
-
     /**
      * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedSint64 at the given index.
      */
@@ -2785,21 +2425,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-     *
      * @return A list containing the unpackedFixed32.
      */
     java.util.List<java.lang.Integer> getUnpackedFixed32List();
-
     /**
      * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-     *
      * @return The count of unpackedFixed32.
      */
     int getUnpackedFixed32Count();
-
     /**
      * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedFixed32 at the given index.
      */
@@ -2807,21 +2442,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-     *
      * @return A list containing the unpackedFixed64.
      */
     java.util.List<java.lang.Long> getUnpackedFixed64List();
-
     /**
      * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-     *
      * @return The count of unpackedFixed64.
      */
     int getUnpackedFixed64Count();
-
     /**
      * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedFixed64 at the given index.
      */
@@ -2829,21 +2459,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-     *
      * @return A list containing the unpackedSfixed32.
      */
     java.util.List<java.lang.Integer> getUnpackedSfixed32List();
-
     /**
      * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-     *
      * @return The count of unpackedSfixed32.
      */
     int getUnpackedSfixed32Count();
-
     /**
      * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedSfixed32 at the given index.
      */
@@ -2851,21 +2476,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-     *
      * @return A list containing the unpackedSfixed64.
      */
     java.util.List<java.lang.Long> getUnpackedSfixed64List();
-
     /**
      * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-     *
      * @return The count of unpackedSfixed64.
      */
     int getUnpackedSfixed64Count();
-
     /**
      * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedSfixed64 at the given index.
      */
@@ -2873,21 +2493,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated float unpacked_float = 99 [packed = false];</code>
-     *
      * @return A list containing the unpackedFloat.
      */
     java.util.List<java.lang.Float> getUnpackedFloatList();
-
     /**
      * <code>repeated float unpacked_float = 99 [packed = false];</code>
-     *
      * @return The count of unpackedFloat.
      */
     int getUnpackedFloatCount();
-
     /**
      * <code>repeated float unpacked_float = 99 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedFloat at the given index.
      */
@@ -2895,21 +2510,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated double unpacked_double = 100 [packed = false];</code>
-     *
      * @return A list containing the unpackedDouble.
      */
     java.util.List<java.lang.Double> getUnpackedDoubleList();
-
     /**
      * <code>repeated double unpacked_double = 100 [packed = false];</code>
-     *
      * @return The count of unpackedDouble.
      */
     int getUnpackedDoubleCount();
-
     /**
      * <code>repeated double unpacked_double = 100 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedDouble at the given index.
      */
@@ -2917,78 +2527,51 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-     *
      * @return A list containing the unpackedBool.
      */
     java.util.List<java.lang.Boolean> getUnpackedBoolList();
-
     /**
      * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-     *
      * @return The count of unpackedBool.
      */
     int getUnpackedBoolCount();
-
     /**
      * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedBool at the given index.
      */
     boolean getUnpackedBool(int index);
 
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
      * @return A list containing the unpackedNestedEnum.
      */
-    java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        getUnpackedNestedEnumList();
-
+    java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> getUnpackedNestedEnumList();
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
      * @return The count of unpackedNestedEnum.
      */
     int getUnpackedNestedEnumCount();
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
      * @param index The index of the element to return.
      * @return The unpackedNestedEnum at the given index.
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getUnpackedNestedEnum(int index);
-
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getUnpackedNestedEnum(int index);
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
      * @return A list containing the enum numeric values on the wire for unpackedNestedEnum.
      */
-    java.util.List<java.lang.Integer> getUnpackedNestedEnumValueList();
-
+    java.util.List<java.lang.Integer>
+    getUnpackedNestedEnumValueList();
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
      * @param index The index of the value to return.
      * @return The enum numeric value on the wire of unpackedNestedEnum at the given index.
      */
     int getUnpackedNestedEnumValue(int index);
 
     /**
-     *
-     *
      * <pre>
      * Map
      * </pre>
@@ -2996,738 +2579,799 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
      * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
      */
     int getMapInt32Int32Count();
-
     /**
-     *
-     *
      * <pre>
      * Map
      * </pre>
      *
      * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
      */
-    boolean containsMapInt32Int32(int key);
-
-    /** Use {@link #getMapInt32Int32Map()} instead. */
+    boolean containsMapInt32Int32(
+        int key);
+    /**
+     * Use {@link #getMapInt32Int32Map()} instead.
+     */
     @java.lang.Deprecated
-    java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32();
-
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapInt32Int32();
     /**
-     *
-     *
      * <pre>
      * Map
      * </pre>
      *
      * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
      */
-    java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32Map();
-
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapInt32Int32Map();
     /**
-     *
-     *
      * <pre>
      * Map
      * </pre>
      *
      * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
      */
-    int getMapInt32Int32OrDefault(int key, int defaultValue);
-
+    int getMapInt32Int32OrDefault(
+        int key,
+        int defaultValue);
     /**
-     *
-     *
      * <pre>
      * Map
      * </pre>
      *
      * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
      */
-    int getMapInt32Int32OrThrow(int key);
+    int getMapInt32Int32OrThrow(
+        int key);
 
-    /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
     int getMapInt64Int64Count();
-
-    /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
-    boolean containsMapInt64Int64(long key);
-
-    /** Use {@link #getMapInt64Int64Map()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Long, java.lang.Long> getMapInt64Int64();
-
-    /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
-    java.util.Map<java.lang.Long, java.lang.Long> getMapInt64Int64Map();
-
-    /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
-    long getMapInt64Int64OrDefault(long key, long defaultValue);
-
-    /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
-    long getMapInt64Int64OrThrow(long key);
-
-    /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
-    int getMapUint32Uint32Count();
-
-    /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
-    boolean containsMapUint32Uint32(int key);
-
-    /** Use {@link #getMapUint32Uint32Map()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Integer, java.lang.Integer> getMapUint32Uint32();
-
-    /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
-    java.util.Map<java.lang.Integer, java.lang.Integer> getMapUint32Uint32Map();
-
-    /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
-    int getMapUint32Uint32OrDefault(int key, int defaultValue);
-
-    /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
-    int getMapUint32Uint32OrThrow(int key);
-
-    /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
-    int getMapUint64Uint64Count();
-
-    /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
-    boolean containsMapUint64Uint64(long key);
-
-    /** Use {@link #getMapUint64Uint64Map()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Long, java.lang.Long> getMapUint64Uint64();
-
-    /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
-    java.util.Map<java.lang.Long, java.lang.Long> getMapUint64Uint64Map();
-
-    /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
-    long getMapUint64Uint64OrDefault(long key, long defaultValue);
-
-    /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
-    long getMapUint64Uint64OrThrow(long key);
-
-    /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
-    int getMapSint32Sint32Count();
-
-    /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
-    boolean containsMapSint32Sint32(int key);
-
-    /** Use {@link #getMapSint32Sint32Map()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Integer, java.lang.Integer> getMapSint32Sint32();
-
-    /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
-    java.util.Map<java.lang.Integer, java.lang.Integer> getMapSint32Sint32Map();
-
-    /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
-    int getMapSint32Sint32OrDefault(int key, int defaultValue);
-
-    /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
-    int getMapSint32Sint32OrThrow(int key);
-
-    /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
-    int getMapSint64Sint64Count();
-
-    /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
-    boolean containsMapSint64Sint64(long key);
-
-    /** Use {@link #getMapSint64Sint64Map()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Long, java.lang.Long> getMapSint64Sint64();
-
-    /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
-    java.util.Map<java.lang.Long, java.lang.Long> getMapSint64Sint64Map();
-
-    /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
-    long getMapSint64Sint64OrDefault(long key, long defaultValue);
-
-    /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
-    long getMapSint64Sint64OrThrow(long key);
-
-    /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
-    int getMapFixed32Fixed32Count();
-
-    /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
-    boolean containsMapFixed32Fixed32(int key);
-
-    /** Use {@link #getMapFixed32Fixed32Map()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Integer, java.lang.Integer> getMapFixed32Fixed32();
-
-    /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
-    java.util.Map<java.lang.Integer, java.lang.Integer> getMapFixed32Fixed32Map();
-
-    /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
-    int getMapFixed32Fixed32OrDefault(int key, int defaultValue);
-
-    /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
-    int getMapFixed32Fixed32OrThrow(int key);
-
-    /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
-    int getMapFixed64Fixed64Count();
-
-    /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
-    boolean containsMapFixed64Fixed64(long key);
-
-    /** Use {@link #getMapFixed64Fixed64Map()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Long, java.lang.Long> getMapFixed64Fixed64();
-
-    /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
-    java.util.Map<java.lang.Long, java.lang.Long> getMapFixed64Fixed64Map();
-
-    /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
-    long getMapFixed64Fixed64OrDefault(long key, long defaultValue);
-
-    /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
-    long getMapFixed64Fixed64OrThrow(long key);
-
-    /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
-    int getMapSfixed32Sfixed32Count();
-
-    /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
-    boolean containsMapSfixed32Sfixed32(int key);
-
-    /** Use {@link #getMapSfixed32Sfixed32Map()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Integer, java.lang.Integer> getMapSfixed32Sfixed32();
-
-    /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
-    java.util.Map<java.lang.Integer, java.lang.Integer> getMapSfixed32Sfixed32Map();
-
-    /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
-    int getMapSfixed32Sfixed32OrDefault(int key, int defaultValue);
-
-    /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
-    int getMapSfixed32Sfixed32OrThrow(int key);
-
-    /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
-    int getMapSfixed64Sfixed64Count();
-
-    /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
-    boolean containsMapSfixed64Sfixed64(long key);
-
-    /** Use {@link #getMapSfixed64Sfixed64Map()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Long, java.lang.Long> getMapSfixed64Sfixed64();
-
-    /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
-    java.util.Map<java.lang.Long, java.lang.Long> getMapSfixed64Sfixed64Map();
-
-    /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
-    long getMapSfixed64Sfixed64OrDefault(long key, long defaultValue);
-
-    /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
-    long getMapSfixed64Sfixed64OrThrow(long key);
-
-    /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
-    int getMapInt32FloatCount();
-
-    /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
-    boolean containsMapInt32Float(int key);
-
-    /** Use {@link #getMapInt32FloatMap()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Integer, java.lang.Float> getMapInt32Float();
-
-    /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
-    java.util.Map<java.lang.Integer, java.lang.Float> getMapInt32FloatMap();
-
-    /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
-    float getMapInt32FloatOrDefault(int key, float defaultValue);
-
-    /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
-    float getMapInt32FloatOrThrow(int key);
-
-    /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
-    int getMapInt32DoubleCount();
-
-    /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
-    boolean containsMapInt32Double(int key);
-
-    /** Use {@link #getMapInt32DoubleMap()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Integer, java.lang.Double> getMapInt32Double();
-
-    /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
-    java.util.Map<java.lang.Integer, java.lang.Double> getMapInt32DoubleMap();
-
-    /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
-    double getMapInt32DoubleOrDefault(int key, double defaultValue);
-
-    /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
-    double getMapInt32DoubleOrThrow(int key);
-
-    /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
-    int getMapBoolBoolCount();
-
-    /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
-    boolean containsMapBoolBool(boolean key);
-
-    /** Use {@link #getMapBoolBoolMap()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Boolean, java.lang.Boolean> getMapBoolBool();
-
-    /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
-    java.util.Map<java.lang.Boolean, java.lang.Boolean> getMapBoolBoolMap();
-
-    /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
-    boolean getMapBoolBoolOrDefault(boolean key, boolean defaultValue);
-
-    /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
-    boolean getMapBoolBoolOrThrow(boolean key);
-
-    /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
-    int getMapStringStringCount();
-
-    /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
-    boolean containsMapStringString(java.lang.String key);
-
-    /** Use {@link #getMapStringStringMap()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.String, java.lang.String> getMapStringString();
-
-    /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
-    java.util.Map<java.lang.String, java.lang.String> getMapStringStringMap();
-
-    /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
-    /* nullable */
-    java.lang.String getMapStringStringOrDefault(
-        java.lang.String key,
-        /* nullable */
-        java.lang.String defaultValue);
-
-    /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
-    java.lang.String getMapStringStringOrThrow(java.lang.String key);
-
-    /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
-    int getMapStringBytesCount();
-
-    /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
-    boolean containsMapStringBytes(java.lang.String key);
-
-    /** Use {@link #getMapStringBytesMap()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.String, com.google.protobuf.ByteString> getMapStringBytes();
-
-    /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
-    java.util.Map<java.lang.String, com.google.protobuf.ByteString> getMapStringBytesMap();
-
-    /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
-    /* nullable */
-    com.google.protobuf.ByteString getMapStringBytesOrDefault(
-        java.lang.String key,
-        /* nullable */
-        com.google.protobuf.ByteString defaultValue);
-
-    /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
-    com.google.protobuf.ByteString getMapStringBytesOrThrow(java.lang.String key);
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-     * </code>
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
      */
-    int getMapStringNestedMessageCount();
-
+    boolean containsMapInt64Int64(
+        long key);
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-     * </code>
+     * Use {@link #getMapInt64Int64Map()} instead.
      */
-    boolean containsMapStringNestedMessage(java.lang.String key);
-
-    /** Use {@link #getMapStringNestedMessageMap()} instead. */
     @java.lang.Deprecated
-    java.util.Map<
-            java.lang.String,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-        getMapStringNestedMessage();
-
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapInt64Int64();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-     * </code>
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
      */
-    java.util.Map<
-            java.lang.String,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-        getMapStringNestedMessageMap();
-
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapInt64Int64Map();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-     * </code>
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
      */
-    /* nullable */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-        getMapStringNestedMessageOrDefault(
-            java.lang.String key,
-            /* nullable */
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                defaultValue);
-
+    long getMapInt64Int64OrDefault(
+        long key,
+        long defaultValue);
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-     * </code>
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-        getMapStringNestedMessageOrThrow(java.lang.String key);
+    long getMapInt64Int64OrThrow(
+        long key);
 
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-     * </code>
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
      */
-    int getMapStringForeignMessageCount();
-
+    int getMapUint32Uint32Count();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-     * </code>
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
+    boolean containsMapUint32Uint32(
+        int key);
+    /**
+     * Use {@link #getMapUint32Uint32Map()} instead.
      */
-    boolean containsMapStringForeignMessage(java.lang.String key);
-
-    /** Use {@link #getMapStringForeignMessageMap()} instead. */
     @java.lang.Deprecated
-    java.util.Map<
-            java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-        getMapStringForeignMessage();
-
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapUint32Uint32();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-     * </code>
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
      */
-    java.util.Map<
-            java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-        getMapStringForeignMessageMap();
-
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapUint32Uint32Map();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-     * </code>
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
      */
-    /* nullable */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        getMapStringForeignMessageOrDefault(
-            java.lang.String key,
-            /* nullable */
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage defaultValue);
-
+    int getMapUint32Uint32OrDefault(
+        int key,
+        int defaultValue);
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-     * </code>
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        getMapStringForeignMessageOrThrow(java.lang.String key);
+    int getMapUint32Uint32OrThrow(
+        int key);
 
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
      */
-    int getMapStringNestedEnumCount();
-
+    int getMapUint64Uint64Count();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
+    boolean containsMapUint64Uint64(
+        long key);
+    /**
+     * Use {@link #getMapUint64Uint64Map()} instead.
      */
-    boolean containsMapStringNestedEnum(java.lang.String key);
-
-    /** Use {@link #getMapStringNestedEnumMap()} instead. */
     @java.lang.Deprecated
-    java.util.Map<
-            java.lang.String,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        getMapStringNestedEnum();
-
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapUint64Uint64();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
      */
-    java.util.Map<
-            java.lang.String,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        getMapStringNestedEnumMap();
-
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapUint64Uint64Map();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
      */
-    /* nullable */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getMapStringNestedEnumOrDefault(
-            java.lang.String key,
-            /* nullable */
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                defaultValue);
-
+    long getMapUint64Uint64OrDefault(
+        long key,
+        long defaultValue);
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getMapStringNestedEnumOrThrow(java.lang.String key);
-
-    /** Use {@link #getMapStringNestedEnumValueMap()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.String, java.lang.Integer> getMapStringNestedEnumValue();
+    long getMapUint64Uint64OrThrow(
+        long key);
 
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
      */
-    java.util.Map<java.lang.String, java.lang.Integer> getMapStringNestedEnumValueMap();
-
+    int getMapSint32Sint32Count();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
      */
-    int getMapStringNestedEnumValueOrDefault(java.lang.String key, int defaultValue);
-
+    boolean containsMapSint32Sint32(
+        int key);
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * Use {@link #getMapSint32Sint32Map()} instead.
      */
-    int getMapStringNestedEnumValueOrThrow(java.lang.String key);
-
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapSint32Sint32();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
      */
-    int getMapStringForeignEnumCount();
-
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapSint32Sint32Map();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
      */
-    boolean containsMapStringForeignEnum(java.lang.String key);
-
-    /** Use {@link #getMapStringForeignEnumMap()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-        getMapStringForeignEnum();
-
+    int getMapSint32Sint32OrDefault(
+        int key,
+        int defaultValue);
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
      */
-    java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-        getMapStringForeignEnumMap();
+    int getMapSint32Sint32OrThrow(
+        int key);
 
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
      */
-    /* nullable */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getMapStringForeignEnumOrDefault(
-        java.lang.String key,
-        /* nullable */
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum defaultValue);
-
+    int getMapSint64Sint64Count();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
+    boolean containsMapSint64Sint64(
+        long key);
+    /**
+     * Use {@link #getMapSint64Sint64Map()} instead.
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getMapStringForeignEnumOrThrow(
-        java.lang.String key);
-
-    /** Use {@link #getMapStringForeignEnumValueMap()} instead. */
     @java.lang.Deprecated
-    java.util.Map<java.lang.String, java.lang.Integer> getMapStringForeignEnumValue();
-
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapSint64Sint64();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
      */
-    java.util.Map<java.lang.String, java.lang.Integer> getMapStringForeignEnumValueMap();
-
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapSint64Sint64Map();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
      */
-    int getMapStringForeignEnumValueOrDefault(java.lang.String key, int defaultValue);
-
+    long getMapSint64Sint64OrDefault(
+        long key,
+        long defaultValue);
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
      */
-    int getMapStringForeignEnumValueOrThrow(java.lang.String key);
+    long getMapSint64Sint64OrThrow(
+        long key);
 
     /**
-     * <code>uint32 oneof_uint32 = 111;</code>
-     *
-     * @return Whether the oneofUint32 field is set.
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
      */
-    boolean hasOneofUint32();
-
+    int getMapFixed32Fixed32Count();
     /**
-     * <code>uint32 oneof_uint32 = 111;</code>
-     *
-     * @return The oneofUint32.
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
      */
-    int getOneofUint32();
-
+    boolean containsMapFixed32Fixed32(
+        int key);
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-     * </code>
-     *
-     * @return Whether the oneofNestedMessage field is set.
+     * Use {@link #getMapFixed32Fixed32Map()} instead.
      */
-    boolean hasOneofNestedMessage();
-
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapFixed32Fixed32();
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-     * </code>
-     *
-     * @return The oneofNestedMessage.
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-        getOneofNestedMessage();
-
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapFixed32Fixed32Map();
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-     * </code>
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder
-        getOneofNestedMessageOrBuilder();
-
+    int getMapFixed32Fixed32OrDefault(
+        int key,
+        int defaultValue);
     /**
-     * <code>string oneof_string = 113;</code>
-     *
-     * @return Whether the oneofString field is set.
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
      */
-    boolean hasOneofString();
+    int getMapFixed32Fixed32OrThrow(
+        int key);
 
     /**
-     * <code>string oneof_string = 113;</code>
-     *
-     * @return The oneofString.
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
      */
-    java.lang.String getOneofString();
-
+    int getMapFixed64Fixed64Count();
     /**
-     * <code>string oneof_string = 113;</code>
-     *
-     * @return The bytes for oneofString.
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
      */
-    com.google.protobuf.ByteString getOneofStringBytes();
-
+    boolean containsMapFixed64Fixed64(
+        long key);
     /**
-     * <code>bytes oneof_bytes = 114;</code>
-     *
-     * @return Whether the oneofBytes field is set.
+     * Use {@link #getMapFixed64Fixed64Map()} instead.
      */
-    boolean hasOneofBytes();
-
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapFixed64Fixed64();
     /**
-     * <code>bytes oneof_bytes = 114;</code>
-     *
-     * @return The oneofBytes.
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
      */
-    com.google.protobuf.ByteString getOneofBytes();
-
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapFixed64Fixed64Map();
     /**
-     * <code>bool oneof_bool = 115;</code>
-     *
-     * @return Whether the oneofBool field is set.
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
      */
-    boolean hasOneofBool();
+    long getMapFixed64Fixed64OrDefault(
+        long key,
+        long defaultValue);
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
+    long getMapFixed64Fixed64OrThrow(
+        long key);
 
     /**
-     * <code>bool oneof_bool = 115;</code>
-     *
-     * @return The oneofBool.
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
      */
-    boolean getOneofBool();
+    int getMapSfixed32Sfixed32Count();
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    boolean containsMapSfixed32Sfixed32(
+        int key);
+    /**
+     * Use {@link #getMapSfixed32Sfixed32Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapSfixed32Sfixed32();
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapSfixed32Sfixed32Map();
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    int getMapSfixed32Sfixed32OrDefault(
+        int key,
+        int defaultValue);
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    int getMapSfixed32Sfixed32OrThrow(
+        int key);
 
     /**
-     * <code>uint64 oneof_uint64 = 116;</code>
-     *
-     * @return Whether the oneofUint64 field is set.
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
      */
-    boolean hasOneofUint64();
+    int getMapSfixed64Sfixed64Count();
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    boolean containsMapSfixed64Sfixed64(
+        long key);
+    /**
+     * Use {@link #getMapSfixed64Sfixed64Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapSfixed64Sfixed64();
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapSfixed64Sfixed64Map();
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    long getMapSfixed64Sfixed64OrDefault(
+        long key,
+        long defaultValue);
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    long getMapSfixed64Sfixed64OrThrow(
+        long key);
 
     /**
-     * <code>uint64 oneof_uint64 = 116;</code>
-     *
-     * @return The oneofUint64.
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
      */
-    long getOneofUint64();
+    int getMapInt32FloatCount();
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    boolean containsMapInt32Float(
+        int key);
+    /**
+     * Use {@link #getMapInt32FloatMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Float>
+    getMapInt32Float();
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Float>
+    getMapInt32FloatMap();
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    float getMapInt32FloatOrDefault(
+        int key,
+        float defaultValue);
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    float getMapInt32FloatOrThrow(
+        int key);
 
     /**
-     * <code>float oneof_float = 117;</code>
-     *
-     * @return Whether the oneofFloat field is set.
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
      */
-    boolean hasOneofFloat();
+    int getMapInt32DoubleCount();
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    boolean containsMapInt32Double(
+        int key);
+    /**
+     * Use {@link #getMapInt32DoubleMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Double>
+    getMapInt32Double();
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Double>
+    getMapInt32DoubleMap();
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    double getMapInt32DoubleOrDefault(
+        int key,
+        double defaultValue);
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    double getMapInt32DoubleOrThrow(
+        int key);
 
     /**
-     * <code>float oneof_float = 117;</code>
-     *
-     * @return The oneofFloat.
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
      */
-    float getOneofFloat();
+    int getMapBoolBoolCount();
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    boolean containsMapBoolBool(
+        boolean key);
+    /**
+     * Use {@link #getMapBoolBoolMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Boolean, java.lang.Boolean>
+    getMapBoolBool();
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    java.util.Map<java.lang.Boolean, java.lang.Boolean>
+    getMapBoolBoolMap();
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    boolean getMapBoolBoolOrDefault(
+        boolean key,
+        boolean defaultValue);
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    boolean getMapBoolBoolOrThrow(
+        boolean key);
 
     /**
-     * <code>double oneof_double = 118;</code>
-     *
-     * @return Whether the oneofDouble field is set.
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
      */
-    boolean hasOneofDouble();
+    int getMapStringStringCount();
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    boolean containsMapStringString(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringStringMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, java.lang.String>
+    getMapStringString();
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    java.util.Map<java.lang.String, java.lang.String>
+    getMapStringStringMap();
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    /* nullable */
+java.lang.String getMapStringStringOrDefault(
+        java.lang.String key,
+        /* nullable */
+java.lang.String defaultValue);
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    java.lang.String getMapStringStringOrThrow(
+        java.lang.String key);
 
     /**
-     * <code>double oneof_double = 118;</code>
-     *
-     * @return The oneofDouble.
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
      */
-    double getOneofDouble();
+    int getMapStringBytesCount();
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    boolean containsMapStringBytes(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringBytesMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, com.google.protobuf.ByteString>
+    getMapStringBytes();
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    java.util.Map<java.lang.String, com.google.protobuf.ByteString>
+    getMapStringBytesMap();
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    /* nullable */
+com.google.protobuf.ByteString getMapStringBytesOrDefault(
+        java.lang.String key,
+        /* nullable */
+com.google.protobuf.ByteString defaultValue);
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    com.google.protobuf.ByteString getMapStringBytesOrThrow(
+        java.lang.String key);
 
     /**
-     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-     *
-     * @return Whether the oneofEnum field is set.
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
      */
-    boolean hasOneofEnum();
+    int getMapStringNestedMessageCount();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    boolean containsMapStringNestedMessage(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringNestedMessageMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
+    getMapStringNestedMessage();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
+    getMapStringNestedMessageMap();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getMapStringNestedMessageOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage defaultValue);
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getMapStringNestedMessageOrThrow(
+        java.lang.String key);
 
     /**
-     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-     *
-     * @return The enum numeric value on the wire for oneofEnum.
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
      */
-    int getOneofEnumValue();
+    int getMapStringForeignMessageCount();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    boolean containsMapStringForeignMessage(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringForeignMessageMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
+    getMapStringForeignMessage();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
+    getMapStringForeignMessageMap();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getMapStringForeignMessageOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage defaultValue);
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getMapStringForeignMessageOrThrow(
+        java.lang.String key);
 
     /**
-     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-     *
-     * @return The oneofEnum.
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getOneofEnum();
+    int getMapStringNestedEnumCount();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    boolean containsMapStringNestedEnum(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringNestedEnumMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
+    getMapStringNestedEnum();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
+    getMapStringNestedEnumMap();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getMapStringNestedEnumOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum         defaultValue);
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getMapStringNestedEnumOrThrow(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringNestedEnumValueMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, java.lang.Integer>
+    getMapStringNestedEnumValue();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    java.util.Map<java.lang.String, java.lang.Integer>
+    getMapStringNestedEnumValueMap();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    int getMapStringNestedEnumValueOrDefault(
+        java.lang.String key,
+        int defaultValue);
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    int getMapStringNestedEnumValueOrThrow(
+        java.lang.String key);
 
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.OneofFieldCase
-        getOneofFieldCase();
-  }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    int getMapStringForeignEnumCount();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    boolean containsMapStringForeignEnum(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringForeignEnumMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
+    getMapStringForeignEnum();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
+    getMapStringForeignEnumMap();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getMapStringForeignEnumOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum         defaultValue);
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getMapStringForeignEnumOrThrow(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringForeignEnumValueMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, java.lang.Integer>
+    getMapStringForeignEnumValue();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    java.util.Map<java.lang.String, java.lang.Integer>
+    getMapStringForeignEnumValueMap();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    int getMapStringForeignEnumValueOrDefault(
+        java.lang.String key,
+        int defaultValue);
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    int getMapStringForeignEnumValueOrThrow(
+        java.lang.String key);
 
+    /**
+     * <code>uint32 oneof_uint32 = 111;</code>
+     * @return Whether the oneofUint32 field is set.
+     */
+    boolean hasOneofUint32();
+    /**
+     * <code>uint32 oneof_uint32 = 111;</code>
+     * @return The oneofUint32.
+     */
+    int getOneofUint32();
+
+    /**
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
+     * @return Whether the oneofNestedMessage field is set.
+     */
+    boolean hasOneofNestedMessage();
+    /**
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
+     * @return The oneofNestedMessage.
+     */
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getOneofNestedMessage();
+    /**
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
+     */
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder getOneofNestedMessageOrBuilder();
+
+    /**
+     * <code>string oneof_string = 113;</code>
+     * @return Whether the oneofString field is set.
+     */
+    boolean hasOneofString();
+    /**
+     * <code>string oneof_string = 113;</code>
+     * @return The oneofString.
+     */
+    java.lang.String getOneofString();
+    /**
+     * <code>string oneof_string = 113;</code>
+     * @return The bytes for oneofString.
+     */
+    com.google.protobuf.ByteString
+        getOneofStringBytes();
+
+    /**
+     * <code>bytes oneof_bytes = 114;</code>
+     * @return Whether the oneofBytes field is set.
+     */
+    boolean hasOneofBytes();
+    /**
+     * <code>bytes oneof_bytes = 114;</code>
+     * @return The oneofBytes.
+     */
+    com.google.protobuf.ByteString getOneofBytes();
+
+    /**
+     * <code>bool oneof_bool = 115;</code>
+     * @return Whether the oneofBool field is set.
+     */
+    boolean hasOneofBool();
+    /**
+     * <code>bool oneof_bool = 115;</code>
+     * @return The oneofBool.
+     */
+    boolean getOneofBool();
+
+    /**
+     * <code>uint64 oneof_uint64 = 116;</code>
+     * @return Whether the oneofUint64 field is set.
+     */
+    boolean hasOneofUint64();
+    /**
+     * <code>uint64 oneof_uint64 = 116;</code>
+     * @return The oneofUint64.
+     */
+    long getOneofUint64();
+
+    /**
+     * <code>float oneof_float = 117;</code>
+     * @return Whether the oneofFloat field is set.
+     */
+    boolean hasOneofFloat();
+    /**
+     * <code>float oneof_float = 117;</code>
+     * @return The oneofFloat.
+     */
+    float getOneofFloat();
+
+    /**
+     * <code>double oneof_double = 118;</code>
+     * @return Whether the oneofDouble field is set.
+     */
+    boolean hasOneofDouble();
+    /**
+     * <code>double oneof_double = 118;</code>
+     * @return The oneofDouble.
+     */
+    double getOneofDouble();
+
+    /**
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
+     * @return Whether the oneofEnum field is set.
+     */
+    boolean hasOneofEnum();
+    /**
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
+     * @return The enum numeric value on the wire for oneofEnum.
+     */
+    int getOneofEnumValue();
+    /**
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
+     * @return The oneofEnum.
+     */
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getOneofEnum();
+
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.OneofFieldCase getOneofFieldCase();
+  }
   /**
-   *
-   *
    * <pre>
    * This is a slightly trimmed-down version of TestAllTypesProto3 from
    * google/protobuf/test_messages_proto3.proto but without imports/ctypes.
@@ -3735,17 +3379,15 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getMapStringForeig
    *
    * Protobuf type {@code legacy_gencode_test.proto3.TestMostTypesProto3}
    */
-  public static final class TestMostTypesProto3 extends com.google.protobuf.GeneratedMessageV3
-      implements
+  public static final class TestMostTypesProto3 extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:legacy_gencode_test.proto3.TestMostTypesProto3)
       TestMostTypesProto3OrBuilder {
-    private static final long serialVersionUID = 0L;
-
+  private static final long serialVersionUID = 0L;
     // Use TestMostTypesProto3.newBuilder() to construct.
     private TestMostTypesProto3(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
     }
-
     private TestMostTypesProto3() {
       optionalString_ = "";
       optionalBytes_ = com.google.protobuf.ByteString.EMPTY;
@@ -3765,7 +3407,8 @@ private TestMostTypesProto3() {
       repeatedFloat_ = emptyFloatList();
       repeatedDouble_ = emptyDoubleList();
       repeatedBool_ = emptyBooleanList();
-      repeatedString_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      repeatedString_ =
+          com.google.protobuf.LazyStringArrayList.emptyList();
       repeatedBytes_ = emptyList(com.google.protobuf.ByteString.class);
       repeatedNestedMessage_ = java.util.Collections.emptyList();
       repeatedForeignMessage_ = java.util.Collections.emptyList();
@@ -3803,13 +3446,14 @@ private TestMostTypesProto3() {
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
-    protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
       return new TestMostTypesProto3();
     }
 
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return legacy_gencode_test.proto3.Proto3GencodeTestProto
-          .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor;
     }
 
     @SuppressWarnings({"rawtypes"})
@@ -3856,31 +3500,36 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
         case 74:
           return internalGetMapStringForeignEnum();
         default:
-          throw new RuntimeException("Invalid map field number: " + number);
+          throw new RuntimeException(
+              "Invalid map field number: " + number);
       }
     }
-
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return legacy_gencode_test.proto3.Proto3GencodeTestProto
-          .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_fieldAccessorTable
+      return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.class,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder.class);
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.class, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder.class);
     }
 
-    /** Protobuf enum {@code legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum} */
-    public enum NestedEnum implements com.google.protobuf.ProtocolMessageEnum {
-      /** <code>FOO = 0;</code> */
+    /**
+     * Protobuf enum {@code legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum}
+     */
+    public enum NestedEnum
+        implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * <code>FOO = 0;</code>
+       */
       FOO(0),
-      /** <code>BAR = 1;</code> */
+      /**
+       * <code>BAR = 1;</code>
+       */
       BAR(1),
-      /** <code>BAZ = 2;</code> */
+      /**
+       * <code>BAZ = 2;</code>
+       */
       BAZ(2),
       /**
-       *
-       *
        * <pre>
        * Intentionally negative.
        * </pre>
@@ -3891,18 +3540,19 @@ public enum NestedEnum implements com.google.protobuf.ProtocolMessageEnum {
       UNRECOGNIZED(-1),
       ;
 
-      /** <code>FOO = 0;</code> */
+      /**
+       * <code>FOO = 0;</code>
+       */
       public static final int FOO_VALUE = 0;
-
-      /** <code>BAR = 1;</code> */
+      /**
+       * <code>BAR = 1;</code>
+       */
       public static final int BAR_VALUE = 1;
-
-      /** <code>BAZ = 2;</code> */
+      /**
+       * <code>BAZ = 2;</code>
+       */
       public static final int BAZ_VALUE = 2;
-
       /**
-       *
-       *
        * <pre>
        * Intentionally negative.
        * </pre>
@@ -3911,6 +3561,7 @@ public enum NestedEnum implements com.google.protobuf.ProtocolMessageEnum {
        */
       public static final int NEG_VALUE = -1;
 
+
       public final int getNumber() {
         if (this == UNRECOGNIZED) {
           throw new java.lang.IllegalArgumentException(
@@ -3935,53 +3586,50 @@ public static NestedEnum valueOf(int value) {
        */
       public static NestedEnum forNumber(int value) {
         switch (value) {
-          case 0:
-            return FOO;
-          case 1:
-            return BAR;
-          case 2:
-            return BAZ;
-          case -1:
-            return NEG;
-          default:
-            return null;
+          case 0: return FOO;
+          case 1: return BAR;
+          case 2: return BAZ;
+          case -1: return NEG;
+          default: return null;
         }
       }
 
-      public static com.google.protobuf.Internal.EnumLiteMap<NestedEnum> internalGetValueMap() {
+      public static com.google.protobuf.Internal.EnumLiteMap<NestedEnum>
+          internalGetValueMap() {
         return internalValueMap;
       }
+      private static final com.google.protobuf.Internal.EnumLiteMap<
+          NestedEnum> internalValueMap =
+            new com.google.protobuf.Internal.EnumLiteMap<NestedEnum>() {
+              public NestedEnum findValueByNumber(int number) {
+                return NestedEnum.forNumber(number);
+              }
+            };
 
-      private static final com.google.protobuf.Internal.EnumLiteMap<NestedEnum> internalValueMap =
-          new com.google.protobuf.Internal.EnumLiteMap<NestedEnum>() {
-            public NestedEnum findValueByNumber(int number) {
-              return NestedEnum.forNumber(number);
-            }
-          };
-
-      public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+      public final com.google.protobuf.Descriptors.EnumValueDescriptor
+          getValueDescriptor() {
         if (this == UNRECOGNIZED) {
           throw new java.lang.IllegalStateException(
               "Can't get the descriptor of an unrecognized enum value.");
         }
         return getDescriptor().getValues().get(ordinal());
       }
-
-      public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
+      public final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptorForType() {
         return getDescriptor();
       }
-
-      public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDescriptor()
-            .getEnumTypes()
-            .get(0);
+      public static final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDescriptor().getEnumTypes().get(0);
       }
 
       private static final NestedEnum[] VALUES = values();
 
-      public static NestedEnum valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      public static NestedEnum valueOf(
+          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
         if (desc.getType() != getDescriptor()) {
-          throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
+          throw new java.lang.IllegalArgumentException(
+            "EnumValueDescriptor is not for this type.");
         }
         if (desc.getIndex() == -1) {
           return UNRECOGNIZED;
@@ -3998,44 +3646,64 @@ private NestedEnum(int value) {
       // @@protoc_insertion_point(enum_scope:legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum)
     }
 
-    /** Protobuf enum {@code legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum} */
-    public enum AliasedEnum implements com.google.protobuf.ProtocolMessageEnum {
-      /** <code>ALIAS_FOO = 0;</code> */
+    /**
+     * Protobuf enum {@code legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum}
+     */
+    public enum AliasedEnum
+        implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * <code>ALIAS_FOO = 0;</code>
+       */
       ALIAS_FOO(0),
-      /** <code>ALIAS_BAR = 1;</code> */
+      /**
+       * <code>ALIAS_BAR = 1;</code>
+       */
       ALIAS_BAR(1),
-      /** <code>ALIAS_BAZ = 2;</code> */
+      /**
+       * <code>ALIAS_BAZ = 2;</code>
+       */
       ALIAS_BAZ(2),
       UNRECOGNIZED(-1),
       ;
 
-      /** <code>MOO = 2;</code> */
+      /**
+       * <code>MOO = 2;</code>
+       */
       public static final AliasedEnum MOO = ALIAS_BAZ;
-
-      /** <code>moo = 2;</code> */
+      /**
+       * <code>moo = 2;</code>
+       */
       public static final AliasedEnum moo = ALIAS_BAZ;
-
-      /** <code>bAz = 2;</code> */
+      /**
+       * <code>bAz = 2;</code>
+       */
       public static final AliasedEnum bAz = ALIAS_BAZ;
-
-      /** <code>ALIAS_FOO = 0;</code> */
+      /**
+       * <code>ALIAS_FOO = 0;</code>
+       */
       public static final int ALIAS_FOO_VALUE = 0;
-
-      /** <code>ALIAS_BAR = 1;</code> */
+      /**
+       * <code>ALIAS_BAR = 1;</code>
+       */
       public static final int ALIAS_BAR_VALUE = 1;
-
-      /** <code>ALIAS_BAZ = 2;</code> */
+      /**
+       * <code>ALIAS_BAZ = 2;</code>
+       */
       public static final int ALIAS_BAZ_VALUE = 2;
-
-      /** <code>MOO = 2;</code> */
+      /**
+       * <code>MOO = 2;</code>
+       */
       public static final int MOO_VALUE = 2;
-
-      /** <code>moo = 2;</code> */
+      /**
+       * <code>moo = 2;</code>
+       */
       public static final int moo_VALUE = 2;
-
-      /** <code>bAz = 2;</code> */
+      /**
+       * <code>bAz = 2;</code>
+       */
       public static final int bAz_VALUE = 2;
 
+
       public final int getNumber() {
         if (this == UNRECOGNIZED) {
           throw new java.lang.IllegalArgumentException(
@@ -4060,57 +3728,53 @@ public static AliasedEnum valueOf(int value) {
        */
       public static AliasedEnum forNumber(int value) {
         switch (value) {
-          case 0:
-            return ALIAS_FOO;
-          case 1:
-            return ALIAS_BAR;
-          case 2:
-            return ALIAS_BAZ;
-          default:
-            return null;
+          case 0: return ALIAS_FOO;
+          case 1: return ALIAS_BAR;
+          case 2: return ALIAS_BAZ;
+          default: return null;
         }
       }
 
-      public static com.google.protobuf.Internal.EnumLiteMap<AliasedEnum> internalGetValueMap() {
+      public static com.google.protobuf.Internal.EnumLiteMap<AliasedEnum>
+          internalGetValueMap() {
         return internalValueMap;
       }
+      private static final com.google.protobuf.Internal.EnumLiteMap<
+          AliasedEnum> internalValueMap =
+            new com.google.protobuf.Internal.EnumLiteMap<AliasedEnum>() {
+              public AliasedEnum findValueByNumber(int number) {
+                return AliasedEnum.forNumber(number);
+              }
+            };
 
-      private static final com.google.protobuf.Internal.EnumLiteMap<AliasedEnum> internalValueMap =
-          new com.google.protobuf.Internal.EnumLiteMap<AliasedEnum>() {
-            public AliasedEnum findValueByNumber(int number) {
-              return AliasedEnum.forNumber(number);
-            }
-          };
-
-      public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+      public final com.google.protobuf.Descriptors.EnumValueDescriptor
+          getValueDescriptor() {
         if (this == UNRECOGNIZED) {
           throw new java.lang.IllegalStateException(
               "Can't get the descriptor of an unrecognized enum value.");
         }
         return getDescriptor().getValues().get(ordinal());
       }
-
-      public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
+      public final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptorForType() {
         return getDescriptor();
       }
-
-      public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDescriptor()
-            .getEnumTypes()
-            .get(1);
+      public static final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDescriptor().getEnumTypes().get(1);
       }
 
       private static final AliasedEnum[] VALUES = getStaticValuesArray();
-
       private static AliasedEnum[] getStaticValuesArray() {
         return new AliasedEnum[] {
-          ALIAS_FOO, ALIAS_BAR, ALIAS_BAZ, MOO, moo, bAz,
+        ALIAS_FOO, ALIAS_BAR, ALIAS_BAZ, MOO, moo, bAz, 
         };
       }
-
-      public static AliasedEnum valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      public static AliasedEnum valueOf(
+          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
         if (desc.getType() != getDescriptor()) {
-          throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
+          throw new java.lang.IllegalArgumentException(
+            "EnumValueDescriptor is not for this type.");
         }
         if (desc.getIndex() == -1) {
           return UNRECOGNIZED;
@@ -4127,81 +3791,71 @@ private AliasedEnum(int value) {
       // @@protoc_insertion_point(enum_scope:legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum)
     }
 
-    public interface NestedMessageOrBuilder
-        extends
+    public interface NestedMessageOrBuilder extends
         // @@protoc_insertion_point(interface_extends:legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage)
         com.google.protobuf.MessageOrBuilder {
 
       /**
        * <code>int32 a = 1;</code>
-       *
        * @return The a.
        */
       int getA();
 
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
-       *
        * @return Whether the corecursive field is set.
        */
       boolean hasCorecursive();
-
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
-       *
        * @return The corecursive.
        */
       legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 getCorecursive();
-
-      /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code> */
-      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder
-          getCorecursiveOrBuilder();
+      /**
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
+       */
+      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder getCorecursiveOrBuilder();
     }
-
-    /** Protobuf type {@code legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage} */
-    public static final class NestedMessage extends com.google.protobuf.GeneratedMessageV3
-        implements
+    /**
+     * Protobuf type {@code legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage}
+     */
+    public static final class NestedMessage extends
+        com.google.protobuf.GeneratedMessageV3 implements
         // @@protoc_insertion_point(message_implements:legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage)
         NestedMessageOrBuilder {
-      private static final long serialVersionUID = 0L;
-
+    private static final long serialVersionUID = 0L;
       // Use NestedMessage.newBuilder() to construct.
       private NestedMessage(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
         super(builder);
       }
-
-      private NestedMessage() {}
+      private NestedMessage() {
+      }
 
       @java.lang.Override
       @SuppressWarnings({"unused"})
-      protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+      protected java.lang.Object newInstance(
+          UnusedPrivateParameter unused) {
         return new NestedMessage();
       }
 
-      public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_descriptor;
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_fieldAccessorTable
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                    .class,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                    .Builder.class);
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.class, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder.class);
       }
 
       private int bitField0_;
       public static final int A_FIELD_NUMBER = 1;
       private int a_ = 0;
-
       /**
        * <code>int32 a = 1;</code>
-       *
        * @return The a.
        */
       @java.lang.Override
@@ -4211,43 +3865,31 @@ public int getA() {
 
       public static final int CORECURSIVE_FIELD_NUMBER = 2;
       private legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 corecursive_;
-
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
-       *
        * @return Whether the corecursive field is set.
        */
       @java.lang.Override
       public boolean hasCorecursive() {
         return ((bitField0_ & 0x00000001) != 0);
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
-       *
        * @return The corecursive.
        */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-          getCorecursive() {
-        return corecursive_ == null
-            ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                .getDefaultInstance()
-            : corecursive_;
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 getCorecursive() {
+        return corecursive_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance() : corecursive_;
       }
-
-      /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code> */
+      /**
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
+       */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder
-          getCorecursiveOrBuilder() {
-        return corecursive_ == null
-            ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                .getDefaultInstance()
-            : corecursive_;
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder getCorecursiveOrBuilder() {
+        return corecursive_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance() : corecursive_;
       }
 
       private byte memoizedIsInitialized = -1;
-
       @java.lang.Override
       public final boolean isInitialized() {
         byte isInitialized = memoizedIsInitialized;
@@ -4259,7 +3901,8 @@ public final boolean isInitialized() {
       }
 
       @java.lang.Override
-      public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+      public void writeTo(com.google.protobuf.CodedOutputStream output)
+                          throws java.io.IOException {
         if (a_ != 0) {
           output.writeInt32(1, a_);
         }
@@ -4276,10 +3919,12 @@ public int getSerializedSize() {
 
         size = 0;
         if (a_ != 0) {
-          size += com.google.protobuf.CodedOutputStream.computeInt32Size(1, a_);
+          size += com.google.protobuf.CodedOutputStream
+            .computeInt32Size(1, a_);
         }
         if (((bitField0_ & 0x00000001) != 0)) {
-          size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getCorecursive());
+          size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(2, getCorecursive());
         }
         size += getUnknownFields().getSerializedSize();
         memoizedSize = size;
@@ -4289,21 +3934,19 @@ public int getSerializedSize() {
       @java.lang.Override
       public boolean equals(final java.lang.Object obj) {
         if (obj == this) {
-          return true;
+         return true;
         }
-        if (!(obj
-            instanceof
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage)) {
+        if (!(obj instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage)) {
           return super.equals(obj);
         }
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage other =
-            (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage)
-                obj;
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage other = (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) obj;
 
-        if (getA() != other.getA()) return false;
+        if (getA()
+            != other.getA()) return false;
         if (hasCorecursive() != other.hasCorecursive()) return false;
         if (hasCorecursive()) {
-          if (!getCorecursive().equals(other.getCorecursive())) return false;
+          if (!getCorecursive()
+              .equals(other.getCorecursive())) return false;
         }
         if (!getUnknownFields().equals(other.getUnknownFields())) return false;
         return true;
@@ -4327,116 +3970,90 @@ public int hashCode() {
         return hash;
       }
 
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseFrom(java.nio.ByteBuffer data)
-              throws com.google.protobuf.InvalidProtocolBufferException {
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseFrom(
+          java.nio.ByteBuffer data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseFrom(
-              java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws com.google.protobuf.InvalidProtocolBufferException {
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseFrom(
+          java.nio.ByteBuffer data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseFrom(com.google.protobuf.ByteString data)
-              throws com.google.protobuf.InvalidProtocolBufferException {
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseFrom(
+          com.google.protobuf.ByteString data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseFrom(
-              com.google.protobuf.ByteString data,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws com.google.protobuf.InvalidProtocolBufferException {
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseFrom(
+          com.google.protobuf.ByteString data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException {
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseFrom(byte[] data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseFrom(byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws com.google.protobuf.InvalidProtocolBufferException {
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseFrom(
+          byte[] data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseFrom(java.io.InputStream input) throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseFrom(java.io.InputStream input)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3
+            .parseWithIOException(PARSER, input);
       }
-
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseFrom(
-              java.io.InputStream input,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-            PARSER, input, extensionRegistry);
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseFrom(
+          java.io.InputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3
+            .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseDelimitedFrom(java.io.InputStream input)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3
+            .parseDelimitedWithIOException(PARSER, input);
       }
 
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseDelimitedFrom(
-              java.io.InputStream input,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-            PARSER, input, extensionRegistry);
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseDelimitedFrom(
+          java.io.InputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3
+            .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
       }
-
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseFrom(com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseFrom(
+          com.google.protobuf.CodedInputStream input)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3
+            .parseWithIOException(PARSER, input);
       }
-
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseFrom(
-              com.google.protobuf.CodedInputStream input,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-            PARSER, input, extensionRegistry);
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3
+            .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
       @java.lang.Override
-      public Builder newBuilderForType() {
-        return newBuilder();
-      }
-
+      public Builder newBuilderForType() { return newBuilder(); }
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
       }
-
-      public static Builder newBuilder(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              prototype) {
+      public static Builder newBuilder(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
-
       @java.lang.Override
       public Builder toBuilder() {
-        return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+        return this == DEFAULT_INSTANCE
+            ? new Builder() : new Builder().mergeFrom(this);
       }
 
       @java.lang.Override
@@ -4445,48 +4062,42 @@ protected Builder newBuilderForType(
         Builder builder = new Builder(parent);
         return builder;
       }
-
-      /** Protobuf type {@code legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage} */
-      public static final class Builder
-          extends com.google.protobuf.GeneratedMessageV3.Builder<Builder>
-          implements
+      /**
+       * Protobuf type {@code legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage}
+       */
+      public static final class Builder extends
+          com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
           // @@protoc_insertion_point(builder_implements:legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage)
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessageOrBuilder {
-        public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-          return legacy_gencode_test.proto3.Proto3GencodeTestProto
-              .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_descriptor;
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder {
+        public static final com.google.protobuf.Descriptors.Descriptor
+            getDescriptor() {
+          return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_descriptor;
         }
 
         @java.lang.Override
         protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return legacy_gencode_test.proto3.Proto3GencodeTestProto
-              .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_fieldAccessorTable
+          return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage.class,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage.Builder.class);
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.class, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder.class);
         }
 
-        // Construct using
-        // legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.newBuilder()
+        // Construct using legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
 
-        private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        private Builder(
+            com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
           maybeForceBuilderInitialization();
         }
-
         private void maybeForceBuilderInitialization() {
-          if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+          if (com.google.protobuf.GeneratedMessageV3
+                  .alwaysUseFieldBuilders) {
             getCorecursiveFieldBuilder();
           }
         }
-
         @java.lang.Override
         public Builder clear() {
           super.clear();
@@ -4501,23 +4112,19 @@ public Builder clear() {
         }
 
         @java.lang.Override
-        public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-          return legacy_gencode_test.proto3.Proto3GencodeTestProto
-              .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_descriptor;
+        public com.google.protobuf.Descriptors.Descriptor
+            getDescriptorForType() {
+          return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_descriptor;
         }
 
         @java.lang.Override
-        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-            getDefaultInstanceForType() {
-          return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .getDefaultInstance();
+        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getDefaultInstanceForType() {
+          return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance();
         }
 
         @java.lang.Override
-        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-            build() {
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              result = buildPartial();
+        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage build() {
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
@@ -4525,30 +4132,23 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
         }
 
         @java.lang.Override
-        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-            buildPartial() {
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              result =
-                  new legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage(this);
-          if (bitField0_ != 0) {
-            buildPartial0(result);
-          }
+        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage buildPartial() {
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage result = new legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage(this);
+          if (bitField0_ != 0) { buildPartial0(result); }
           onBuilt();
           return result;
         }
 
-        private void buildPartial0(
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                result) {
+        private void buildPartial0(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage result) {
           int from_bitField0_ = bitField0_;
           if (((from_bitField0_ & 0x00000001) != 0)) {
             result.a_ = a_;
           }
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000002) != 0)) {
-            result.corecursive_ =
-                corecursiveBuilder_ == null ? corecursive_ : corecursiveBuilder_.build();
+            result.corecursive_ = corecursiveBuilder_ == null
+                ? corecursive_
+                : corecursiveBuilder_.build();
             to_bitField0_ |= 0x00000001;
           }
           result.bitField0_ |= to_bitField0_;
@@ -4558,58 +4158,46 @@ private void buildPartial0(
         public Builder clone() {
           return super.clone();
         }
-
         @java.lang.Override
         public Builder setField(
-            com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+            com.google.protobuf.Descriptors.FieldDescriptor field,
+            java.lang.Object value) {
           return super.setField(field, value);
         }
-
         @java.lang.Override
-        public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+        public Builder clearField(
+            com.google.protobuf.Descriptors.FieldDescriptor field) {
           return super.clearField(field);
         }
-
         @java.lang.Override
-        public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        public Builder clearOneof(
+            com.google.protobuf.Descriptors.OneofDescriptor oneof) {
           return super.clearOneof(oneof);
         }
-
         @java.lang.Override
         public Builder setRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
-            int index,
-            java.lang.Object value) {
+            int index, java.lang.Object value) {
           return super.setRepeatedField(field, index, value);
         }
-
         @java.lang.Override
         public Builder addRepeatedField(
-            com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+            com.google.protobuf.Descriptors.FieldDescriptor field,
+            java.lang.Object value) {
           return super.addRepeatedField(field, value);
         }
-
         @java.lang.Override
         public Builder mergeFrom(com.google.protobuf.Message other) {
-          if (other
-              instanceof
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) {
-            return mergeFrom(
-                (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                        .NestedMessage)
-                    other);
+          if (other instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) {
+            return mergeFrom((legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                other) {
-          if (other
-              == legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .getDefaultInstance()) return this;
+        public Builder mergeFrom(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage other) {
+          if (other == legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance()) return this;
           if (other.getA() != 0) {
             setA(other.getA());
           }
@@ -4642,25 +4230,24 @@ public Builder mergeFrom(
                 case 0:
                   done = true;
                   break;
-                case 8:
-                  {
-                    a_ = input.readInt32();
-                    bitField0_ |= 0x00000001;
-                    break;
-                  } // case 8
-                case 18:
-                  {
-                    input.readMessage(getCorecursiveFieldBuilder().getBuilder(), extensionRegistry);
-                    bitField0_ |= 0x00000002;
-                    break;
-                  } // case 18
-                default:
-                  {
-                    if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                      done = true; // was an endgroup tag
-                    }
-                    break;
-                  } // default:
+                case 8: {
+                  a_ = input.readInt32();
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 8
+                case 18: {
+                  input.readMessage(
+                      getCorecursiveFieldBuilder().getBuilder(),
+                      extensionRegistry);
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 18
+                default: {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
               } // switch (tag)
             } // while (!done)
           } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -4670,24 +4257,19 @@ public Builder mergeFrom(
           } // finally
           return this;
         }
-
         private int bitField0_;
 
-        private int a_;
-
+        private int a_ ;
         /**
          * <code>int32 a = 1;</code>
-         *
          * @return The a.
          */
         @java.lang.Override
         public int getA() {
           return a_;
         }
-
         /**
          * <code>int32 a = 1;</code>
-         *
          * @param value The a to set.
          * @return This builder for chaining.
          */
@@ -4698,10 +4280,8 @@ public Builder setA(int value) {
           onChanged();
           return this;
         }
-
         /**
          * <code>int32 a = 1;</code>
-         *
          * @return This builder for chaining.
          */
         public Builder clearA() {
@@ -4713,40 +4293,29 @@ public Builder clearA() {
 
         private legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 corecursive_;
         private com.google.protobuf.SingleFieldBuilderV3<
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder>
-            corecursiveBuilder_;
-
+            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder> corecursiveBuilder_;
         /**
          * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
-         *
          * @return Whether the corecursive field is set.
          */
         public boolean hasCorecursive() {
           return ((bitField0_ & 0x00000002) != 0);
         }
-
         /**
          * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
-         *
          * @return The corecursive.
          */
-        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-            getCorecursive() {
+        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 getCorecursive() {
           if (corecursiveBuilder_ == null) {
-            return corecursive_ == null
-                ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .getDefaultInstance()
-                : corecursive_;
+            return corecursive_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance() : corecursive_;
           } else {
             return corecursiveBuilder_.getMessage();
           }
         }
-
-        /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code> */
-        public Builder setCorecursive(
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 value) {
+        /**
+         * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
+         */
+        public Builder setCorecursive(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 value) {
           if (corecursiveBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -4759,11 +4328,11 @@ public Builder setCorecursive(
           onChanged();
           return this;
         }
-
-        /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code> */
+        /**
+         * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
+         */
         public Builder setCorecursive(
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder
-                builderForValue) {
+            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder builderForValue) {
           if (corecursiveBuilder_ == null) {
             corecursive_ = builderForValue.build();
           } else {
@@ -4773,16 +4342,14 @@ public Builder setCorecursive(
           onChanged();
           return this;
         }
-
-        /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code> */
-        public Builder mergeCorecursive(
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 value) {
+        /**
+         * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
+         */
+        public Builder mergeCorecursive(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 value) {
           if (corecursiveBuilder_ == null) {
-            if (((bitField0_ & 0x00000002) != 0)
-                && corecursive_ != null
-                && corecursive_
-                    != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                        .getDefaultInstance()) {
+            if (((bitField0_ & 0x00000002) != 0) &&
+              corecursive_ != null &&
+              corecursive_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance()) {
               getCorecursiveBuilder().mergeFrom(value);
             } else {
               corecursive_ = value;
@@ -4796,8 +4363,9 @@ public Builder mergeCorecursive(
           }
           return this;
         }
-
-        /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code> */
+        /**
+         * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
+         */
         public Builder clearCorecursive() {
           bitField0_ = (bitField0_ & ~0x00000002);
           corecursive_ = null;
@@ -4808,46 +4376,41 @@ public Builder clearCorecursive() {
           onChanged();
           return this;
         }
-
-        /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code> */
-        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder
-            getCorecursiveBuilder() {
+        /**
+         * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
+         */
+        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder getCorecursiveBuilder() {
           bitField0_ |= 0x00000002;
           onChanged();
           return getCorecursiveFieldBuilder().getBuilder();
         }
-
-        /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code> */
-        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder
-            getCorecursiveOrBuilder() {
+        /**
+         * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
+         */
+        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder getCorecursiveOrBuilder() {
           if (corecursiveBuilder_ != null) {
             return corecursiveBuilder_.getMessageOrBuilder();
           } else {
-            return corecursive_ == null
-                ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .getDefaultInstance()
-                : corecursive_;
+            return corecursive_ == null ?
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance() : corecursive_;
           }
         }
-
-        /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code> */
+        /**
+         * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
+         */
         private com.google.protobuf.SingleFieldBuilderV3<
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder>
+            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder> 
             getCorecursiveFieldBuilder() {
           if (corecursiveBuilder_ == null) {
-            corecursiveBuilder_ =
-                new com.google.protobuf.SingleFieldBuilderV3<
-                    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3,
-                    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder,
-                    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder>(
-                    getCorecursive(), getParentForChildren(), isClean());
+            corecursiveBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder>(
+                    getCorecursive(),
+                    getParentForChildren(),
+                    isClean());
             corecursive_ = null;
           }
           return corecursiveBuilder_;
         }
-
         @java.lang.Override
         public final Builder setUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -4860,48 +4423,41 @@ public final Builder mergeUnknownFields(
           return super.mergeUnknownFields(unknownFields);
         }
 
+
         // @@protoc_insertion_point(builder_scope:legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage)
       }
 
       // @@protoc_insertion_point(class_scope:legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage)
-      private static final legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          DEFAULT_INSTANCE;
-
+      private static final legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage DEFAULT_INSTANCE;
       static {
-        DEFAULT_INSTANCE =
-            new legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                .NestedMessage();
+        DEFAULT_INSTANCE = new legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage();
       }
 
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          getDefaultInstance() {
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getDefaultInstance() {
         return DEFAULT_INSTANCE;
       }
 
-      private static final com.google.protobuf.Parser<NestedMessage> PARSER =
-          new com.google.protobuf.AbstractParser<NestedMessage>() {
-            @java.lang.Override
-            public NestedMessage parsePartialFrom(
-                com.google.protobuf.CodedInputStream input,
-                com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-                throws com.google.protobuf.InvalidProtocolBufferException {
-              Builder builder = newBuilder();
-              try {
-                builder.mergeFrom(input, extensionRegistry);
-              } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-                throw e.setUnfinishedMessage(builder.buildPartial());
-              } catch (com.google.protobuf.UninitializedMessageException e) {
-                throw e.asInvalidProtocolBufferException()
-                    .setUnfinishedMessage(builder.buildPartial());
-              } catch (java.io.IOException e) {
-                throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                    .setUnfinishedMessage(builder.buildPartial());
-              }
-              return builder.buildPartial();
-            }
-          };
+      private static final com.google.protobuf.Parser<NestedMessage>
+          PARSER = new com.google.protobuf.AbstractParser<NestedMessage>() {
+        @java.lang.Override
+        public NestedMessage parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
+        }
+      };
 
       public static com.google.protobuf.Parser<NestedMessage> parser() {
         return PARSER;
@@ -4913,21 +4469,18 @@ public com.google.protobuf.Parser<NestedMessage> getParserForType() {
       }
 
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-          getDefaultInstanceForType() {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
+
     }
 
     private int bitField0_;
     private int oneofFieldCase_ = 0;
-
     @SuppressWarnings("serial")
     private java.lang.Object oneofField_;
-
     public enum OneofFieldCase
-        implements
-            com.google.protobuf.Internal.EnumLite,
+        implements com.google.protobuf.Internal.EnumLite,
             com.google.protobuf.AbstractMessage.InternalOneOfEnum {
       ONEOF_UINT32(111),
       ONEOF_NESTED_MESSAGE(112),
@@ -4940,11 +4493,9 @@ public enum OneofFieldCase
       ONEOF_ENUM(119),
       ONEOFFIELD_NOT_SET(0);
       private final int value;
-
       private OneofFieldCase(int value) {
         this.value = value;
       }
-
       /**
        * @param value The number of the enum to look for.
        * @return The enum associated with the given number.
@@ -4957,46 +4508,34 @@ public static OneofFieldCase valueOf(int value) {
 
       public static OneofFieldCase forNumber(int value) {
         switch (value) {
-          case 111:
-            return ONEOF_UINT32;
-          case 112:
-            return ONEOF_NESTED_MESSAGE;
-          case 113:
-            return ONEOF_STRING;
-          case 114:
-            return ONEOF_BYTES;
-          case 115:
-            return ONEOF_BOOL;
-          case 116:
-            return ONEOF_UINT64;
-          case 117:
-            return ONEOF_FLOAT;
-          case 118:
-            return ONEOF_DOUBLE;
-          case 119:
-            return ONEOF_ENUM;
-          case 0:
-            return ONEOFFIELD_NOT_SET;
-          default:
-            return null;
+          case 111: return ONEOF_UINT32;
+          case 112: return ONEOF_NESTED_MESSAGE;
+          case 113: return ONEOF_STRING;
+          case 114: return ONEOF_BYTES;
+          case 115: return ONEOF_BOOL;
+          case 116: return ONEOF_UINT64;
+          case 117: return ONEOF_FLOAT;
+          case 118: return ONEOF_DOUBLE;
+          case 119: return ONEOF_ENUM;
+          case 0: return ONEOFFIELD_NOT_SET;
+          default: return null;
         }
       }
-
       public int getNumber() {
         return this.value;
       }
     };
 
-    public OneofFieldCase getOneofFieldCase() {
-      return OneofFieldCase.forNumber(oneofFieldCase_);
+    public OneofFieldCase
+    getOneofFieldCase() {
+      return OneofFieldCase.forNumber(
+          oneofFieldCase_);
     }
 
     public static final int OPTIONAL_INT32_FIELD_NUMBER = 1;
     private int optionalInt32_ = 0;
-
     /**
      * <code>int32 optional_int32 = 1;</code>
-     *
      * @return The optionalInt32.
      */
     @java.lang.Override
@@ -5006,10 +4545,8 @@ public int getOptionalInt32() {
 
     public static final int OPTIONAL_INT64_FIELD_NUMBER = 2;
     private long optionalInt64_ = 0L;
-
     /**
      * <code>int64 optional_int64 = 2;</code>
-     *
      * @return The optionalInt64.
      */
     @java.lang.Override
@@ -5019,10 +4556,8 @@ public long getOptionalInt64() {
 
     public static final int OPTIONAL_UINT32_FIELD_NUMBER = 3;
     private int optionalUint32_ = 0;
-
     /**
      * <code>uint32 optional_uint32 = 3;</code>
-     *
      * @return The optionalUint32.
      */
     @java.lang.Override
@@ -5032,10 +4567,8 @@ public int getOptionalUint32() {
 
     public static final int OPTIONAL_UINT64_FIELD_NUMBER = 4;
     private long optionalUint64_ = 0L;
-
     /**
      * <code>uint64 optional_uint64 = 4;</code>
-     *
      * @return The optionalUint64.
      */
     @java.lang.Override
@@ -5045,10 +4578,8 @@ public long getOptionalUint64() {
 
     public static final int OPTIONAL_SINT32_FIELD_NUMBER = 5;
     private int optionalSint32_ = 0;
-
     /**
      * <code>sint32 optional_sint32 = 5;</code>
-     *
      * @return The optionalSint32.
      */
     @java.lang.Override
@@ -5058,10 +4589,8 @@ public int getOptionalSint32() {
 
     public static final int OPTIONAL_SINT64_FIELD_NUMBER = 6;
     private long optionalSint64_ = 0L;
-
     /**
      * <code>sint64 optional_sint64 = 6;</code>
-     *
      * @return The optionalSint64.
      */
     @java.lang.Override
@@ -5071,10 +4600,8 @@ public long getOptionalSint64() {
 
     public static final int OPTIONAL_FIXED32_FIELD_NUMBER = 7;
     private int optionalFixed32_ = 0;
-
     /**
      * <code>fixed32 optional_fixed32 = 7;</code>
-     *
      * @return The optionalFixed32.
      */
     @java.lang.Override
@@ -5084,10 +4611,8 @@ public int getOptionalFixed32() {
 
     public static final int OPTIONAL_FIXED64_FIELD_NUMBER = 8;
     private long optionalFixed64_ = 0L;
-
     /**
      * <code>fixed64 optional_fixed64 = 8;</code>
-     *
      * @return The optionalFixed64.
      */
     @java.lang.Override
@@ -5097,10 +4622,8 @@ public long getOptionalFixed64() {
 
     public static final int OPTIONAL_SFIXED32_FIELD_NUMBER = 9;
     private int optionalSfixed32_ = 0;
-
     /**
      * <code>sfixed32 optional_sfixed32 = 9;</code>
-     *
      * @return The optionalSfixed32.
      */
     @java.lang.Override
@@ -5110,10 +4633,8 @@ public int getOptionalSfixed32() {
 
     public static final int OPTIONAL_SFIXED64_FIELD_NUMBER = 10;
     private long optionalSfixed64_ = 0L;
-
     /**
      * <code>sfixed64 optional_sfixed64 = 10;</code>
-     *
      * @return The optionalSfixed64.
      */
     @java.lang.Override
@@ -5123,10 +4644,8 @@ public long getOptionalSfixed64() {
 
     public static final int OPTIONAL_FLOAT_FIELD_NUMBER = 11;
     private float optionalFloat_ = 0F;
-
     /**
      * <code>float optional_float = 11;</code>
-     *
      * @return The optionalFloat.
      */
     @java.lang.Override
@@ -5136,10 +4655,8 @@ public float getOptionalFloat() {
 
     public static final int OPTIONAL_DOUBLE_FIELD_NUMBER = 12;
     private double optionalDouble_ = 0D;
-
     /**
      * <code>double optional_double = 12;</code>
-     *
      * @return The optionalDouble.
      */
     @java.lang.Override
@@ -5149,10 +4666,8 @@ public double getOptionalDouble() {
 
     public static final int OPTIONAL_BOOL_FIELD_NUMBER = 13;
     private boolean optionalBool_ = false;
-
     /**
      * <code>bool optional_bool = 13;</code>
-     *
      * @return The optionalBool.
      */
     @java.lang.Override
@@ -5161,13 +4676,10 @@ public boolean getOptionalBool() {
     }
 
     public static final int OPTIONAL_STRING_FIELD_NUMBER = 14;
-
     @SuppressWarnings("serial")
     private volatile java.lang.Object optionalString_ = "";
-
     /**
      * <code>string optional_string = 14;</code>
-     *
      * @return The optionalString.
      */
     @java.lang.Override
@@ -5176,24 +4688,25 @@ public java.lang.String getOptionalString() {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         optionalString_ = s;
         return s;
       }
     }
-
     /**
      * <code>string optional_string = 14;</code>
-     *
      * @return The bytes for optionalString.
      */
     @java.lang.Override
-    public com.google.protobuf.ByteString getOptionalStringBytes() {
+    public com.google.protobuf.ByteString
+        getOptionalStringBytes() {
       java.lang.Object ref = optionalString_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
         optionalString_ = b;
         return b;
       } else {
@@ -5203,10 +4716,8 @@ public com.google.protobuf.ByteString getOptionalStringBytes() {
 
     public static final int OPTIONAL_BYTES_FIELD_NUMBER = 15;
     private com.google.protobuf.ByteString optionalBytes_ = com.google.protobuf.ByteString.EMPTY;
-
     /**
      * <code>bytes optional_bytes = 15;</code>
-     *
      * @return The optionalBytes.
      */
     @java.lang.Override
@@ -5215,775 +4726,598 @@ public com.google.protobuf.ByteString getOptionalBytes() {
     }
 
     public static final int OPTIONAL_NESTED_MESSAGE_FIELD_NUMBER = 18;
-    private legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-        optionalNestedMessage_;
-
+    private legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage optionalNestedMessage_;
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
      * @return Whether the optionalNestedMessage field is set.
      */
     @java.lang.Override
     public boolean hasOptionalNestedMessage() {
       return ((bitField0_ & 0x00000001) != 0);
     }
-
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
      * @return The optionalNestedMessage.
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-        getOptionalNestedMessage() {
-      return optionalNestedMessage_ == null
-          ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .getDefaultInstance()
-          : optionalNestedMessage_;
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getOptionalNestedMessage() {
+      return optionalNestedMessage_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance() : optionalNestedMessage_;
     }
-
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-     * </code>
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-            .NestedMessageOrBuilder
-        getOptionalNestedMessageOrBuilder() {
-      return optionalNestedMessage_ == null
-          ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .getDefaultInstance()
-          : optionalNestedMessage_;
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder getOptionalNestedMessageOrBuilder() {
+      return optionalNestedMessage_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance() : optionalNestedMessage_;
     }
 
     public static final int OPTIONAL_FOREIGN_MESSAGE_FIELD_NUMBER = 19;
-    private legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        optionalForeignMessage_;
-
+    private legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage optionalForeignMessage_;
     /**
      * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
-     *
      * @return Whether the optionalForeignMessage field is set.
      */
     @java.lang.Override
     public boolean hasOptionalForeignMessage() {
       return ((bitField0_ & 0x00000002) != 0);
     }
-
     /**
      * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
-     *
      * @return The optionalForeignMessage.
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        getOptionalForeignMessage() {
-      return optionalForeignMessage_ == null
-          ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance()
-          : optionalForeignMessage_;
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getOptionalForeignMessage() {
+      return optionalForeignMessage_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance() : optionalForeignMessage_;
     }
-
-    /** <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code> */
+    /**
+     * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
+     */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder
-        getOptionalForeignMessageOrBuilder() {
-      return optionalForeignMessage_ == null
-          ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance()
-          : optionalForeignMessage_;
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder getOptionalForeignMessageOrBuilder() {
+      return optionalForeignMessage_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance() : optionalForeignMessage_;
     }
 
     public static final int OPTIONAL_NESTED_ENUM_FIELD_NUMBER = 21;
     private int optionalNestedEnum_ = 0;
-
     /**
-     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;</code>
      * @return The enum numeric value on the wire for optionalNestedEnum.
      */
-    @java.lang.Override
-    public int getOptionalNestedEnumValue() {
+    @java.lang.Override public int getOptionalNestedEnumValue() {
       return optionalNestedEnum_;
     }
-
     /**
-     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;</code>
      * @return The optionalNestedEnum.
      */
-    @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getOptionalNestedEnum() {
-      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum result =
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-              .forNumber(optionalNestedEnum_);
-      return result == null
-          ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-              .UNRECOGNIZED
-          : result;
+    @java.lang.Override public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getOptionalNestedEnum() {
+      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.forNumber(optionalNestedEnum_);
+      return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.UNRECOGNIZED : result;
     }
 
     public static final int OPTIONAL_FOREIGN_ENUM_FIELD_NUMBER = 22;
     private int optionalForeignEnum_ = 0;
-
     /**
      * <code>.legacy_gencode_test.proto3.ForeignEnum optional_foreign_enum = 22;</code>
-     *
      * @return The enum numeric value on the wire for optionalForeignEnum.
      */
-    @java.lang.Override
-    public int getOptionalForeignEnumValue() {
+    @java.lang.Override public int getOptionalForeignEnumValue() {
       return optionalForeignEnum_;
     }
-
     /**
      * <code>.legacy_gencode_test.proto3.ForeignEnum optional_foreign_enum = 22;</code>
-     *
      * @return The optionalForeignEnum.
      */
-    @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getOptionalForeignEnum() {
-      legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum result =
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.forNumber(
-              optionalForeignEnum_);
-      return result == null
-          ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.UNRECOGNIZED
-          : result;
+    @java.lang.Override public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getOptionalForeignEnum() {
+      legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.forNumber(optionalForeignEnum_);
+      return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.UNRECOGNIZED : result;
     }
 
     public static final int OPTIONAL_ALIASED_ENUM_FIELD_NUMBER = 23;
     private int optionalAliasedEnum_ = 0;
-
     /**
-     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;</code>
      * @return The enum numeric value on the wire for optionalAliasedEnum.
      */
-    @java.lang.Override
-    public int getOptionalAliasedEnumValue() {
+    @java.lang.Override public int getOptionalAliasedEnumValue() {
       return optionalAliasedEnum_;
     }
-
     /**
-     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;</code>
      * @return The optionalAliasedEnum.
      */
-    @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum
-        getOptionalAliasedEnum() {
-      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum result =
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum
-              .forNumber(optionalAliasedEnum_);
-      return result == null
-          ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum
-              .UNRECOGNIZED
-          : result;
+    @java.lang.Override public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum getOptionalAliasedEnum() {
+      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum.forNumber(optionalAliasedEnum_);
+      return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum.UNRECOGNIZED : result;
     }
 
     public static final int RECURSIVE_MESSAGE_FIELD_NUMBER = 27;
     private legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 recursiveMessage_;
-
     /**
      * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
-     *
      * @return Whether the recursiveMessage field is set.
      */
     @java.lang.Override
     public boolean hasRecursiveMessage() {
       return ((bitField0_ & 0x00000004) != 0);
     }
-
     /**
      * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
-     *
      * @return The recursiveMessage.
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-        getRecursiveMessage() {
-      return recursiveMessage_ == null
-          ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .getDefaultInstance()
-          : recursiveMessage_;
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 getRecursiveMessage() {
+      return recursiveMessage_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance() : recursiveMessage_;
     }
-
-    /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code> */
+    /**
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
+     */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder
-        getRecursiveMessageOrBuilder() {
-      return recursiveMessage_ == null
-          ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .getDefaultInstance()
-          : recursiveMessage_;
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder getRecursiveMessageOrBuilder() {
+      return recursiveMessage_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance() : recursiveMessage_;
     }
 
     public static final int REPEATED_INT32_FIELD_NUMBER = 31;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList repeatedInt32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList repeatedInt32_ =
+        emptyIntList();
     /**
-     *
-     *
      * <pre>
      * Repeated
      * </pre>
      *
      * <code>repeated int32 repeated_int32 = 31;</code>
-     *
      * @return A list containing the repeatedInt32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getRepeatedInt32List() {
+    public java.util.List<java.lang.Integer>
+        getRepeatedInt32List() {
       return repeatedInt32_;
     }
-
     /**
-     *
-     *
      * <pre>
      * Repeated
      * </pre>
      *
      * <code>repeated int32 repeated_int32 = 31;</code>
-     *
      * @return The count of repeatedInt32.
      */
     public int getRepeatedInt32Count() {
       return repeatedInt32_.size();
     }
-
     /**
-     *
-     *
      * <pre>
      * Repeated
      * </pre>
      *
      * <code>repeated int32 repeated_int32 = 31;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedInt32 at the given index.
      */
     public int getRepeatedInt32(int index) {
       return repeatedInt32_.getInt(index);
     }
-
     private int repeatedInt32MemoizedSerializedSize = -1;
 
     public static final int REPEATED_INT64_FIELD_NUMBER = 32;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList repeatedInt64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList repeatedInt64_ =
+        emptyLongList();
     /**
      * <code>repeated int64 repeated_int64 = 32;</code>
-     *
      * @return A list containing the repeatedInt64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getRepeatedInt64List() {
+    public java.util.List<java.lang.Long>
+        getRepeatedInt64List() {
       return repeatedInt64_;
     }
-
     /**
      * <code>repeated int64 repeated_int64 = 32;</code>
-     *
      * @return The count of repeatedInt64.
      */
     public int getRepeatedInt64Count() {
       return repeatedInt64_.size();
     }
-
     /**
      * <code>repeated int64 repeated_int64 = 32;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedInt64 at the given index.
      */
     public long getRepeatedInt64(int index) {
       return repeatedInt64_.getLong(index);
     }
-
     private int repeatedInt64MemoizedSerializedSize = -1;
 
     public static final int REPEATED_UINT32_FIELD_NUMBER = 33;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList repeatedUint32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList repeatedUint32_ =
+        emptyIntList();
     /**
      * <code>repeated uint32 repeated_uint32 = 33;</code>
-     *
      * @return A list containing the repeatedUint32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getRepeatedUint32List() {
+    public java.util.List<java.lang.Integer>
+        getRepeatedUint32List() {
       return repeatedUint32_;
     }
-
     /**
      * <code>repeated uint32 repeated_uint32 = 33;</code>
-     *
      * @return The count of repeatedUint32.
      */
     public int getRepeatedUint32Count() {
       return repeatedUint32_.size();
     }
-
     /**
      * <code>repeated uint32 repeated_uint32 = 33;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedUint32 at the given index.
      */
     public int getRepeatedUint32(int index) {
       return repeatedUint32_.getInt(index);
     }
-
     private int repeatedUint32MemoizedSerializedSize = -1;
 
     public static final int REPEATED_UINT64_FIELD_NUMBER = 34;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList repeatedUint64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList repeatedUint64_ =
+        emptyLongList();
     /**
      * <code>repeated uint64 repeated_uint64 = 34;</code>
-     *
      * @return A list containing the repeatedUint64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getRepeatedUint64List() {
+    public java.util.List<java.lang.Long>
+        getRepeatedUint64List() {
       return repeatedUint64_;
     }
-
     /**
      * <code>repeated uint64 repeated_uint64 = 34;</code>
-     *
      * @return The count of repeatedUint64.
      */
     public int getRepeatedUint64Count() {
       return repeatedUint64_.size();
     }
-
     /**
      * <code>repeated uint64 repeated_uint64 = 34;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedUint64 at the given index.
      */
     public long getRepeatedUint64(int index) {
       return repeatedUint64_.getLong(index);
     }
-
     private int repeatedUint64MemoizedSerializedSize = -1;
 
     public static final int REPEATED_SINT32_FIELD_NUMBER = 35;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList repeatedSint32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList repeatedSint32_ =
+        emptyIntList();
     /**
      * <code>repeated sint32 repeated_sint32 = 35;</code>
-     *
      * @return A list containing the repeatedSint32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getRepeatedSint32List() {
+    public java.util.List<java.lang.Integer>
+        getRepeatedSint32List() {
       return repeatedSint32_;
     }
-
     /**
      * <code>repeated sint32 repeated_sint32 = 35;</code>
-     *
      * @return The count of repeatedSint32.
      */
     public int getRepeatedSint32Count() {
       return repeatedSint32_.size();
     }
-
     /**
      * <code>repeated sint32 repeated_sint32 = 35;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedSint32 at the given index.
      */
     public int getRepeatedSint32(int index) {
       return repeatedSint32_.getInt(index);
     }
-
     private int repeatedSint32MemoizedSerializedSize = -1;
 
     public static final int REPEATED_SINT64_FIELD_NUMBER = 36;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList repeatedSint64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList repeatedSint64_ =
+        emptyLongList();
     /**
      * <code>repeated sint64 repeated_sint64 = 36;</code>
-     *
      * @return A list containing the repeatedSint64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getRepeatedSint64List() {
+    public java.util.List<java.lang.Long>
+        getRepeatedSint64List() {
       return repeatedSint64_;
     }
-
     /**
      * <code>repeated sint64 repeated_sint64 = 36;</code>
-     *
      * @return The count of repeatedSint64.
      */
     public int getRepeatedSint64Count() {
       return repeatedSint64_.size();
     }
-
     /**
      * <code>repeated sint64 repeated_sint64 = 36;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedSint64 at the given index.
      */
     public long getRepeatedSint64(int index) {
       return repeatedSint64_.getLong(index);
     }
-
     private int repeatedSint64MemoizedSerializedSize = -1;
 
     public static final int REPEATED_FIXED32_FIELD_NUMBER = 37;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList repeatedFixed32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList repeatedFixed32_ =
+        emptyIntList();
     /**
      * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-     *
      * @return A list containing the repeatedFixed32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getRepeatedFixed32List() {
+    public java.util.List<java.lang.Integer>
+        getRepeatedFixed32List() {
       return repeatedFixed32_;
     }
-
     /**
      * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-     *
      * @return The count of repeatedFixed32.
      */
     public int getRepeatedFixed32Count() {
       return repeatedFixed32_.size();
     }
-
     /**
      * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedFixed32 at the given index.
      */
     public int getRepeatedFixed32(int index) {
       return repeatedFixed32_.getInt(index);
     }
-
     private int repeatedFixed32MemoizedSerializedSize = -1;
 
     public static final int REPEATED_FIXED64_FIELD_NUMBER = 38;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList repeatedFixed64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList repeatedFixed64_ =
+        emptyLongList();
     /**
      * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-     *
      * @return A list containing the repeatedFixed64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getRepeatedFixed64List() {
+    public java.util.List<java.lang.Long>
+        getRepeatedFixed64List() {
       return repeatedFixed64_;
     }
-
     /**
      * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-     *
      * @return The count of repeatedFixed64.
      */
     public int getRepeatedFixed64Count() {
       return repeatedFixed64_.size();
     }
-
     /**
      * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedFixed64 at the given index.
      */
     public long getRepeatedFixed64(int index) {
       return repeatedFixed64_.getLong(index);
     }
-
     private int repeatedFixed64MemoizedSerializedSize = -1;
 
     public static final int REPEATED_SFIXED32_FIELD_NUMBER = 39;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList repeatedSfixed32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList repeatedSfixed32_ =
+        emptyIntList();
     /**
      * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-     *
      * @return A list containing the repeatedSfixed32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getRepeatedSfixed32List() {
+    public java.util.List<java.lang.Integer>
+        getRepeatedSfixed32List() {
       return repeatedSfixed32_;
     }
-
     /**
      * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-     *
      * @return The count of repeatedSfixed32.
      */
     public int getRepeatedSfixed32Count() {
       return repeatedSfixed32_.size();
     }
-
     /**
      * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedSfixed32 at the given index.
      */
     public int getRepeatedSfixed32(int index) {
       return repeatedSfixed32_.getInt(index);
     }
-
     private int repeatedSfixed32MemoizedSerializedSize = -1;
 
     public static final int REPEATED_SFIXED64_FIELD_NUMBER = 40;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList repeatedSfixed64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList repeatedSfixed64_ =
+        emptyLongList();
     /**
      * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-     *
      * @return A list containing the repeatedSfixed64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getRepeatedSfixed64List() {
+    public java.util.List<java.lang.Long>
+        getRepeatedSfixed64List() {
       return repeatedSfixed64_;
     }
-
     /**
      * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-     *
      * @return The count of repeatedSfixed64.
      */
     public int getRepeatedSfixed64Count() {
       return repeatedSfixed64_.size();
     }
-
     /**
      * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedSfixed64 at the given index.
      */
     public long getRepeatedSfixed64(int index) {
       return repeatedSfixed64_.getLong(index);
     }
-
     private int repeatedSfixed64MemoizedSerializedSize = -1;
 
     public static final int REPEATED_FLOAT_FIELD_NUMBER = 41;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.FloatList repeatedFloat_ = emptyFloatList();
-
+    private com.google.protobuf.Internal.FloatList repeatedFloat_ =
+        emptyFloatList();
     /**
      * <code>repeated float repeated_float = 41;</code>
-     *
      * @return A list containing the repeatedFloat.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Float> getRepeatedFloatList() {
+    public java.util.List<java.lang.Float>
+        getRepeatedFloatList() {
       return repeatedFloat_;
     }
-
     /**
      * <code>repeated float repeated_float = 41;</code>
-     *
      * @return The count of repeatedFloat.
      */
     public int getRepeatedFloatCount() {
       return repeatedFloat_.size();
     }
-
     /**
      * <code>repeated float repeated_float = 41;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedFloat at the given index.
      */
     public float getRepeatedFloat(int index) {
       return repeatedFloat_.getFloat(index);
     }
-
     private int repeatedFloatMemoizedSerializedSize = -1;
 
     public static final int REPEATED_DOUBLE_FIELD_NUMBER = 42;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.DoubleList repeatedDouble_ = emptyDoubleList();
-
+    private com.google.protobuf.Internal.DoubleList repeatedDouble_ =
+        emptyDoubleList();
     /**
      * <code>repeated double repeated_double = 42;</code>
-     *
      * @return A list containing the repeatedDouble.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Double> getRepeatedDoubleList() {
+    public java.util.List<java.lang.Double>
+        getRepeatedDoubleList() {
       return repeatedDouble_;
     }
-
     /**
      * <code>repeated double repeated_double = 42;</code>
-     *
      * @return The count of repeatedDouble.
      */
     public int getRepeatedDoubleCount() {
       return repeatedDouble_.size();
     }
-
     /**
      * <code>repeated double repeated_double = 42;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedDouble at the given index.
      */
     public double getRepeatedDouble(int index) {
       return repeatedDouble_.getDouble(index);
     }
-
     private int repeatedDoubleMemoizedSerializedSize = -1;
 
     public static final int REPEATED_BOOL_FIELD_NUMBER = 43;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.BooleanList repeatedBool_ = emptyBooleanList();
-
+    private com.google.protobuf.Internal.BooleanList repeatedBool_ =
+        emptyBooleanList();
     /**
      * <code>repeated bool repeated_bool = 43;</code>
-     *
      * @return A list containing the repeatedBool.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Boolean> getRepeatedBoolList() {
+    public java.util.List<java.lang.Boolean>
+        getRepeatedBoolList() {
       return repeatedBool_;
     }
-
     /**
      * <code>repeated bool repeated_bool = 43;</code>
-     *
      * @return The count of repeatedBool.
      */
     public int getRepeatedBoolCount() {
       return repeatedBool_.size();
     }
-
     /**
      * <code>repeated bool repeated_bool = 43;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedBool at the given index.
      */
     public boolean getRepeatedBool(int index) {
       return repeatedBool_.getBoolean(index);
     }
-
     private int repeatedBoolMemoizedSerializedSize = -1;
 
     public static final int REPEATED_STRING_FIELD_NUMBER = 44;
-
     @SuppressWarnings("serial")
     private com.google.protobuf.LazyStringArrayList repeatedString_ =
         com.google.protobuf.LazyStringArrayList.emptyList();
-
     /**
      * <code>repeated string repeated_string = 44;</code>
-     *
      * @return A list containing the repeatedString.
      */
-    public com.google.protobuf.ProtocolStringList getRepeatedStringList() {
+    public com.google.protobuf.ProtocolStringList
+        getRepeatedStringList() {
       return repeatedString_;
     }
-
     /**
      * <code>repeated string repeated_string = 44;</code>
-     *
      * @return The count of repeatedString.
      */
     public int getRepeatedStringCount() {
       return repeatedString_.size();
     }
-
     /**
      * <code>repeated string repeated_string = 44;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedString at the given index.
      */
     public java.lang.String getRepeatedString(int index) {
       return repeatedString_.get(index);
     }
-
     /**
      * <code>repeated string repeated_string = 44;</code>
-     *
      * @param index The index of the value to return.
      * @return The bytes of the repeatedString at the given index.
      */
-    public com.google.protobuf.ByteString getRepeatedStringBytes(int index) {
+    public com.google.protobuf.ByteString
+        getRepeatedStringBytes(int index) {
       return repeatedString_.getByteString(index);
     }
 
     public static final int REPEATED_BYTES_FIELD_NUMBER = 45;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.ProtobufList<com.google.protobuf.ByteString>
-        repeatedBytes_ = emptyList(com.google.protobuf.ByteString.class);
-
+    private com.google.protobuf.Internal.ProtobufList<com.google.protobuf.ByteString> repeatedBytes_ =
+        emptyList(com.google.protobuf.ByteString.class);
     /**
      * <code>repeated bytes repeated_bytes = 45;</code>
-     *
      * @return A list containing the repeatedBytes.
      */
     @java.lang.Override
-    public java.util.List<com.google.protobuf.ByteString> getRepeatedBytesList() {
+    public java.util.List<com.google.protobuf.ByteString>
+        getRepeatedBytesList() {
       return repeatedBytes_;
     }
-
     /**
      * <code>repeated bytes repeated_bytes = 45;</code>
-     *
      * @return The count of repeatedBytes.
      */
     public int getRepeatedBytesCount() {
       return repeatedBytes_.size();
     }
-
     /**
      * <code>repeated bytes repeated_bytes = 45;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedBytes at the given index.
      */
@@ -5992,214 +5326,136 @@ public com.google.protobuf.ByteString getRepeatedBytes(int index) {
     }
 
     public static final int REPEATED_NESTED_MESSAGE_FIELD_NUMBER = 48;
-
     @SuppressWarnings("serial")
-    private java.util.List<
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-        repeatedNestedMessage_;
-
+    private java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> repeatedNestedMessage_;
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
      */
     @java.lang.Override
-    public java.util.List<
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-        getRepeatedNestedMessageList() {
+    public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> getRepeatedNestedMessageList() {
       return repeatedNestedMessage_;
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
      */
     @java.lang.Override
-    public java.util.List<
-            ? extends
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .NestedMessageOrBuilder>
+    public java.util.List<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> 
         getRepeatedNestedMessageOrBuilderList() {
       return repeatedNestedMessage_;
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
      */
     @java.lang.Override
     public int getRepeatedNestedMessageCount() {
       return repeatedNestedMessage_.size();
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-        getRepeatedNestedMessage(int index) {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getRepeatedNestedMessage(int index) {
       return repeatedNestedMessage_.get(index);
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-            .NestedMessageOrBuilder
-        getRepeatedNestedMessageOrBuilder(int index) {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder getRepeatedNestedMessageOrBuilder(
+        int index) {
       return repeatedNestedMessage_.get(index);
     }
 
     public static final int REPEATED_FOREIGN_MESSAGE_FIELD_NUMBER = 49;
-
     @SuppressWarnings("serial")
-    private java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-        repeatedForeignMessage_;
-
+    private java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> repeatedForeignMessage_;
     /**
-     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
      */
     @java.lang.Override
-    public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-        getRepeatedForeignMessageList() {
+    public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> getRepeatedForeignMessageList() {
       return repeatedForeignMessage_;
     }
-
     /**
-     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
      */
     @java.lang.Override
-    public java.util.List<
-            ? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>
+    public java.util.List<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder> 
         getRepeatedForeignMessageOrBuilderList() {
       return repeatedForeignMessage_;
     }
-
     /**
-     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
      */
     @java.lang.Override
     public int getRepeatedForeignMessageCount() {
       return repeatedForeignMessage_.size();
     }
-
     /**
-     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        getRepeatedForeignMessage(int index) {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedForeignMessage(int index) {
       return repeatedForeignMessage_.get(index);
     }
-
     /**
-     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder
-        getRepeatedForeignMessageOrBuilder(int index) {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder getRepeatedForeignMessageOrBuilder(
+        int index) {
       return repeatedForeignMessage_.get(index);
     }
 
     public static final int REPEATED_NESTED_ENUM_FIELD_NUMBER = 51;
-
     @SuppressWarnings("serial")
     private java.util.List<java.lang.Integer> repeatedNestedEnum_;
-
     private static final com.google.protobuf.Internal.ListAdapter.Converter<
-            java.lang.Integer,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        repeatedNestedEnum_converter_ =
+        java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> repeatedNestedEnum_converter_ =
             new com.google.protobuf.Internal.ListAdapter.Converter<
-                java.lang.Integer,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .NestedEnum>() {
-              public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedEnum
-                  convert(java.lang.Integer from) {
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                    result =
-                        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                            .NestedEnum.forNumber(from);
-                return result == null
-                    ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                        .NestedEnum.UNRECOGNIZED
-                    : result;
+                java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>() {
+              public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum convert(java.lang.Integer from) {
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.forNumber(from);
+                return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.UNRECOGNIZED : result;
               }
             };
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
      * @return A list containing the repeatedNestedEnum.
      */
     @java.lang.Override
-    public java.util.List<
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        getRepeatedNestedEnumList() {
+    public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> getRepeatedNestedEnumList() {
       return new com.google.protobuf.Internal.ListAdapter<
-          java.lang.Integer,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(
-          repeatedNestedEnum_, repeatedNestedEnum_converter_);
+          java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(repeatedNestedEnum_, repeatedNestedEnum_converter_);
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
      * @return The count of repeatedNestedEnum.
      */
     @java.lang.Override
     public int getRepeatedNestedEnumCount() {
       return repeatedNestedEnum_.size();
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
      * @param index The index of the element to return.
      * @return The repeatedNestedEnum at the given index.
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getRepeatedNestedEnum(int index) {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getRepeatedNestedEnum(int index) {
       return repeatedNestedEnum_converter_.convert(repeatedNestedEnum_.get(index));
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
      * @return A list containing the enum numeric values on the wire for repeatedNestedEnum.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getRepeatedNestedEnumValueList() {
+    public java.util.List<java.lang.Integer>
+    getRepeatedNestedEnumValueList() {
       return repeatedNestedEnum_;
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
      * @param index The index of the value to return.
      * @return The enum numeric value on the wire of repeatedNestedEnum at the given index.
      */
@@ -6207,78 +5463,57 @@ public java.util.List<java.lang.Integer> getRepeatedNestedEnumValueList() {
     public int getRepeatedNestedEnumValue(int index) {
       return repeatedNestedEnum_.get(index);
     }
-
     private int repeatedNestedEnumMemoizedSerializedSize;
 
     public static final int REPEATED_FOREIGN_ENUM_FIELD_NUMBER = 52;
-
     @SuppressWarnings("serial")
     private java.util.List<java.lang.Integer> repeatedForeignEnum_;
-
     private static final com.google.protobuf.Internal.ListAdapter.Converter<
-            java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-        repeatedForeignEnum_converter_ =
+        java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum> repeatedForeignEnum_converter_ =
             new com.google.protobuf.Internal.ListAdapter.Converter<
-                java.lang.Integer,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>() {
-              public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum convert(
-                  java.lang.Integer from) {
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum result =
-                    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.forNumber(from);
-                return result == null
-                    ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.UNRECOGNIZED
-                    : result;
+                java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>() {
+              public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum convert(java.lang.Integer from) {
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.forNumber(from);
+                return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.UNRECOGNIZED : result;
               }
             };
-
     /**
      * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-     *
      * @return A list containing the repeatedForeignEnum.
      */
     @java.lang.Override
-    public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-        getRepeatedForeignEnumList() {
+    public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum> getRepeatedForeignEnumList() {
       return new com.google.protobuf.Internal.ListAdapter<
-          java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>(
-          repeatedForeignEnum_, repeatedForeignEnum_converter_);
+          java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>(repeatedForeignEnum_, repeatedForeignEnum_converter_);
     }
-
     /**
      * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-     *
      * @return The count of repeatedForeignEnum.
      */
     @java.lang.Override
     public int getRepeatedForeignEnumCount() {
       return repeatedForeignEnum_.size();
     }
-
     /**
      * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedForeignEnum at the given index.
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getRepeatedForeignEnum(
-        int index) {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getRepeatedForeignEnum(int index) {
       return repeatedForeignEnum_converter_.convert(repeatedForeignEnum_.get(index));
     }
-
     /**
      * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-     *
      * @return A list containing the enum numeric values on the wire for repeatedForeignEnum.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getRepeatedForeignEnumValueList() {
+    public java.util.List<java.lang.Integer>
+    getRepeatedForeignEnumValueList() {
       return repeatedForeignEnum_;
     }
-
     /**
      * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-     *
      * @param index The index of the value to return.
      * @return The enum numeric value on the wire of repeatedForeignEnum at the given index.
      */
@@ -6286,582 +5521,459 @@ public java.util.List<java.lang.Integer> getRepeatedForeignEnumValueList() {
     public int getRepeatedForeignEnumValue(int index) {
       return repeatedForeignEnum_.get(index);
     }
-
     private int repeatedForeignEnumMemoizedSerializedSize;
 
     public static final int PACKED_INT32_FIELD_NUMBER = 75;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList packedInt32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList packedInt32_ =
+        emptyIntList();
     /**
-     *
-     *
      * <pre>
      * Packed
      * </pre>
      *
      * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-     *
      * @return A list containing the packedInt32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getPackedInt32List() {
+    public java.util.List<java.lang.Integer>
+        getPackedInt32List() {
       return packedInt32_;
     }
-
     /**
-     *
-     *
      * <pre>
      * Packed
      * </pre>
      *
      * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-     *
      * @return The count of packedInt32.
      */
     public int getPackedInt32Count() {
       return packedInt32_.size();
     }
-
     /**
-     *
-     *
      * <pre>
      * Packed
      * </pre>
      *
      * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedInt32 at the given index.
      */
     public int getPackedInt32(int index) {
       return packedInt32_.getInt(index);
     }
-
     private int packedInt32MemoizedSerializedSize = -1;
 
     public static final int PACKED_INT64_FIELD_NUMBER = 76;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList packedInt64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList packedInt64_ =
+        emptyLongList();
     /**
      * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-     *
      * @return A list containing the packedInt64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getPackedInt64List() {
+    public java.util.List<java.lang.Long>
+        getPackedInt64List() {
       return packedInt64_;
     }
-
     /**
      * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-     *
      * @return The count of packedInt64.
      */
     public int getPackedInt64Count() {
       return packedInt64_.size();
     }
-
     /**
      * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedInt64 at the given index.
      */
     public long getPackedInt64(int index) {
       return packedInt64_.getLong(index);
     }
-
     private int packedInt64MemoizedSerializedSize = -1;
 
     public static final int PACKED_UINT32_FIELD_NUMBER = 77;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList packedUint32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList packedUint32_ =
+        emptyIntList();
     /**
      * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-     *
      * @return A list containing the packedUint32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getPackedUint32List() {
+    public java.util.List<java.lang.Integer>
+        getPackedUint32List() {
       return packedUint32_;
     }
-
     /**
      * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-     *
      * @return The count of packedUint32.
      */
     public int getPackedUint32Count() {
       return packedUint32_.size();
     }
-
     /**
      * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedUint32 at the given index.
      */
     public int getPackedUint32(int index) {
       return packedUint32_.getInt(index);
     }
-
     private int packedUint32MemoizedSerializedSize = -1;
 
     public static final int PACKED_UINT64_FIELD_NUMBER = 78;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList packedUint64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList packedUint64_ =
+        emptyLongList();
     /**
      * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-     *
      * @return A list containing the packedUint64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getPackedUint64List() {
+    public java.util.List<java.lang.Long>
+        getPackedUint64List() {
       return packedUint64_;
     }
-
     /**
      * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-     *
      * @return The count of packedUint64.
      */
     public int getPackedUint64Count() {
       return packedUint64_.size();
     }
-
     /**
      * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedUint64 at the given index.
      */
     public long getPackedUint64(int index) {
       return packedUint64_.getLong(index);
     }
-
     private int packedUint64MemoizedSerializedSize = -1;
 
     public static final int PACKED_SINT32_FIELD_NUMBER = 79;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList packedSint32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList packedSint32_ =
+        emptyIntList();
     /**
      * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-     *
      * @return A list containing the packedSint32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getPackedSint32List() {
+    public java.util.List<java.lang.Integer>
+        getPackedSint32List() {
       return packedSint32_;
     }
-
     /**
      * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-     *
      * @return The count of packedSint32.
      */
     public int getPackedSint32Count() {
       return packedSint32_.size();
     }
-
     /**
      * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedSint32 at the given index.
      */
     public int getPackedSint32(int index) {
       return packedSint32_.getInt(index);
     }
-
     private int packedSint32MemoizedSerializedSize = -1;
 
     public static final int PACKED_SINT64_FIELD_NUMBER = 80;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList packedSint64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList packedSint64_ =
+        emptyLongList();
     /**
      * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-     *
      * @return A list containing the packedSint64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getPackedSint64List() {
+    public java.util.List<java.lang.Long>
+        getPackedSint64List() {
       return packedSint64_;
     }
-
     /**
      * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-     *
      * @return The count of packedSint64.
      */
     public int getPackedSint64Count() {
       return packedSint64_.size();
     }
-
     /**
      * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedSint64 at the given index.
      */
     public long getPackedSint64(int index) {
       return packedSint64_.getLong(index);
     }
-
     private int packedSint64MemoizedSerializedSize = -1;
 
     public static final int PACKED_FIXED32_FIELD_NUMBER = 81;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList packedFixed32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList packedFixed32_ =
+        emptyIntList();
     /**
      * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-     *
      * @return A list containing the packedFixed32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getPackedFixed32List() {
+    public java.util.List<java.lang.Integer>
+        getPackedFixed32List() {
       return packedFixed32_;
     }
-
     /**
      * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-     *
      * @return The count of packedFixed32.
      */
     public int getPackedFixed32Count() {
       return packedFixed32_.size();
     }
-
     /**
      * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedFixed32 at the given index.
      */
     public int getPackedFixed32(int index) {
       return packedFixed32_.getInt(index);
     }
-
     private int packedFixed32MemoizedSerializedSize = -1;
 
     public static final int PACKED_FIXED64_FIELD_NUMBER = 82;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList packedFixed64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList packedFixed64_ =
+        emptyLongList();
     /**
      * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-     *
      * @return A list containing the packedFixed64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getPackedFixed64List() {
+    public java.util.List<java.lang.Long>
+        getPackedFixed64List() {
       return packedFixed64_;
     }
-
     /**
      * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-     *
      * @return The count of packedFixed64.
      */
     public int getPackedFixed64Count() {
       return packedFixed64_.size();
     }
-
     /**
      * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedFixed64 at the given index.
      */
     public long getPackedFixed64(int index) {
       return packedFixed64_.getLong(index);
     }
-
     private int packedFixed64MemoizedSerializedSize = -1;
 
     public static final int PACKED_SFIXED32_FIELD_NUMBER = 83;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList packedSfixed32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList packedSfixed32_ =
+        emptyIntList();
     /**
      * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-     *
      * @return A list containing the packedSfixed32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getPackedSfixed32List() {
+    public java.util.List<java.lang.Integer>
+        getPackedSfixed32List() {
       return packedSfixed32_;
     }
-
     /**
      * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-     *
      * @return The count of packedSfixed32.
      */
     public int getPackedSfixed32Count() {
       return packedSfixed32_.size();
     }
-
     /**
      * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedSfixed32 at the given index.
      */
     public int getPackedSfixed32(int index) {
       return packedSfixed32_.getInt(index);
     }
-
     private int packedSfixed32MemoizedSerializedSize = -1;
 
     public static final int PACKED_SFIXED64_FIELD_NUMBER = 84;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList packedSfixed64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList packedSfixed64_ =
+        emptyLongList();
     /**
      * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-     *
      * @return A list containing the packedSfixed64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getPackedSfixed64List() {
+    public java.util.List<java.lang.Long>
+        getPackedSfixed64List() {
       return packedSfixed64_;
     }
-
     /**
      * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-     *
      * @return The count of packedSfixed64.
      */
     public int getPackedSfixed64Count() {
       return packedSfixed64_.size();
     }
-
     /**
      * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedSfixed64 at the given index.
      */
     public long getPackedSfixed64(int index) {
       return packedSfixed64_.getLong(index);
     }
-
     private int packedSfixed64MemoizedSerializedSize = -1;
 
     public static final int PACKED_FLOAT_FIELD_NUMBER = 85;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.FloatList packedFloat_ = emptyFloatList();
-
+    private com.google.protobuf.Internal.FloatList packedFloat_ =
+        emptyFloatList();
     /**
      * <code>repeated float packed_float = 85 [packed = true];</code>
-     *
      * @return A list containing the packedFloat.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Float> getPackedFloatList() {
+    public java.util.List<java.lang.Float>
+        getPackedFloatList() {
       return packedFloat_;
     }
-
     /**
      * <code>repeated float packed_float = 85 [packed = true];</code>
-     *
      * @return The count of packedFloat.
      */
     public int getPackedFloatCount() {
       return packedFloat_.size();
     }
-
     /**
      * <code>repeated float packed_float = 85 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedFloat at the given index.
      */
     public float getPackedFloat(int index) {
       return packedFloat_.getFloat(index);
     }
-
     private int packedFloatMemoizedSerializedSize = -1;
 
     public static final int PACKED_DOUBLE_FIELD_NUMBER = 86;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.DoubleList packedDouble_ = emptyDoubleList();
-
+    private com.google.protobuf.Internal.DoubleList packedDouble_ =
+        emptyDoubleList();
     /**
      * <code>repeated double packed_double = 86 [packed = true];</code>
-     *
      * @return A list containing the packedDouble.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Double> getPackedDoubleList() {
+    public java.util.List<java.lang.Double>
+        getPackedDoubleList() {
       return packedDouble_;
     }
-
     /**
      * <code>repeated double packed_double = 86 [packed = true];</code>
-     *
      * @return The count of packedDouble.
      */
     public int getPackedDoubleCount() {
       return packedDouble_.size();
     }
-
     /**
      * <code>repeated double packed_double = 86 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedDouble at the given index.
      */
     public double getPackedDouble(int index) {
       return packedDouble_.getDouble(index);
     }
-
     private int packedDoubleMemoizedSerializedSize = -1;
 
     public static final int PACKED_BOOL_FIELD_NUMBER = 87;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.BooleanList packedBool_ = emptyBooleanList();
-
+    private com.google.protobuf.Internal.BooleanList packedBool_ =
+        emptyBooleanList();
     /**
      * <code>repeated bool packed_bool = 87 [packed = true];</code>
-     *
      * @return A list containing the packedBool.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Boolean> getPackedBoolList() {
+    public java.util.List<java.lang.Boolean>
+        getPackedBoolList() {
       return packedBool_;
     }
-
     /**
      * <code>repeated bool packed_bool = 87 [packed = true];</code>
-     *
      * @return The count of packedBool.
      */
     public int getPackedBoolCount() {
       return packedBool_.size();
     }
-
     /**
      * <code>repeated bool packed_bool = 87 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedBool at the given index.
      */
     public boolean getPackedBool(int index) {
       return packedBool_.getBoolean(index);
     }
-
     private int packedBoolMemoizedSerializedSize = -1;
 
     public static final int PACKED_NESTED_ENUM_FIELD_NUMBER = 88;
-
     @SuppressWarnings("serial")
     private java.util.List<java.lang.Integer> packedNestedEnum_;
-
     private static final com.google.protobuf.Internal.ListAdapter.Converter<
-            java.lang.Integer,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        packedNestedEnum_converter_ =
+        java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> packedNestedEnum_converter_ =
             new com.google.protobuf.Internal.ListAdapter.Converter<
-                java.lang.Integer,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .NestedEnum>() {
-              public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedEnum
-                  convert(java.lang.Integer from) {
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                    result =
-                        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                            .NestedEnum.forNumber(from);
-                return result == null
-                    ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                        .NestedEnum.UNRECOGNIZED
-                    : result;
+                java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>() {
+              public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum convert(java.lang.Integer from) {
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.forNumber(from);
+                return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.UNRECOGNIZED : result;
               }
             };
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
      * @return A list containing the packedNestedEnum.
      */
     @java.lang.Override
-    public java.util.List<
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        getPackedNestedEnumList() {
+    public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> getPackedNestedEnumList() {
       return new com.google.protobuf.Internal.ListAdapter<
-          java.lang.Integer,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(
-          packedNestedEnum_, packedNestedEnum_converter_);
+          java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(packedNestedEnum_, packedNestedEnum_converter_);
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
      * @return The count of packedNestedEnum.
      */
     @java.lang.Override
     public int getPackedNestedEnumCount() {
       return packedNestedEnum_.size();
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
      * @param index The index of the element to return.
      * @return The packedNestedEnum at the given index.
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getPackedNestedEnum(int index) {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getPackedNestedEnum(int index) {
       return packedNestedEnum_converter_.convert(packedNestedEnum_.get(index));
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
      * @return A list containing the enum numeric values on the wire for packedNestedEnum.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getPackedNestedEnumValueList() {
+    public java.util.List<java.lang.Integer>
+    getPackedNestedEnumValueList() {
       return packedNestedEnum_;
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
      * @param index The index of the value to return.
      * @return The enum numeric value on the wire of packedNestedEnum at the given index.
      */
@@ -6869,54 +5981,42 @@ public java.util.List<java.lang.Integer> getPackedNestedEnumValueList() {
     public int getPackedNestedEnumValue(int index) {
       return packedNestedEnum_.get(index);
     }
-
     private int packedNestedEnumMemoizedSerializedSize;
 
     public static final int UNPACKED_INT32_FIELD_NUMBER = 89;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList unpackedInt32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList unpackedInt32_ =
+        emptyIntList();
     /**
-     *
-     *
      * <pre>
      * Unpacked
      * </pre>
      *
      * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-     *
      * @return A list containing the unpackedInt32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getUnpackedInt32List() {
+    public java.util.List<java.lang.Integer>
+        getUnpackedInt32List() {
       return unpackedInt32_;
     }
-
     /**
-     *
-     *
      * <pre>
      * Unpacked
      * </pre>
      *
      * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-     *
      * @return The count of unpackedInt32.
      */
     public int getUnpackedInt32Count() {
       return unpackedInt32_.size();
     }
-
     /**
-     *
-     *
      * <pre>
      * Unpacked
      * </pre>
      *
      * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedInt32 at the given index.
      */
@@ -6925,32 +6025,27 @@ public int getUnpackedInt32(int index) {
     }
 
     public static final int UNPACKED_INT64_FIELD_NUMBER = 90;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList unpackedInt64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList unpackedInt64_ =
+        emptyLongList();
     /**
      * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-     *
      * @return A list containing the unpackedInt64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getUnpackedInt64List() {
+    public java.util.List<java.lang.Long>
+        getUnpackedInt64List() {
       return unpackedInt64_;
     }
-
     /**
      * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-     *
      * @return The count of unpackedInt64.
      */
     public int getUnpackedInt64Count() {
       return unpackedInt64_.size();
     }
-
     /**
      * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedInt64 at the given index.
      */
@@ -6959,32 +6054,27 @@ public long getUnpackedInt64(int index) {
     }
 
     public static final int UNPACKED_UINT32_FIELD_NUMBER = 91;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList unpackedUint32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList unpackedUint32_ =
+        emptyIntList();
     /**
      * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-     *
      * @return A list containing the unpackedUint32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getUnpackedUint32List() {
+    public java.util.List<java.lang.Integer>
+        getUnpackedUint32List() {
       return unpackedUint32_;
     }
-
     /**
      * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-     *
      * @return The count of unpackedUint32.
      */
     public int getUnpackedUint32Count() {
       return unpackedUint32_.size();
     }
-
     /**
      * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedUint32 at the given index.
      */
@@ -6993,32 +6083,27 @@ public int getUnpackedUint32(int index) {
     }
 
     public static final int UNPACKED_UINT64_FIELD_NUMBER = 92;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList unpackedUint64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList unpackedUint64_ =
+        emptyLongList();
     /**
      * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-     *
      * @return A list containing the unpackedUint64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getUnpackedUint64List() {
+    public java.util.List<java.lang.Long>
+        getUnpackedUint64List() {
       return unpackedUint64_;
     }
-
     /**
      * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-     *
      * @return The count of unpackedUint64.
      */
     public int getUnpackedUint64Count() {
       return unpackedUint64_.size();
     }
-
     /**
      * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedUint64 at the given index.
      */
@@ -7027,32 +6112,27 @@ public long getUnpackedUint64(int index) {
     }
 
     public static final int UNPACKED_SINT32_FIELD_NUMBER = 93;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList unpackedSint32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList unpackedSint32_ =
+        emptyIntList();
     /**
      * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-     *
      * @return A list containing the unpackedSint32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getUnpackedSint32List() {
+    public java.util.List<java.lang.Integer>
+        getUnpackedSint32List() {
       return unpackedSint32_;
     }
-
     /**
      * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-     *
      * @return The count of unpackedSint32.
      */
     public int getUnpackedSint32Count() {
       return unpackedSint32_.size();
     }
-
     /**
      * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedSint32 at the given index.
      */
@@ -7061,32 +6141,27 @@ public int getUnpackedSint32(int index) {
     }
 
     public static final int UNPACKED_SINT64_FIELD_NUMBER = 94;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList unpackedSint64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList unpackedSint64_ =
+        emptyLongList();
     /**
      * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-     *
      * @return A list containing the unpackedSint64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getUnpackedSint64List() {
+    public java.util.List<java.lang.Long>
+        getUnpackedSint64List() {
       return unpackedSint64_;
     }
-
     /**
      * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-     *
      * @return The count of unpackedSint64.
      */
     public int getUnpackedSint64Count() {
       return unpackedSint64_.size();
     }
-
     /**
      * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedSint64 at the given index.
      */
@@ -7095,32 +6170,27 @@ public long getUnpackedSint64(int index) {
     }
 
     public static final int UNPACKED_FIXED32_FIELD_NUMBER = 95;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList unpackedFixed32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList unpackedFixed32_ =
+        emptyIntList();
     /**
      * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-     *
      * @return A list containing the unpackedFixed32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getUnpackedFixed32List() {
+    public java.util.List<java.lang.Integer>
+        getUnpackedFixed32List() {
       return unpackedFixed32_;
     }
-
     /**
      * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-     *
      * @return The count of unpackedFixed32.
      */
     public int getUnpackedFixed32Count() {
       return unpackedFixed32_.size();
     }
-
     /**
      * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedFixed32 at the given index.
      */
@@ -7129,32 +6199,27 @@ public int getUnpackedFixed32(int index) {
     }
 
     public static final int UNPACKED_FIXED64_FIELD_NUMBER = 96;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList unpackedFixed64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList unpackedFixed64_ =
+        emptyLongList();
     /**
      * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-     *
      * @return A list containing the unpackedFixed64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getUnpackedFixed64List() {
+    public java.util.List<java.lang.Long>
+        getUnpackedFixed64List() {
       return unpackedFixed64_;
     }
-
     /**
      * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-     *
      * @return The count of unpackedFixed64.
      */
     public int getUnpackedFixed64Count() {
       return unpackedFixed64_.size();
     }
-
     /**
      * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedFixed64 at the given index.
      */
@@ -7163,32 +6228,27 @@ public long getUnpackedFixed64(int index) {
     }
 
     public static final int UNPACKED_SFIXED32_FIELD_NUMBER = 97;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList unpackedSfixed32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList unpackedSfixed32_ =
+        emptyIntList();
     /**
      * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-     *
      * @return A list containing the unpackedSfixed32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getUnpackedSfixed32List() {
+    public java.util.List<java.lang.Integer>
+        getUnpackedSfixed32List() {
       return unpackedSfixed32_;
     }
-
     /**
      * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-     *
      * @return The count of unpackedSfixed32.
      */
     public int getUnpackedSfixed32Count() {
       return unpackedSfixed32_.size();
     }
-
     /**
      * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedSfixed32 at the given index.
      */
@@ -7197,32 +6257,27 @@ public int getUnpackedSfixed32(int index) {
     }
 
     public static final int UNPACKED_SFIXED64_FIELD_NUMBER = 98;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList unpackedSfixed64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList unpackedSfixed64_ =
+        emptyLongList();
     /**
      * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-     *
      * @return A list containing the unpackedSfixed64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getUnpackedSfixed64List() {
+    public java.util.List<java.lang.Long>
+        getUnpackedSfixed64List() {
       return unpackedSfixed64_;
     }
-
     /**
      * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-     *
      * @return The count of unpackedSfixed64.
      */
     public int getUnpackedSfixed64Count() {
       return unpackedSfixed64_.size();
     }
-
     /**
      * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedSfixed64 at the given index.
      */
@@ -7231,32 +6286,27 @@ public long getUnpackedSfixed64(int index) {
     }
 
     public static final int UNPACKED_FLOAT_FIELD_NUMBER = 99;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.FloatList unpackedFloat_ = emptyFloatList();
-
+    private com.google.protobuf.Internal.FloatList unpackedFloat_ =
+        emptyFloatList();
     /**
      * <code>repeated float unpacked_float = 99 [packed = false];</code>
-     *
      * @return A list containing the unpackedFloat.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Float> getUnpackedFloatList() {
+    public java.util.List<java.lang.Float>
+        getUnpackedFloatList() {
       return unpackedFloat_;
     }
-
     /**
      * <code>repeated float unpacked_float = 99 [packed = false];</code>
-     *
      * @return The count of unpackedFloat.
      */
     public int getUnpackedFloatCount() {
       return unpackedFloat_.size();
     }
-
     /**
      * <code>repeated float unpacked_float = 99 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedFloat at the given index.
      */
@@ -7265,32 +6315,27 @@ public float getUnpackedFloat(int index) {
     }
 
     public static final int UNPACKED_DOUBLE_FIELD_NUMBER = 100;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.DoubleList unpackedDouble_ = emptyDoubleList();
-
+    private com.google.protobuf.Internal.DoubleList unpackedDouble_ =
+        emptyDoubleList();
     /**
      * <code>repeated double unpacked_double = 100 [packed = false];</code>
-     *
      * @return A list containing the unpackedDouble.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Double> getUnpackedDoubleList() {
+    public java.util.List<java.lang.Double>
+        getUnpackedDoubleList() {
       return unpackedDouble_;
     }
-
     /**
      * <code>repeated double unpacked_double = 100 [packed = false];</code>
-     *
      * @return The count of unpackedDouble.
      */
     public int getUnpackedDoubleCount() {
       return unpackedDouble_.size();
     }
-
     /**
      * <code>repeated double unpacked_double = 100 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedDouble at the given index.
      */
@@ -7299,32 +6344,27 @@ public double getUnpackedDouble(int index) {
     }
 
     public static final int UNPACKED_BOOL_FIELD_NUMBER = 101;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.BooleanList unpackedBool_ = emptyBooleanList();
-
+    private com.google.protobuf.Internal.BooleanList unpackedBool_ =
+        emptyBooleanList();
     /**
      * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-     *
      * @return A list containing the unpackedBool.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Boolean> getUnpackedBoolList() {
+    public java.util.List<java.lang.Boolean>
+        getUnpackedBoolList() {
       return unpackedBool_;
     }
-
     /**
      * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-     *
      * @return The count of unpackedBool.
      */
     public int getUnpackedBoolCount() {
       return unpackedBool_.size();
     }
-
     /**
      * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedBool at the given index.
      */
@@ -7333,92 +6373,54 @@ public boolean getUnpackedBool(int index) {
     }
 
     public static final int UNPACKED_NESTED_ENUM_FIELD_NUMBER = 102;
-
     @SuppressWarnings("serial")
     private java.util.List<java.lang.Integer> unpackedNestedEnum_;
-
     private static final com.google.protobuf.Internal.ListAdapter.Converter<
-            java.lang.Integer,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        unpackedNestedEnum_converter_ =
+        java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> unpackedNestedEnum_converter_ =
             new com.google.protobuf.Internal.ListAdapter.Converter<
-                java.lang.Integer,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .NestedEnum>() {
-              public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedEnum
-                  convert(java.lang.Integer from) {
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                    result =
-                        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                            .NestedEnum.forNumber(from);
-                return result == null
-                    ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                        .NestedEnum.UNRECOGNIZED
-                    : result;
+                java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>() {
+              public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum convert(java.lang.Integer from) {
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.forNumber(from);
+                return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.UNRECOGNIZED : result;
               }
             };
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
      * @return A list containing the unpackedNestedEnum.
      */
     @java.lang.Override
-    public java.util.List<
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        getUnpackedNestedEnumList() {
+    public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> getUnpackedNestedEnumList() {
       return new com.google.protobuf.Internal.ListAdapter<
-          java.lang.Integer,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(
-          unpackedNestedEnum_, unpackedNestedEnum_converter_);
+          java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(unpackedNestedEnum_, unpackedNestedEnum_converter_);
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
      * @return The count of unpackedNestedEnum.
      */
     @java.lang.Override
     public int getUnpackedNestedEnumCount() {
       return unpackedNestedEnum_.size();
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
      * @param index The index of the element to return.
      * @return The unpackedNestedEnum at the given index.
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getUnpackedNestedEnum(int index) {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getUnpackedNestedEnum(int index) {
       return unpackedNestedEnum_converter_.convert(unpackedNestedEnum_.get(index));
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
      * @return A list containing the enum numeric values on the wire for unpackedNestedEnum.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getUnpackedNestedEnumValueList() {
+    public java.util.List<java.lang.Integer>
+    getUnpackedNestedEnumValueList() {
       return unpackedNestedEnum_;
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
      * @param index The index of the value to return.
      * @return The enum numeric value on the wire of unpackedNestedEnum at the given index.
      */
@@ -7428,37 +6430,32 @@ public int getUnpackedNestedEnumValue(int index) {
     }
 
     public static final int MAP_INT32_INT32_FIELD_NUMBER = 56;
-
     private static final class MapInt32Int32DefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Integer, java.lang.Integer>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32Int32Entry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.INT32,
-              0,
-              com.google.protobuf.WireFormat.FieldType.INT32,
-              0);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32Int32Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.INT32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.INT32,
+                  0);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer> mapInt32Int32_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Integer> mapInt32Int32_;
     private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-        internalGetMapInt32Int32() {
+    internalGetMapInt32Int32() {
       if (mapInt32Int32_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapInt32Int32DefaultEntryHolder.defaultEntry);
       }
       return mapInt32Int32_;
     }
-
     public int getMapInt32Int32Count() {
       return internalGetMapInt32Int32().getMap().size();
     }
-
     /**
-     *
-     *
      * <pre>
      * Map
      * </pre>
@@ -7466,21 +6463,20 @@ public int getMapInt32Int32Count() {
      * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
      */
     @java.lang.Override
-    public boolean containsMapInt32Int32(int key) {
+    public boolean containsMapInt32Int32(
+        int key) {
 
       return internalGetMapInt32Int32().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapInt32Int32Map()} instead. */
+    /**
+     * Use {@link #getMapInt32Int32Map()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32() {
       return getMapInt32Int32Map();
     }
-
     /**
-     *
-     *
      * <pre>
      * Map
      * </pre>
@@ -7491,10 +6487,7 @@ public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32() {
     public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32Map() {
       return internalGetMapInt32Int32().getMap();
     }
-
     /**
-     *
-     *
      * <pre>
      * Map
      * </pre>
@@ -7502,15 +6495,15 @@ public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32Map()
      * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
      */
     @java.lang.Override
-    public int getMapInt32Int32OrDefault(int key, int defaultValue) {
+    public int getMapInt32Int32OrDefault(
+        int key,
+        int defaultValue) {
 
-      java.util.Map<java.lang.Integer, java.lang.Integer> map = internalGetMapInt32Int32().getMap();
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapInt32Int32().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
     /**
-     *
-     *
      * <pre>
      * Map
      * </pre>
@@ -7518,9 +6511,11 @@ public int getMapInt32Int32OrDefault(int key, int defaultValue) {
      * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
      */
     @java.lang.Override
-    public int getMapInt32Int32OrThrow(int key) {
+    public int getMapInt32Int32OrThrow(
+        int key) {
 
-      java.util.Map<java.lang.Integer, java.lang.Integer> map = internalGetMapInt32Int32().getMap();
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapInt32Int32().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -7528,67 +6523,76 @@ public int getMapInt32Int32OrThrow(int key) {
     }
 
     public static final int MAP_INT64_INT64_FIELD_NUMBER = 57;
-
     private static final class MapInt64Int64DefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Long, java.lang.Long>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt64Int64Entry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.INT64,
-              0L,
-              com.google.protobuf.WireFormat.FieldType.INT64,
-              0L);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Long, java.lang.Long> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Long, java.lang.Long>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt64Int64Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.INT64,
+                  0L,
+                  com.google.protobuf.WireFormat.FieldType.INT64,
+                  0L);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Long, java.lang.Long> mapInt64Int64_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Long, java.lang.Long> mapInt64Int64_;
     private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
-        internalGetMapInt64Int64() {
+    internalGetMapInt64Int64() {
       if (mapInt64Int64_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapInt64Int64DefaultEntryHolder.defaultEntry);
       }
       return mapInt64Int64_;
     }
-
     public int getMapInt64Int64Count() {
       return internalGetMapInt64Int64().getMap().size();
     }
-
-    /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
     @java.lang.Override
-    public boolean containsMapInt64Int64(long key) {
+    public boolean containsMapInt64Int64(
+        long key) {
 
       return internalGetMapInt64Int64().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapInt64Int64Map()} instead. */
+    /**
+     * Use {@link #getMapInt64Int64Map()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Long, java.lang.Long> getMapInt64Int64() {
       return getMapInt64Int64Map();
     }
-
-    /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Long, java.lang.Long> getMapInt64Int64Map() {
       return internalGetMapInt64Int64().getMap();
     }
-
-    /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
     @java.lang.Override
-    public long getMapInt64Int64OrDefault(long key, long defaultValue) {
+    public long getMapInt64Int64OrDefault(
+        long key,
+        long defaultValue) {
 
-      java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapInt64Int64().getMap();
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapInt64Int64().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
     @java.lang.Override
-    public long getMapInt64Int64OrThrow(long key) {
+    public long getMapInt64Int64OrThrow(
+        long key) {
 
-      java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapInt64Int64().getMap();
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapInt64Int64().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -7596,66 +6600,73 @@ public long getMapInt64Int64OrThrow(long key) {
     }
 
     public static final int MAP_UINT32_UINT32_FIELD_NUMBER = 58;
-
     private static final class MapUint32Uint32DefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Integer, java.lang.Integer>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint32Uint32Entry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.UINT32,
-              0,
-              com.google.protobuf.WireFormat.FieldType.UINT32,
-              0);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint32Uint32Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.UINT32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.UINT32,
+                  0);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer> mapUint32Uint32_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Integer> mapUint32Uint32_;
     private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-        internalGetMapUint32Uint32() {
+    internalGetMapUint32Uint32() {
       if (mapUint32Uint32_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapUint32Uint32DefaultEntryHolder.defaultEntry);
       }
       return mapUint32Uint32_;
     }
-
     public int getMapUint32Uint32Count() {
       return internalGetMapUint32Uint32().getMap().size();
     }
-
-    /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
     @java.lang.Override
-    public boolean containsMapUint32Uint32(int key) {
+    public boolean containsMapUint32Uint32(
+        int key) {
 
       return internalGetMapUint32Uint32().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapUint32Uint32Map()} instead. */
+    /**
+     * Use {@link #getMapUint32Uint32Map()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Integer, java.lang.Integer> getMapUint32Uint32() {
       return getMapUint32Uint32Map();
     }
-
-    /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Integer, java.lang.Integer> getMapUint32Uint32Map() {
       return internalGetMapUint32Uint32().getMap();
     }
-
-    /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
     @java.lang.Override
-    public int getMapUint32Uint32OrDefault(int key, int defaultValue) {
+    public int getMapUint32Uint32OrDefault(
+        int key,
+        int defaultValue) {
 
       java.util.Map<java.lang.Integer, java.lang.Integer> map =
           internalGetMapUint32Uint32().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
     @java.lang.Override
-    public int getMapUint32Uint32OrThrow(int key) {
+    public int getMapUint32Uint32OrThrow(
+        int key) {
 
       java.util.Map<java.lang.Integer, java.lang.Integer> map =
           internalGetMapUint32Uint32().getMap();
@@ -7666,67 +6677,76 @@ public int getMapUint32Uint32OrThrow(int key) {
     }
 
     public static final int MAP_UINT64_UINT64_FIELD_NUMBER = 59;
-
     private static final class MapUint64Uint64DefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Long, java.lang.Long>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint64Uint64Entry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.UINT64,
-              0L,
-              com.google.protobuf.WireFormat.FieldType.UINT64,
-              0L);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Long, java.lang.Long> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Long, java.lang.Long>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint64Uint64Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.UINT64,
+                  0L,
+                  com.google.protobuf.WireFormat.FieldType.UINT64,
+                  0L);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Long, java.lang.Long> mapUint64Uint64_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Long, java.lang.Long> mapUint64Uint64_;
     private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
-        internalGetMapUint64Uint64() {
+    internalGetMapUint64Uint64() {
       if (mapUint64Uint64_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapUint64Uint64DefaultEntryHolder.defaultEntry);
       }
       return mapUint64Uint64_;
     }
-
     public int getMapUint64Uint64Count() {
       return internalGetMapUint64Uint64().getMap().size();
     }
-
-    /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
     @java.lang.Override
-    public boolean containsMapUint64Uint64(long key) {
+    public boolean containsMapUint64Uint64(
+        long key) {
 
       return internalGetMapUint64Uint64().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapUint64Uint64Map()} instead. */
+    /**
+     * Use {@link #getMapUint64Uint64Map()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Long, java.lang.Long> getMapUint64Uint64() {
       return getMapUint64Uint64Map();
     }
-
-    /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Long, java.lang.Long> getMapUint64Uint64Map() {
       return internalGetMapUint64Uint64().getMap();
     }
-
-    /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
     @java.lang.Override
-    public long getMapUint64Uint64OrDefault(long key, long defaultValue) {
+    public long getMapUint64Uint64OrDefault(
+        long key,
+        long defaultValue) {
 
-      java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapUint64Uint64().getMap();
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapUint64Uint64().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
     @java.lang.Override
-    public long getMapUint64Uint64OrThrow(long key) {
+    public long getMapUint64Uint64OrThrow(
+        long key) {
 
-      java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapUint64Uint64().getMap();
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapUint64Uint64().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -7734,66 +6754,73 @@ public long getMapUint64Uint64OrThrow(long key) {
     }
 
     public static final int MAP_SINT32_SINT32_FIELD_NUMBER = 60;
-
     private static final class MapSint32Sint32DefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Integer, java.lang.Integer>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint32Sint32Entry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.SINT32,
-              0,
-              com.google.protobuf.WireFormat.FieldType.SINT32,
-              0);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint32Sint32Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.SINT32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.SINT32,
+                  0);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer> mapSint32Sint32_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Integer> mapSint32Sint32_;
     private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-        internalGetMapSint32Sint32() {
+    internalGetMapSint32Sint32() {
       if (mapSint32Sint32_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapSint32Sint32DefaultEntryHolder.defaultEntry);
       }
       return mapSint32Sint32_;
     }
-
     public int getMapSint32Sint32Count() {
       return internalGetMapSint32Sint32().getMap().size();
     }
-
-    /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
     @java.lang.Override
-    public boolean containsMapSint32Sint32(int key) {
+    public boolean containsMapSint32Sint32(
+        int key) {
 
       return internalGetMapSint32Sint32().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapSint32Sint32Map()} instead. */
+    /**
+     * Use {@link #getMapSint32Sint32Map()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSint32Sint32() {
       return getMapSint32Sint32Map();
     }
-
-    /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSint32Sint32Map() {
       return internalGetMapSint32Sint32().getMap();
     }
-
-    /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
     @java.lang.Override
-    public int getMapSint32Sint32OrDefault(int key, int defaultValue) {
+    public int getMapSint32Sint32OrDefault(
+        int key,
+        int defaultValue) {
 
       java.util.Map<java.lang.Integer, java.lang.Integer> map =
           internalGetMapSint32Sint32().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
     @java.lang.Override
-    public int getMapSint32Sint32OrThrow(int key) {
+    public int getMapSint32Sint32OrThrow(
+        int key) {
 
       java.util.Map<java.lang.Integer, java.lang.Integer> map =
           internalGetMapSint32Sint32().getMap();
@@ -7804,67 +6831,76 @@ public int getMapSint32Sint32OrThrow(int key) {
     }
 
     public static final int MAP_SINT64_SINT64_FIELD_NUMBER = 61;
-
     private static final class MapSint64Sint64DefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Long, java.lang.Long>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint64Sint64Entry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.SINT64,
-              0L,
-              com.google.protobuf.WireFormat.FieldType.SINT64,
-              0L);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Long, java.lang.Long> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Long, java.lang.Long>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint64Sint64Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.SINT64,
+                  0L,
+                  com.google.protobuf.WireFormat.FieldType.SINT64,
+                  0L);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Long, java.lang.Long> mapSint64Sint64_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Long, java.lang.Long> mapSint64Sint64_;
     private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
-        internalGetMapSint64Sint64() {
+    internalGetMapSint64Sint64() {
       if (mapSint64Sint64_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapSint64Sint64DefaultEntryHolder.defaultEntry);
       }
       return mapSint64Sint64_;
     }
-
     public int getMapSint64Sint64Count() {
       return internalGetMapSint64Sint64().getMap().size();
     }
-
-    /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
     @java.lang.Override
-    public boolean containsMapSint64Sint64(long key) {
+    public boolean containsMapSint64Sint64(
+        long key) {
 
       return internalGetMapSint64Sint64().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapSint64Sint64Map()} instead. */
+    /**
+     * Use {@link #getMapSint64Sint64Map()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Long, java.lang.Long> getMapSint64Sint64() {
       return getMapSint64Sint64Map();
     }
-
-    /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Long, java.lang.Long> getMapSint64Sint64Map() {
       return internalGetMapSint64Sint64().getMap();
     }
-
-    /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
     @java.lang.Override
-    public long getMapSint64Sint64OrDefault(long key, long defaultValue) {
+    public long getMapSint64Sint64OrDefault(
+        long key,
+        long defaultValue) {
 
-      java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapSint64Sint64().getMap();
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapSint64Sint64().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
     @java.lang.Override
-    public long getMapSint64Sint64OrThrow(long key) {
+    public long getMapSint64Sint64OrThrow(
+        long key) {
 
-      java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapSint64Sint64().getMap();
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapSint64Sint64().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -7872,66 +6908,73 @@ public long getMapSint64Sint64OrThrow(long key) {
     }
 
     public static final int MAP_FIXED32_FIXED32_FIELD_NUMBER = 62;
-
     private static final class MapFixed32Fixed32DefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Integer, java.lang.Integer>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed32Fixed32Entry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.FIXED32,
-              0,
-              com.google.protobuf.WireFormat.FieldType.FIXED32,
-              0);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed32Fixed32Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.FIXED32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.FIXED32,
+                  0);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer> mapFixed32Fixed32_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Integer> mapFixed32Fixed32_;
     private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-        internalGetMapFixed32Fixed32() {
+    internalGetMapFixed32Fixed32() {
       if (mapFixed32Fixed32_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapFixed32Fixed32DefaultEntryHolder.defaultEntry);
       }
       return mapFixed32Fixed32_;
     }
-
     public int getMapFixed32Fixed32Count() {
       return internalGetMapFixed32Fixed32().getMap().size();
     }
-
-    /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
     @java.lang.Override
-    public boolean containsMapFixed32Fixed32(int key) {
+    public boolean containsMapFixed32Fixed32(
+        int key) {
 
       return internalGetMapFixed32Fixed32().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapFixed32Fixed32Map()} instead. */
+    /**
+     * Use {@link #getMapFixed32Fixed32Map()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Integer, java.lang.Integer> getMapFixed32Fixed32() {
       return getMapFixed32Fixed32Map();
     }
-
-    /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Integer, java.lang.Integer> getMapFixed32Fixed32Map() {
       return internalGetMapFixed32Fixed32().getMap();
     }
-
-    /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
     @java.lang.Override
-    public int getMapFixed32Fixed32OrDefault(int key, int defaultValue) {
+    public int getMapFixed32Fixed32OrDefault(
+        int key,
+        int defaultValue) {
 
       java.util.Map<java.lang.Integer, java.lang.Integer> map =
           internalGetMapFixed32Fixed32().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
     @java.lang.Override
-    public int getMapFixed32Fixed32OrThrow(int key) {
+    public int getMapFixed32Fixed32OrThrow(
+        int key) {
 
       java.util.Map<java.lang.Integer, java.lang.Integer> map =
           internalGetMapFixed32Fixed32().getMap();
@@ -7942,67 +6985,76 @@ public int getMapFixed32Fixed32OrThrow(int key) {
     }
 
     public static final int MAP_FIXED64_FIXED64_FIELD_NUMBER = 63;
-
     private static final class MapFixed64Fixed64DefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Long, java.lang.Long>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed64Fixed64Entry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.FIXED64,
-              0L,
-              com.google.protobuf.WireFormat.FieldType.FIXED64,
-              0L);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Long, java.lang.Long> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Long, java.lang.Long>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed64Fixed64Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.FIXED64,
+                  0L,
+                  com.google.protobuf.WireFormat.FieldType.FIXED64,
+                  0L);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Long, java.lang.Long> mapFixed64Fixed64_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Long, java.lang.Long> mapFixed64Fixed64_;
     private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
-        internalGetMapFixed64Fixed64() {
+    internalGetMapFixed64Fixed64() {
       if (mapFixed64Fixed64_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapFixed64Fixed64DefaultEntryHolder.defaultEntry);
       }
       return mapFixed64Fixed64_;
     }
-
     public int getMapFixed64Fixed64Count() {
       return internalGetMapFixed64Fixed64().getMap().size();
     }
-
-    /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
     @java.lang.Override
-    public boolean containsMapFixed64Fixed64(long key) {
+    public boolean containsMapFixed64Fixed64(
+        long key) {
 
       return internalGetMapFixed64Fixed64().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapFixed64Fixed64Map()} instead. */
+    /**
+     * Use {@link #getMapFixed64Fixed64Map()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Long, java.lang.Long> getMapFixed64Fixed64() {
       return getMapFixed64Fixed64Map();
     }
-
-    /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Long, java.lang.Long> getMapFixed64Fixed64Map() {
       return internalGetMapFixed64Fixed64().getMap();
     }
-
-    /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
     @java.lang.Override
-    public long getMapFixed64Fixed64OrDefault(long key, long defaultValue) {
+    public long getMapFixed64Fixed64OrDefault(
+        long key,
+        long defaultValue) {
 
-      java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapFixed64Fixed64().getMap();
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapFixed64Fixed64().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
     @java.lang.Override
-    public long getMapFixed64Fixed64OrThrow(long key) {
+    public long getMapFixed64Fixed64OrThrow(
+        long key) {
 
-      java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapFixed64Fixed64().getMap();
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapFixed64Fixed64().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -8010,66 +7062,73 @@ public long getMapFixed64Fixed64OrThrow(long key) {
     }
 
     public static final int MAP_SFIXED32_SFIXED32_FIELD_NUMBER = 64;
-
     private static final class MapSfixed32Sfixed32DefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Integer, java.lang.Integer>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed32Sfixed32Entry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.SFIXED32,
-              0,
-              com.google.protobuf.WireFormat.FieldType.SFIXED32,
-              0);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed32Sfixed32Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.SFIXED32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.SFIXED32,
+                  0);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer> mapSfixed32Sfixed32_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Integer> mapSfixed32Sfixed32_;
     private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-        internalGetMapSfixed32Sfixed32() {
+    internalGetMapSfixed32Sfixed32() {
       if (mapSfixed32Sfixed32_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry);
       }
       return mapSfixed32Sfixed32_;
     }
-
     public int getMapSfixed32Sfixed32Count() {
       return internalGetMapSfixed32Sfixed32().getMap().size();
     }
-
-    /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
     @java.lang.Override
-    public boolean containsMapSfixed32Sfixed32(int key) {
+    public boolean containsMapSfixed32Sfixed32(
+        int key) {
 
       return internalGetMapSfixed32Sfixed32().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapSfixed32Sfixed32Map()} instead. */
+    /**
+     * Use {@link #getMapSfixed32Sfixed32Map()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSfixed32Sfixed32() {
       return getMapSfixed32Sfixed32Map();
     }
-
-    /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSfixed32Sfixed32Map() {
       return internalGetMapSfixed32Sfixed32().getMap();
     }
-
-    /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
     @java.lang.Override
-    public int getMapSfixed32Sfixed32OrDefault(int key, int defaultValue) {
+    public int getMapSfixed32Sfixed32OrDefault(
+        int key,
+        int defaultValue) {
 
       java.util.Map<java.lang.Integer, java.lang.Integer> map =
           internalGetMapSfixed32Sfixed32().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
     @java.lang.Override
-    public int getMapSfixed32Sfixed32OrThrow(int key) {
+    public int getMapSfixed32Sfixed32OrThrow(
+        int key) {
 
       java.util.Map<java.lang.Integer, java.lang.Integer> map =
           internalGetMapSfixed32Sfixed32().getMap();
@@ -8080,67 +7139,76 @@ public int getMapSfixed32Sfixed32OrThrow(int key) {
     }
 
     public static final int MAP_SFIXED64_SFIXED64_FIELD_NUMBER = 65;
-
     private static final class MapSfixed64Sfixed64DefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Long, java.lang.Long>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed64Sfixed64Entry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.SFIXED64,
-              0L,
-              com.google.protobuf.WireFormat.FieldType.SFIXED64,
-              0L);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Long, java.lang.Long> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Long, java.lang.Long>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed64Sfixed64Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.SFIXED64,
+                  0L,
+                  com.google.protobuf.WireFormat.FieldType.SFIXED64,
+                  0L);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Long, java.lang.Long> mapSfixed64Sfixed64_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Long, java.lang.Long> mapSfixed64Sfixed64_;
     private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
-        internalGetMapSfixed64Sfixed64() {
+    internalGetMapSfixed64Sfixed64() {
       if (mapSfixed64Sfixed64_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry);
       }
       return mapSfixed64Sfixed64_;
     }
-
     public int getMapSfixed64Sfixed64Count() {
       return internalGetMapSfixed64Sfixed64().getMap().size();
     }
-
-    /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
     @java.lang.Override
-    public boolean containsMapSfixed64Sfixed64(long key) {
+    public boolean containsMapSfixed64Sfixed64(
+        long key) {
 
       return internalGetMapSfixed64Sfixed64().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapSfixed64Sfixed64Map()} instead. */
+    /**
+     * Use {@link #getMapSfixed64Sfixed64Map()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Long, java.lang.Long> getMapSfixed64Sfixed64() {
       return getMapSfixed64Sfixed64Map();
     }
-
-    /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Long, java.lang.Long> getMapSfixed64Sfixed64Map() {
       return internalGetMapSfixed64Sfixed64().getMap();
     }
-
-    /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
     @java.lang.Override
-    public long getMapSfixed64Sfixed64OrDefault(long key, long defaultValue) {
+    public long getMapSfixed64Sfixed64OrDefault(
+        long key,
+        long defaultValue) {
 
-      java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapSfixed64Sfixed64().getMap();
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapSfixed64Sfixed64().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
     @java.lang.Override
-    public long getMapSfixed64Sfixed64OrThrow(long key) {
+    public long getMapSfixed64Sfixed64OrThrow(
+        long key) {
 
-      java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapSfixed64Sfixed64().getMap();
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapSfixed64Sfixed64().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -8148,67 +7216,76 @@ public long getMapSfixed64Sfixed64OrThrow(long key) {
     }
 
     public static final int MAP_INT32_FLOAT_FIELD_NUMBER = 66;
-
     private static final class MapInt32FloatDefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Integer, java.lang.Float>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32FloatEntry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.INT32,
-              0,
-              com.google.protobuf.WireFormat.FieldType.FLOAT,
-              0F);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Float> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Float>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32FloatEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.INT32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.FLOAT,
+                  0F);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float> mapInt32Float_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Float> mapInt32Float_;
     private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float>
-        internalGetMapInt32Float() {
+    internalGetMapInt32Float() {
       if (mapInt32Float_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapInt32FloatDefaultEntryHolder.defaultEntry);
       }
       return mapInt32Float_;
     }
-
     public int getMapInt32FloatCount() {
       return internalGetMapInt32Float().getMap().size();
     }
-
-    /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
     @java.lang.Override
-    public boolean containsMapInt32Float(int key) {
+    public boolean containsMapInt32Float(
+        int key) {
 
       return internalGetMapInt32Float().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapInt32FloatMap()} instead. */
+    /**
+     * Use {@link #getMapInt32FloatMap()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Integer, java.lang.Float> getMapInt32Float() {
       return getMapInt32FloatMap();
     }
-
-    /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Integer, java.lang.Float> getMapInt32FloatMap() {
       return internalGetMapInt32Float().getMap();
     }
-
-    /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
     @java.lang.Override
-    public float getMapInt32FloatOrDefault(int key, float defaultValue) {
+    public float getMapInt32FloatOrDefault(
+        int key,
+        float defaultValue) {
 
-      java.util.Map<java.lang.Integer, java.lang.Float> map = internalGetMapInt32Float().getMap();
+      java.util.Map<java.lang.Integer, java.lang.Float> map =
+          internalGetMapInt32Float().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
     @java.lang.Override
-    public float getMapInt32FloatOrThrow(int key) {
+    public float getMapInt32FloatOrThrow(
+        int key) {
 
-      java.util.Map<java.lang.Integer, java.lang.Float> map = internalGetMapInt32Float().getMap();
+      java.util.Map<java.lang.Integer, java.lang.Float> map =
+          internalGetMapInt32Float().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -8216,67 +7293,76 @@ public float getMapInt32FloatOrThrow(int key) {
     }
 
     public static final int MAP_INT32_DOUBLE_FIELD_NUMBER = 67;
-
     private static final class MapInt32DoubleDefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Double> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Integer, java.lang.Double>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32DoubleEntry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.INT32,
-              0,
-              com.google.protobuf.WireFormat.FieldType.DOUBLE,
-              0D);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Double> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Double>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32DoubleEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.INT32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.DOUBLE,
+                  0D);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Double> mapInt32Double_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Double> mapInt32Double_;
     private com.google.protobuf.MapField<java.lang.Integer, java.lang.Double>
-        internalGetMapInt32Double() {
+    internalGetMapInt32Double() {
       if (mapInt32Double_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapInt32DoubleDefaultEntryHolder.defaultEntry);
       }
       return mapInt32Double_;
     }
-
     public int getMapInt32DoubleCount() {
       return internalGetMapInt32Double().getMap().size();
     }
-
-    /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
     @java.lang.Override
-    public boolean containsMapInt32Double(int key) {
+    public boolean containsMapInt32Double(
+        int key) {
 
       return internalGetMapInt32Double().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapInt32DoubleMap()} instead. */
+    /**
+     * Use {@link #getMapInt32DoubleMap()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Integer, java.lang.Double> getMapInt32Double() {
       return getMapInt32DoubleMap();
     }
-
-    /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Integer, java.lang.Double> getMapInt32DoubleMap() {
       return internalGetMapInt32Double().getMap();
     }
-
-    /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
     @java.lang.Override
-    public double getMapInt32DoubleOrDefault(int key, double defaultValue) {
+    public double getMapInt32DoubleOrDefault(
+        int key,
+        double defaultValue) {
 
-      java.util.Map<java.lang.Integer, java.lang.Double> map = internalGetMapInt32Double().getMap();
+      java.util.Map<java.lang.Integer, java.lang.Double> map =
+          internalGetMapInt32Double().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
     @java.lang.Override
-    public double getMapInt32DoubleOrThrow(int key) {
+    public double getMapInt32DoubleOrThrow(
+        int key) {
 
-      java.util.Map<java.lang.Integer, java.lang.Double> map = internalGetMapInt32Double().getMap();
+      java.util.Map<java.lang.Integer, java.lang.Double> map =
+          internalGetMapInt32Double().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -8284,67 +7370,76 @@ public double getMapInt32DoubleOrThrow(int key) {
     }
 
     public static final int MAP_BOOL_BOOL_FIELD_NUMBER = 68;
-
     private static final class MapBoolBoolDefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Boolean, java.lang.Boolean> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Boolean, java.lang.Boolean>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapBoolBoolEntry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.BOOL,
-              false,
-              com.google.protobuf.WireFormat.FieldType.BOOL,
-              false);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Boolean, java.lang.Boolean> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Boolean, java.lang.Boolean>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapBoolBoolEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.BOOL,
+                  false,
+                  com.google.protobuf.WireFormat.FieldType.BOOL,
+                  false);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Boolean, java.lang.Boolean> mapBoolBool_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Boolean, java.lang.Boolean> mapBoolBool_;
     private com.google.protobuf.MapField<java.lang.Boolean, java.lang.Boolean>
-        internalGetMapBoolBool() {
+    internalGetMapBoolBool() {
       if (mapBoolBool_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapBoolBoolDefaultEntryHolder.defaultEntry);
       }
       return mapBoolBool_;
     }
-
     public int getMapBoolBoolCount() {
       return internalGetMapBoolBool().getMap().size();
     }
-
-    /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
     @java.lang.Override
-    public boolean containsMapBoolBool(boolean key) {
+    public boolean containsMapBoolBool(
+        boolean key) {
 
       return internalGetMapBoolBool().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapBoolBoolMap()} instead. */
+    /**
+     * Use {@link #getMapBoolBoolMap()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Boolean, java.lang.Boolean> getMapBoolBool() {
       return getMapBoolBoolMap();
     }
-
-    /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Boolean, java.lang.Boolean> getMapBoolBoolMap() {
       return internalGetMapBoolBool().getMap();
     }
-
-    /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
     @java.lang.Override
-    public boolean getMapBoolBoolOrDefault(boolean key, boolean defaultValue) {
+    public boolean getMapBoolBoolOrDefault(
+        boolean key,
+        boolean defaultValue) {
 
-      java.util.Map<java.lang.Boolean, java.lang.Boolean> map = internalGetMapBoolBool().getMap();
+      java.util.Map<java.lang.Boolean, java.lang.Boolean> map =
+          internalGetMapBoolBool().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
     @java.lang.Override
-    public boolean getMapBoolBoolOrThrow(boolean key) {
+    public boolean getMapBoolBoolOrThrow(
+        boolean key) {
 
-      java.util.Map<java.lang.Boolean, java.lang.Boolean> map = internalGetMapBoolBool().getMap();
+      java.util.Map<java.lang.Boolean, java.lang.Boolean> map =
+          internalGetMapBoolBool().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -8352,76 +7447,78 @@ public boolean getMapBoolBoolOrThrow(boolean key) {
     }
 
     public static final int MAP_STRING_STRING_FIELD_NUMBER = 69;
-
     private static final class MapStringStringDefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.String, java.lang.String> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.String, java.lang.String>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringStringEntry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.STRING,
-              "",
-              com.google.protobuf.WireFormat.FieldType.STRING,
-              "");
+      static final com.google.protobuf.MapEntry<
+          java.lang.String, java.lang.String> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.String, java.lang.String>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringStringEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "");
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.String, java.lang.String> mapStringString_;
-
+    private com.google.protobuf.MapField<
+        java.lang.String, java.lang.String> mapStringString_;
     private com.google.protobuf.MapField<java.lang.String, java.lang.String>
-        internalGetMapStringString() {
+    internalGetMapStringString() {
       if (mapStringString_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapStringStringDefaultEntryHolder.defaultEntry);
       }
       return mapStringString_;
     }
-
     public int getMapStringStringCount() {
       return internalGetMapStringString().getMap().size();
     }
-
-    /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
     @java.lang.Override
-    public boolean containsMapStringString(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public boolean containsMapStringString(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
       return internalGetMapStringString().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapStringStringMap()} instead. */
+    /**
+     * Use {@link #getMapStringStringMap()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, java.lang.String> getMapStringString() {
       return getMapStringStringMap();
     }
-
-    /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.String, java.lang.String> getMapStringStringMap() {
       return internalGetMapStringString().getMap();
     }
-
-    /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
     @java.lang.Override
-    public /* nullable */ java.lang.String getMapStringStringOrDefault(
+    public /* nullable */
+java.lang.String getMapStringStringOrDefault(
         java.lang.String key,
         /* nullable */
-        java.lang.String defaultValue) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
-      java.util.Map<java.lang.String, java.lang.String> map = internalGetMapStringString().getMap();
+java.lang.String defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, java.lang.String> map =
+          internalGetMapStringString().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
     @java.lang.Override
-    public java.lang.String getMapStringStringOrThrow(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
-      java.util.Map<java.lang.String, java.lang.String> map = internalGetMapStringString().getMap();
+    public java.lang.String getMapStringStringOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, java.lang.String> map =
+          internalGetMapStringString().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -8429,79 +7526,76 @@ public java.lang.String getMapStringStringOrThrow(java.lang.String key) {
     }
 
     public static final int MAP_STRING_BYTES_FIELD_NUMBER = 70;
-
     private static final class MapStringBytesDefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.String, com.google.protobuf.ByteString>
-          defaultEntry =
+      static final com.google.protobuf.MapEntry<
+          java.lang.String, com.google.protobuf.ByteString> defaultEntry =
               com.google.protobuf.MapEntry
-                  .<java.lang.String, com.google.protobuf.ByteString>newDefaultInstance(
-                      legacy_gencode_test.proto3.Proto3GencodeTestProto
-                          .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringBytesEntry_descriptor,
-                      com.google.protobuf.WireFormat.FieldType.STRING,
-                      "",
-                      com.google.protobuf.WireFormat.FieldType.BYTES,
-                      com.google.protobuf.ByteString.EMPTY);
+              .<java.lang.String, com.google.protobuf.ByteString>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringBytesEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.BYTES,
+                  com.google.protobuf.ByteString.EMPTY);
     }
-
     @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.String, com.google.protobuf.ByteString> mapStringBytes_;
     private com.google.protobuf.MapField<java.lang.String, com.google.protobuf.ByteString>
-        mapStringBytes_;
-
-    private com.google.protobuf.MapField<java.lang.String, com.google.protobuf.ByteString>
-        internalGetMapStringBytes() {
+    internalGetMapStringBytes() {
       if (mapStringBytes_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapStringBytesDefaultEntryHolder.defaultEntry);
       }
       return mapStringBytes_;
     }
-
     public int getMapStringBytesCount() {
       return internalGetMapStringBytes().getMap().size();
     }
-
-    /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
     @java.lang.Override
-    public boolean containsMapStringBytes(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public boolean containsMapStringBytes(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
       return internalGetMapStringBytes().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapStringBytesMap()} instead. */
+    /**
+     * Use {@link #getMapStringBytesMap()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, com.google.protobuf.ByteString> getMapStringBytes() {
       return getMapStringBytesMap();
     }
-
-    /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.String, com.google.protobuf.ByteString> getMapStringBytesMap() {
       return internalGetMapStringBytes().getMap();
     }
-
-    /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
     @java.lang.Override
-    public /* nullable */ com.google.protobuf.ByteString getMapStringBytesOrDefault(
+    public /* nullable */
+com.google.protobuf.ByteString getMapStringBytesOrDefault(
         java.lang.String key,
         /* nullable */
-        com.google.protobuf.ByteString defaultValue) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+com.google.protobuf.ByteString defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
       java.util.Map<java.lang.String, com.google.protobuf.ByteString> map =
           internalGetMapStringBytes().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
     @java.lang.Override
-    public com.google.protobuf.ByteString getMapStringBytesOrThrow(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public com.google.protobuf.ByteString getMapStringBytesOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
       java.util.Map<java.lang.String, com.google.protobuf.ByteString> map =
           internalGetMapStringBytes().getMap();
       if (!map.containsKey(key)) {
@@ -8511,121 +7605,78 @@ public com.google.protobuf.ByteString getMapStringBytesOrThrow(java.lang.String
     }
 
     public static final int MAP_STRING_NESTED_MESSAGE_FIELD_NUMBER = 71;
-
     private static final class MapStringNestedMessageDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-          defaultEntry =
+          java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> defaultEntry =
               com.google.protobuf.MapEntry
-                  .<java.lang.String,
-                      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                          .NestedMessage>
-                      newDefaultInstance(
-                          legacy_gencode_test.proto3.Proto3GencodeTestProto
-                              .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedMessageEntry_descriptor,
-                          com.google.protobuf.WireFormat.FieldType.STRING,
-                          "",
-                          com.google.protobuf.WireFormat.FieldType.MESSAGE,
-                          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                              .NestedMessage.getDefaultInstance());
+              .<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedMessageEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.MESSAGE,
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance());
     }
-
     @SuppressWarnings("serial")
     private com.google.protobuf.MapField<
-            java.lang.String,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-        mapStringNestedMessage_;
-
-    private com.google.protobuf.MapField<
-            java.lang.String,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-        internalGetMapStringNestedMessage() {
+        java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> mapStringNestedMessage_;
+    private com.google.protobuf.MapField<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
+    internalGetMapStringNestedMessage() {
       if (mapStringNestedMessage_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapStringNestedMessageDefaultEntryHolder.defaultEntry);
       }
       return mapStringNestedMessage_;
     }
-
     public int getMapStringNestedMessageCount() {
       return internalGetMapStringNestedMessage().getMap().size();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
      */
     @java.lang.Override
-    public boolean containsMapStringNestedMessage(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public boolean containsMapStringNestedMessage(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
       return internalGetMapStringNestedMessage().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapStringNestedMessageMap()} instead. */
+    /**
+     * Use {@link #getMapStringNestedMessageMap()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
-    public java.util.Map<
-            java.lang.String,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-        getMapStringNestedMessage() {
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> getMapStringNestedMessage() {
       return getMapStringNestedMessageMap();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
      */
     @java.lang.Override
-    public java.util.Map<
-            java.lang.String,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-        getMapStringNestedMessageMap() {
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> getMapStringNestedMessageMap() {
       return internalGetMapStringNestedMessage().getMap();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
      */
     @java.lang.Override
-    public /* nullable */ legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-            .NestedMessage
-        getMapStringNestedMessageOrDefault(
-            java.lang.String key,
-            /* nullable */
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                defaultValue) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
-      java.util.Map<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-          map = internalGetMapStringNestedMessage().getMap();
+    public /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getMapStringNestedMessageOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> map =
+          internalGetMapStringNestedMessage().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-        getMapStringNestedMessageOrThrow(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
-      java.util.Map<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-          map = internalGetMapStringNestedMessage().getMap();
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getMapStringNestedMessageOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> map =
+          internalGetMapStringNestedMessage().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -8633,111 +7684,78 @@ public boolean containsMapStringNestedMessage(java.lang.String key) {
     }
 
     public static final int MAP_STRING_FOREIGN_MESSAGE_FIELD_NUMBER = 72;
-
     private static final class MapStringForeignMessageDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
-              java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-          defaultEntry =
+          java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> defaultEntry =
               com.google.protobuf.MapEntry
-                  .<java.lang.String,
-                      legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-                      newDefaultInstance(
-                          legacy_gencode_test.proto3.Proto3GencodeTestProto
-                              .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignMessageEntry_descriptor,
-                          com.google.protobuf.WireFormat.FieldType.STRING,
-                          "",
-                          com.google.protobuf.WireFormat.FieldType.MESSAGE,
-                          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-                              .getDefaultInstance());
+              .<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignMessageEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.MESSAGE,
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance());
     }
-
     @SuppressWarnings("serial")
     private com.google.protobuf.MapField<
-            java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-        mapStringForeignMessage_;
-
-    private com.google.protobuf.MapField<
-            java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-        internalGetMapStringForeignMessage() {
+        java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> mapStringForeignMessage_;
+    private com.google.protobuf.MapField<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
+    internalGetMapStringForeignMessage() {
       if (mapStringForeignMessage_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapStringForeignMessageDefaultEntryHolder.defaultEntry);
       }
       return mapStringForeignMessage_;
     }
-
     public int getMapStringForeignMessageCount() {
       return internalGetMapStringForeignMessage().getMap().size();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
      */
     @java.lang.Override
-    public boolean containsMapStringForeignMessage(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public boolean containsMapStringForeignMessage(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
       return internalGetMapStringForeignMessage().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapStringForeignMessageMap()} instead. */
+    /**
+     * Use {@link #getMapStringForeignMessageMap()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
-    public java.util.Map<
-            java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-        getMapStringForeignMessage() {
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> getMapStringForeignMessage() {
       return getMapStringForeignMessageMap();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
      */
     @java.lang.Override
-    public java.util.Map<
-            java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-        getMapStringForeignMessageMap() {
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> getMapStringForeignMessageMap() {
       return internalGetMapStringForeignMessage().getMap();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
      */
     @java.lang.Override
-    public /* nullable */ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        getMapStringForeignMessageOrDefault(
-            java.lang.String key,
-            /* nullable */
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage defaultValue) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
-      java.util.Map<
-              java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-          map = internalGetMapStringForeignMessage().getMap();
+    public /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getMapStringForeignMessageOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> map =
+          internalGetMapStringForeignMessage().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        getMapStringForeignMessageOrThrow(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
-      java.util.Map<
-              java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-          map = internalGetMapStringForeignMessage().getMap();
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getMapStringForeignMessageOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> map =
+          internalGetMapStringForeignMessage().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -8745,126 +7763,93 @@ public boolean containsMapStringForeignMessage(java.lang.String key) {
     }
 
     public static final int MAP_STRING_NESTED_ENUM_FIELD_NUMBER = 73;
-
     private static final class MapStringNestedEnumDefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.String, java.lang.Integer>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedEnumEntry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.STRING,
-              "",
-              com.google.protobuf.WireFormat.FieldType.ENUM,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.FOO
-                  .getNumber());
+      static final com.google.protobuf.MapEntry<
+          java.lang.String, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.String, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedEnumEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.ENUM,
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.FOO.getNumber());
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.String, java.lang.Integer> mapStringNestedEnum_;
-
+    private com.google.protobuf.MapField<
+        java.lang.String, java.lang.Integer> mapStringNestedEnum_;
     private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
-        internalGetMapStringNestedEnum() {
+    internalGetMapStringNestedEnum() {
       if (mapStringNestedEnum_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapStringNestedEnumDefaultEntryHolder.defaultEntry);
       }
       return mapStringNestedEnum_;
     }
-
-    private static final com.google.protobuf.Internal.MapAdapter.Converter<
-            java.lang.Integer,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        mapStringNestedEnumValueConverter =
+    private static final
+    com.google.protobuf.Internal.MapAdapter.Converter<
+        java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> mapStringNestedEnumValueConverter =
             com.google.protobuf.Internal.MapAdapter.newEnumConverter(
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                    .internalGetValueMap(),
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                    .UNRECOGNIZED);
-
-    private static final java.util.Map<
-            java.lang.String,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        internalGetAdaptedMapStringNestedEnumMap(
-            java.util.Map<java.lang.String, java.lang.Integer> map) {
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.internalGetValueMap(),
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.UNRECOGNIZED);
+    private static final java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
+    internalGetAdaptedMapStringNestedEnumMap(
+        java.util.Map<java.lang.String, java.lang.Integer> map) {
       return new com.google.protobuf.Internal.MapAdapter<
-          java.lang.String,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum,
-          java.lang.Integer>(map, mapStringNestedEnumValueConverter);
+          java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum, java.lang.Integer>(
+              map, mapStringNestedEnumValueConverter);
     }
-
     public int getMapStringNestedEnumCount() {
       return internalGetMapStringNestedEnum().getMap().size();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
      */
     @java.lang.Override
-    public boolean containsMapStringNestedEnum(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public boolean containsMapStringNestedEnum(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
       return internalGetMapStringNestedEnum().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapStringNestedEnumMap()} instead. */
+    /**
+     * Use {@link #getMapStringNestedEnumMap()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
-    public java.util.Map<
-            java.lang.String,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        getMapStringNestedEnum() {
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
+    getMapStringNestedEnum() {
       return getMapStringNestedEnumMap();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
      */
     @java.lang.Override
-    public java.util.Map<
-            java.lang.String,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        getMapStringNestedEnumMap() {
-      return internalGetAdaptedMapStringNestedEnumMap(internalGetMapStringNestedEnum().getMap());
-    }
-
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
+    getMapStringNestedEnumMap() {
+      return internalGetAdaptedMapStringNestedEnumMap(
+          internalGetMapStringNestedEnum().getMap());}
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
      */
     @java.lang.Override
-    public /* nullable */ legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-            .NestedEnum
-        getMapStringNestedEnumOrDefault(
-            java.lang.String key,
-            /* nullable */
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                defaultValue) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getMapStringNestedEnumOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
       java.util.Map<java.lang.String, java.lang.Integer> map =
           internalGetMapStringNestedEnum().getMap();
       return map.containsKey(key)
-          ? mapStringNestedEnumValueConverter.doForward(map.get(key))
-          : defaultValue;
+             ? mapStringNestedEnumValueConverter.doForward(map.get(key))
+             : defaultValue;
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getMapStringNestedEnumOrThrow(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getMapStringNestedEnumOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
       java.util.Map<java.lang.String, java.lang.Integer> map =
           internalGetMapStringNestedEnum().getMap();
       if (!map.containsKey(key)) {
@@ -8872,49 +7857,42 @@ public boolean containsMapStringNestedEnum(java.lang.String key) {
       }
       return mapStringNestedEnumValueConverter.doForward(map.get(key));
     }
-
-    /** Use {@link #getMapStringNestedEnumValueMap()} instead. */
+    /**
+     * Use {@link #getMapStringNestedEnumValueMap()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
-    public java.util.Map<java.lang.String, java.lang.Integer> getMapStringNestedEnumValue() {
+    public java.util.Map<java.lang.String, java.lang.Integer>
+    getMapStringNestedEnumValue() {
       return getMapStringNestedEnumValueMap();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
      */
     @java.lang.Override
-    public java.util.Map<java.lang.String, java.lang.Integer> getMapStringNestedEnumValueMap() {
+    public java.util.Map<java.lang.String, java.lang.Integer>
+    getMapStringNestedEnumValueMap() {
       return internalGetMapStringNestedEnum().getMap();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
      */
     @java.lang.Override
-    public int getMapStringNestedEnumValueOrDefault(java.lang.String key, int defaultValue) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public int getMapStringNestedEnumValueOrDefault(
+        java.lang.String key,
+        int defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
       java.util.Map<java.lang.String, java.lang.Integer> map =
           internalGetMapStringNestedEnum().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
      */
     @java.lang.Override
-    public int getMapStringNestedEnumValueOrThrow(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public int getMapStringNestedEnumValueOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
       java.util.Map<java.lang.String, java.lang.Integer> map =
           internalGetMapStringNestedEnum().getMap();
       if (!map.containsKey(key)) {
@@ -8924,118 +7902,93 @@ public int getMapStringNestedEnumValueOrThrow(java.lang.String key) {
     }
 
     public static final int MAP_STRING_FOREIGN_ENUM_FIELD_NUMBER = 74;
-
     private static final class MapStringForeignEnumDefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.String, java.lang.Integer>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignEnumEntry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.STRING,
-              "",
-              com.google.protobuf.WireFormat.FieldType.ENUM,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.FOREIGN_FOO
-                  .getNumber());
+      static final com.google.protobuf.MapEntry<
+          java.lang.String, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.String, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignEnumEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.ENUM,
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.FOREIGN_FOO.getNumber());
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.String, java.lang.Integer> mapStringForeignEnum_;
-
+    private com.google.protobuf.MapField<
+        java.lang.String, java.lang.Integer> mapStringForeignEnum_;
     private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
-        internalGetMapStringForeignEnum() {
+    internalGetMapStringForeignEnum() {
       if (mapStringForeignEnum_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapStringForeignEnumDefaultEntryHolder.defaultEntry);
       }
       return mapStringForeignEnum_;
     }
-
-    private static final com.google.protobuf.Internal.MapAdapter.Converter<
-            java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-        mapStringForeignEnumValueConverter =
+    private static final
+    com.google.protobuf.Internal.MapAdapter.Converter<
+        java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum> mapStringForeignEnumValueConverter =
             com.google.protobuf.Internal.MapAdapter.newEnumConverter(
                 legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.internalGetValueMap(),
                 legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.UNRECOGNIZED);
-
-    private static final java.util.Map<
-            java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-        internalGetAdaptedMapStringForeignEnumMap(
-            java.util.Map<java.lang.String, java.lang.Integer> map) {
+    private static final java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
+    internalGetAdaptedMapStringForeignEnumMap(
+        java.util.Map<java.lang.String, java.lang.Integer> map) {
       return new com.google.protobuf.Internal.MapAdapter<
-          java.lang.String,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum,
-          java.lang.Integer>(map, mapStringForeignEnumValueConverter);
+          java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum, java.lang.Integer>(
+              map, mapStringForeignEnumValueConverter);
     }
-
     public int getMapStringForeignEnumCount() {
       return internalGetMapStringForeignEnum().getMap().size();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
      */
     @java.lang.Override
-    public boolean containsMapStringForeignEnum(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public boolean containsMapStringForeignEnum(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
       return internalGetMapStringForeignEnum().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapStringForeignEnumMap()} instead. */
+    /**
+     * Use {@link #getMapStringForeignEnumMap()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
-    public java.util.Map<
-            java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-        getMapStringForeignEnum() {
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
+    getMapStringForeignEnum() {
       return getMapStringForeignEnumMap();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
      */
     @java.lang.Override
-    public java.util.Map<
-            java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-        getMapStringForeignEnumMap() {
-      return internalGetAdaptedMapStringForeignEnumMap(internalGetMapStringForeignEnum().getMap());
-    }
-
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
+    getMapStringForeignEnumMap() {
+      return internalGetAdaptedMapStringForeignEnumMap(
+          internalGetMapStringForeignEnum().getMap());}
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
      */
     @java.lang.Override
-    public /* nullable */ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum
-        getMapStringForeignEnumOrDefault(
-            java.lang.String key,
-            /* nullable */
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum defaultValue) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getMapStringForeignEnumOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
       java.util.Map<java.lang.String, java.lang.Integer> map =
           internalGetMapStringForeignEnum().getMap();
       return map.containsKey(key)
-          ? mapStringForeignEnumValueConverter.doForward(map.get(key))
-          : defaultValue;
+             ? mapStringForeignEnumValueConverter.doForward(map.get(key))
+             : defaultValue;
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum
-        getMapStringForeignEnumOrThrow(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getMapStringForeignEnumOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
       java.util.Map<java.lang.String, java.lang.Integer> map =
           internalGetMapStringForeignEnum().getMap();
       if (!map.containsKey(key)) {
@@ -9043,49 +7996,42 @@ public boolean containsMapStringForeignEnum(java.lang.String key) {
       }
       return mapStringForeignEnumValueConverter.doForward(map.get(key));
     }
-
-    /** Use {@link #getMapStringForeignEnumValueMap()} instead. */
+    /**
+     * Use {@link #getMapStringForeignEnumValueMap()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
-    public java.util.Map<java.lang.String, java.lang.Integer> getMapStringForeignEnumValue() {
+    public java.util.Map<java.lang.String, java.lang.Integer>
+    getMapStringForeignEnumValue() {
       return getMapStringForeignEnumValueMap();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
      */
     @java.lang.Override
-    public java.util.Map<java.lang.String, java.lang.Integer> getMapStringForeignEnumValueMap() {
+    public java.util.Map<java.lang.String, java.lang.Integer>
+    getMapStringForeignEnumValueMap() {
       return internalGetMapStringForeignEnum().getMap();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
      */
     @java.lang.Override
-    public int getMapStringForeignEnumValueOrDefault(java.lang.String key, int defaultValue) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public int getMapStringForeignEnumValueOrDefault(
+        java.lang.String key,
+        int defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
       java.util.Map<java.lang.String, java.lang.Integer> map =
           internalGetMapStringForeignEnum().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
      */
     @java.lang.Override
-    public int getMapStringForeignEnumValueOrThrow(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public int getMapStringForeignEnumValueOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
       java.util.Map<java.lang.String, java.lang.Integer> map =
           internalGetMapStringForeignEnum().getMap();
       if (!map.containsKey(key)) {
@@ -9095,20 +8041,16 @@ public int getMapStringForeignEnumValueOrThrow(java.lang.String key) {
     }
 
     public static final int ONEOF_UINT32_FIELD_NUMBER = 111;
-
     /**
      * <code>uint32 oneof_uint32 = 111;</code>
-     *
      * @return Whether the oneofUint32 field is set.
      */
     @java.lang.Override
     public boolean hasOneofUint32() {
       return oneofFieldCase_ == 111;
     }
-
     /**
      * <code>uint32 oneof_uint32 = 111;</code>
-     *
      * @return The oneofUint32.
      */
     @java.lang.Override
@@ -9120,68 +8062,46 @@ public int getOneofUint32() {
     }
 
     public static final int ONEOF_NESTED_MESSAGE_FIELD_NUMBER = 112;
-
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
      * @return Whether the oneofNestedMessage field is set.
      */
     @java.lang.Override
     public boolean hasOneofNestedMessage() {
       return oneofFieldCase_ == 112;
     }
-
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
      * @return The oneofNestedMessage.
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-        getOneofNestedMessage() {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getOneofNestedMessage() {
       if (oneofFieldCase_ == 112) {
-        return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage)
-            oneofField_;
+         return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) oneofField_;
       }
-      return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-          .getDefaultInstance();
+      return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance();
     }
-
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-     * </code>
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-            .NestedMessageOrBuilder
-        getOneofNestedMessageOrBuilder() {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder getOneofNestedMessageOrBuilder() {
       if (oneofFieldCase_ == 112) {
-        return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage)
-            oneofField_;
+         return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) oneofField_;
       }
-      return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-          .getDefaultInstance();
+      return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance();
     }
 
     public static final int ONEOF_STRING_FIELD_NUMBER = 113;
-
     /**
      * <code>string oneof_string = 113;</code>
-     *
      * @return Whether the oneofString field is set.
      */
     public boolean hasOneofString() {
       return oneofFieldCase_ == 113;
     }
-
     /**
      * <code>string oneof_string = 113;</code>
-     *
      * @return The oneofString.
      */
     public java.lang.String getOneofString() {
@@ -9192,7 +8112,8 @@ public java.lang.String getOneofString() {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (oneofFieldCase_ == 113) {
           oneofField_ = s;
@@ -9200,20 +8121,20 @@ public java.lang.String getOneofString() {
         return s;
       }
     }
-
     /**
      * <code>string oneof_string = 113;</code>
-     *
      * @return The bytes for oneofString.
      */
-    public com.google.protobuf.ByteString getOneofStringBytes() {
+    public com.google.protobuf.ByteString
+        getOneofStringBytes() {
       java.lang.Object ref = "";
       if (oneofFieldCase_ == 113) {
         ref = oneofField_;
       }
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
         if (oneofFieldCase_ == 113) {
           oneofField_ = b;
         }
@@ -9224,20 +8145,16 @@ public com.google.protobuf.ByteString getOneofStringBytes() {
     }
 
     public static final int ONEOF_BYTES_FIELD_NUMBER = 114;
-
     /**
      * <code>bytes oneof_bytes = 114;</code>
-     *
      * @return Whether the oneofBytes field is set.
      */
     @java.lang.Override
     public boolean hasOneofBytes() {
       return oneofFieldCase_ == 114;
     }
-
     /**
      * <code>bytes oneof_bytes = 114;</code>
-     *
      * @return The oneofBytes.
      */
     @java.lang.Override
@@ -9249,20 +8166,16 @@ public com.google.protobuf.ByteString getOneofBytes() {
     }
 
     public static final int ONEOF_BOOL_FIELD_NUMBER = 115;
-
     /**
      * <code>bool oneof_bool = 115;</code>
-     *
      * @return Whether the oneofBool field is set.
      */
     @java.lang.Override
     public boolean hasOneofBool() {
       return oneofFieldCase_ == 115;
     }
-
     /**
      * <code>bool oneof_bool = 115;</code>
-     *
      * @return The oneofBool.
      */
     @java.lang.Override
@@ -9274,20 +8187,16 @@ public boolean getOneofBool() {
     }
 
     public static final int ONEOF_UINT64_FIELD_NUMBER = 116;
-
     /**
      * <code>uint64 oneof_uint64 = 116;</code>
-     *
      * @return Whether the oneofUint64 field is set.
      */
     @java.lang.Override
     public boolean hasOneofUint64() {
       return oneofFieldCase_ == 116;
     }
-
     /**
      * <code>uint64 oneof_uint64 = 116;</code>
-     *
      * @return The oneofUint64.
      */
     @java.lang.Override
@@ -9299,20 +8208,16 @@ public long getOneofUint64() {
     }
 
     public static final int ONEOF_FLOAT_FIELD_NUMBER = 117;
-
     /**
      * <code>float oneof_float = 117;</code>
-     *
      * @return Whether the oneofFloat field is set.
      */
     @java.lang.Override
     public boolean hasOneofFloat() {
       return oneofFieldCase_ == 117;
     }
-
     /**
      * <code>float oneof_float = 117;</code>
-     *
      * @return The oneofFloat.
      */
     @java.lang.Override
@@ -9324,20 +8229,16 @@ public float getOneofFloat() {
     }
 
     public static final int ONEOF_DOUBLE_FIELD_NUMBER = 118;
-
     /**
      * <code>double oneof_double = 118;</code>
-     *
      * @return Whether the oneofDouble field is set.
      */
     @java.lang.Override
     public boolean hasOneofDouble() {
       return oneofFieldCase_ == 118;
     }
-
     /**
      * <code>double oneof_double = 118;</code>
-     *
      * @return The oneofDouble.
      */
     @java.lang.Override
@@ -9349,19 +8250,15 @@ public double getOneofDouble() {
     }
 
     public static final int ONEOF_ENUM_FIELD_NUMBER = 119;
-
     /**
      * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-     *
      * @return Whether the oneofEnum field is set.
      */
     public boolean hasOneofEnum() {
       return oneofFieldCase_ == 119;
     }
-
     /**
      * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-     *
      * @return The enum numeric value on the wire for oneofEnum.
      */
     public int getOneofEnumValue() {
@@ -9370,28 +8267,20 @@ public int getOneofEnumValue() {
       }
       return 0;
     }
-
     /**
      * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-     *
      * @return The oneofEnum.
      */
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getOneofEnum() {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getOneofEnum() {
       if (oneofFieldCase_ == 119) {
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum result =
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                .forNumber((java.lang.Integer) oneofField_);
-        return result == null
-            ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                .UNRECOGNIZED
-            : result;
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.forNumber(
+            (java.lang.Integer) oneofField_);
+        return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.UNRECOGNIZED : result;
       }
       return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.FOO;
     }
 
     private byte memoizedIsInitialized = -1;
-
     @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
@@ -9403,7 +8292,8 @@ public final boolean isInitialized() {
     }
 
     @java.lang.Override
-    public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
       getSerializedSize();
       if (optionalInt32_ != 0) {
         output.writeInt32(1, optionalInt32_);
@@ -9456,20 +8346,13 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(19, getOptionalForeignMessage());
       }
-      if (optionalNestedEnum_
-          != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.FOO
-              .getNumber()) {
+      if (optionalNestedEnum_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.FOO.getNumber()) {
         output.writeEnum(21, optionalNestedEnum_);
       }
-      if (optionalForeignEnum_
-          != legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.FOREIGN_FOO
-              .getNumber()) {
+      if (optionalForeignEnum_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.FOREIGN_FOO.getNumber()) {
         output.writeEnum(22, optionalForeignEnum_);
       }
-      if (optionalAliasedEnum_
-          != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum
-              .ALIAS_FOO
-              .getNumber()) {
+      if (optionalAliasedEnum_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum.ALIAS_FOO.getNumber()) {
         output.writeEnum(23, optionalAliasedEnum_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
@@ -9592,64 +8475,116 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       for (int i = 0; i < repeatedForeignEnum_.size(); i++) {
         output.writeEnumNoTag(repeatedForeignEnum_.get(i));
       }
-      com.google.protobuf.GeneratedMessageV3.serializeIntegerMapTo(
-          output, internalGetMapInt32Int32(), MapInt32Int32DefaultEntryHolder.defaultEntry, 56);
-      com.google.protobuf.GeneratedMessageV3.serializeLongMapTo(
-          output, internalGetMapInt64Int64(), MapInt64Int64DefaultEntryHolder.defaultEntry, 57);
-      com.google.protobuf.GeneratedMessageV3.serializeIntegerMapTo(
-          output, internalGetMapUint32Uint32(), MapUint32Uint32DefaultEntryHolder.defaultEntry, 58);
-      com.google.protobuf.GeneratedMessageV3.serializeLongMapTo(
-          output, internalGetMapUint64Uint64(), MapUint64Uint64DefaultEntryHolder.defaultEntry, 59);
-      com.google.protobuf.GeneratedMessageV3.serializeIntegerMapTo(
-          output, internalGetMapSint32Sint32(), MapSint32Sint32DefaultEntryHolder.defaultEntry, 60);
-      com.google.protobuf.GeneratedMessageV3.serializeLongMapTo(
-          output, internalGetMapSint64Sint64(), MapSint64Sint64DefaultEntryHolder.defaultEntry, 61);
-      com.google.protobuf.GeneratedMessageV3.serializeIntegerMapTo(
+      com.google.protobuf.GeneratedMessageV3
+        .serializeIntegerMapTo(
           output,
-          internalGetMapFixed32Fixed32(),
+          internalGetMapInt32Int32(),
+          MapInt32Int32DefaultEntryHolder.defaultEntry,
+          56);
+      com.google.protobuf.GeneratedMessageV3
+        .serializeLongMapTo(
+          output,
+          internalGetMapInt64Int64(),
+          MapInt64Int64DefaultEntryHolder.defaultEntry,
+          57);
+      com.google.protobuf.GeneratedMessageV3
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapUint32Uint32(),
+          MapUint32Uint32DefaultEntryHolder.defaultEntry,
+          58);
+      com.google.protobuf.GeneratedMessageV3
+        .serializeLongMapTo(
+          output,
+          internalGetMapUint64Uint64(),
+          MapUint64Uint64DefaultEntryHolder.defaultEntry,
+          59);
+      com.google.protobuf.GeneratedMessageV3
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapSint32Sint32(),
+          MapSint32Sint32DefaultEntryHolder.defaultEntry,
+          60);
+      com.google.protobuf.GeneratedMessageV3
+        .serializeLongMapTo(
+          output,
+          internalGetMapSint64Sint64(),
+          MapSint64Sint64DefaultEntryHolder.defaultEntry,
+          61);
+      com.google.protobuf.GeneratedMessageV3
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapFixed32Fixed32(),
           MapFixed32Fixed32DefaultEntryHolder.defaultEntry,
           62);
-      com.google.protobuf.GeneratedMessageV3.serializeLongMapTo(
+      com.google.protobuf.GeneratedMessageV3
+        .serializeLongMapTo(
           output,
           internalGetMapFixed64Fixed64(),
           MapFixed64Fixed64DefaultEntryHolder.defaultEntry,
           63);
-      com.google.protobuf.GeneratedMessageV3.serializeIntegerMapTo(
+      com.google.protobuf.GeneratedMessageV3
+        .serializeIntegerMapTo(
           output,
           internalGetMapSfixed32Sfixed32(),
           MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry,
           64);
-      com.google.protobuf.GeneratedMessageV3.serializeLongMapTo(
+      com.google.protobuf.GeneratedMessageV3
+        .serializeLongMapTo(
           output,
           internalGetMapSfixed64Sfixed64(),
           MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry,
           65);
-      com.google.protobuf.GeneratedMessageV3.serializeIntegerMapTo(
-          output, internalGetMapInt32Float(), MapInt32FloatDefaultEntryHolder.defaultEntry, 66);
-      com.google.protobuf.GeneratedMessageV3.serializeIntegerMapTo(
-          output, internalGetMapInt32Double(), MapInt32DoubleDefaultEntryHolder.defaultEntry, 67);
-      com.google.protobuf.GeneratedMessageV3.serializeBooleanMapTo(
-          output, internalGetMapBoolBool(), MapBoolBoolDefaultEntryHolder.defaultEntry, 68);
-      com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
-          output, internalGetMapStringString(), MapStringStringDefaultEntryHolder.defaultEntry, 69);
-      com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
-          output, internalGetMapStringBytes(), MapStringBytesDefaultEntryHolder.defaultEntry, 70);
-      com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
+      com.google.protobuf.GeneratedMessageV3
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapInt32Float(),
+          MapInt32FloatDefaultEntryHolder.defaultEntry,
+          66);
+      com.google.protobuf.GeneratedMessageV3
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapInt32Double(),
+          MapInt32DoubleDefaultEntryHolder.defaultEntry,
+          67);
+      com.google.protobuf.GeneratedMessageV3
+        .serializeBooleanMapTo(
+          output,
+          internalGetMapBoolBool(),
+          MapBoolBoolDefaultEntryHolder.defaultEntry,
+          68);
+      com.google.protobuf.GeneratedMessageV3
+        .serializeStringMapTo(
+          output,
+          internalGetMapStringString(),
+          MapStringStringDefaultEntryHolder.defaultEntry,
+          69);
+      com.google.protobuf.GeneratedMessageV3
+        .serializeStringMapTo(
+          output,
+          internalGetMapStringBytes(),
+          MapStringBytesDefaultEntryHolder.defaultEntry,
+          70);
+      com.google.protobuf.GeneratedMessageV3
+        .serializeStringMapTo(
           output,
           internalGetMapStringNestedMessage(),
           MapStringNestedMessageDefaultEntryHolder.defaultEntry,
           71);
-      com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
+      com.google.protobuf.GeneratedMessageV3
+        .serializeStringMapTo(
           output,
           internalGetMapStringForeignMessage(),
           MapStringForeignMessageDefaultEntryHolder.defaultEntry,
           72);
-      com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
+      com.google.protobuf.GeneratedMessageV3
+        .serializeStringMapTo(
           output,
           internalGetMapStringNestedEnum(),
           MapStringNestedEnumDefaultEntryHolder.defaultEntry,
           73);
-      com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
+      com.google.protobuf.GeneratedMessageV3
+        .serializeStringMapTo(
           output,
           internalGetMapStringForeignEnum(),
           MapStringForeignEnumDefaultEntryHolder.defaultEntry,
@@ -9795,31 +8730,34 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
         output.writeEnum(102, unpackedNestedEnum_.get(i));
       }
       if (oneofFieldCase_ == 111) {
-        output.writeUInt32(111, (int) ((java.lang.Integer) oneofField_));
+        output.writeUInt32(
+            111, (int)((java.lang.Integer) oneofField_));
       }
       if (oneofFieldCase_ == 112) {
-        output.writeMessage(
-            112,
-            (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage)
-                oneofField_);
+        output.writeMessage(112, (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) oneofField_);
       }
       if (oneofFieldCase_ == 113) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 113, oneofField_);
       }
       if (oneofFieldCase_ == 114) {
-        output.writeBytes(114, (com.google.protobuf.ByteString) oneofField_);
+        output.writeBytes(
+            114, (com.google.protobuf.ByteString) oneofField_);
       }
       if (oneofFieldCase_ == 115) {
-        output.writeBool(115, (boolean) ((java.lang.Boolean) oneofField_));
+        output.writeBool(
+            115, (boolean)((java.lang.Boolean) oneofField_));
       }
       if (oneofFieldCase_ == 116) {
-        output.writeUInt64(116, (long) ((java.lang.Long) oneofField_));
+        output.writeUInt64(
+            116, (long)((java.lang.Long) oneofField_));
       }
       if (oneofFieldCase_ == 117) {
-        output.writeFloat(117, (float) ((java.lang.Float) oneofField_));
+        output.writeFloat(
+            117, (float)((java.lang.Float) oneofField_));
       }
       if (oneofFieldCase_ == 118) {
-        output.writeDouble(118, (double) ((java.lang.Double) oneofField_));
+        output.writeDouble(
+            118, (double)((java.lang.Double) oneofField_));
       }
       if (oneofFieldCase_ == 119) {
         output.writeEnum(119, ((java.lang.Integer) oneofField_));
@@ -9834,159 +8772,169 @@ public int getSerializedSize() {
 
       size = 0;
       if (optionalInt32_ != 0) {
-        size += com.google.protobuf.CodedOutputStream.computeInt32Size(1, optionalInt32_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(1, optionalInt32_);
       }
       if (optionalInt64_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream.computeInt64Size(2, optionalInt64_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt64Size(2, optionalInt64_);
       }
       if (optionalUint32_ != 0) {
-        size += com.google.protobuf.CodedOutputStream.computeUInt32Size(3, optionalUint32_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(3, optionalUint32_);
       }
       if (optionalUint64_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream.computeUInt64Size(4, optionalUint64_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(4, optionalUint64_);
       }
       if (optionalSint32_ != 0) {
-        size += com.google.protobuf.CodedOutputStream.computeSInt32Size(5, optionalSint32_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeSInt32Size(5, optionalSint32_);
       }
       if (optionalSint64_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream.computeSInt64Size(6, optionalSint64_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeSInt64Size(6, optionalSint64_);
       }
       if (optionalFixed32_ != 0) {
-        size += com.google.protobuf.CodedOutputStream.computeFixed32Size(7, optionalFixed32_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeFixed32Size(7, optionalFixed32_);
       }
       if (optionalFixed64_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream.computeFixed64Size(8, optionalFixed64_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeFixed64Size(8, optionalFixed64_);
       }
       if (optionalSfixed32_ != 0) {
-        size += com.google.protobuf.CodedOutputStream.computeSFixed32Size(9, optionalSfixed32_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeSFixed32Size(9, optionalSfixed32_);
       }
       if (optionalSfixed64_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream.computeSFixed64Size(10, optionalSfixed64_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeSFixed64Size(10, optionalSfixed64_);
       }
       if (java.lang.Float.floatToRawIntBits(optionalFloat_) != 0) {
-        size += com.google.protobuf.CodedOutputStream.computeFloatSize(11, optionalFloat_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeFloatSize(11, optionalFloat_);
       }
       if (java.lang.Double.doubleToRawLongBits(optionalDouble_) != 0) {
-        size += com.google.protobuf.CodedOutputStream.computeDoubleSize(12, optionalDouble_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeDoubleSize(12, optionalDouble_);
       }
       if (optionalBool_ != false) {
-        size += com.google.protobuf.CodedOutputStream.computeBoolSize(13, optionalBool_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(13, optionalBool_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(optionalString_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(14, optionalString_);
       }
       if (!optionalBytes_.isEmpty()) {
-        size += com.google.protobuf.CodedOutputStream.computeBytesSize(15, optionalBytes_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(15, optionalBytes_);
       }
       if (((bitField0_ & 0x00000001) != 0)) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeMessageSize(
-                18, getOptionalNestedMessage());
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(18, getOptionalNestedMessage());
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeMessageSize(
-                19, getOptionalForeignMessage());
-      }
-      if (optionalNestedEnum_
-          != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.FOO
-              .getNumber()) {
-        size += com.google.protobuf.CodedOutputStream.computeEnumSize(21, optionalNestedEnum_);
-      }
-      if (optionalForeignEnum_
-          != legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.FOREIGN_FOO
-              .getNumber()) {
-        size += com.google.protobuf.CodedOutputStream.computeEnumSize(22, optionalForeignEnum_);
-      }
-      if (optionalAliasedEnum_
-          != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum
-              .ALIAS_FOO
-              .getNumber()) {
-        size += com.google.protobuf.CodedOutputStream.computeEnumSize(23, optionalAliasedEnum_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(19, getOptionalForeignMessage());
+      }
+      if (optionalNestedEnum_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.FOO.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(21, optionalNestedEnum_);
+      }
+      if (optionalForeignEnum_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.FOREIGN_FOO.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(22, optionalForeignEnum_);
+      }
+      if (optionalAliasedEnum_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum.ALIAS_FOO.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(23, optionalAliasedEnum_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(27, getRecursiveMessage());
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(27, getRecursiveMessage());
       }
       {
         int dataSize = 0;
         for (int i = 0; i < repeatedInt32_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(repeatedInt32_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt32SizeNoTag(repeatedInt32_.getInt(i));
         }
         size += dataSize;
         if (!getRepeatedInt32List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedInt32MemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < repeatedInt64_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeInt64SizeNoTag(
-                  repeatedInt64_.getLong(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt64SizeNoTag(repeatedInt64_.getLong(i));
         }
         size += dataSize;
         if (!getRepeatedInt64List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedInt64MemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < repeatedUint32_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeUInt32SizeNoTag(
-                  repeatedUint32_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(repeatedUint32_.getInt(i));
         }
         size += dataSize;
         if (!getRepeatedUint32List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedUint32MemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < repeatedUint64_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeUInt64SizeNoTag(
-                  repeatedUint64_.getLong(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt64SizeNoTag(repeatedUint64_.getLong(i));
         }
         size += dataSize;
         if (!getRepeatedUint64List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedUint64MemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < repeatedSint32_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeSInt32SizeNoTag(
-                  repeatedSint32_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt32SizeNoTag(repeatedSint32_.getInt(i));
         }
         size += dataSize;
         if (!getRepeatedSint32List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedSint32MemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < repeatedSint64_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeSInt64SizeNoTag(
-                  repeatedSint64_.getLong(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt64SizeNoTag(repeatedSint64_.getLong(i));
         }
         size += dataSize;
         if (!getRepeatedSint64List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedSint64MemoizedSerializedSize = dataSize;
       }
@@ -9996,7 +8944,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getRepeatedFixed32List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedFixed32MemoizedSerializedSize = dataSize;
       }
@@ -10006,7 +8955,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getRepeatedFixed64List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedFixed64MemoizedSerializedSize = dataSize;
       }
@@ -10016,7 +8966,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getRepeatedSfixed32List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedSfixed32MemoizedSerializedSize = dataSize;
       }
@@ -10026,7 +8977,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getRepeatedSfixed64List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedSfixed64MemoizedSerializedSize = dataSize;
       }
@@ -10036,7 +8988,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getRepeatedFloatList().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedFloatMemoizedSerializedSize = dataSize;
       }
@@ -10046,7 +8999,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getRepeatedDoubleList().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedDoubleMemoizedSerializedSize = dataSize;
       }
@@ -10056,7 +9010,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getRepeatedBoolList().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedBoolMemoizedSerializedSize = dataSize;
       }
@@ -10071,329 +9026,315 @@ public int getSerializedSize() {
       {
         int dataSize = 0;
         for (int i = 0; i < repeatedBytes_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeBytesSizeNoTag(repeatedBytes_.get(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeBytesSizeNoTag(repeatedBytes_.get(i));
         }
         size += dataSize;
         size += 2 * getRepeatedBytesList().size();
       }
       for (int i = 0; i < repeatedNestedMessage_.size(); i++) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeMessageSize(
-                48, repeatedNestedMessage_.get(i));
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(48, repeatedNestedMessage_.get(i));
       }
       for (int i = 0; i < repeatedForeignMessage_.size(); i++) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeMessageSize(
-                49, repeatedForeignMessage_.get(i));
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(49, repeatedForeignMessage_.get(i));
       }
       {
         int dataSize = 0;
         for (int i = 0; i < repeatedNestedEnum_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeEnumSizeNoTag(
-                  repeatedNestedEnum_.get(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeEnumSizeNoTag(repeatedNestedEnum_.get(i));
         }
         size += dataSize;
-        if (!getRepeatedNestedEnumList().isEmpty()) {
-          size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeUInt32SizeNoTag(dataSize);
-        }
-        repeatedNestedEnumMemoizedSerializedSize = dataSize;
+        if (!getRepeatedNestedEnumList().isEmpty()) {  size += 2;
+          size += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(dataSize);
+        }repeatedNestedEnumMemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < repeatedForeignEnum_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeEnumSizeNoTag(
-                  repeatedForeignEnum_.get(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeEnumSizeNoTag(repeatedForeignEnum_.get(i));
         }
         size += dataSize;
-        if (!getRepeatedForeignEnumList().isEmpty()) {
-          size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeUInt32SizeNoTag(dataSize);
-        }
-        repeatedForeignEnumMemoizedSerializedSize = dataSize;
-      }
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry :
-          internalGetMapInt32Int32().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer> mapInt32Int32__ =
-            MapInt32Int32DefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(56, mapInt32Int32__);
-      }
-      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry :
-          internalGetMapInt64Int64().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> mapInt64Int64__ =
-            MapInt64Int64DefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(57, mapInt64Int64__);
-      }
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry :
-          internalGetMapUint32Uint32().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer> mapUint32Uint32__ =
-            MapUint32Uint32DefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(58, mapUint32Uint32__);
-      }
-      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry :
-          internalGetMapUint64Uint64().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> mapUint64Uint64__ =
-            MapUint64Uint64DefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(59, mapUint64Uint64__);
-      }
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry :
-          internalGetMapSint32Sint32().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer> mapSint32Sint32__ =
-            MapSint32Sint32DefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(60, mapSint32Sint32__);
-      }
-      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry :
-          internalGetMapSint64Sint64().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> mapSint64Sint64__ =
-            MapSint64Sint64DefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(61, mapSint64Sint64__);
-      }
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry :
-          internalGetMapFixed32Fixed32().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer> mapFixed32Fixed32__ =
-            MapFixed32Fixed32DefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(62, mapFixed32Fixed32__);
-      }
-      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry :
-          internalGetMapFixed64Fixed64().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> mapFixed64Fixed64__ =
-            MapFixed64Fixed64DefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(63, mapFixed64Fixed64__);
-      }
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry :
-          internalGetMapSfixed32Sfixed32().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer> mapSfixed32Sfixed32__ =
-            MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(64, mapSfixed32Sfixed32__);
-      }
-      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry :
-          internalGetMapSfixed64Sfixed64().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> mapSfixed64Sfixed64__ =
-            MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(65, mapSfixed64Sfixed64__);
-      }
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Float> entry :
-          internalGetMapInt32Float().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float> mapInt32Float__ =
-            MapInt32FloatDefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(66, mapInt32Float__);
-      }
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Double> entry :
-          internalGetMapInt32Double().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Double> mapInt32Double__ =
-            MapInt32DoubleDefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(67, mapInt32Double__);
-      }
-      for (java.util.Map.Entry<java.lang.Boolean, java.lang.Boolean> entry :
-          internalGetMapBoolBool().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Boolean, java.lang.Boolean> mapBoolBool__ =
-            MapBoolBoolDefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(68, mapBoolBool__);
-      }
-      for (java.util.Map.Entry<java.lang.String, java.lang.String> entry :
-          internalGetMapStringString().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.String, java.lang.String> mapStringString__ =
-            MapStringStringDefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(69, mapStringString__);
-      }
-      for (java.util.Map.Entry<java.lang.String, com.google.protobuf.ByteString> entry :
-          internalGetMapStringBytes().getMap().entrySet()) {
+        if (!getRepeatedForeignEnumList().isEmpty()) {  size += 2;
+          size += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(dataSize);
+        }repeatedForeignEnumMemoizedSerializedSize = dataSize;
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetMapInt32Int32().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        mapInt32Int32__ = MapInt32Int32DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(56, mapInt32Int32__);
+      }
+      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry
+           : internalGetMapInt64Int64().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+        mapInt64Int64__ = MapInt64Int64DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(57, mapInt64Int64__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetMapUint32Uint32().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        mapUint32Uint32__ = MapUint32Uint32DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(58, mapUint32Uint32__);
+      }
+      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry
+           : internalGetMapUint64Uint64().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+        mapUint64Uint64__ = MapUint64Uint64DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(59, mapUint64Uint64__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetMapSint32Sint32().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        mapSint32Sint32__ = MapSint32Sint32DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(60, mapSint32Sint32__);
+      }
+      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry
+           : internalGetMapSint64Sint64().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+        mapSint64Sint64__ = MapSint64Sint64DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(61, mapSint64Sint64__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetMapFixed32Fixed32().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        mapFixed32Fixed32__ = MapFixed32Fixed32DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(62, mapFixed32Fixed32__);
+      }
+      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry
+           : internalGetMapFixed64Fixed64().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+        mapFixed64Fixed64__ = MapFixed64Fixed64DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(63, mapFixed64Fixed64__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetMapSfixed32Sfixed32().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        mapSfixed32Sfixed32__ = MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(64, mapSfixed32Sfixed32__);
+      }
+      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry
+           : internalGetMapSfixed64Sfixed64().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+        mapSfixed64Sfixed64__ = MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(65, mapSfixed64Sfixed64__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Float> entry
+           : internalGetMapInt32Float().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float>
+        mapInt32Float__ = MapInt32FloatDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(66, mapInt32Float__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Double> entry
+           : internalGetMapInt32Double().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Double>
+        mapInt32Double__ = MapInt32DoubleDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(67, mapInt32Double__);
+      }
+      for (java.util.Map.Entry<java.lang.Boolean, java.lang.Boolean> entry
+           : internalGetMapBoolBool().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Boolean, java.lang.Boolean>
+        mapBoolBool__ = MapBoolBoolDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(68, mapBoolBool__);
+      }
+      for (java.util.Map.Entry<java.lang.String, java.lang.String> entry
+           : internalGetMapStringString().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, java.lang.String>
+        mapStringString__ = MapStringStringDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(69, mapStringString__);
+      }
+      for (java.util.Map.Entry<java.lang.String, com.google.protobuf.ByteString> entry
+           : internalGetMapStringBytes().getMap().entrySet()) {
         com.google.protobuf.MapEntry<java.lang.String, com.google.protobuf.ByteString>
-            mapStringBytes__ =
-                MapStringBytesDefaultEntryHolder.defaultEntry
-                    .newBuilderForType()
-                    .setKey(entry.getKey())
-                    .setValue(entry.getValue())
-                    .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(70, mapStringBytes__);
-      }
-      for (java.util.Map.Entry<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-          entry : internalGetMapStringNestedMessage().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<
-                java.lang.String,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-            mapStringNestedMessage__ =
-                MapStringNestedMessageDefaultEntryHolder.defaultEntry
-                    .newBuilderForType()
-                    .setKey(entry.getKey())
-                    .setValue(entry.getValue())
-                    .build();
-        size +=
-            com.google.protobuf.CodedOutputStream.computeMessageSize(71, mapStringNestedMessage__);
-      }
-      for (java.util.Map.Entry<
-              java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-          entry : internalGetMapStringForeignMessage().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<
-                java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-            mapStringForeignMessage__ =
-                MapStringForeignMessageDefaultEntryHolder.defaultEntry
-                    .newBuilderForType()
-                    .setKey(entry.getKey())
-                    .setValue(entry.getValue())
-                    .build();
-        size +=
-            com.google.protobuf.CodedOutputStream.computeMessageSize(72, mapStringForeignMessage__);
-      }
-      for (java.util.Map.Entry<java.lang.String, java.lang.Integer> entry :
-          internalGetMapStringNestedEnum().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer> mapStringNestedEnum__ =
-            MapStringNestedEnumDefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(73, mapStringNestedEnum__);
-      }
-      for (java.util.Map.Entry<java.lang.String, java.lang.Integer> entry :
-          internalGetMapStringForeignEnum().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer> mapStringForeignEnum__ =
-            MapStringForeignEnumDefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size +=
-            com.google.protobuf.CodedOutputStream.computeMessageSize(74, mapStringForeignEnum__);
+        mapStringBytes__ = MapStringBytesDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(70, mapStringBytes__);
+      }
+      for (java.util.Map.Entry<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> entry
+           : internalGetMapStringNestedMessage().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
+        mapStringNestedMessage__ = MapStringNestedMessageDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(71, mapStringNestedMessage__);
+      }
+      for (java.util.Map.Entry<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> entry
+           : internalGetMapStringForeignMessage().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
+        mapStringForeignMessage__ = MapStringForeignMessageDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(72, mapStringForeignMessage__);
+      }
+      for (java.util.Map.Entry<java.lang.String, java.lang.Integer> entry
+           : internalGetMapStringNestedEnum().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer>
+        mapStringNestedEnum__ = MapStringNestedEnumDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(73, mapStringNestedEnum__);
+      }
+      for (java.util.Map.Entry<java.lang.String, java.lang.Integer> entry
+           : internalGetMapStringForeignEnum().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer>
+        mapStringForeignEnum__ = MapStringForeignEnumDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(74, mapStringForeignEnum__);
       }
       {
         int dataSize = 0;
         for (int i = 0; i < packedInt32_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(packedInt32_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt32SizeNoTag(packedInt32_.getInt(i));
         }
         size += dataSize;
         if (!getPackedInt32List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedInt32MemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < packedInt64_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeInt64SizeNoTag(packedInt64_.getLong(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt64SizeNoTag(packedInt64_.getLong(i));
         }
         size += dataSize;
         if (!getPackedInt64List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedInt64MemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < packedUint32_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeUInt32SizeNoTag(packedUint32_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(packedUint32_.getInt(i));
         }
         size += dataSize;
         if (!getPackedUint32List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedUint32MemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < packedUint64_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeUInt64SizeNoTag(
-                  packedUint64_.getLong(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt64SizeNoTag(packedUint64_.getLong(i));
         }
         size += dataSize;
         if (!getPackedUint64List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedUint64MemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < packedSint32_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeSInt32SizeNoTag(packedSint32_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt32SizeNoTag(packedSint32_.getInt(i));
         }
         size += dataSize;
         if (!getPackedSint32List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedSint32MemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < packedSint64_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeSInt64SizeNoTag(
-                  packedSint64_.getLong(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt64SizeNoTag(packedSint64_.getLong(i));
         }
         size += dataSize;
         if (!getPackedSint64List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedSint64MemoizedSerializedSize = dataSize;
       }
@@ -10403,7 +9344,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getPackedFixed32List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedFixed32MemoizedSerializedSize = dataSize;
       }
@@ -10413,7 +9355,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getPackedFixed64List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedFixed64MemoizedSerializedSize = dataSize;
       }
@@ -10423,7 +9366,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getPackedSfixed32List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedSfixed32MemoizedSerializedSize = dataSize;
       }
@@ -10433,7 +9377,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getPackedSfixed64List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedSfixed64MemoizedSerializedSize = dataSize;
       }
@@ -10443,7 +9388,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getPackedFloatList().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedFloatMemoizedSerializedSize = dataSize;
       }
@@ -10453,7 +9399,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getPackedDoubleList().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedDoubleMemoizedSerializedSize = dataSize;
       }
@@ -10463,28 +9410,28 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getPackedBoolList().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedBoolMemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < packedNestedEnum_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeEnumSizeNoTag(packedNestedEnum_.get(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeEnumSizeNoTag(packedNestedEnum_.get(i));
         }
         size += dataSize;
-        if (!getPackedNestedEnumList().isEmpty()) {
-          size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeUInt32SizeNoTag(dataSize);
-        }
-        packedNestedEnumMemoizedSerializedSize = dataSize;
+        if (!getPackedNestedEnumList().isEmpty()) {  size += 2;
+          size += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(dataSize);
+        }packedNestedEnumMemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < unpackedInt32_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(unpackedInt32_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt32SizeNoTag(unpackedInt32_.getInt(i));
         }
         size += dataSize;
         size += 2 * getUnpackedInt32List().size();
@@ -10492,9 +9439,8 @@ public int getSerializedSize() {
       {
         int dataSize = 0;
         for (int i = 0; i < unpackedInt64_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeInt64SizeNoTag(
-                  unpackedInt64_.getLong(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt64SizeNoTag(unpackedInt64_.getLong(i));
         }
         size += dataSize;
         size += 2 * getUnpackedInt64List().size();
@@ -10502,9 +9448,8 @@ public int getSerializedSize() {
       {
         int dataSize = 0;
         for (int i = 0; i < unpackedUint32_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeUInt32SizeNoTag(
-                  unpackedUint32_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(unpackedUint32_.getInt(i));
         }
         size += dataSize;
         size += 2 * getUnpackedUint32List().size();
@@ -10512,9 +9457,8 @@ public int getSerializedSize() {
       {
         int dataSize = 0;
         for (int i = 0; i < unpackedUint64_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeUInt64SizeNoTag(
-                  unpackedUint64_.getLong(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt64SizeNoTag(unpackedUint64_.getLong(i));
         }
         size += dataSize;
         size += 2 * getUnpackedUint64List().size();
@@ -10522,9 +9466,8 @@ public int getSerializedSize() {
       {
         int dataSize = 0;
         for (int i = 0; i < unpackedSint32_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeSInt32SizeNoTag(
-                  unpackedSint32_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt32SizeNoTag(unpackedSint32_.getInt(i));
         }
         size += dataSize;
         size += 2 * getUnpackedSint32List().size();
@@ -10532,9 +9475,8 @@ public int getSerializedSize() {
       {
         int dataSize = 0;
         for (int i = 0; i < unpackedSint64_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeSInt64SizeNoTag(
-                  unpackedSint64_.getLong(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt64SizeNoTag(unpackedSint64_.getLong(i));
         }
         size += dataSize;
         size += 2 * getUnpackedSint64List().size();
@@ -10584,58 +9526,52 @@ public int getSerializedSize() {
       {
         int dataSize = 0;
         for (int i = 0; i < unpackedNestedEnum_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeEnumSizeNoTag(
-                  unpackedNestedEnum_.get(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeEnumSizeNoTag(unpackedNestedEnum_.get(i));
         }
         size += dataSize;
         size += 2 * unpackedNestedEnum_.size();
       }
       if (oneofFieldCase_ == 111) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeUInt32Size(
-                111, (int) ((java.lang.Integer) oneofField_));
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(
+              111, (int)((java.lang.Integer) oneofField_));
       }
       if (oneofFieldCase_ == 112) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeMessageSize(
-                112,
-                (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                        .NestedMessage)
-                    oneofField_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(112, (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) oneofField_);
       }
       if (oneofFieldCase_ == 113) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(113, oneofField_);
       }
       if (oneofFieldCase_ == 114) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeBytesSize(
-                114, (com.google.protobuf.ByteString) oneofField_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(
+              114, (com.google.protobuf.ByteString) oneofField_);
       }
       if (oneofFieldCase_ == 115) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeBoolSize(
-                115, (boolean) ((java.lang.Boolean) oneofField_));
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(
+              115, (boolean)((java.lang.Boolean) oneofField_));
       }
       if (oneofFieldCase_ == 116) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeUInt64Size(
-                116, (long) ((java.lang.Long) oneofField_));
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(
+              116, (long)((java.lang.Long) oneofField_));
       }
       if (oneofFieldCase_ == 117) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeFloatSize(
-                117, (float) ((java.lang.Float) oneofField_));
+        size += com.google.protobuf.CodedOutputStream
+          .computeFloatSize(
+              117, (float)((java.lang.Float) oneofField_));
       }
       if (oneofFieldCase_ == 118) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeDoubleSize(
-                118, (double) ((java.lang.Double) oneofField_));
+        size += com.google.protobuf.CodedOutputStream
+          .computeDoubleSize(
+              118, (double)((java.lang.Double) oneofField_));
       }
       if (oneofFieldCase_ == 119) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeEnumSize(
-                119, ((java.lang.Integer) oneofField_));
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(119, ((java.lang.Integer) oneofField_));
       }
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
@@ -10645,152 +9581,230 @@ public int getSerializedSize() {
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
-        return true;
+       return true;
       }
       if (!(obj instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3)) {
         return super.equals(obj);
       }
-      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 other =
-          (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3) obj;
-
-      if (getOptionalInt32() != other.getOptionalInt32()) return false;
-      if (getOptionalInt64() != other.getOptionalInt64()) return false;
-      if (getOptionalUint32() != other.getOptionalUint32()) return false;
-      if (getOptionalUint64() != other.getOptionalUint64()) return false;
-      if (getOptionalSint32() != other.getOptionalSint32()) return false;
-      if (getOptionalSint64() != other.getOptionalSint64()) return false;
-      if (getOptionalFixed32() != other.getOptionalFixed32()) return false;
-      if (getOptionalFixed64() != other.getOptionalFixed64()) return false;
-      if (getOptionalSfixed32() != other.getOptionalSfixed32()) return false;
-      if (getOptionalSfixed64() != other.getOptionalSfixed64()) return false;
+      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 other = (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3) obj;
+
+      if (getOptionalInt32()
+          != other.getOptionalInt32()) return false;
+      if (getOptionalInt64()
+          != other.getOptionalInt64()) return false;
+      if (getOptionalUint32()
+          != other.getOptionalUint32()) return false;
+      if (getOptionalUint64()
+          != other.getOptionalUint64()) return false;
+      if (getOptionalSint32()
+          != other.getOptionalSint32()) return false;
+      if (getOptionalSint64()
+          != other.getOptionalSint64()) return false;
+      if (getOptionalFixed32()
+          != other.getOptionalFixed32()) return false;
+      if (getOptionalFixed64()
+          != other.getOptionalFixed64()) return false;
+      if (getOptionalSfixed32()
+          != other.getOptionalSfixed32()) return false;
+      if (getOptionalSfixed64()
+          != other.getOptionalSfixed64()) return false;
       if (java.lang.Float.floatToIntBits(getOptionalFloat())
-          != java.lang.Float.floatToIntBits(other.getOptionalFloat())) return false;
+          != java.lang.Float.floatToIntBits(
+              other.getOptionalFloat())) return false;
       if (java.lang.Double.doubleToLongBits(getOptionalDouble())
-          != java.lang.Double.doubleToLongBits(other.getOptionalDouble())) return false;
-      if (getOptionalBool() != other.getOptionalBool()) return false;
-      if (!getOptionalString().equals(other.getOptionalString())) return false;
-      if (!getOptionalBytes().equals(other.getOptionalBytes())) return false;
+          != java.lang.Double.doubleToLongBits(
+              other.getOptionalDouble())) return false;
+      if (getOptionalBool()
+          != other.getOptionalBool()) return false;
+      if (!getOptionalString()
+          .equals(other.getOptionalString())) return false;
+      if (!getOptionalBytes()
+          .equals(other.getOptionalBytes())) return false;
       if (hasOptionalNestedMessage() != other.hasOptionalNestedMessage()) return false;
       if (hasOptionalNestedMessage()) {
-        if (!getOptionalNestedMessage().equals(other.getOptionalNestedMessage())) return false;
+        if (!getOptionalNestedMessage()
+            .equals(other.getOptionalNestedMessage())) return false;
       }
       if (hasOptionalForeignMessage() != other.hasOptionalForeignMessage()) return false;
       if (hasOptionalForeignMessage()) {
-        if (!getOptionalForeignMessage().equals(other.getOptionalForeignMessage())) return false;
+        if (!getOptionalForeignMessage()
+            .equals(other.getOptionalForeignMessage())) return false;
       }
       if (optionalNestedEnum_ != other.optionalNestedEnum_) return false;
       if (optionalForeignEnum_ != other.optionalForeignEnum_) return false;
       if (optionalAliasedEnum_ != other.optionalAliasedEnum_) return false;
       if (hasRecursiveMessage() != other.hasRecursiveMessage()) return false;
       if (hasRecursiveMessage()) {
-        if (!getRecursiveMessage().equals(other.getRecursiveMessage())) return false;
-      }
-      if (!getRepeatedInt32List().equals(other.getRepeatedInt32List())) return false;
-      if (!getRepeatedInt64List().equals(other.getRepeatedInt64List())) return false;
-      if (!getRepeatedUint32List().equals(other.getRepeatedUint32List())) return false;
-      if (!getRepeatedUint64List().equals(other.getRepeatedUint64List())) return false;
-      if (!getRepeatedSint32List().equals(other.getRepeatedSint32List())) return false;
-      if (!getRepeatedSint64List().equals(other.getRepeatedSint64List())) return false;
-      if (!getRepeatedFixed32List().equals(other.getRepeatedFixed32List())) return false;
-      if (!getRepeatedFixed64List().equals(other.getRepeatedFixed64List())) return false;
-      if (!getRepeatedSfixed32List().equals(other.getRepeatedSfixed32List())) return false;
-      if (!getRepeatedSfixed64List().equals(other.getRepeatedSfixed64List())) return false;
-      if (!getRepeatedFloatList().equals(other.getRepeatedFloatList())) return false;
-      if (!getRepeatedDoubleList().equals(other.getRepeatedDoubleList())) return false;
-      if (!getRepeatedBoolList().equals(other.getRepeatedBoolList())) return false;
-      if (!getRepeatedStringList().equals(other.getRepeatedStringList())) return false;
-      if (!getRepeatedBytesList().equals(other.getRepeatedBytesList())) return false;
-      if (!getRepeatedNestedMessageList().equals(other.getRepeatedNestedMessageList()))
-        return false;
-      if (!getRepeatedForeignMessageList().equals(other.getRepeatedForeignMessageList()))
-        return false;
+        if (!getRecursiveMessage()
+            .equals(other.getRecursiveMessage())) return false;
+      }
+      if (!getRepeatedInt32List()
+          .equals(other.getRepeatedInt32List())) return false;
+      if (!getRepeatedInt64List()
+          .equals(other.getRepeatedInt64List())) return false;
+      if (!getRepeatedUint32List()
+          .equals(other.getRepeatedUint32List())) return false;
+      if (!getRepeatedUint64List()
+          .equals(other.getRepeatedUint64List())) return false;
+      if (!getRepeatedSint32List()
+          .equals(other.getRepeatedSint32List())) return false;
+      if (!getRepeatedSint64List()
+          .equals(other.getRepeatedSint64List())) return false;
+      if (!getRepeatedFixed32List()
+          .equals(other.getRepeatedFixed32List())) return false;
+      if (!getRepeatedFixed64List()
+          .equals(other.getRepeatedFixed64List())) return false;
+      if (!getRepeatedSfixed32List()
+          .equals(other.getRepeatedSfixed32List())) return false;
+      if (!getRepeatedSfixed64List()
+          .equals(other.getRepeatedSfixed64List())) return false;
+      if (!getRepeatedFloatList()
+          .equals(other.getRepeatedFloatList())) return false;
+      if (!getRepeatedDoubleList()
+          .equals(other.getRepeatedDoubleList())) return false;
+      if (!getRepeatedBoolList()
+          .equals(other.getRepeatedBoolList())) return false;
+      if (!getRepeatedStringList()
+          .equals(other.getRepeatedStringList())) return false;
+      if (!getRepeatedBytesList()
+          .equals(other.getRepeatedBytesList())) return false;
+      if (!getRepeatedNestedMessageList()
+          .equals(other.getRepeatedNestedMessageList())) return false;
+      if (!getRepeatedForeignMessageList()
+          .equals(other.getRepeatedForeignMessageList())) return false;
       if (!repeatedNestedEnum_.equals(other.repeatedNestedEnum_)) return false;
       if (!repeatedForeignEnum_.equals(other.repeatedForeignEnum_)) return false;
-      if (!getPackedInt32List().equals(other.getPackedInt32List())) return false;
-      if (!getPackedInt64List().equals(other.getPackedInt64List())) return false;
-      if (!getPackedUint32List().equals(other.getPackedUint32List())) return false;
-      if (!getPackedUint64List().equals(other.getPackedUint64List())) return false;
-      if (!getPackedSint32List().equals(other.getPackedSint32List())) return false;
-      if (!getPackedSint64List().equals(other.getPackedSint64List())) return false;
-      if (!getPackedFixed32List().equals(other.getPackedFixed32List())) return false;
-      if (!getPackedFixed64List().equals(other.getPackedFixed64List())) return false;
-      if (!getPackedSfixed32List().equals(other.getPackedSfixed32List())) return false;
-      if (!getPackedSfixed64List().equals(other.getPackedSfixed64List())) return false;
-      if (!getPackedFloatList().equals(other.getPackedFloatList())) return false;
-      if (!getPackedDoubleList().equals(other.getPackedDoubleList())) return false;
-      if (!getPackedBoolList().equals(other.getPackedBoolList())) return false;
+      if (!getPackedInt32List()
+          .equals(other.getPackedInt32List())) return false;
+      if (!getPackedInt64List()
+          .equals(other.getPackedInt64List())) return false;
+      if (!getPackedUint32List()
+          .equals(other.getPackedUint32List())) return false;
+      if (!getPackedUint64List()
+          .equals(other.getPackedUint64List())) return false;
+      if (!getPackedSint32List()
+          .equals(other.getPackedSint32List())) return false;
+      if (!getPackedSint64List()
+          .equals(other.getPackedSint64List())) return false;
+      if (!getPackedFixed32List()
+          .equals(other.getPackedFixed32List())) return false;
+      if (!getPackedFixed64List()
+          .equals(other.getPackedFixed64List())) return false;
+      if (!getPackedSfixed32List()
+          .equals(other.getPackedSfixed32List())) return false;
+      if (!getPackedSfixed64List()
+          .equals(other.getPackedSfixed64List())) return false;
+      if (!getPackedFloatList()
+          .equals(other.getPackedFloatList())) return false;
+      if (!getPackedDoubleList()
+          .equals(other.getPackedDoubleList())) return false;
+      if (!getPackedBoolList()
+          .equals(other.getPackedBoolList())) return false;
       if (!packedNestedEnum_.equals(other.packedNestedEnum_)) return false;
-      if (!getUnpackedInt32List().equals(other.getUnpackedInt32List())) return false;
-      if (!getUnpackedInt64List().equals(other.getUnpackedInt64List())) return false;
-      if (!getUnpackedUint32List().equals(other.getUnpackedUint32List())) return false;
-      if (!getUnpackedUint64List().equals(other.getUnpackedUint64List())) return false;
-      if (!getUnpackedSint32List().equals(other.getUnpackedSint32List())) return false;
-      if (!getUnpackedSint64List().equals(other.getUnpackedSint64List())) return false;
-      if (!getUnpackedFixed32List().equals(other.getUnpackedFixed32List())) return false;
-      if (!getUnpackedFixed64List().equals(other.getUnpackedFixed64List())) return false;
-      if (!getUnpackedSfixed32List().equals(other.getUnpackedSfixed32List())) return false;
-      if (!getUnpackedSfixed64List().equals(other.getUnpackedSfixed64List())) return false;
-      if (!getUnpackedFloatList().equals(other.getUnpackedFloatList())) return false;
-      if (!getUnpackedDoubleList().equals(other.getUnpackedDoubleList())) return false;
-      if (!getUnpackedBoolList().equals(other.getUnpackedBoolList())) return false;
+      if (!getUnpackedInt32List()
+          .equals(other.getUnpackedInt32List())) return false;
+      if (!getUnpackedInt64List()
+          .equals(other.getUnpackedInt64List())) return false;
+      if (!getUnpackedUint32List()
+          .equals(other.getUnpackedUint32List())) return false;
+      if (!getUnpackedUint64List()
+          .equals(other.getUnpackedUint64List())) return false;
+      if (!getUnpackedSint32List()
+          .equals(other.getUnpackedSint32List())) return false;
+      if (!getUnpackedSint64List()
+          .equals(other.getUnpackedSint64List())) return false;
+      if (!getUnpackedFixed32List()
+          .equals(other.getUnpackedFixed32List())) return false;
+      if (!getUnpackedFixed64List()
+          .equals(other.getUnpackedFixed64List())) return false;
+      if (!getUnpackedSfixed32List()
+          .equals(other.getUnpackedSfixed32List())) return false;
+      if (!getUnpackedSfixed64List()
+          .equals(other.getUnpackedSfixed64List())) return false;
+      if (!getUnpackedFloatList()
+          .equals(other.getUnpackedFloatList())) return false;
+      if (!getUnpackedDoubleList()
+          .equals(other.getUnpackedDoubleList())) return false;
+      if (!getUnpackedBoolList()
+          .equals(other.getUnpackedBoolList())) return false;
       if (!unpackedNestedEnum_.equals(other.unpackedNestedEnum_)) return false;
-      if (!internalGetMapInt32Int32().equals(other.internalGetMapInt32Int32())) return false;
-      if (!internalGetMapInt64Int64().equals(other.internalGetMapInt64Int64())) return false;
-      if (!internalGetMapUint32Uint32().equals(other.internalGetMapUint32Uint32())) return false;
-      if (!internalGetMapUint64Uint64().equals(other.internalGetMapUint64Uint64())) return false;
-      if (!internalGetMapSint32Sint32().equals(other.internalGetMapSint32Sint32())) return false;
-      if (!internalGetMapSint64Sint64().equals(other.internalGetMapSint64Sint64())) return false;
-      if (!internalGetMapFixed32Fixed32().equals(other.internalGetMapFixed32Fixed32()))
-        return false;
-      if (!internalGetMapFixed64Fixed64().equals(other.internalGetMapFixed64Fixed64()))
-        return false;
-      if (!internalGetMapSfixed32Sfixed32().equals(other.internalGetMapSfixed32Sfixed32()))
-        return false;
-      if (!internalGetMapSfixed64Sfixed64().equals(other.internalGetMapSfixed64Sfixed64()))
-        return false;
-      if (!internalGetMapInt32Float().equals(other.internalGetMapInt32Float())) return false;
-      if (!internalGetMapInt32Double().equals(other.internalGetMapInt32Double())) return false;
-      if (!internalGetMapBoolBool().equals(other.internalGetMapBoolBool())) return false;
-      if (!internalGetMapStringString().equals(other.internalGetMapStringString())) return false;
-      if (!internalGetMapStringBytes().equals(other.internalGetMapStringBytes())) return false;
-      if (!internalGetMapStringNestedMessage().equals(other.internalGetMapStringNestedMessage()))
-        return false;
-      if (!internalGetMapStringForeignMessage().equals(other.internalGetMapStringForeignMessage()))
-        return false;
-      if (!internalGetMapStringNestedEnum().equals(other.internalGetMapStringNestedEnum()))
-        return false;
-      if (!internalGetMapStringForeignEnum().equals(other.internalGetMapStringForeignEnum()))
-        return false;
+      if (!internalGetMapInt32Int32().equals(
+          other.internalGetMapInt32Int32())) return false;
+      if (!internalGetMapInt64Int64().equals(
+          other.internalGetMapInt64Int64())) return false;
+      if (!internalGetMapUint32Uint32().equals(
+          other.internalGetMapUint32Uint32())) return false;
+      if (!internalGetMapUint64Uint64().equals(
+          other.internalGetMapUint64Uint64())) return false;
+      if (!internalGetMapSint32Sint32().equals(
+          other.internalGetMapSint32Sint32())) return false;
+      if (!internalGetMapSint64Sint64().equals(
+          other.internalGetMapSint64Sint64())) return false;
+      if (!internalGetMapFixed32Fixed32().equals(
+          other.internalGetMapFixed32Fixed32())) return false;
+      if (!internalGetMapFixed64Fixed64().equals(
+          other.internalGetMapFixed64Fixed64())) return false;
+      if (!internalGetMapSfixed32Sfixed32().equals(
+          other.internalGetMapSfixed32Sfixed32())) return false;
+      if (!internalGetMapSfixed64Sfixed64().equals(
+          other.internalGetMapSfixed64Sfixed64())) return false;
+      if (!internalGetMapInt32Float().equals(
+          other.internalGetMapInt32Float())) return false;
+      if (!internalGetMapInt32Double().equals(
+          other.internalGetMapInt32Double())) return false;
+      if (!internalGetMapBoolBool().equals(
+          other.internalGetMapBoolBool())) return false;
+      if (!internalGetMapStringString().equals(
+          other.internalGetMapStringString())) return false;
+      if (!internalGetMapStringBytes().equals(
+          other.internalGetMapStringBytes())) return false;
+      if (!internalGetMapStringNestedMessage().equals(
+          other.internalGetMapStringNestedMessage())) return false;
+      if (!internalGetMapStringForeignMessage().equals(
+          other.internalGetMapStringForeignMessage())) return false;
+      if (!internalGetMapStringNestedEnum().equals(
+          other.internalGetMapStringNestedEnum())) return false;
+      if (!internalGetMapStringForeignEnum().equals(
+          other.internalGetMapStringForeignEnum())) return false;
       if (!getOneofFieldCase().equals(other.getOneofFieldCase())) return false;
       switch (oneofFieldCase_) {
         case 111:
-          if (getOneofUint32() != other.getOneofUint32()) return false;
+          if (getOneofUint32()
+              != other.getOneofUint32()) return false;
           break;
         case 112:
-          if (!getOneofNestedMessage().equals(other.getOneofNestedMessage())) return false;
+          if (!getOneofNestedMessage()
+              .equals(other.getOneofNestedMessage())) return false;
           break;
         case 113:
-          if (!getOneofString().equals(other.getOneofString())) return false;
+          if (!getOneofString()
+              .equals(other.getOneofString())) return false;
           break;
         case 114:
-          if (!getOneofBytes().equals(other.getOneofBytes())) return false;
+          if (!getOneofBytes()
+              .equals(other.getOneofBytes())) return false;
           break;
         case 115:
-          if (getOneofBool() != other.getOneofBool()) return false;
+          if (getOneofBool()
+              != other.getOneofBool()) return false;
           break;
         case 116:
-          if (getOneofUint64() != other.getOneofUint64()) return false;
+          if (getOneofUint64()
+              != other.getOneofUint64()) return false;
           break;
         case 117:
           if (java.lang.Float.floatToIntBits(getOneofFloat())
-              != java.lang.Float.floatToIntBits(other.getOneofFloat())) return false;
+              != java.lang.Float.floatToIntBits(
+                  other.getOneofFloat())) return false;
           break;
         case 118:
           if (java.lang.Double.doubleToLongBits(getOneofDouble())
-              != java.lang.Double.doubleToLongBits(other.getOneofDouble())) return false;
+              != java.lang.Double.doubleToLongBits(
+                  other.getOneofDouble())) return false;
           break;
         case 119:
-          if (getOneofEnumValue() != other.getOneofEnumValue()) return false;
+          if (getOneofEnumValue()
+              != other.getOneofEnumValue()) return false;
           break;
         case 0:
         default:
@@ -10809,32 +9823,37 @@ public int hashCode() {
       hash = (37 * hash) + OPTIONAL_INT32_FIELD_NUMBER;
       hash = (53 * hash) + getOptionalInt32();
       hash = (37 * hash) + OPTIONAL_INT64_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getOptionalInt64());
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getOptionalInt64());
       hash = (37 * hash) + OPTIONAL_UINT32_FIELD_NUMBER;
       hash = (53 * hash) + getOptionalUint32();
       hash = (37 * hash) + OPTIONAL_UINT64_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getOptionalUint64());
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getOptionalUint64());
       hash = (37 * hash) + OPTIONAL_SINT32_FIELD_NUMBER;
       hash = (53 * hash) + getOptionalSint32();
       hash = (37 * hash) + OPTIONAL_SINT64_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getOptionalSint64());
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getOptionalSint64());
       hash = (37 * hash) + OPTIONAL_FIXED32_FIELD_NUMBER;
       hash = (53 * hash) + getOptionalFixed32();
       hash = (37 * hash) + OPTIONAL_FIXED64_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getOptionalFixed64());
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getOptionalFixed64());
       hash = (37 * hash) + OPTIONAL_SFIXED32_FIELD_NUMBER;
       hash = (53 * hash) + getOptionalSfixed32();
       hash = (37 * hash) + OPTIONAL_SFIXED64_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getOptionalSfixed64());
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getOptionalSfixed64());
       hash = (37 * hash) + OPTIONAL_FLOAT_FIELD_NUMBER;
-      hash = (53 * hash) + java.lang.Float.floatToIntBits(getOptionalFloat());
+      hash = (53 * hash) + java.lang.Float.floatToIntBits(
+          getOptionalFloat());
       hash = (37 * hash) + OPTIONAL_DOUBLE_FIELD_NUMBER;
-      hash =
-          (53 * hash)
-              + com.google.protobuf.Internal.hashLong(
-                  java.lang.Double.doubleToLongBits(getOptionalDouble()));
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          java.lang.Double.doubleToLongBits(getOptionalDouble()));
       hash = (37 * hash) + OPTIONAL_BOOL_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getOptionalBool());
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getOptionalBool());
       hash = (37 * hash) + OPTIONAL_STRING_FIELD_NUMBER;
       hash = (53 * hash) + getOptionalString().hashCode();
       hash = (37 * hash) + OPTIONAL_BYTES_FIELD_NUMBER;
@@ -11140,22 +10159,23 @@ public int hashCode() {
           break;
         case 115:
           hash = (37 * hash) + ONEOF_BOOL_FIELD_NUMBER;
-          hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getOneofBool());
+          hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+              getOneofBool());
           break;
         case 116:
           hash = (37 * hash) + ONEOF_UINT64_FIELD_NUMBER;
-          hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getOneofUint64());
+          hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+              getOneofUint64());
           break;
         case 117:
           hash = (37 * hash) + ONEOF_FLOAT_FIELD_NUMBER;
-          hash = (53 * hash) + java.lang.Float.floatToIntBits(getOneofFloat());
+          hash = (53 * hash) + java.lang.Float.floatToIntBits(
+              getOneofFloat());
           break;
         case 118:
           hash = (37 * hash) + ONEOF_DOUBLE_FIELD_NUMBER;
-          hash =
-              (53 * hash)
-                  + com.google.protobuf.Internal.hashLong(
-                      java.lang.Double.doubleToLongBits(getOneofDouble()));
+          hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+              java.lang.Double.doubleToLongBits(getOneofDouble()));
           break;
         case 119:
           hash = (37 * hash) + ONEOF_ENUM_FIELD_NUMBER;
@@ -11170,95 +10190,89 @@ public int hashCode() {
     }
 
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(
-        java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(
-        java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(
-        byte[] data) throws com.google.protobuf.InvalidProtocolBufferException {
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(
-        byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(
-        java.io.InputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(
-        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-        parseDelimitedFrom(
-            java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-          PARSER, input, extensionRegistry);
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(
-        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
     @java.lang.Override
-    public Builder newBuilderForType() {
-      return newBuilder();
-    }
-
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-
-    public static Builder newBuilder(
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 prototype) {
+    public static Builder newBuilder(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-
     @java.lang.Override
     public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
 
     @java.lang.Override
@@ -11267,10 +10281,7 @@ protected Builder newBuilderForType(
       Builder builder = new Builder(parent);
       return builder;
     }
-
     /**
-     *
-     *
      * <pre>
      * This is a slightly trimmed-down version of TestAllTypesProto3 from
      * google/protobuf/test_messages_proto3.proto but without imports/ctypes.
@@ -11278,14 +10289,13 @@ protected Builder newBuilderForType(
      *
      * Protobuf type {@code legacy_gencode_test.proto3.TestMostTypesProto3}
      */
-    public static final class Builder
-        extends com.google.protobuf.GeneratedMessageV3.Builder<Builder>
-        implements
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:legacy_gencode_test.proto3.TestMostTypesProto3)
         legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor;
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor;
       }
 
       @SuppressWarnings({"rawtypes"})
@@ -11331,10 +10341,10 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
           case 74:
             return internalGetMapStringForeignEnum();
           default:
-            throw new RuntimeException("Invalid map field number: " + number);
+            throw new RuntimeException(
+                "Invalid map field number: " + number);
         }
       }
-
       @SuppressWarnings({"rawtypes"})
       protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
           int number) {
@@ -11378,34 +10388,31 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFi
           case 74:
             return internalGetMutableMapStringForeignEnum();
           default:
-            throw new RuntimeException("Invalid map field number: " + number);
+            throw new RuntimeException(
+                "Invalid map field number: " + number);
         }
       }
-
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_fieldAccessorTable
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.class,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder
-                    .class);
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.class, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder.class);
       }
 
-      // Construct using
-      // legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.newBuilder()
+      // Construct using legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
-
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
           getOptionalNestedMessageFieldBuilder();
           getOptionalForeignMessageFieldBuilder();
           getRecursiveMessageFieldBuilder();
@@ -11413,7 +10420,6 @@ private void maybeForceBuilderInitialization() {
           getRepeatedForeignMessageFieldBuilder();
         }
       }
-
       @java.lang.Override
       public Builder clear() {
         super.clear();
@@ -11466,7 +10472,8 @@ public Builder clear() {
         repeatedFloat_ = emptyFloatList();
         repeatedDouble_ = emptyDoubleList();
         repeatedBool_ = emptyBooleanList();
-        repeatedString_ = com.google.protobuf.LazyStringArrayList.emptyList();
+        repeatedString_ =
+            com.google.protobuf.LazyStringArrayList.emptyList();
         repeatedBytes_ = emptyList(com.google.protobuf.ByteString.class);
         if (repeatedNestedMessageBuilder_ == null) {
           repeatedNestedMessage_ = java.util.Collections.emptyList();
@@ -11544,22 +10551,19 @@ public Builder clear() {
       }
 
       @java.lang.Override
-      public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor;
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor;
       }
 
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-          getDefaultInstanceForType() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-            .getDefaultInstance();
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 getDefaultInstanceForType() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance();
       }
 
       @java.lang.Override
       public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 build() {
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result =
-            buildPartial();
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -11568,25 +10572,17 @@ public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 bui
 
       @java.lang.Override
       public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 buildPartial() {
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result =
-            new legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3(this);
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result = new legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3(this);
         buildPartialRepeatedFields(result);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
-        if (bitField1_ != 0) {
-          buildPartial1(result);
-        }
-        if (bitField2_ != 0) {
-          buildPartial2(result);
-        }
+        if (bitField0_ != 0) { buildPartial0(result); }
+        if (bitField1_ != 0) { buildPartial1(result); }
+        if (bitField2_ != 0) { buildPartial2(result); }
         buildPartialOneofs(result);
         onBuilt();
         return result;
       }
 
-      private void buildPartialRepeatedFields(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result) {
+      private void buildPartialRepeatedFields(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result) {
         if (repeatedNestedMessageBuilder_ == null) {
           if (((bitField1_ & 0x00000010) != 0)) {
             repeatedNestedMessage_ = java.util.Collections.unmodifiableList(repeatedNestedMessage_);
@@ -11598,8 +10594,7 @@ private void buildPartialRepeatedFields(
         }
         if (repeatedForeignMessageBuilder_ == null) {
           if (((bitField1_ & 0x00000020) != 0)) {
-            repeatedForeignMessage_ =
-                java.util.Collections.unmodifiableList(repeatedForeignMessage_);
+            repeatedForeignMessage_ = java.util.Collections.unmodifiableList(repeatedForeignMessage_);
             bitField1_ = (bitField1_ & ~0x00000020);
           }
           result.repeatedForeignMessage_ = repeatedForeignMessage_;
@@ -11628,8 +10623,7 @@ private void buildPartialRepeatedFields(
         result.unpackedNestedEnum_ = unpackedNestedEnum_;
       }
 
-      private void buildPartial0(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result) {
+      private void buildPartial0(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.optionalInt32_ = optionalInt32_;
@@ -11678,17 +10672,15 @@ private void buildPartial0(
         }
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00008000) != 0)) {
-          result.optionalNestedMessage_ =
-              optionalNestedMessageBuilder_ == null
-                  ? optionalNestedMessage_
-                  : optionalNestedMessageBuilder_.build();
+          result.optionalNestedMessage_ = optionalNestedMessageBuilder_ == null
+              ? optionalNestedMessage_
+              : optionalNestedMessageBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00010000) != 0)) {
-          result.optionalForeignMessage_ =
-              optionalForeignMessageBuilder_ == null
-                  ? optionalForeignMessage_
-                  : optionalForeignMessageBuilder_.build();
+          result.optionalForeignMessage_ = optionalForeignMessageBuilder_ == null
+              ? optionalForeignMessage_
+              : optionalForeignMessageBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
         if (((from_bitField0_ & 0x00020000) != 0)) {
@@ -11701,10 +10693,9 @@ private void buildPartial0(
           result.optionalAliasedEnum_ = optionalAliasedEnum_;
         }
         if (((from_bitField0_ & 0x00100000) != 0)) {
-          result.recursiveMessage_ =
-              recursiveMessageBuilder_ == null
-                  ? recursiveMessage_
-                  : recursiveMessageBuilder_.build();
+          result.recursiveMessage_ = recursiveMessageBuilder_ == null
+              ? recursiveMessage_
+              : recursiveMessageBuilder_.build();
           to_bitField0_ |= 0x00000004;
         }
         if (((from_bitField0_ & 0x00200000) != 0)) {
@@ -11754,8 +10745,7 @@ private void buildPartial0(
         result.bitField0_ |= to_bitField0_;
       }
 
-      private void buildPartial1(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result) {
+      private void buildPartial1(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result) {
         int from_bitField1_ = bitField1_;
         if (((from_bitField1_ & 0x00000001) != 0)) {
           repeatedDouble_.makeImmutable();
@@ -11867,8 +10857,7 @@ private void buildPartial1(
         }
       }
 
-      private void buildPartial2(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result) {
+      private void buildPartial2(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result) {
         int from_bitField2_ = bitField2_;
         if (((from_bitField2_ & 0x00000001) != 0)) {
           unpackedFloat_.makeImmutable();
@@ -11943,14 +10932,10 @@ private void buildPartial2(
           result.mapStringBytes_.makeImmutable();
         }
         if (((from_bitField2_ & 0x00080000) != 0)) {
-          result.mapStringNestedMessage_ =
-              internalGetMapStringNestedMessage()
-                  .build(MapStringNestedMessageDefaultEntryHolder.defaultEntry);
+          result.mapStringNestedMessage_ = internalGetMapStringNestedMessage().build(MapStringNestedMessageDefaultEntryHolder.defaultEntry);
         }
         if (((from_bitField2_ & 0x00100000) != 0)) {
-          result.mapStringForeignMessage_ =
-              internalGetMapStringForeignMessage()
-                  .build(MapStringForeignMessageDefaultEntryHolder.defaultEntry);
+          result.mapStringForeignMessage_ = internalGetMapStringForeignMessage().build(MapStringForeignMessageDefaultEntryHolder.defaultEntry);
         }
         if (((from_bitField2_ & 0x00200000) != 0)) {
           result.mapStringNestedEnum_ = internalGetMapStringNestedEnum();
@@ -11962,11 +10947,11 @@ private void buildPartial2(
         }
       }
 
-      private void buildPartialOneofs(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result) {
+      private void buildPartialOneofs(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result) {
         result.oneofFieldCase_ = oneofFieldCase_;
         result.oneofField_ = this.oneofField_;
-        if (oneofFieldCase_ == 112 && oneofNestedMessageBuilder_ != null) {
+        if (oneofFieldCase_ == 112 &&
+            oneofNestedMessageBuilder_ != null) {
           result.oneofField_ = oneofNestedMessageBuilder_.build();
         }
       }
@@ -11975,54 +10960,46 @@ private void buildPartialOneofs(
       public Builder clone() {
         return super.clone();
       }
-
       @java.lang.Override
       public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.setField(field, value);
       }
-
       @java.lang.Override
-      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
-
       @java.lang.Override
-      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
-
       @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index,
-          java.lang.Object value) {
+          int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
-
       @java.lang.Override
       public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
-
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other
-            instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3) {
-          return mergeFrom(
-              (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3) other);
+        if (other instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3) {
+          return mergeFrom((legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 other) {
-        if (other
-            == legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                .getDefaultInstance()) return this;
+      public Builder mergeFrom(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 other) {
+        if (other == legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance()) return this;
         if (other.getOptionalInt32() != 0) {
           setOptionalInt32(other.getOptionalInt32());
         }
@@ -12270,10 +11247,9 @@ public Builder mergeFrom(
               repeatedNestedMessageBuilder_ = null;
               repeatedNestedMessage_ = other.repeatedNestedMessage_;
               bitField1_ = (bitField1_ & ~0x00000010);
-              repeatedNestedMessageBuilder_ =
-                  com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
-                      ? getRepeatedNestedMessageFieldBuilder()
-                      : null;
+              repeatedNestedMessageBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getRepeatedNestedMessageFieldBuilder() : null;
             } else {
               repeatedNestedMessageBuilder_.addAllMessages(other.repeatedNestedMessage_);
             }
@@ -12297,10 +11273,9 @@ public Builder mergeFrom(
               repeatedForeignMessageBuilder_ = null;
               repeatedForeignMessage_ = other.repeatedForeignMessage_;
               bitField1_ = (bitField1_ & ~0x00000020);
-              repeatedForeignMessageBuilder_ =
-                  com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
-                      ? getRepeatedForeignMessageFieldBuilder()
-                      : null;
+              repeatedForeignMessageBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getRepeatedForeignMessageFieldBuilder() : null;
             } else {
               repeatedForeignMessageBuilder_.addAllMessages(other.repeatedForeignMessage_);
             }
@@ -12632,98 +11607,105 @@ public Builder mergeFrom(
           }
           onChanged();
         }
-        internalGetMutableMapInt32Int32().mergeFrom(other.internalGetMapInt32Int32());
+        internalGetMutableMapInt32Int32().mergeFrom(
+            other.internalGetMapInt32Int32());
         bitField2_ |= 0x00000010;
-        internalGetMutableMapInt64Int64().mergeFrom(other.internalGetMapInt64Int64());
+        internalGetMutableMapInt64Int64().mergeFrom(
+            other.internalGetMapInt64Int64());
         bitField2_ |= 0x00000020;
-        internalGetMutableMapUint32Uint32().mergeFrom(other.internalGetMapUint32Uint32());
+        internalGetMutableMapUint32Uint32().mergeFrom(
+            other.internalGetMapUint32Uint32());
         bitField2_ |= 0x00000040;
-        internalGetMutableMapUint64Uint64().mergeFrom(other.internalGetMapUint64Uint64());
+        internalGetMutableMapUint64Uint64().mergeFrom(
+            other.internalGetMapUint64Uint64());
         bitField2_ |= 0x00000080;
-        internalGetMutableMapSint32Sint32().mergeFrom(other.internalGetMapSint32Sint32());
+        internalGetMutableMapSint32Sint32().mergeFrom(
+            other.internalGetMapSint32Sint32());
         bitField2_ |= 0x00000100;
-        internalGetMutableMapSint64Sint64().mergeFrom(other.internalGetMapSint64Sint64());
+        internalGetMutableMapSint64Sint64().mergeFrom(
+            other.internalGetMapSint64Sint64());
         bitField2_ |= 0x00000200;
-        internalGetMutableMapFixed32Fixed32().mergeFrom(other.internalGetMapFixed32Fixed32());
+        internalGetMutableMapFixed32Fixed32().mergeFrom(
+            other.internalGetMapFixed32Fixed32());
         bitField2_ |= 0x00000400;
-        internalGetMutableMapFixed64Fixed64().mergeFrom(other.internalGetMapFixed64Fixed64());
+        internalGetMutableMapFixed64Fixed64().mergeFrom(
+            other.internalGetMapFixed64Fixed64());
         bitField2_ |= 0x00000800;
-        internalGetMutableMapSfixed32Sfixed32().mergeFrom(other.internalGetMapSfixed32Sfixed32());
+        internalGetMutableMapSfixed32Sfixed32().mergeFrom(
+            other.internalGetMapSfixed32Sfixed32());
         bitField2_ |= 0x00001000;
-        internalGetMutableMapSfixed64Sfixed64().mergeFrom(other.internalGetMapSfixed64Sfixed64());
+        internalGetMutableMapSfixed64Sfixed64().mergeFrom(
+            other.internalGetMapSfixed64Sfixed64());
         bitField2_ |= 0x00002000;
-        internalGetMutableMapInt32Float().mergeFrom(other.internalGetMapInt32Float());
+        internalGetMutableMapInt32Float().mergeFrom(
+            other.internalGetMapInt32Float());
         bitField2_ |= 0x00004000;
-        internalGetMutableMapInt32Double().mergeFrom(other.internalGetMapInt32Double());
+        internalGetMutableMapInt32Double().mergeFrom(
+            other.internalGetMapInt32Double());
         bitField2_ |= 0x00008000;
-        internalGetMutableMapBoolBool().mergeFrom(other.internalGetMapBoolBool());
+        internalGetMutableMapBoolBool().mergeFrom(
+            other.internalGetMapBoolBool());
         bitField2_ |= 0x00010000;
-        internalGetMutableMapStringString().mergeFrom(other.internalGetMapStringString());
+        internalGetMutableMapStringString().mergeFrom(
+            other.internalGetMapStringString());
         bitField2_ |= 0x00020000;
-        internalGetMutableMapStringBytes().mergeFrom(other.internalGetMapStringBytes());
+        internalGetMutableMapStringBytes().mergeFrom(
+            other.internalGetMapStringBytes());
         bitField2_ |= 0x00040000;
-        internalGetMutableMapStringNestedMessage()
-            .mergeFrom(other.internalGetMapStringNestedMessage());
+        internalGetMutableMapStringNestedMessage().mergeFrom(
+            other.internalGetMapStringNestedMessage());
         bitField2_ |= 0x00080000;
-        internalGetMutableMapStringForeignMessage()
-            .mergeFrom(other.internalGetMapStringForeignMessage());
+        internalGetMutableMapStringForeignMessage().mergeFrom(
+            other.internalGetMapStringForeignMessage());
         bitField2_ |= 0x00100000;
-        internalGetMutableMapStringNestedEnum().mergeFrom(other.internalGetMapStringNestedEnum());
+        internalGetMutableMapStringNestedEnum().mergeFrom(
+            other.internalGetMapStringNestedEnum());
         bitField2_ |= 0x00200000;
-        internalGetMutableMapStringForeignEnum().mergeFrom(other.internalGetMapStringForeignEnum());
+        internalGetMutableMapStringForeignEnum().mergeFrom(
+            other.internalGetMapStringForeignEnum());
         bitField2_ |= 0x00400000;
         switch (other.getOneofFieldCase()) {
-          case ONEOF_UINT32:
-            {
-              setOneofUint32(other.getOneofUint32());
-              break;
-            }
-          case ONEOF_NESTED_MESSAGE:
-            {
-              mergeOneofNestedMessage(other.getOneofNestedMessage());
-              break;
-            }
-          case ONEOF_STRING:
-            {
-              oneofFieldCase_ = 113;
-              oneofField_ = other.oneofField_;
-              onChanged();
-              break;
-            }
-          case ONEOF_BYTES:
-            {
-              setOneofBytes(other.getOneofBytes());
-              break;
-            }
-          case ONEOF_BOOL:
-            {
-              setOneofBool(other.getOneofBool());
-              break;
-            }
-          case ONEOF_UINT64:
-            {
-              setOneofUint64(other.getOneofUint64());
-              break;
-            }
-          case ONEOF_FLOAT:
-            {
-              setOneofFloat(other.getOneofFloat());
-              break;
-            }
-          case ONEOF_DOUBLE:
-            {
-              setOneofDouble(other.getOneofDouble());
-              break;
-            }
-          case ONEOF_ENUM:
-            {
-              setOneofEnumValue(other.getOneofEnumValue());
-              break;
-            }
-          case ONEOFFIELD_NOT_SET:
-            {
-              break;
-            }
+          case ONEOF_UINT32: {
+            setOneofUint32(other.getOneofUint32());
+            break;
+          }
+          case ONEOF_NESTED_MESSAGE: {
+            mergeOneofNestedMessage(other.getOneofNestedMessage());
+            break;
+          }
+          case ONEOF_STRING: {
+            oneofFieldCase_ = 113;
+            oneofField_ = other.oneofField_;
+            onChanged();
+            break;
+          }
+          case ONEOF_BYTES: {
+            setOneofBytes(other.getOneofBytes());
+            break;
+          }
+          case ONEOF_BOOL: {
+            setOneofBool(other.getOneofBool());
+            break;
+          }
+          case ONEOF_UINT64: {
+            setOneofUint64(other.getOneofUint64());
+            break;
+          }
+          case ONEOF_FLOAT: {
+            setOneofFloat(other.getOneofFloat());
+            break;
+          }
+          case ONEOF_DOUBLE: {
+            setOneofDouble(other.getOneofDouble());
+            break;
+          }
+          case ONEOF_ENUM: {
+            setOneofEnumValue(other.getOneofEnumValue());
+            break;
+          }
+          case ONEOFFIELD_NOT_SET: {
+            break;
+          }
         }
         this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
@@ -12751,1293 +11733,1094 @@ public Builder mergeFrom(
               case 0:
                 done = true;
                 break;
-              case 8:
-                {
-                  optionalInt32_ = input.readInt32();
-                  bitField0_ |= 0x00000001;
-                  break;
-                } // case 8
-              case 16:
-                {
-                  optionalInt64_ = input.readInt64();
-                  bitField0_ |= 0x00000002;
-                  break;
-                } // case 16
-              case 24:
-                {
-                  optionalUint32_ = input.readUInt32();
-                  bitField0_ |= 0x00000004;
-                  break;
-                } // case 24
-              case 32:
-                {
-                  optionalUint64_ = input.readUInt64();
-                  bitField0_ |= 0x00000008;
-                  break;
-                } // case 32
-              case 40:
-                {
-                  optionalSint32_ = input.readSInt32();
-                  bitField0_ |= 0x00000010;
-                  break;
-                } // case 40
-              case 48:
-                {
-                  optionalSint64_ = input.readSInt64();
-                  bitField0_ |= 0x00000020;
-                  break;
-                } // case 48
-              case 61:
-                {
-                  optionalFixed32_ = input.readFixed32();
-                  bitField0_ |= 0x00000040;
-                  break;
-                } // case 61
-              case 65:
-                {
-                  optionalFixed64_ = input.readFixed64();
-                  bitField0_ |= 0x00000080;
-                  break;
-                } // case 65
-              case 77:
-                {
-                  optionalSfixed32_ = input.readSFixed32();
-                  bitField0_ |= 0x00000100;
-                  break;
-                } // case 77
-              case 81:
-                {
-                  optionalSfixed64_ = input.readSFixed64();
-                  bitField0_ |= 0x00000200;
-                  break;
-                } // case 81
-              case 93:
-                {
-                  optionalFloat_ = input.readFloat();
-                  bitField0_ |= 0x00000400;
-                  break;
-                } // case 93
-              case 97:
-                {
-                  optionalDouble_ = input.readDouble();
-                  bitField0_ |= 0x00000800;
-                  break;
-                } // case 97
-              case 104:
-                {
-                  optionalBool_ = input.readBool();
-                  bitField0_ |= 0x00001000;
-                  break;
-                } // case 104
-              case 114:
-                {
-                  optionalString_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00002000;
-                  break;
-                } // case 114
-              case 122:
-                {
-                  optionalBytes_ = input.readBytes();
-                  bitField0_ |= 0x00004000;
-                  break;
-                } // case 122
-              case 146:
-                {
-                  input.readMessage(
-                      getOptionalNestedMessageFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00008000;
-                  break;
-                } // case 146
-              case 154:
-                {
-                  input.readMessage(
-                      getOptionalForeignMessageFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00010000;
-                  break;
-                } // case 154
-              case 168:
-                {
-                  optionalNestedEnum_ = input.readEnum();
-                  bitField0_ |= 0x00020000;
-                  break;
-                } // case 168
-              case 176:
-                {
-                  optionalForeignEnum_ = input.readEnum();
-                  bitField0_ |= 0x00040000;
-                  break;
-                } // case 176
-              case 184:
-                {
-                  optionalAliasedEnum_ = input.readEnum();
-                  bitField0_ |= 0x00080000;
-                  break;
-                } // case 184
-              case 218:
-                {
-                  input.readMessage(
-                      getRecursiveMessageFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00100000;
-                  break;
-                } // case 218
-              case 248:
-                {
-                  int v = input.readInt32();
-                  ensureRepeatedInt32IsMutable();
-                  repeatedInt32_.addInt(v);
-                  break;
-                } // case 248
-              case 250:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureRepeatedInt32IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedInt32_.addInt(input.readInt32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 250
-              case 256:
-                {
-                  long v = input.readInt64();
-                  ensureRepeatedInt64IsMutable();
-                  repeatedInt64_.addLong(v);
-                  break;
-                } // case 256
-              case 258:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureRepeatedInt64IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedInt64_.addLong(input.readInt64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 258
-              case 264:
-                {
-                  int v = input.readUInt32();
-                  ensureRepeatedUint32IsMutable();
-                  repeatedUint32_.addInt(v);
-                  break;
-                } // case 264
-              case 266:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureRepeatedUint32IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedUint32_.addInt(input.readUInt32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 266
-              case 272:
-                {
-                  long v = input.readUInt64();
-                  ensureRepeatedUint64IsMutable();
-                  repeatedUint64_.addLong(v);
-                  break;
-                } // case 272
-              case 274:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureRepeatedUint64IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedUint64_.addLong(input.readUInt64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 274
-              case 280:
-                {
-                  int v = input.readSInt32();
-                  ensureRepeatedSint32IsMutable();
-                  repeatedSint32_.addInt(v);
-                  break;
-                } // case 280
-              case 282:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureRepeatedSint32IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedSint32_.addInt(input.readSInt32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 282
-              case 288:
-                {
-                  long v = input.readSInt64();
-                  ensureRepeatedSint64IsMutable();
-                  repeatedSint64_.addLong(v);
-                  break;
-                } // case 288
-              case 290:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureRepeatedSint64IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedSint64_.addLong(input.readSInt64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 290
-              case 301:
-                {
-                  int v = input.readFixed32();
-                  ensureRepeatedFixed32IsMutable();
-                  repeatedFixed32_.addInt(v);
-                  break;
-                } // case 301
-              case 298:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureRepeatedFixed32IsMutable(alloc / 4);
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedFixed32_.addInt(input.readFixed32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 298
-              case 305:
-                {
-                  long v = input.readFixed64();
-                  ensureRepeatedFixed64IsMutable();
-                  repeatedFixed64_.addLong(v);
-                  break;
-                } // case 305
-              case 306:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureRepeatedFixed64IsMutable(alloc / 8);
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedFixed64_.addLong(input.readFixed64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 306
-              case 317:
-                {
-                  int v = input.readSFixed32();
-                  ensureRepeatedSfixed32IsMutable();
-                  repeatedSfixed32_.addInt(v);
-                  break;
-                } // case 317
-              case 314:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureRepeatedSfixed32IsMutable(alloc / 4);
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedSfixed32_.addInt(input.readSFixed32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 314
-              case 321:
-                {
-                  long v = input.readSFixed64();
-                  ensureRepeatedSfixed64IsMutable();
-                  repeatedSfixed64_.addLong(v);
-                  break;
-                } // case 321
-              case 322:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureRepeatedSfixed64IsMutable(alloc / 8);
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedSfixed64_.addLong(input.readSFixed64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 322
-              case 333:
-                {
-                  float v = input.readFloat();
-                  ensureRepeatedFloatIsMutable();
-                  repeatedFloat_.addFloat(v);
-                  break;
-                } // case 333
-              case 330:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureRepeatedFloatIsMutable(alloc / 4);
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedFloat_.addFloat(input.readFloat());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 330
-              case 337:
-                {
-                  double v = input.readDouble();
-                  ensureRepeatedDoubleIsMutable();
-                  repeatedDouble_.addDouble(v);
-                  break;
-                } // case 337
-              case 338:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureRepeatedDoubleIsMutable(alloc / 8);
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedDouble_.addDouble(input.readDouble());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 338
-              case 344:
-                {
-                  boolean v = input.readBool();
-                  ensureRepeatedBoolIsMutable();
-                  repeatedBool_.addBoolean(v);
-                  break;
-                } // case 344
-              case 346:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureRepeatedBoolIsMutable(alloc / 1);
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedBool_.addBoolean(input.readBool());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 346
-              case 354:
-                {
-                  java.lang.String s = input.readStringRequireUtf8();
-                  ensureRepeatedStringIsMutable();
-                  repeatedString_.add(s);
-                  break;
-                } // case 354
-              case 362:
-                {
-                  com.google.protobuf.ByteString v = input.readBytes();
-                  ensureRepeatedBytesIsMutable();
-                  repeatedBytes_.add(v);
-                  break;
-                } // case 362
-              case 386:
-                {
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                          .NestedMessage
-                      m =
-                          input.readMessage(
-                              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                                  .NestedMessage.parser(),
-                              extensionRegistry);
-                  if (repeatedNestedMessageBuilder_ == null) {
-                    ensureRepeatedNestedMessageIsMutable();
-                    repeatedNestedMessage_.add(m);
-                  } else {
-                    repeatedNestedMessageBuilder_.addMessage(m);
-                  }
-                  break;
-                } // case 386
-              case 394:
-                {
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage m =
-                      input.readMessage(
-                          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.parser(),
-                          extensionRegistry);
-                  if (repeatedForeignMessageBuilder_ == null) {
-                    ensureRepeatedForeignMessageIsMutable();
-                    repeatedForeignMessage_.add(m);
-                  } else {
-                    repeatedForeignMessageBuilder_.addMessage(m);
-                  }
-                  break;
-                } // case 394
-              case 408:
-                {
+              case 8: {
+                optionalInt32_ = input.readInt32();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 16: {
+                optionalInt64_ = input.readInt64();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 24: {
+                optionalUint32_ = input.readUInt32();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              case 32: {
+                optionalUint64_ = input.readUInt64();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 32
+              case 40: {
+                optionalSint32_ = input.readSInt32();
+                bitField0_ |= 0x00000010;
+                break;
+              } // case 40
+              case 48: {
+                optionalSint64_ = input.readSInt64();
+                bitField0_ |= 0x00000020;
+                break;
+              } // case 48
+              case 61: {
+                optionalFixed32_ = input.readFixed32();
+                bitField0_ |= 0x00000040;
+                break;
+              } // case 61
+              case 65: {
+                optionalFixed64_ = input.readFixed64();
+                bitField0_ |= 0x00000080;
+                break;
+              } // case 65
+              case 77: {
+                optionalSfixed32_ = input.readSFixed32();
+                bitField0_ |= 0x00000100;
+                break;
+              } // case 77
+              case 81: {
+                optionalSfixed64_ = input.readSFixed64();
+                bitField0_ |= 0x00000200;
+                break;
+              } // case 81
+              case 93: {
+                optionalFloat_ = input.readFloat();
+                bitField0_ |= 0x00000400;
+                break;
+              } // case 93
+              case 97: {
+                optionalDouble_ = input.readDouble();
+                bitField0_ |= 0x00000800;
+                break;
+              } // case 97
+              case 104: {
+                optionalBool_ = input.readBool();
+                bitField0_ |= 0x00001000;
+                break;
+              } // case 104
+              case 114: {
+                optionalString_ = input.readStringRequireUtf8();
+                bitField0_ |= 0x00002000;
+                break;
+              } // case 114
+              case 122: {
+                optionalBytes_ = input.readBytes();
+                bitField0_ |= 0x00004000;
+                break;
+              } // case 122
+              case 146: {
+                input.readMessage(
+                    getOptionalNestedMessageFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00008000;
+                break;
+              } // case 146
+              case 154: {
+                input.readMessage(
+                    getOptionalForeignMessageFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00010000;
+                break;
+              } // case 154
+              case 168: {
+                optionalNestedEnum_ = input.readEnum();
+                bitField0_ |= 0x00020000;
+                break;
+              } // case 168
+              case 176: {
+                optionalForeignEnum_ = input.readEnum();
+                bitField0_ |= 0x00040000;
+                break;
+              } // case 176
+              case 184: {
+                optionalAliasedEnum_ = input.readEnum();
+                bitField0_ |= 0x00080000;
+                break;
+              } // case 184
+              case 218: {
+                input.readMessage(
+                    getRecursiveMessageFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00100000;
+                break;
+              } // case 218
+              case 248: {
+                int v = input.readInt32();
+                ensureRepeatedInt32IsMutable();
+                repeatedInt32_.addInt(v);
+                break;
+              } // case 248
+              case 250: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedInt32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedInt32_.addInt(input.readInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 250
+              case 256: {
+                long v = input.readInt64();
+                ensureRepeatedInt64IsMutable();
+                repeatedInt64_.addLong(v);
+                break;
+              } // case 256
+              case 258: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedInt64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedInt64_.addLong(input.readInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 258
+              case 264: {
+                int v = input.readUInt32();
+                ensureRepeatedUint32IsMutable();
+                repeatedUint32_.addInt(v);
+                break;
+              } // case 264
+              case 266: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedUint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedUint32_.addInt(input.readUInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 266
+              case 272: {
+                long v = input.readUInt64();
+                ensureRepeatedUint64IsMutable();
+                repeatedUint64_.addLong(v);
+                break;
+              } // case 272
+              case 274: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedUint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedUint64_.addLong(input.readUInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 274
+              case 280: {
+                int v = input.readSInt32();
+                ensureRepeatedSint32IsMutable();
+                repeatedSint32_.addInt(v);
+                break;
+              } // case 280
+              case 282: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedSint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedSint32_.addInt(input.readSInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 282
+              case 288: {
+                long v = input.readSInt64();
+                ensureRepeatedSint64IsMutable();
+                repeatedSint64_.addLong(v);
+                break;
+              } // case 288
+              case 290: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedSint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedSint64_.addLong(input.readSInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 290
+              case 301: {
+                int v = input.readFixed32();
+                ensureRepeatedFixed32IsMutable();
+                repeatedFixed32_.addInt(v);
+                break;
+              } // case 301
+              case 298: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedFixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedFixed32_.addInt(input.readFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 298
+              case 305: {
+                long v = input.readFixed64();
+                ensureRepeatedFixed64IsMutable();
+                repeatedFixed64_.addLong(v);
+                break;
+              } // case 305
+              case 306: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedFixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedFixed64_.addLong(input.readFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 306
+              case 317: {
+                int v = input.readSFixed32();
+                ensureRepeatedSfixed32IsMutable();
+                repeatedSfixed32_.addInt(v);
+                break;
+              } // case 317
+              case 314: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedSfixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedSfixed32_.addInt(input.readSFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 314
+              case 321: {
+                long v = input.readSFixed64();
+                ensureRepeatedSfixed64IsMutable();
+                repeatedSfixed64_.addLong(v);
+                break;
+              } // case 321
+              case 322: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedSfixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedSfixed64_.addLong(input.readSFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 322
+              case 333: {
+                float v = input.readFloat();
+                ensureRepeatedFloatIsMutable();
+                repeatedFloat_.addFloat(v);
+                break;
+              } // case 333
+              case 330: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedFloatIsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedFloat_.addFloat(input.readFloat());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 330
+              case 337: {
+                double v = input.readDouble();
+                ensureRepeatedDoubleIsMutable();
+                repeatedDouble_.addDouble(v);
+                break;
+              } // case 337
+              case 338: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedDoubleIsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedDouble_.addDouble(input.readDouble());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 338
+              case 344: {
+                boolean v = input.readBool();
+                ensureRepeatedBoolIsMutable();
+                repeatedBool_.addBoolean(v);
+                break;
+              } // case 344
+              case 346: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedBoolIsMutable(alloc / 1);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedBool_.addBoolean(input.readBool());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 346
+              case 354: {
+                java.lang.String s = input.readStringRequireUtf8();
+                ensureRepeatedStringIsMutable();
+                repeatedString_.add(s);
+                break;
+              } // case 354
+              case 362: {
+                com.google.protobuf.ByteString v = input.readBytes();
+                ensureRepeatedBytesIsMutable();
+                repeatedBytes_.add(v);
+                break;
+              } // case 362
+              case 386: {
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage m =
+                    input.readMessage(
+                        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.parser(),
+                        extensionRegistry);
+                if (repeatedNestedMessageBuilder_ == null) {
+                  ensureRepeatedNestedMessageIsMutable();
+                  repeatedNestedMessage_.add(m);
+                } else {
+                  repeatedNestedMessageBuilder_.addMessage(m);
+                }
+                break;
+              } // case 386
+              case 394: {
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage m =
+                    input.readMessage(
+                        legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.parser(),
+                        extensionRegistry);
+                if (repeatedForeignMessageBuilder_ == null) {
+                  ensureRepeatedForeignMessageIsMutable();
+                  repeatedForeignMessage_.add(m);
+                } else {
+                  repeatedForeignMessageBuilder_.addMessage(m);
+                }
+                break;
+              } // case 394
+              case 408: {
+                int tmpRaw = input.readEnum();
+                ensureRepeatedNestedEnumIsMutable();
+                repeatedNestedEnum_.add(tmpRaw);
+                break;
+              } // case 408
+              case 410: {
+                int length = input.readRawVarint32();
+                int oldLimit = input.pushLimit(length);
+                while(input.getBytesUntilLimit() > 0) {
                   int tmpRaw = input.readEnum();
                   ensureRepeatedNestedEnumIsMutable();
                   repeatedNestedEnum_.add(tmpRaw);
-                  break;
-                } // case 408
-              case 410:
-                {
-                  int length = input.readRawVarint32();
-                  int oldLimit = input.pushLimit(length);
-                  while (input.getBytesUntilLimit() > 0) {
-                    int tmpRaw = input.readEnum();
-                    ensureRepeatedNestedEnumIsMutable();
-                    repeatedNestedEnum_.add(tmpRaw);
-                  }
-                  input.popLimit(oldLimit);
-                  break;
-                } // case 410
-              case 416:
-                {
+                }
+                input.popLimit(oldLimit);
+                break;
+              } // case 410
+              case 416: {
+                int tmpRaw = input.readEnum();
+                ensureRepeatedForeignEnumIsMutable();
+                repeatedForeignEnum_.add(tmpRaw);
+                break;
+              } // case 416
+              case 418: {
+                int length = input.readRawVarint32();
+                int oldLimit = input.pushLimit(length);
+                while(input.getBytesUntilLimit() > 0) {
                   int tmpRaw = input.readEnum();
                   ensureRepeatedForeignEnumIsMutable();
                   repeatedForeignEnum_.add(tmpRaw);
-                  break;
-                } // case 416
-              case 418:
-                {
-                  int length = input.readRawVarint32();
-                  int oldLimit = input.pushLimit(length);
-                  while (input.getBytesUntilLimit() > 0) {
-                    int tmpRaw = input.readEnum();
-                    ensureRepeatedForeignEnumIsMutable();
-                    repeatedForeignEnum_.add(tmpRaw);
-                  }
-                  input.popLimit(oldLimit);
-                  break;
-                } // case 418
-              case 450:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-                      mapInt32Int32__ =
-                          input.readMessage(
-                              MapInt32Int32DefaultEntryHolder.defaultEntry.getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapInt32Int32()
-                      .getMutableMap()
-                      .put(mapInt32Int32__.getKey(), mapInt32Int32__.getValue());
-                  bitField2_ |= 0x00000010;
-                  break;
-                } // case 450
-              case 458:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> mapInt64Int64__ =
-                      input.readMessage(
-                          MapInt64Int64DefaultEntryHolder.defaultEntry.getParserForType(),
-                          extensionRegistry);
-                  internalGetMutableMapInt64Int64()
-                      .getMutableMap()
-                      .put(mapInt64Int64__.getKey(), mapInt64Int64__.getValue());
-                  bitField2_ |= 0x00000020;
-                  break;
-                } // case 458
-              case 466:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-                      mapUint32Uint32__ =
-                          input.readMessage(
-                              MapUint32Uint32DefaultEntryHolder.defaultEntry.getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapUint32Uint32()
-                      .getMutableMap()
-                      .put(mapUint32Uint32__.getKey(), mapUint32Uint32__.getValue());
-                  bitField2_ |= 0x00000040;
-                  break;
-                } // case 466
-              case 474:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> mapUint64Uint64__ =
-                      input.readMessage(
-                          MapUint64Uint64DefaultEntryHolder.defaultEntry.getParserForType(),
-                          extensionRegistry);
-                  internalGetMutableMapUint64Uint64()
-                      .getMutableMap()
-                      .put(mapUint64Uint64__.getKey(), mapUint64Uint64__.getValue());
-                  bitField2_ |= 0x00000080;
-                  break;
-                } // case 474
-              case 482:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-                      mapSint32Sint32__ =
-                          input.readMessage(
-                              MapSint32Sint32DefaultEntryHolder.defaultEntry.getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapSint32Sint32()
-                      .getMutableMap()
-                      .put(mapSint32Sint32__.getKey(), mapSint32Sint32__.getValue());
-                  bitField2_ |= 0x00000100;
-                  break;
-                } // case 482
-              case 490:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> mapSint64Sint64__ =
-                      input.readMessage(
-                          MapSint64Sint64DefaultEntryHolder.defaultEntry.getParserForType(),
-                          extensionRegistry);
-                  internalGetMutableMapSint64Sint64()
-                      .getMutableMap()
-                      .put(mapSint64Sint64__.getKey(), mapSint64Sint64__.getValue());
-                  bitField2_ |= 0x00000200;
-                  break;
-                } // case 490
-              case 498:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-                      mapFixed32Fixed32__ =
-                          input.readMessage(
-                              MapFixed32Fixed32DefaultEntryHolder.defaultEntry.getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapFixed32Fixed32()
-                      .getMutableMap()
-                      .put(mapFixed32Fixed32__.getKey(), mapFixed32Fixed32__.getValue());
-                  bitField2_ |= 0x00000400;
-                  break;
-                } // case 498
-              case 506:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> mapFixed64Fixed64__ =
-                      input.readMessage(
-                          MapFixed64Fixed64DefaultEntryHolder.defaultEntry.getParserForType(),
-                          extensionRegistry);
-                  internalGetMutableMapFixed64Fixed64()
-                      .getMutableMap()
-                      .put(mapFixed64Fixed64__.getKey(), mapFixed64Fixed64__.getValue());
-                  bitField2_ |= 0x00000800;
-                  break;
-                } // case 506
-              case 514:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-                      mapSfixed32Sfixed32__ =
-                          input.readMessage(
-                              MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry.getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapSfixed32Sfixed32()
-                      .getMutableMap()
-                      .put(mapSfixed32Sfixed32__.getKey(), mapSfixed32Sfixed32__.getValue());
-                  bitField2_ |= 0x00001000;
-                  break;
-                } // case 514
-              case 522:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
-                      mapSfixed64Sfixed64__ =
-                          input.readMessage(
-                              MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry.getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapSfixed64Sfixed64()
-                      .getMutableMap()
-                      .put(mapSfixed64Sfixed64__.getKey(), mapSfixed64Sfixed64__.getValue());
-                  bitField2_ |= 0x00002000;
-                  break;
-                } // case 522
-              case 530:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float> mapInt32Float__ =
-                      input.readMessage(
-                          MapInt32FloatDefaultEntryHolder.defaultEntry.getParserForType(),
-                          extensionRegistry);
-                  internalGetMutableMapInt32Float()
-                      .getMutableMap()
-                      .put(mapInt32Float__.getKey(), mapInt32Float__.getValue());
-                  bitField2_ |= 0x00004000;
-                  break;
-                } // case 530
-              case 538:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Double>
-                      mapInt32Double__ =
-                          input.readMessage(
-                              MapInt32DoubleDefaultEntryHolder.defaultEntry.getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapInt32Double()
-                      .getMutableMap()
-                      .put(mapInt32Double__.getKey(), mapInt32Double__.getValue());
-                  bitField2_ |= 0x00008000;
-                  break;
-                } // case 538
-              case 546:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Boolean, java.lang.Boolean> mapBoolBool__ =
-                      input.readMessage(
-                          MapBoolBoolDefaultEntryHolder.defaultEntry.getParserForType(),
-                          extensionRegistry);
-                  internalGetMutableMapBoolBool()
-                      .getMutableMap()
-                      .put(mapBoolBool__.getKey(), mapBoolBool__.getValue());
-                  bitField2_ |= 0x00010000;
-                  break;
-                } // case 546
-              case 554:
-                {
-                  com.google.protobuf.MapEntry<java.lang.String, java.lang.String>
-                      mapStringString__ =
-                          input.readMessage(
-                              MapStringStringDefaultEntryHolder.defaultEntry.getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapStringString()
-                      .getMutableMap()
-                      .put(mapStringString__.getKey(), mapStringString__.getValue());
-                  bitField2_ |= 0x00020000;
-                  break;
-                } // case 554
-              case 562:
-                {
-                  com.google.protobuf.MapEntry<java.lang.String, com.google.protobuf.ByteString>
-                      mapStringBytes__ =
-                          input.readMessage(
-                              MapStringBytesDefaultEntryHolder.defaultEntry.getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapStringBytes()
-                      .getMutableMap()
-                      .put(mapStringBytes__.getKey(), mapStringBytes__.getValue());
-                  bitField2_ |= 0x00040000;
-                  break;
-                } // case 562
-              case 570:
-                {
-                  com.google.protobuf.MapEntry<
-                          java.lang.String,
-                          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                              .NestedMessage>
-                      mapStringNestedMessage__ =
-                          input.readMessage(
-                              MapStringNestedMessageDefaultEntryHolder.defaultEntry
-                                  .getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapStringNestedMessage()
-                      .ensureBuilderMap()
-                      .put(mapStringNestedMessage__.getKey(), mapStringNestedMessage__.getValue());
-                  bitField2_ |= 0x00080000;
-                  break;
-                } // case 570
-              case 578:
-                {
-                  com.google.protobuf.MapEntry<
-                          java.lang.String,
-                          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-                      mapStringForeignMessage__ =
-                          input.readMessage(
-                              MapStringForeignMessageDefaultEntryHolder.defaultEntry
-                                  .getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapStringForeignMessage()
-                      .ensureBuilderMap()
-                      .put(
-                          mapStringForeignMessage__.getKey(), mapStringForeignMessage__.getValue());
-                  bitField2_ |= 0x00100000;
-                  break;
-                } // case 578
-              case 586:
-                {
-                  com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer>
-                      mapStringNestedEnum__ =
-                          input.readMessage(
-                              MapStringNestedEnumDefaultEntryHolder.defaultEntry.getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapStringNestedEnum()
-                      .getMutableMap()
-                      .put(mapStringNestedEnum__.getKey(), mapStringNestedEnum__.getValue());
-                  bitField2_ |= 0x00200000;
-                  break;
-                } // case 586
-              case 594:
-                {
-                  com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer>
-                      mapStringForeignEnum__ =
-                          input.readMessage(
-                              MapStringForeignEnumDefaultEntryHolder.defaultEntry
-                                  .getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapStringForeignEnum()
-                      .getMutableMap()
-                      .put(mapStringForeignEnum__.getKey(), mapStringForeignEnum__.getValue());
-                  bitField2_ |= 0x00400000;
-                  break;
-                } // case 594
-              case 600:
-                {
-                  int v = input.readInt32();
-                  ensurePackedInt32IsMutable();
-                  packedInt32_.addInt(v);
-                  break;
-                } // case 600
-              case 602:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensurePackedInt32IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedInt32_.addInt(input.readInt32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 602
-              case 608:
-                {
-                  long v = input.readInt64();
-                  ensurePackedInt64IsMutable();
-                  packedInt64_.addLong(v);
-                  break;
-                } // case 608
-              case 610:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensurePackedInt64IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedInt64_.addLong(input.readInt64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 610
-              case 616:
-                {
-                  int v = input.readUInt32();
-                  ensurePackedUint32IsMutable();
-                  packedUint32_.addInt(v);
-                  break;
-                } // case 616
-              case 618:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensurePackedUint32IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedUint32_.addInt(input.readUInt32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 618
-              case 624:
-                {
-                  long v = input.readUInt64();
-                  ensurePackedUint64IsMutable();
-                  packedUint64_.addLong(v);
-                  break;
-                } // case 624
-              case 626:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensurePackedUint64IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedUint64_.addLong(input.readUInt64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 626
-              case 632:
-                {
-                  int v = input.readSInt32();
-                  ensurePackedSint32IsMutable();
-                  packedSint32_.addInt(v);
-                  break;
-                } // case 632
-              case 634:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensurePackedSint32IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedSint32_.addInt(input.readSInt32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 634
-              case 640:
-                {
-                  long v = input.readSInt64();
-                  ensurePackedSint64IsMutable();
-                  packedSint64_.addLong(v);
-                  break;
-                } // case 640
-              case 642:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensurePackedSint64IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedSint64_.addLong(input.readSInt64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 642
-              case 653:
-                {
-                  int v = input.readFixed32();
-                  ensurePackedFixed32IsMutable();
-                  packedFixed32_.addInt(v);
-                  break;
-                } // case 653
-              case 650:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensurePackedFixed32IsMutable(alloc / 4);
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedFixed32_.addInt(input.readFixed32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 650
-              case 657:
-                {
-                  long v = input.readFixed64();
-                  ensurePackedFixed64IsMutable();
-                  packedFixed64_.addLong(v);
-                  break;
-                } // case 657
-              case 658:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensurePackedFixed64IsMutable(alloc / 8);
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedFixed64_.addLong(input.readFixed64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 658
-              case 669:
-                {
-                  int v = input.readSFixed32();
-                  ensurePackedSfixed32IsMutable();
-                  packedSfixed32_.addInt(v);
-                  break;
-                } // case 669
-              case 666:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensurePackedSfixed32IsMutable(alloc / 4);
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedSfixed32_.addInt(input.readSFixed32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 666
-              case 673:
-                {
-                  long v = input.readSFixed64();
-                  ensurePackedSfixed64IsMutable();
-                  packedSfixed64_.addLong(v);
-                  break;
-                } // case 673
-              case 674:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensurePackedSfixed64IsMutable(alloc / 8);
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedSfixed64_.addLong(input.readSFixed64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 674
-              case 685:
-                {
-                  float v = input.readFloat();
-                  ensurePackedFloatIsMutable();
-                  packedFloat_.addFloat(v);
-                  break;
-                } // case 685
-              case 682:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensurePackedFloatIsMutable(alloc / 4);
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedFloat_.addFloat(input.readFloat());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 682
-              case 689:
-                {
-                  double v = input.readDouble();
-                  ensurePackedDoubleIsMutable();
-                  packedDouble_.addDouble(v);
-                  break;
-                } // case 689
-              case 690:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensurePackedDoubleIsMutable(alloc / 8);
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedDouble_.addDouble(input.readDouble());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 690
-              case 696:
-                {
-                  boolean v = input.readBool();
-                  ensurePackedBoolIsMutable();
-                  packedBool_.addBoolean(v);
-                  break;
-                } // case 696
-              case 698:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensurePackedBoolIsMutable(alloc / 1);
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedBool_.addBoolean(input.readBool());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 698
-              case 704:
-                {
-                  int tmpRaw = input.readEnum();
-                  ensurePackedNestedEnumIsMutable();
-                  packedNestedEnum_.add(tmpRaw);
-                  break;
-                } // case 704
-              case 706:
-                {
-                  int length = input.readRawVarint32();
-                  int oldLimit = input.pushLimit(length);
-                  while (input.getBytesUntilLimit() > 0) {
-                    int tmpRaw = input.readEnum();
-                    ensurePackedNestedEnumIsMutable();
-                    packedNestedEnum_.add(tmpRaw);
-                  }
-                  input.popLimit(oldLimit);
-                  break;
-                } // case 706
-              case 712:
-                {
-                  int v = input.readInt32();
-                  ensureUnpackedInt32IsMutable();
-                  unpackedInt32_.addInt(v);
-                  break;
-                } // case 712
-              case 714:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureUnpackedInt32IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedInt32_.addInt(input.readInt32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 714
-              case 720:
-                {
-                  long v = input.readInt64();
-                  ensureUnpackedInt64IsMutable();
-                  unpackedInt64_.addLong(v);
-                  break;
-                } // case 720
-              case 722:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureUnpackedInt64IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedInt64_.addLong(input.readInt64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 722
-              case 728:
-                {
-                  int v = input.readUInt32();
-                  ensureUnpackedUint32IsMutable();
-                  unpackedUint32_.addInt(v);
-                  break;
-                } // case 728
-              case 730:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureUnpackedUint32IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedUint32_.addInt(input.readUInt32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 730
-              case 736:
-                {
-                  long v = input.readUInt64();
-                  ensureUnpackedUint64IsMutable();
-                  unpackedUint64_.addLong(v);
-                  break;
-                } // case 736
-              case 738:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureUnpackedUint64IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedUint64_.addLong(input.readUInt64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 738
-              case 744:
-                {
-                  int v = input.readSInt32();
-                  ensureUnpackedSint32IsMutable();
-                  unpackedSint32_.addInt(v);
-                  break;
-                } // case 744
-              case 746:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureUnpackedSint32IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedSint32_.addInt(input.readSInt32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 746
-              case 752:
-                {
-                  long v = input.readSInt64();
-                  ensureUnpackedSint64IsMutable();
-                  unpackedSint64_.addLong(v);
-                  break;
-                } // case 752
-              case 754:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureUnpackedSint64IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedSint64_.addLong(input.readSInt64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 754
-              case 765:
-                {
-                  int v = input.readFixed32();
-                  ensureUnpackedFixed32IsMutable();
-                  unpackedFixed32_.addInt(v);
-                  break;
-                } // case 765
-              case 762:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureUnpackedFixed32IsMutable(alloc / 4);
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedFixed32_.addInt(input.readFixed32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 762
-              case 769:
-                {
-                  long v = input.readFixed64();
-                  ensureUnpackedFixed64IsMutable();
-                  unpackedFixed64_.addLong(v);
-                  break;
-                } // case 769
-              case 770:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureUnpackedFixed64IsMutable(alloc / 8);
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedFixed64_.addLong(input.readFixed64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 770
-              case 781:
-                {
-                  int v = input.readSFixed32();
-                  ensureUnpackedSfixed32IsMutable();
-                  unpackedSfixed32_.addInt(v);
-                  break;
-                } // case 781
-              case 778:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureUnpackedSfixed32IsMutable(alloc / 4);
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedSfixed32_.addInt(input.readSFixed32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 778
-              case 785:
-                {
-                  long v = input.readSFixed64();
-                  ensureUnpackedSfixed64IsMutable();
-                  unpackedSfixed64_.addLong(v);
-                  break;
-                } // case 785
-              case 786:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureUnpackedSfixed64IsMutable(alloc / 8);
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedSfixed64_.addLong(input.readSFixed64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 786
-              case 797:
-                {
-                  float v = input.readFloat();
-                  ensureUnpackedFloatIsMutable();
-                  unpackedFloat_.addFloat(v);
-                  break;
-                } // case 797
-              case 794:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureUnpackedFloatIsMutable(alloc / 4);
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedFloat_.addFloat(input.readFloat());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 794
-              case 801:
-                {
-                  double v = input.readDouble();
-                  ensureUnpackedDoubleIsMutable();
-                  unpackedDouble_.addDouble(v);
-                  break;
-                } // case 801
-              case 802:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureUnpackedDoubleIsMutable(alloc / 8);
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedDouble_.addDouble(input.readDouble());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 802
-              case 808:
-                {
-                  boolean v = input.readBool();
-                  ensureUnpackedBoolIsMutable();
-                  unpackedBool_.addBoolean(v);
-                  break;
-                } // case 808
-              case 810:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureUnpackedBoolIsMutable(alloc / 1);
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedBool_.addBoolean(input.readBool());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 810
-              case 816:
-                {
+                }
+                input.popLimit(oldLimit);
+                break;
+              } // case 418
+              case 450: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+                mapInt32Int32__ = input.readMessage(
+                    MapInt32Int32DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapInt32Int32().getMutableMap().put(
+                    mapInt32Int32__.getKey(), mapInt32Int32__.getValue());
+                bitField2_ |= 0x00000010;
+                break;
+              } // case 450
+              case 458: {
+                com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+                mapInt64Int64__ = input.readMessage(
+                    MapInt64Int64DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapInt64Int64().getMutableMap().put(
+                    mapInt64Int64__.getKey(), mapInt64Int64__.getValue());
+                bitField2_ |= 0x00000020;
+                break;
+              } // case 458
+              case 466: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+                mapUint32Uint32__ = input.readMessage(
+                    MapUint32Uint32DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapUint32Uint32().getMutableMap().put(
+                    mapUint32Uint32__.getKey(), mapUint32Uint32__.getValue());
+                bitField2_ |= 0x00000040;
+                break;
+              } // case 466
+              case 474: {
+                com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+                mapUint64Uint64__ = input.readMessage(
+                    MapUint64Uint64DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapUint64Uint64().getMutableMap().put(
+                    mapUint64Uint64__.getKey(), mapUint64Uint64__.getValue());
+                bitField2_ |= 0x00000080;
+                break;
+              } // case 474
+              case 482: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+                mapSint32Sint32__ = input.readMessage(
+                    MapSint32Sint32DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapSint32Sint32().getMutableMap().put(
+                    mapSint32Sint32__.getKey(), mapSint32Sint32__.getValue());
+                bitField2_ |= 0x00000100;
+                break;
+              } // case 482
+              case 490: {
+                com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+                mapSint64Sint64__ = input.readMessage(
+                    MapSint64Sint64DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapSint64Sint64().getMutableMap().put(
+                    mapSint64Sint64__.getKey(), mapSint64Sint64__.getValue());
+                bitField2_ |= 0x00000200;
+                break;
+              } // case 490
+              case 498: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+                mapFixed32Fixed32__ = input.readMessage(
+                    MapFixed32Fixed32DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapFixed32Fixed32().getMutableMap().put(
+                    mapFixed32Fixed32__.getKey(), mapFixed32Fixed32__.getValue());
+                bitField2_ |= 0x00000400;
+                break;
+              } // case 498
+              case 506: {
+                com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+                mapFixed64Fixed64__ = input.readMessage(
+                    MapFixed64Fixed64DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapFixed64Fixed64().getMutableMap().put(
+                    mapFixed64Fixed64__.getKey(), mapFixed64Fixed64__.getValue());
+                bitField2_ |= 0x00000800;
+                break;
+              } // case 506
+              case 514: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+                mapSfixed32Sfixed32__ = input.readMessage(
+                    MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapSfixed32Sfixed32().getMutableMap().put(
+                    mapSfixed32Sfixed32__.getKey(), mapSfixed32Sfixed32__.getValue());
+                bitField2_ |= 0x00001000;
+                break;
+              } // case 514
+              case 522: {
+                com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+                mapSfixed64Sfixed64__ = input.readMessage(
+                    MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapSfixed64Sfixed64().getMutableMap().put(
+                    mapSfixed64Sfixed64__.getKey(), mapSfixed64Sfixed64__.getValue());
+                bitField2_ |= 0x00002000;
+                break;
+              } // case 522
+              case 530: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float>
+                mapInt32Float__ = input.readMessage(
+                    MapInt32FloatDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapInt32Float().getMutableMap().put(
+                    mapInt32Float__.getKey(), mapInt32Float__.getValue());
+                bitField2_ |= 0x00004000;
+                break;
+              } // case 530
+              case 538: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Double>
+                mapInt32Double__ = input.readMessage(
+                    MapInt32DoubleDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapInt32Double().getMutableMap().put(
+                    mapInt32Double__.getKey(), mapInt32Double__.getValue());
+                bitField2_ |= 0x00008000;
+                break;
+              } // case 538
+              case 546: {
+                com.google.protobuf.MapEntry<java.lang.Boolean, java.lang.Boolean>
+                mapBoolBool__ = input.readMessage(
+                    MapBoolBoolDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapBoolBool().getMutableMap().put(
+                    mapBoolBool__.getKey(), mapBoolBool__.getValue());
+                bitField2_ |= 0x00010000;
+                break;
+              } // case 546
+              case 554: {
+                com.google.protobuf.MapEntry<java.lang.String, java.lang.String>
+                mapStringString__ = input.readMessage(
+                    MapStringStringDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapStringString().getMutableMap().put(
+                    mapStringString__.getKey(), mapStringString__.getValue());
+                bitField2_ |= 0x00020000;
+                break;
+              } // case 554
+              case 562: {
+                com.google.protobuf.MapEntry<java.lang.String, com.google.protobuf.ByteString>
+                mapStringBytes__ = input.readMessage(
+                    MapStringBytesDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapStringBytes().getMutableMap().put(
+                    mapStringBytes__.getKey(), mapStringBytes__.getValue());
+                bitField2_ |= 0x00040000;
+                break;
+              } // case 562
+              case 570: {
+                com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
+                mapStringNestedMessage__ = input.readMessage(
+                    MapStringNestedMessageDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapStringNestedMessage().ensureBuilderMap().put(
+                    mapStringNestedMessage__.getKey(), mapStringNestedMessage__.getValue());
+                bitField2_ |= 0x00080000;
+                break;
+              } // case 570
+              case 578: {
+                com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
+                mapStringForeignMessage__ = input.readMessage(
+                    MapStringForeignMessageDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapStringForeignMessage().ensureBuilderMap().put(
+                    mapStringForeignMessage__.getKey(), mapStringForeignMessage__.getValue());
+                bitField2_ |= 0x00100000;
+                break;
+              } // case 578
+              case 586: {
+                com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer>
+                mapStringNestedEnum__ = input.readMessage(
+                    MapStringNestedEnumDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapStringNestedEnum().getMutableMap().put(
+                    mapStringNestedEnum__.getKey(), mapStringNestedEnum__.getValue());
+                bitField2_ |= 0x00200000;
+                break;
+              } // case 586
+              case 594: {
+                com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer>
+                mapStringForeignEnum__ = input.readMessage(
+                    MapStringForeignEnumDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapStringForeignEnum().getMutableMap().put(
+                    mapStringForeignEnum__.getKey(), mapStringForeignEnum__.getValue());
+                bitField2_ |= 0x00400000;
+                break;
+              } // case 594
+              case 600: {
+                int v = input.readInt32();
+                ensurePackedInt32IsMutable();
+                packedInt32_.addInt(v);
+                break;
+              } // case 600
+              case 602: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedInt32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedInt32_.addInt(input.readInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 602
+              case 608: {
+                long v = input.readInt64();
+                ensurePackedInt64IsMutable();
+                packedInt64_.addLong(v);
+                break;
+              } // case 608
+              case 610: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedInt64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedInt64_.addLong(input.readInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 610
+              case 616: {
+                int v = input.readUInt32();
+                ensurePackedUint32IsMutable();
+                packedUint32_.addInt(v);
+                break;
+              } // case 616
+              case 618: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedUint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedUint32_.addInt(input.readUInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 618
+              case 624: {
+                long v = input.readUInt64();
+                ensurePackedUint64IsMutable();
+                packedUint64_.addLong(v);
+                break;
+              } // case 624
+              case 626: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedUint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedUint64_.addLong(input.readUInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 626
+              case 632: {
+                int v = input.readSInt32();
+                ensurePackedSint32IsMutable();
+                packedSint32_.addInt(v);
+                break;
+              } // case 632
+              case 634: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedSint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedSint32_.addInt(input.readSInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 634
+              case 640: {
+                long v = input.readSInt64();
+                ensurePackedSint64IsMutable();
+                packedSint64_.addLong(v);
+                break;
+              } // case 640
+              case 642: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedSint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedSint64_.addLong(input.readSInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 642
+              case 653: {
+                int v = input.readFixed32();
+                ensurePackedFixed32IsMutable();
+                packedFixed32_.addInt(v);
+                break;
+              } // case 653
+              case 650: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedFixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedFixed32_.addInt(input.readFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 650
+              case 657: {
+                long v = input.readFixed64();
+                ensurePackedFixed64IsMutable();
+                packedFixed64_.addLong(v);
+                break;
+              } // case 657
+              case 658: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedFixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedFixed64_.addLong(input.readFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 658
+              case 669: {
+                int v = input.readSFixed32();
+                ensurePackedSfixed32IsMutable();
+                packedSfixed32_.addInt(v);
+                break;
+              } // case 669
+              case 666: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedSfixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedSfixed32_.addInt(input.readSFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 666
+              case 673: {
+                long v = input.readSFixed64();
+                ensurePackedSfixed64IsMutable();
+                packedSfixed64_.addLong(v);
+                break;
+              } // case 673
+              case 674: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedSfixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedSfixed64_.addLong(input.readSFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 674
+              case 685: {
+                float v = input.readFloat();
+                ensurePackedFloatIsMutable();
+                packedFloat_.addFloat(v);
+                break;
+              } // case 685
+              case 682: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedFloatIsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedFloat_.addFloat(input.readFloat());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 682
+              case 689: {
+                double v = input.readDouble();
+                ensurePackedDoubleIsMutable();
+                packedDouble_.addDouble(v);
+                break;
+              } // case 689
+              case 690: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedDoubleIsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedDouble_.addDouble(input.readDouble());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 690
+              case 696: {
+                boolean v = input.readBool();
+                ensurePackedBoolIsMutable();
+                packedBool_.addBoolean(v);
+                break;
+              } // case 696
+              case 698: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedBoolIsMutable(alloc / 1);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedBool_.addBoolean(input.readBool());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 698
+              case 704: {
+                int tmpRaw = input.readEnum();
+                ensurePackedNestedEnumIsMutable();
+                packedNestedEnum_.add(tmpRaw);
+                break;
+              } // case 704
+              case 706: {
+                int length = input.readRawVarint32();
+                int oldLimit = input.pushLimit(length);
+                while(input.getBytesUntilLimit() > 0) {
+                  int tmpRaw = input.readEnum();
+                  ensurePackedNestedEnumIsMutable();
+                  packedNestedEnum_.add(tmpRaw);
+                }
+                input.popLimit(oldLimit);
+                break;
+              } // case 706
+              case 712: {
+                int v = input.readInt32();
+                ensureUnpackedInt32IsMutable();
+                unpackedInt32_.addInt(v);
+                break;
+              } // case 712
+              case 714: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedInt32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedInt32_.addInt(input.readInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 714
+              case 720: {
+                long v = input.readInt64();
+                ensureUnpackedInt64IsMutable();
+                unpackedInt64_.addLong(v);
+                break;
+              } // case 720
+              case 722: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedInt64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedInt64_.addLong(input.readInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 722
+              case 728: {
+                int v = input.readUInt32();
+                ensureUnpackedUint32IsMutable();
+                unpackedUint32_.addInt(v);
+                break;
+              } // case 728
+              case 730: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedUint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedUint32_.addInt(input.readUInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 730
+              case 736: {
+                long v = input.readUInt64();
+                ensureUnpackedUint64IsMutable();
+                unpackedUint64_.addLong(v);
+                break;
+              } // case 736
+              case 738: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedUint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedUint64_.addLong(input.readUInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 738
+              case 744: {
+                int v = input.readSInt32();
+                ensureUnpackedSint32IsMutable();
+                unpackedSint32_.addInt(v);
+                break;
+              } // case 744
+              case 746: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedSint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedSint32_.addInt(input.readSInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 746
+              case 752: {
+                long v = input.readSInt64();
+                ensureUnpackedSint64IsMutable();
+                unpackedSint64_.addLong(v);
+                break;
+              } // case 752
+              case 754: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedSint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedSint64_.addLong(input.readSInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 754
+              case 765: {
+                int v = input.readFixed32();
+                ensureUnpackedFixed32IsMutable();
+                unpackedFixed32_.addInt(v);
+                break;
+              } // case 765
+              case 762: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedFixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedFixed32_.addInt(input.readFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 762
+              case 769: {
+                long v = input.readFixed64();
+                ensureUnpackedFixed64IsMutable();
+                unpackedFixed64_.addLong(v);
+                break;
+              } // case 769
+              case 770: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedFixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedFixed64_.addLong(input.readFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 770
+              case 781: {
+                int v = input.readSFixed32();
+                ensureUnpackedSfixed32IsMutable();
+                unpackedSfixed32_.addInt(v);
+                break;
+              } // case 781
+              case 778: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedSfixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedSfixed32_.addInt(input.readSFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 778
+              case 785: {
+                long v = input.readSFixed64();
+                ensureUnpackedSfixed64IsMutable();
+                unpackedSfixed64_.addLong(v);
+                break;
+              } // case 785
+              case 786: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedSfixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedSfixed64_.addLong(input.readSFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 786
+              case 797: {
+                float v = input.readFloat();
+                ensureUnpackedFloatIsMutable();
+                unpackedFloat_.addFloat(v);
+                break;
+              } // case 797
+              case 794: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedFloatIsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedFloat_.addFloat(input.readFloat());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 794
+              case 801: {
+                double v = input.readDouble();
+                ensureUnpackedDoubleIsMutable();
+                unpackedDouble_.addDouble(v);
+                break;
+              } // case 801
+              case 802: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedDoubleIsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedDouble_.addDouble(input.readDouble());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 802
+              case 808: {
+                boolean v = input.readBool();
+                ensureUnpackedBoolIsMutable();
+                unpackedBool_.addBoolean(v);
+                break;
+              } // case 808
+              case 810: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedBoolIsMutable(alloc / 1);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedBool_.addBoolean(input.readBool());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 810
+              case 816: {
+                int tmpRaw = input.readEnum();
+                ensureUnpackedNestedEnumIsMutable();
+                unpackedNestedEnum_.add(tmpRaw);
+                break;
+              } // case 816
+              case 818: {
+                int length = input.readRawVarint32();
+                int oldLimit = input.pushLimit(length);
+                while(input.getBytesUntilLimit() > 0) {
                   int tmpRaw = input.readEnum();
                   ensureUnpackedNestedEnumIsMutable();
                   unpackedNestedEnum_.add(tmpRaw);
-                  break;
-                } // case 816
-              case 818:
-                {
-                  int length = input.readRawVarint32();
-                  int oldLimit = input.pushLimit(length);
-                  while (input.getBytesUntilLimit() > 0) {
-                    int tmpRaw = input.readEnum();
-                    ensureUnpackedNestedEnumIsMutable();
-                    unpackedNestedEnum_.add(tmpRaw);
-                  }
-                  input.popLimit(oldLimit);
-                  break;
-                } // case 818
-              case 888:
-                {
-                  oneofField_ = input.readUInt32();
-                  oneofFieldCase_ = 111;
-                  break;
-                } // case 888
-              case 898:
-                {
-                  input.readMessage(
-                      getOneofNestedMessageFieldBuilder().getBuilder(), extensionRegistry);
-                  oneofFieldCase_ = 112;
-                  break;
-                } // case 898
-              case 906:
-                {
-                  java.lang.String s = input.readStringRequireUtf8();
-                  oneofFieldCase_ = 113;
-                  oneofField_ = s;
-                  break;
-                } // case 906
-              case 914:
-                {
-                  oneofField_ = input.readBytes();
-                  oneofFieldCase_ = 114;
-                  break;
-                } // case 914
-              case 920:
-                {
-                  oneofField_ = input.readBool();
-                  oneofFieldCase_ = 115;
-                  break;
-                } // case 920
-              case 928:
-                {
-                  oneofField_ = input.readUInt64();
-                  oneofFieldCase_ = 116;
-                  break;
-                } // case 928
-              case 941:
-                {
-                  oneofField_ = input.readFloat();
-                  oneofFieldCase_ = 117;
-                  break;
-                } // case 941
-              case 945:
-                {
-                  oneofField_ = input.readDouble();
-                  oneofFieldCase_ = 118;
-                  break;
-                } // case 945
-              case 952:
-                {
-                  int rawValue = input.readEnum();
-                  oneofFieldCase_ = 119;
-                  oneofField_ = rawValue;
-                  break;
-                } // case 952
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
+                }
+                input.popLimit(oldLimit);
+                break;
+              } // case 818
+              case 888: {
+                oneofField_ = input.readUInt32();
+                oneofFieldCase_ = 111;
+                break;
+              } // case 888
+              case 898: {
+                input.readMessage(
+                    getOneofNestedMessageFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                oneofFieldCase_ = 112;
+                break;
+              } // case 898
+              case 906: {
+                java.lang.String s = input.readStringRequireUtf8();
+                oneofFieldCase_ = 113;
+                oneofField_ = s;
+                break;
+              } // case 906
+              case 914: {
+                oneofField_ = input.readBytes();
+                oneofFieldCase_ = 114;
+                break;
+              } // case 914
+              case 920: {
+                oneofField_ = input.readBool();
+                oneofFieldCase_ = 115;
+                break;
+              } // case 920
+              case 928: {
+                oneofField_ = input.readUInt64();
+                oneofFieldCase_ = 116;
+                break;
+              } // case 928
+              case 941: {
+                oneofField_ = input.readFloat();
+                oneofFieldCase_ = 117;
+                break;
+              } // case 941
+              case 945: {
+                oneofField_ = input.readDouble();
+                oneofFieldCase_ = 118;
+                break;
+              } // case 945
+              case 952: {
+                int rawValue = input.readEnum();
+                oneofFieldCase_ = 119;
+                oneofField_ = rawValue;
+                break;
+              } // case 952
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
             } // switch (tag)
           } // while (!done)
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -14047,12 +12830,12 @@ public Builder mergeFrom(
         } // finally
         return this;
       }
-
       private int oneofFieldCase_ = 0;
       private java.lang.Object oneofField_;
-
-      public OneofFieldCase getOneofFieldCase() {
-        return OneofFieldCase.forNumber(oneofFieldCase_);
+      public OneofFieldCase
+          getOneofFieldCase() {
+        return OneofFieldCase.forNumber(
+            oneofFieldCase_);
       }
 
       public Builder clearOneofField() {
@@ -14066,21 +12849,17 @@ public Builder clearOneofField() {
       private int bitField1_;
       private int bitField2_;
 
-      private int optionalInt32_;
-
+      private int optionalInt32_ ;
       /**
        * <code>int32 optional_int32 = 1;</code>
-       *
        * @return The optionalInt32.
        */
       @java.lang.Override
       public int getOptionalInt32() {
         return optionalInt32_;
       }
-
       /**
        * <code>int32 optional_int32 = 1;</code>
-       *
        * @param value The optionalInt32 to set.
        * @return This builder for chaining.
        */
@@ -14091,10 +12870,8 @@ public Builder setOptionalInt32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>int32 optional_int32 = 1;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalInt32() {
@@ -14104,21 +12881,17 @@ public Builder clearOptionalInt32() {
         return this;
       }
 
-      private long optionalInt64_;
-
+      private long optionalInt64_ ;
       /**
        * <code>int64 optional_int64 = 2;</code>
-       *
        * @return The optionalInt64.
        */
       @java.lang.Override
       public long getOptionalInt64() {
         return optionalInt64_;
       }
-
       /**
        * <code>int64 optional_int64 = 2;</code>
-       *
        * @param value The optionalInt64 to set.
        * @return This builder for chaining.
        */
@@ -14129,10 +12902,8 @@ public Builder setOptionalInt64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>int64 optional_int64 = 2;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalInt64() {
@@ -14142,21 +12913,17 @@ public Builder clearOptionalInt64() {
         return this;
       }
 
-      private int optionalUint32_;
-
+      private int optionalUint32_ ;
       /**
        * <code>uint32 optional_uint32 = 3;</code>
-       *
        * @return The optionalUint32.
        */
       @java.lang.Override
       public int getOptionalUint32() {
         return optionalUint32_;
       }
-
       /**
        * <code>uint32 optional_uint32 = 3;</code>
-       *
        * @param value The optionalUint32 to set.
        * @return This builder for chaining.
        */
@@ -14167,10 +12934,8 @@ public Builder setOptionalUint32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>uint32 optional_uint32 = 3;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalUint32() {
@@ -14180,21 +12945,17 @@ public Builder clearOptionalUint32() {
         return this;
       }
 
-      private long optionalUint64_;
-
+      private long optionalUint64_ ;
       /**
        * <code>uint64 optional_uint64 = 4;</code>
-       *
        * @return The optionalUint64.
        */
       @java.lang.Override
       public long getOptionalUint64() {
         return optionalUint64_;
       }
-
       /**
        * <code>uint64 optional_uint64 = 4;</code>
-       *
        * @param value The optionalUint64 to set.
        * @return This builder for chaining.
        */
@@ -14205,10 +12966,8 @@ public Builder setOptionalUint64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>uint64 optional_uint64 = 4;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalUint64() {
@@ -14218,21 +12977,17 @@ public Builder clearOptionalUint64() {
         return this;
       }
 
-      private int optionalSint32_;
-
+      private int optionalSint32_ ;
       /**
        * <code>sint32 optional_sint32 = 5;</code>
-       *
        * @return The optionalSint32.
        */
       @java.lang.Override
       public int getOptionalSint32() {
         return optionalSint32_;
       }
-
       /**
        * <code>sint32 optional_sint32 = 5;</code>
-       *
        * @param value The optionalSint32 to set.
        * @return This builder for chaining.
        */
@@ -14243,10 +12998,8 @@ public Builder setOptionalSint32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>sint32 optional_sint32 = 5;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalSint32() {
@@ -14256,21 +13009,17 @@ public Builder clearOptionalSint32() {
         return this;
       }
 
-      private long optionalSint64_;
-
+      private long optionalSint64_ ;
       /**
        * <code>sint64 optional_sint64 = 6;</code>
-       *
        * @return The optionalSint64.
        */
       @java.lang.Override
       public long getOptionalSint64() {
         return optionalSint64_;
       }
-
       /**
        * <code>sint64 optional_sint64 = 6;</code>
-       *
        * @param value The optionalSint64 to set.
        * @return This builder for chaining.
        */
@@ -14281,10 +13030,8 @@ public Builder setOptionalSint64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>sint64 optional_sint64 = 6;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalSint64() {
@@ -14294,21 +13041,17 @@ public Builder clearOptionalSint64() {
         return this;
       }
 
-      private int optionalFixed32_;
-
+      private int optionalFixed32_ ;
       /**
        * <code>fixed32 optional_fixed32 = 7;</code>
-       *
        * @return The optionalFixed32.
        */
       @java.lang.Override
       public int getOptionalFixed32() {
         return optionalFixed32_;
       }
-
       /**
        * <code>fixed32 optional_fixed32 = 7;</code>
-       *
        * @param value The optionalFixed32 to set.
        * @return This builder for chaining.
        */
@@ -14319,10 +13062,8 @@ public Builder setOptionalFixed32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>fixed32 optional_fixed32 = 7;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalFixed32() {
@@ -14332,21 +13073,17 @@ public Builder clearOptionalFixed32() {
         return this;
       }
 
-      private long optionalFixed64_;
-
+      private long optionalFixed64_ ;
       /**
        * <code>fixed64 optional_fixed64 = 8;</code>
-       *
        * @return The optionalFixed64.
        */
       @java.lang.Override
       public long getOptionalFixed64() {
         return optionalFixed64_;
       }
-
       /**
        * <code>fixed64 optional_fixed64 = 8;</code>
-       *
        * @param value The optionalFixed64 to set.
        * @return This builder for chaining.
        */
@@ -14357,10 +13094,8 @@ public Builder setOptionalFixed64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>fixed64 optional_fixed64 = 8;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalFixed64() {
@@ -14370,21 +13105,17 @@ public Builder clearOptionalFixed64() {
         return this;
       }
 
-      private int optionalSfixed32_;
-
+      private int optionalSfixed32_ ;
       /**
        * <code>sfixed32 optional_sfixed32 = 9;</code>
-       *
        * @return The optionalSfixed32.
        */
       @java.lang.Override
       public int getOptionalSfixed32() {
         return optionalSfixed32_;
       }
-
       /**
        * <code>sfixed32 optional_sfixed32 = 9;</code>
-       *
        * @param value The optionalSfixed32 to set.
        * @return This builder for chaining.
        */
@@ -14395,10 +13126,8 @@ public Builder setOptionalSfixed32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>sfixed32 optional_sfixed32 = 9;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalSfixed32() {
@@ -14408,21 +13137,17 @@ public Builder clearOptionalSfixed32() {
         return this;
       }
 
-      private long optionalSfixed64_;
-
+      private long optionalSfixed64_ ;
       /**
        * <code>sfixed64 optional_sfixed64 = 10;</code>
-       *
        * @return The optionalSfixed64.
        */
       @java.lang.Override
       public long getOptionalSfixed64() {
         return optionalSfixed64_;
       }
-
       /**
        * <code>sfixed64 optional_sfixed64 = 10;</code>
-       *
        * @param value The optionalSfixed64 to set.
        * @return This builder for chaining.
        */
@@ -14433,10 +13158,8 @@ public Builder setOptionalSfixed64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>sfixed64 optional_sfixed64 = 10;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalSfixed64() {
@@ -14446,21 +13169,17 @@ public Builder clearOptionalSfixed64() {
         return this;
       }
 
-      private float optionalFloat_;
-
+      private float optionalFloat_ ;
       /**
        * <code>float optional_float = 11;</code>
-       *
        * @return The optionalFloat.
        */
       @java.lang.Override
       public float getOptionalFloat() {
         return optionalFloat_;
       }
-
       /**
        * <code>float optional_float = 11;</code>
-       *
        * @param value The optionalFloat to set.
        * @return This builder for chaining.
        */
@@ -14471,10 +13190,8 @@ public Builder setOptionalFloat(float value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>float optional_float = 11;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalFloat() {
@@ -14484,21 +13201,17 @@ public Builder clearOptionalFloat() {
         return this;
       }
 
-      private double optionalDouble_;
-
+      private double optionalDouble_ ;
       /**
        * <code>double optional_double = 12;</code>
-       *
        * @return The optionalDouble.
        */
       @java.lang.Override
       public double getOptionalDouble() {
         return optionalDouble_;
       }
-
       /**
        * <code>double optional_double = 12;</code>
-       *
        * @param value The optionalDouble to set.
        * @return This builder for chaining.
        */
@@ -14509,10 +13222,8 @@ public Builder setOptionalDouble(double value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>double optional_double = 12;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalDouble() {
@@ -14522,21 +13233,17 @@ public Builder clearOptionalDouble() {
         return this;
       }
 
-      private boolean optionalBool_;
-
+      private boolean optionalBool_ ;
       /**
        * <code>bool optional_bool = 13;</code>
-       *
        * @return The optionalBool.
        */
       @java.lang.Override
       public boolean getOptionalBool() {
         return optionalBool_;
       }
-
       /**
        * <code>bool optional_bool = 13;</code>
-       *
        * @param value The optionalBool to set.
        * @return This builder for chaining.
        */
@@ -14547,10 +13254,8 @@ public Builder setOptionalBool(boolean value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>bool optional_bool = 13;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalBool() {
@@ -14561,16 +13266,15 @@ public Builder clearOptionalBool() {
       }
 
       private java.lang.Object optionalString_ = "";
-
       /**
        * <code>string optional_string = 14;</code>
-       *
        * @return The optionalString.
        */
       public java.lang.String getOptionalString() {
         java.lang.Object ref = optionalString_;
         if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           optionalString_ = s;
           return s;
@@ -14578,43 +13282,38 @@ public java.lang.String getOptionalString() {
           return (java.lang.String) ref;
         }
       }
-
       /**
        * <code>string optional_string = 14;</code>
-       *
        * @return The bytes for optionalString.
        */
-      public com.google.protobuf.ByteString getOptionalStringBytes() {
+      public com.google.protobuf.ByteString
+          getOptionalStringBytes() {
         java.lang.Object ref = optionalString_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
-              com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
           optionalString_ = b;
           return b;
         } else {
           return (com.google.protobuf.ByteString) ref;
         }
       }
-
       /**
        * <code>string optional_string = 14;</code>
-       *
        * @param value The optionalString to set.
        * @return This builder for chaining.
        */
-      public Builder setOptionalString(java.lang.String value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setOptionalString(
+          java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
         optionalString_ = value;
         bitField0_ |= 0x00002000;
         onChanged();
         return this;
       }
-
       /**
        * <code>string optional_string = 14;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalString() {
@@ -14623,17 +13322,14 @@ public Builder clearOptionalString() {
         onChanged();
         return this;
       }
-
       /**
        * <code>string optional_string = 14;</code>
-       *
        * @param value The bytes for optionalString to set.
        * @return This builder for chaining.
        */
-      public Builder setOptionalStringBytes(com.google.protobuf.ByteString value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setOptionalStringBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
         checkByteStringIsUtf8(value);
         optionalString_ = value;
         bitField0_ |= 0x00002000;
@@ -14642,36 +13338,28 @@ public Builder setOptionalStringBytes(com.google.protobuf.ByteString value) {
       }
 
       private com.google.protobuf.ByteString optionalBytes_ = com.google.protobuf.ByteString.EMPTY;
-
       /**
        * <code>bytes optional_bytes = 15;</code>
-       *
        * @return The optionalBytes.
        */
       @java.lang.Override
       public com.google.protobuf.ByteString getOptionalBytes() {
         return optionalBytes_;
       }
-
       /**
        * <code>bytes optional_bytes = 15;</code>
-       *
        * @param value The optionalBytes to set.
        * @return This builder for chaining.
        */
       public Builder setOptionalBytes(com.google.protobuf.ByteString value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         optionalBytes_ = value;
         bitField0_ |= 0x00004000;
         onChanged();
         return this;
       }
-
       /**
        * <code>bytes optional_bytes = 15;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalBytes() {
@@ -14681,54 +13369,31 @@ public Builder clearOptionalBytes() {
         return this;
       }
 
-      private legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-          optionalNestedMessage_;
+      private legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage optionalNestedMessage_;
       private com.google.protobuf.SingleFieldBuilderV3<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .NestedMessageOrBuilder>
-          optionalNestedMessageBuilder_;
-
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> optionalNestedMessageBuilder_;
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
        * @return Whether the optionalNestedMessage field is set.
        */
       public boolean hasOptionalNestedMessage() {
         return ((bitField0_ & 0x00008000) != 0);
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
        * @return The optionalNestedMessage.
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-          getOptionalNestedMessage() {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getOptionalNestedMessage() {
         if (optionalNestedMessageBuilder_ == null) {
-          return optionalNestedMessage_ == null
-              ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .getDefaultInstance()
-              : optionalNestedMessage_;
+          return optionalNestedMessage_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance() : optionalNestedMessage_;
         } else {
           return optionalNestedMessageBuilder_.getMessage();
         }
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
        */
-      public Builder setOptionalNestedMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              value) {
+      public Builder setOptionalNestedMessage(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage value) {
         if (optionalNestedMessageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -14741,16 +13406,11 @@ public Builder setOptionalNestedMessage(
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
        */
       public Builder setOptionalNestedMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder
-              builderForValue) {
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder builderForValue) {
         if (optionalNestedMessageBuilder_ == null) {
           optionalNestedMessage_ = builderForValue.build();
         } else {
@@ -14760,21 +13420,14 @@ public Builder setOptionalNestedMessage(
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
        */
-      public Builder mergeOptionalNestedMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              value) {
+      public Builder mergeOptionalNestedMessage(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage value) {
         if (optionalNestedMessageBuilder_ == null) {
-          if (((bitField0_ & 0x00008000) != 0)
-              && optionalNestedMessage_ != null
-              && optionalNestedMessage_
-                  != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage.getDefaultInstance()) {
+          if (((bitField0_ & 0x00008000) != 0) &&
+            optionalNestedMessage_ != null &&
+            optionalNestedMessage_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance()) {
             getOptionalNestedMessageBuilder().mergeFrom(value);
           } else {
             optionalNestedMessage_ = value;
@@ -14788,11 +13441,8 @@ public Builder mergeOptionalNestedMessage(
         }
         return this;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
        */
       public Builder clearOptionalNestedMessage() {
         bitField0_ = (bitField0_ & ~0x00008000);
@@ -14804,102 +13454,67 @@ public Builder clearOptionalNestedMessage() {
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .Builder
-          getOptionalNestedMessageBuilder() {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder getOptionalNestedMessageBuilder() {
         bitField0_ |= 0x00008000;
         onChanged();
         return getOptionalNestedMessageFieldBuilder().getBuilder();
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessageOrBuilder
-          getOptionalNestedMessageOrBuilder() {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder getOptionalNestedMessageOrBuilder() {
         if (optionalNestedMessageBuilder_ != null) {
           return optionalNestedMessageBuilder_.getMessageOrBuilder();
         } else {
-          return optionalNestedMessage_ == null
-              ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .getDefaultInstance()
-              : optionalNestedMessage_;
+          return optionalNestedMessage_ == null ?
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance() : optionalNestedMessage_;
         }
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .NestedMessageOrBuilder>
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> 
           getOptionalNestedMessageFieldBuilder() {
         if (optionalNestedMessageBuilder_ == null) {
-          optionalNestedMessageBuilder_ =
-              new com.google.protobuf.SingleFieldBuilderV3<
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage.Builder,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessageOrBuilder>(
-                  getOptionalNestedMessage(), getParentForChildren(), isClean());
+          optionalNestedMessageBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder>(
+                  getOptionalNestedMessage(),
+                  getParentForChildren(),
+                  isClean());
           optionalNestedMessage_ = null;
         }
         return optionalNestedMessageBuilder_;
       }
 
-      private legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-          optionalForeignMessage_;
+      private legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage optionalForeignMessage_;
       private com.google.protobuf.SingleFieldBuilderV3<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>
-          optionalForeignMessageBuilder_;
-
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder> optionalForeignMessageBuilder_;
       /**
        * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
-       *
        * @return Whether the optionalForeignMessage field is set.
        */
       public boolean hasOptionalForeignMessage() {
         return ((bitField0_ & 0x00010000) != 0);
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
-       *
        * @return The optionalForeignMessage.
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-          getOptionalForeignMessage() {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getOptionalForeignMessage() {
         if (optionalForeignMessageBuilder_ == null) {
-          return optionalForeignMessage_ == null
-              ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-                  .getDefaultInstance()
-              : optionalForeignMessage_;
+          return optionalForeignMessage_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance() : optionalForeignMessage_;
         } else {
           return optionalForeignMessageBuilder_.getMessage();
         }
       }
-
-      /** <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code> */
-      public Builder setOptionalForeignMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage value) {
+      /**
+       * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
+       */
+      public Builder setOptionalForeignMessage(legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage value) {
         if (optionalForeignMessageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -14912,11 +13527,11 @@ public Builder setOptionalForeignMessage(
         onChanged();
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code> */
+      /**
+       * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
+       */
       public Builder setOptionalForeignMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder
-              builderForValue) {
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder builderForValue) {
         if (optionalForeignMessageBuilder_ == null) {
           optionalForeignMessage_ = builderForValue.build();
         } else {
@@ -14926,16 +13541,14 @@ public Builder setOptionalForeignMessage(
         onChanged();
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code> */
-      public Builder mergeOptionalForeignMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage value) {
+      /**
+       * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
+       */
+      public Builder mergeOptionalForeignMessage(legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage value) {
         if (optionalForeignMessageBuilder_ == null) {
-          if (((bitField0_ & 0x00010000) != 0)
-              && optionalForeignMessage_ != null
-              && optionalForeignMessage_
-                  != legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-                      .getDefaultInstance()) {
+          if (((bitField0_ & 0x00010000) != 0) &&
+            optionalForeignMessage_ != null &&
+            optionalForeignMessage_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance()) {
             getOptionalForeignMessageBuilder().mergeFrom(value);
           } else {
             optionalForeignMessage_ = value;
@@ -14949,8 +13562,9 @@ public Builder mergeOptionalForeignMessage(
         }
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code> */
+      /**
+       * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
+       */
       public Builder clearOptionalForeignMessage() {
         bitField0_ = (bitField0_ & ~0x00010000);
         optionalForeignMessage_ = null;
@@ -14961,63 +13575,52 @@ public Builder clearOptionalForeignMessage() {
         onChanged();
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code> */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder
-          getOptionalForeignMessageBuilder() {
+      /**
+       * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
+       */
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder getOptionalForeignMessageBuilder() {
         bitField0_ |= 0x00010000;
         onChanged();
         return getOptionalForeignMessageFieldBuilder().getBuilder();
       }
-
-      /** <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code> */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder
-          getOptionalForeignMessageOrBuilder() {
+      /**
+       * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
+       */
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder getOptionalForeignMessageOrBuilder() {
         if (optionalForeignMessageBuilder_ != null) {
           return optionalForeignMessageBuilder_.getMessageOrBuilder();
         } else {
-          return optionalForeignMessage_ == null
-              ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-                  .getDefaultInstance()
-              : optionalForeignMessage_;
+          return optionalForeignMessage_ == null ?
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance() : optionalForeignMessage_;
         }
       }
-
-      /** <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code> */
+      /**
+       * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
+       */
       private com.google.protobuf.SingleFieldBuilderV3<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder> 
           getOptionalForeignMessageFieldBuilder() {
         if (optionalForeignMessageBuilder_ == null) {
-          optionalForeignMessageBuilder_ =
-              new com.google.protobuf.SingleFieldBuilderV3<
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>(
-                  getOptionalForeignMessage(), getParentForChildren(), isClean());
+          optionalForeignMessageBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>(
+                  getOptionalForeignMessage(),
+                  getParentForChildren(),
+                  isClean());
           optionalForeignMessage_ = null;
         }
         return optionalForeignMessageBuilder_;
       }
 
       private int optionalNestedEnum_ = 0;
-
       /**
-       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;</code>
        * @return The enum numeric value on the wire for optionalNestedEnum.
        */
-      @java.lang.Override
-      public int getOptionalNestedEnumValue() {
+      @java.lang.Override public int getOptionalNestedEnumValue() {
         return optionalNestedEnum_;
       }
-
       /**
-       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;</code>
        * @param value The enum numeric value on the wire for optionalNestedEnum to set.
        * @return This builder for chaining.
        */
@@ -15027,34 +13630,21 @@ public Builder setOptionalNestedEnumValue(int value) {
         onChanged();
         return this;
       }
-
       /**
-       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;</code>
        * @return The optionalNestedEnum.
        */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-          getOptionalNestedEnum() {
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum result =
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                .forNumber(optionalNestedEnum_);
-        return result == null
-            ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                .UNRECOGNIZED
-            : result;
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getOptionalNestedEnum() {
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.forNumber(optionalNestedEnum_);
+        return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.UNRECOGNIZED : result;
       }
-
       /**
-       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;</code>
        * @param value The optionalNestedEnum to set.
        * @return This builder for chaining.
        */
-      public Builder setOptionalNestedEnum(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
+      public Builder setOptionalNestedEnum(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -15063,11 +13653,8 @@ public Builder setOptionalNestedEnum(
         onChanged();
         return this;
       }
-
       /**
-       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;</code>
        * @return This builder for chaining.
        */
       public Builder clearOptionalNestedEnum() {
@@ -15078,20 +13665,15 @@ public Builder clearOptionalNestedEnum() {
       }
 
       private int optionalForeignEnum_ = 0;
-
       /**
        * <code>.legacy_gencode_test.proto3.ForeignEnum optional_foreign_enum = 22;</code>
-       *
        * @return The enum numeric value on the wire for optionalForeignEnum.
        */
-      @java.lang.Override
-      public int getOptionalForeignEnumValue() {
+      @java.lang.Override public int getOptionalForeignEnumValue() {
         return optionalForeignEnum_;
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.ForeignEnum optional_foreign_enum = 22;</code>
-       *
        * @param value The enum numeric value on the wire for optionalForeignEnum to set.
        * @return This builder for chaining.
        */
@@ -15101,31 +13683,21 @@ public Builder setOptionalForeignEnumValue(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.ForeignEnum optional_foreign_enum = 22;</code>
-       *
        * @return The optionalForeignEnum.
        */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum
-          getOptionalForeignEnum() {
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum result =
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.forNumber(
-                optionalForeignEnum_);
-        return result == null
-            ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.UNRECOGNIZED
-            : result;
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getOptionalForeignEnum() {
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.forNumber(optionalForeignEnum_);
+        return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.UNRECOGNIZED : result;
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.ForeignEnum optional_foreign_enum = 22;</code>
-       *
        * @param value The optionalForeignEnum to set.
        * @return This builder for chaining.
        */
-      public Builder setOptionalForeignEnum(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum value) {
+      public Builder setOptionalForeignEnum(legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -15134,10 +13706,8 @@ public Builder setOptionalForeignEnum(
         onChanged();
         return this;
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.ForeignEnum optional_foreign_enum = 22;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalForeignEnum() {
@@ -15148,24 +13718,15 @@ public Builder clearOptionalForeignEnum() {
       }
 
       private int optionalAliasedEnum_ = 0;
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;</code>
        * @return The enum numeric value on the wire for optionalAliasedEnum.
        */
-      @java.lang.Override
-      public int getOptionalAliasedEnumValue() {
+      @java.lang.Override public int getOptionalAliasedEnumValue() {
         return optionalAliasedEnum_;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;</code>
        * @param value The enum numeric value on the wire for optionalAliasedEnum to set.
        * @return This builder for chaining.
        */
@@ -15175,36 +13736,21 @@ public Builder setOptionalAliasedEnumValue(int value) {
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;</code>
        * @return The optionalAliasedEnum.
        */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum
-          getOptionalAliasedEnum() {
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum result =
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum
-                .forNumber(optionalAliasedEnum_);
-        return result == null
-            ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum
-                .UNRECOGNIZED
-            : result;
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum getOptionalAliasedEnum() {
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum.forNumber(optionalAliasedEnum_);
+        return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum.UNRECOGNIZED : result;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;</code>
        * @param value The optionalAliasedEnum to set.
        * @return This builder for chaining.
        */
-      public Builder setOptionalAliasedEnum(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum value) {
+      public Builder setOptionalAliasedEnum(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -15213,12 +13759,8 @@ public Builder setOptionalAliasedEnum(
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;</code>
        * @return This builder for chaining.
        */
       public Builder clearOptionalAliasedEnum() {
@@ -15228,43 +13770,31 @@ public Builder clearOptionalAliasedEnum() {
         return this;
       }
 
-      private legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-          recursiveMessage_;
+      private legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 recursiveMessage_;
       private com.google.protobuf.SingleFieldBuilderV3<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder>
-          recursiveMessageBuilder_;
-
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder> recursiveMessageBuilder_;
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
-       *
        * @return Whether the recursiveMessage field is set.
        */
       public boolean hasRecursiveMessage() {
         return ((bitField0_ & 0x00100000) != 0);
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
-       *
        * @return The recursiveMessage.
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-          getRecursiveMessage() {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 getRecursiveMessage() {
         if (recursiveMessageBuilder_ == null) {
-          return recursiveMessage_ == null
-              ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .getDefaultInstance()
-              : recursiveMessage_;
+          return recursiveMessage_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance() : recursiveMessage_;
         } else {
           return recursiveMessageBuilder_.getMessage();
         }
       }
-
-      /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code> */
-      public Builder setRecursiveMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 value) {
+      /**
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
+       */
+      public Builder setRecursiveMessage(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 value) {
         if (recursiveMessageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -15277,11 +13807,11 @@ public Builder setRecursiveMessage(
         onChanged();
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code> */
+      /**
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
+       */
       public Builder setRecursiveMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder
-              builderForValue) {
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder builderForValue) {
         if (recursiveMessageBuilder_ == null) {
           recursiveMessage_ = builderForValue.build();
         } else {
@@ -15291,16 +13821,14 @@ public Builder setRecursiveMessage(
         onChanged();
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code> */
-      public Builder mergeRecursiveMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 value) {
+      /**
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
+       */
+      public Builder mergeRecursiveMessage(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 value) {
         if (recursiveMessageBuilder_ == null) {
-          if (((bitField0_ & 0x00100000) != 0)
-              && recursiveMessage_ != null
-              && recursiveMessage_
-                  != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .getDefaultInstance()) {
+          if (((bitField0_ & 0x00100000) != 0) &&
+            recursiveMessage_ != null &&
+            recursiveMessage_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance()) {
             getRecursiveMessageBuilder().mergeFrom(value);
           } else {
             recursiveMessage_ = value;
@@ -15314,8 +13842,9 @@ public Builder mergeRecursiveMessage(
         }
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code> */
+      /**
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
+       */
       public Builder clearRecursiveMessage() {
         bitField0_ = (bitField0_ & ~0x00100000);
         recursiveMessage_ = null;
@@ -15326,116 +13855,97 @@ public Builder clearRecursiveMessage() {
         onChanged();
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code> */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder
-          getRecursiveMessageBuilder() {
+      /**
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
+       */
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder getRecursiveMessageBuilder() {
         bitField0_ |= 0x00100000;
         onChanged();
         return getRecursiveMessageFieldBuilder().getBuilder();
       }
-
-      /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code> */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder
-          getRecursiveMessageOrBuilder() {
+      /**
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
+       */
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder getRecursiveMessageOrBuilder() {
         if (recursiveMessageBuilder_ != null) {
           return recursiveMessageBuilder_.getMessageOrBuilder();
         } else {
-          return recursiveMessage_ == null
-              ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .getDefaultInstance()
-              : recursiveMessage_;
+          return recursiveMessage_ == null ?
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance() : recursiveMessage_;
         }
       }
-
-      /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code> */
+      /**
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
+       */
       private com.google.protobuf.SingleFieldBuilderV3<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder>
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder> 
           getRecursiveMessageFieldBuilder() {
         if (recursiveMessageBuilder_ == null) {
-          recursiveMessageBuilder_ =
-              new com.google.protobuf.SingleFieldBuilderV3<
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder>(
-                  getRecursiveMessage(), getParentForChildren(), isClean());
+          recursiveMessageBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder>(
+                  getRecursiveMessage(),
+                  getParentForChildren(),
+                  isClean());
           recursiveMessage_ = null;
         }
         return recursiveMessageBuilder_;
       }
 
       private com.google.protobuf.Internal.IntList repeatedInt32_ = emptyIntList();
-
       private void ensureRepeatedInt32IsMutable() {
         if (!repeatedInt32_.isModifiable()) {
           repeatedInt32_ = makeMutableCopy(repeatedInt32_);
         }
         bitField0_ |= 0x00200000;
       }
-
       /**
-       *
-       *
        * <pre>
        * Repeated
        * </pre>
        *
        * <code>repeated int32 repeated_int32 = 31;</code>
-       *
        * @return A list containing the repeatedInt32.
        */
-      public java.util.List<java.lang.Integer> getRepeatedInt32List() {
+      public java.util.List<java.lang.Integer>
+          getRepeatedInt32List() {
         repeatedInt32_.makeImmutable();
         return repeatedInt32_;
       }
-
       /**
-       *
-       *
        * <pre>
        * Repeated
        * </pre>
        *
        * <code>repeated int32 repeated_int32 = 31;</code>
-       *
        * @return The count of repeatedInt32.
        */
       public int getRepeatedInt32Count() {
         return repeatedInt32_.size();
       }
-
       /**
-       *
-       *
        * <pre>
        * Repeated
        * </pre>
        *
        * <code>repeated int32 repeated_int32 = 31;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedInt32 at the given index.
        */
       public int getRepeatedInt32(int index) {
         return repeatedInt32_.getInt(index);
       }
-
       /**
-       *
-       *
        * <pre>
        * Repeated
        * </pre>
        *
        * <code>repeated int32 repeated_int32 = 31;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedInt32 to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedInt32(int index, int value) {
+      public Builder setRepeatedInt32(
+          int index, int value) {
 
         ensureRepeatedInt32IsMutable();
         repeatedInt32_.setInt(index, value);
@@ -15443,16 +13953,12 @@ public Builder setRepeatedInt32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
-       *
-       *
        * <pre>
        * Repeated
        * </pre>
        *
        * <code>repeated int32 repeated_int32 = 31;</code>
-       *
        * @param value The repeatedInt32 to add.
        * @return This builder for chaining.
        */
@@ -15464,36 +13970,30 @@ public Builder addRepeatedInt32(int value) {
         onChanged();
         return this;
       }
-
       /**
-       *
-       *
        * <pre>
        * Repeated
        * </pre>
        *
        * <code>repeated int32 repeated_int32 = 31;</code>
-       *
        * @param values The repeatedInt32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedInt32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllRepeatedInt32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureRepeatedInt32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedInt32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedInt32_);
         bitField0_ |= 0x00200000;
         onChanged();
         return this;
       }
-
       /**
-       *
-       *
        * <pre>
        * Repeated
        * </pre>
        *
        * <code>repeated int32 repeated_int32 = 31;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedInt32() {
@@ -15504,51 +14004,44 @@ public Builder clearRepeatedInt32() {
       }
 
       private com.google.protobuf.Internal.LongList repeatedInt64_ = emptyLongList();
-
       private void ensureRepeatedInt64IsMutable() {
         if (!repeatedInt64_.isModifiable()) {
           repeatedInt64_ = makeMutableCopy(repeatedInt64_);
         }
         bitField0_ |= 0x00400000;
       }
-
       /**
        * <code>repeated int64 repeated_int64 = 32;</code>
-       *
        * @return A list containing the repeatedInt64.
        */
-      public java.util.List<java.lang.Long> getRepeatedInt64List() {
+      public java.util.List<java.lang.Long>
+          getRepeatedInt64List() {
         repeatedInt64_.makeImmutable();
         return repeatedInt64_;
       }
-
       /**
        * <code>repeated int64 repeated_int64 = 32;</code>
-       *
        * @return The count of repeatedInt64.
        */
       public int getRepeatedInt64Count() {
         return repeatedInt64_.size();
       }
-
       /**
        * <code>repeated int64 repeated_int64 = 32;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedInt64 at the given index.
        */
       public long getRepeatedInt64(int index) {
         return repeatedInt64_.getLong(index);
       }
-
       /**
        * <code>repeated int64 repeated_int64 = 32;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedInt64 to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedInt64(int index, long value) {
+      public Builder setRepeatedInt64(
+          int index, long value) {
 
         ensureRepeatedInt64IsMutable();
         repeatedInt64_.setLong(index, value);
@@ -15556,10 +14049,8 @@ public Builder setRepeatedInt64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated int64 repeated_int64 = 32;</code>
-       *
        * @param value The repeatedInt64 to add.
        * @return This builder for chaining.
        */
@@ -15571,24 +14062,22 @@ public Builder addRepeatedInt64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated int64 repeated_int64 = 32;</code>
-       *
        * @param values The repeatedInt64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedInt64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllRepeatedInt64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensureRepeatedInt64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedInt64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedInt64_);
         bitField0_ |= 0x00400000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated int64 repeated_int64 = 32;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedInt64() {
@@ -15599,51 +14088,44 @@ public Builder clearRepeatedInt64() {
       }
 
       private com.google.protobuf.Internal.IntList repeatedUint32_ = emptyIntList();
-
       private void ensureRepeatedUint32IsMutable() {
         if (!repeatedUint32_.isModifiable()) {
           repeatedUint32_ = makeMutableCopy(repeatedUint32_);
         }
         bitField0_ |= 0x00800000;
       }
-
       /**
        * <code>repeated uint32 repeated_uint32 = 33;</code>
-       *
        * @return A list containing the repeatedUint32.
        */
-      public java.util.List<java.lang.Integer> getRepeatedUint32List() {
+      public java.util.List<java.lang.Integer>
+          getRepeatedUint32List() {
         repeatedUint32_.makeImmutable();
         return repeatedUint32_;
       }
-
       /**
        * <code>repeated uint32 repeated_uint32 = 33;</code>
-       *
        * @return The count of repeatedUint32.
        */
       public int getRepeatedUint32Count() {
         return repeatedUint32_.size();
       }
-
       /**
        * <code>repeated uint32 repeated_uint32 = 33;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedUint32 at the given index.
        */
       public int getRepeatedUint32(int index) {
         return repeatedUint32_.getInt(index);
       }
-
       /**
        * <code>repeated uint32 repeated_uint32 = 33;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedUint32 to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedUint32(int index, int value) {
+      public Builder setRepeatedUint32(
+          int index, int value) {
 
         ensureRepeatedUint32IsMutable();
         repeatedUint32_.setInt(index, value);
@@ -15651,10 +14133,8 @@ public Builder setRepeatedUint32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint32 repeated_uint32 = 33;</code>
-       *
        * @param value The repeatedUint32 to add.
        * @return This builder for chaining.
        */
@@ -15666,24 +14146,22 @@ public Builder addRepeatedUint32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint32 repeated_uint32 = 33;</code>
-       *
        * @param values The repeatedUint32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedUint32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllRepeatedUint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureRepeatedUint32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedUint32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedUint32_);
         bitField0_ |= 0x00800000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint32 repeated_uint32 = 33;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedUint32() {
@@ -15694,51 +14172,44 @@ public Builder clearRepeatedUint32() {
       }
 
       private com.google.protobuf.Internal.LongList repeatedUint64_ = emptyLongList();
-
       private void ensureRepeatedUint64IsMutable() {
         if (!repeatedUint64_.isModifiable()) {
           repeatedUint64_ = makeMutableCopy(repeatedUint64_);
         }
         bitField0_ |= 0x01000000;
       }
-
       /**
        * <code>repeated uint64 repeated_uint64 = 34;</code>
-       *
        * @return A list containing the repeatedUint64.
        */
-      public java.util.List<java.lang.Long> getRepeatedUint64List() {
+      public java.util.List<java.lang.Long>
+          getRepeatedUint64List() {
         repeatedUint64_.makeImmutable();
         return repeatedUint64_;
       }
-
       /**
        * <code>repeated uint64 repeated_uint64 = 34;</code>
-       *
        * @return The count of repeatedUint64.
        */
       public int getRepeatedUint64Count() {
         return repeatedUint64_.size();
       }
-
       /**
        * <code>repeated uint64 repeated_uint64 = 34;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedUint64 at the given index.
        */
       public long getRepeatedUint64(int index) {
         return repeatedUint64_.getLong(index);
       }
-
       /**
        * <code>repeated uint64 repeated_uint64 = 34;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedUint64 to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedUint64(int index, long value) {
+      public Builder setRepeatedUint64(
+          int index, long value) {
 
         ensureRepeatedUint64IsMutable();
         repeatedUint64_.setLong(index, value);
@@ -15746,10 +14217,8 @@ public Builder setRepeatedUint64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint64 repeated_uint64 = 34;</code>
-       *
        * @param value The repeatedUint64 to add.
        * @return This builder for chaining.
        */
@@ -15761,24 +14230,22 @@ public Builder addRepeatedUint64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint64 repeated_uint64 = 34;</code>
-       *
        * @param values The repeatedUint64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedUint64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllRepeatedUint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensureRepeatedUint64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedUint64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedUint64_);
         bitField0_ |= 0x01000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint64 repeated_uint64 = 34;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedUint64() {
@@ -15789,51 +14256,44 @@ public Builder clearRepeatedUint64() {
       }
 
       private com.google.protobuf.Internal.IntList repeatedSint32_ = emptyIntList();
-
       private void ensureRepeatedSint32IsMutable() {
         if (!repeatedSint32_.isModifiable()) {
           repeatedSint32_ = makeMutableCopy(repeatedSint32_);
         }
         bitField0_ |= 0x02000000;
       }
-
       /**
        * <code>repeated sint32 repeated_sint32 = 35;</code>
-       *
        * @return A list containing the repeatedSint32.
        */
-      public java.util.List<java.lang.Integer> getRepeatedSint32List() {
+      public java.util.List<java.lang.Integer>
+          getRepeatedSint32List() {
         repeatedSint32_.makeImmutable();
         return repeatedSint32_;
       }
-
       /**
        * <code>repeated sint32 repeated_sint32 = 35;</code>
-       *
        * @return The count of repeatedSint32.
        */
       public int getRepeatedSint32Count() {
         return repeatedSint32_.size();
       }
-
       /**
        * <code>repeated sint32 repeated_sint32 = 35;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedSint32 at the given index.
        */
       public int getRepeatedSint32(int index) {
         return repeatedSint32_.getInt(index);
       }
-
       /**
        * <code>repeated sint32 repeated_sint32 = 35;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedSint32 to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedSint32(int index, int value) {
+      public Builder setRepeatedSint32(
+          int index, int value) {
 
         ensureRepeatedSint32IsMutable();
         repeatedSint32_.setInt(index, value);
@@ -15841,10 +14301,8 @@ public Builder setRepeatedSint32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint32 repeated_sint32 = 35;</code>
-       *
        * @param value The repeatedSint32 to add.
        * @return This builder for chaining.
        */
@@ -15856,24 +14314,22 @@ public Builder addRepeatedSint32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint32 repeated_sint32 = 35;</code>
-       *
        * @param values The repeatedSint32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedSint32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllRepeatedSint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureRepeatedSint32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedSint32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedSint32_);
         bitField0_ |= 0x02000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint32 repeated_sint32 = 35;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedSint32() {
@@ -15884,51 +14340,44 @@ public Builder clearRepeatedSint32() {
       }
 
       private com.google.protobuf.Internal.LongList repeatedSint64_ = emptyLongList();
-
       private void ensureRepeatedSint64IsMutable() {
         if (!repeatedSint64_.isModifiable()) {
           repeatedSint64_ = makeMutableCopy(repeatedSint64_);
         }
         bitField0_ |= 0x04000000;
       }
-
       /**
        * <code>repeated sint64 repeated_sint64 = 36;</code>
-       *
        * @return A list containing the repeatedSint64.
        */
-      public java.util.List<java.lang.Long> getRepeatedSint64List() {
+      public java.util.List<java.lang.Long>
+          getRepeatedSint64List() {
         repeatedSint64_.makeImmutable();
         return repeatedSint64_;
       }
-
       /**
        * <code>repeated sint64 repeated_sint64 = 36;</code>
-       *
        * @return The count of repeatedSint64.
        */
       public int getRepeatedSint64Count() {
         return repeatedSint64_.size();
       }
-
       /**
        * <code>repeated sint64 repeated_sint64 = 36;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedSint64 at the given index.
        */
       public long getRepeatedSint64(int index) {
         return repeatedSint64_.getLong(index);
       }
-
       /**
        * <code>repeated sint64 repeated_sint64 = 36;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedSint64 to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedSint64(int index, long value) {
+      public Builder setRepeatedSint64(
+          int index, long value) {
 
         ensureRepeatedSint64IsMutable();
         repeatedSint64_.setLong(index, value);
@@ -15936,10 +14385,8 @@ public Builder setRepeatedSint64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint64 repeated_sint64 = 36;</code>
-       *
        * @param value The repeatedSint64 to add.
        * @return This builder for chaining.
        */
@@ -15951,24 +14398,22 @@ public Builder addRepeatedSint64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint64 repeated_sint64 = 36;</code>
-       *
        * @param values The repeatedSint64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedSint64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllRepeatedSint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensureRepeatedSint64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedSint64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedSint64_);
         bitField0_ |= 0x04000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint64 repeated_sint64 = 36;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedSint64() {
@@ -15979,58 +14424,50 @@ public Builder clearRepeatedSint64() {
       }
 
       private com.google.protobuf.Internal.IntList repeatedFixed32_ = emptyIntList();
-
       private void ensureRepeatedFixed32IsMutable() {
         if (!repeatedFixed32_.isModifiable()) {
           repeatedFixed32_ = makeMutableCopy(repeatedFixed32_);
         }
         bitField0_ |= 0x08000000;
       }
-
       private void ensureRepeatedFixed32IsMutable(int capacity) {
         if (!repeatedFixed32_.isModifiable()) {
           repeatedFixed32_ = makeMutableCopy(repeatedFixed32_, capacity);
         }
         bitField0_ |= 0x08000000;
       }
-
       /**
        * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-       *
        * @return A list containing the repeatedFixed32.
        */
-      public java.util.List<java.lang.Integer> getRepeatedFixed32List() {
+      public java.util.List<java.lang.Integer>
+          getRepeatedFixed32List() {
         repeatedFixed32_.makeImmutable();
         return repeatedFixed32_;
       }
-
       /**
        * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-       *
        * @return The count of repeatedFixed32.
        */
       public int getRepeatedFixed32Count() {
         return repeatedFixed32_.size();
       }
-
       /**
        * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedFixed32 at the given index.
        */
       public int getRepeatedFixed32(int index) {
         return repeatedFixed32_.getInt(index);
       }
-
       /**
        * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedFixed32 to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedFixed32(int index, int value) {
+      public Builder setRepeatedFixed32(
+          int index, int value) {
 
         ensureRepeatedFixed32IsMutable();
         repeatedFixed32_.setInt(index, value);
@@ -16038,10 +14475,8 @@ public Builder setRepeatedFixed32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-       *
        * @param value The repeatedFixed32 to add.
        * @return This builder for chaining.
        */
@@ -16053,24 +14488,22 @@ public Builder addRepeatedFixed32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-       *
        * @param values The repeatedFixed32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedFixed32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllRepeatedFixed32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureRepeatedFixed32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedFixed32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedFixed32_);
         bitField0_ |= 0x08000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedFixed32() {
@@ -16081,58 +14514,50 @@ public Builder clearRepeatedFixed32() {
       }
 
       private com.google.protobuf.Internal.LongList repeatedFixed64_ = emptyLongList();
-
       private void ensureRepeatedFixed64IsMutable() {
         if (!repeatedFixed64_.isModifiable()) {
           repeatedFixed64_ = makeMutableCopy(repeatedFixed64_);
         }
         bitField0_ |= 0x10000000;
       }
-
       private void ensureRepeatedFixed64IsMutable(int capacity) {
         if (!repeatedFixed64_.isModifiable()) {
           repeatedFixed64_ = makeMutableCopy(repeatedFixed64_, capacity);
         }
         bitField0_ |= 0x10000000;
       }
-
       /**
        * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-       *
        * @return A list containing the repeatedFixed64.
        */
-      public java.util.List<java.lang.Long> getRepeatedFixed64List() {
+      public java.util.List<java.lang.Long>
+          getRepeatedFixed64List() {
         repeatedFixed64_.makeImmutable();
         return repeatedFixed64_;
       }
-
       /**
        * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-       *
        * @return The count of repeatedFixed64.
        */
       public int getRepeatedFixed64Count() {
         return repeatedFixed64_.size();
       }
-
       /**
        * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedFixed64 at the given index.
        */
       public long getRepeatedFixed64(int index) {
         return repeatedFixed64_.getLong(index);
       }
-
       /**
        * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedFixed64 to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedFixed64(int index, long value) {
+      public Builder setRepeatedFixed64(
+          int index, long value) {
 
         ensureRepeatedFixed64IsMutable();
         repeatedFixed64_.setLong(index, value);
@@ -16140,10 +14565,8 @@ public Builder setRepeatedFixed64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-       *
        * @param value The repeatedFixed64 to add.
        * @return This builder for chaining.
        */
@@ -16155,24 +14578,22 @@ public Builder addRepeatedFixed64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-       *
        * @param values The repeatedFixed64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedFixed64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllRepeatedFixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensureRepeatedFixed64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedFixed64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedFixed64_);
         bitField0_ |= 0x10000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedFixed64() {
@@ -16183,58 +14604,50 @@ public Builder clearRepeatedFixed64() {
       }
 
       private com.google.protobuf.Internal.IntList repeatedSfixed32_ = emptyIntList();
-
       private void ensureRepeatedSfixed32IsMutable() {
         if (!repeatedSfixed32_.isModifiable()) {
           repeatedSfixed32_ = makeMutableCopy(repeatedSfixed32_);
         }
         bitField0_ |= 0x20000000;
       }
-
       private void ensureRepeatedSfixed32IsMutable(int capacity) {
         if (!repeatedSfixed32_.isModifiable()) {
           repeatedSfixed32_ = makeMutableCopy(repeatedSfixed32_, capacity);
         }
         bitField0_ |= 0x20000000;
       }
-
       /**
        * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-       *
        * @return A list containing the repeatedSfixed32.
        */
-      public java.util.List<java.lang.Integer> getRepeatedSfixed32List() {
+      public java.util.List<java.lang.Integer>
+          getRepeatedSfixed32List() {
         repeatedSfixed32_.makeImmutable();
         return repeatedSfixed32_;
       }
-
       /**
        * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-       *
        * @return The count of repeatedSfixed32.
        */
       public int getRepeatedSfixed32Count() {
         return repeatedSfixed32_.size();
       }
-
       /**
        * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedSfixed32 at the given index.
        */
       public int getRepeatedSfixed32(int index) {
         return repeatedSfixed32_.getInt(index);
       }
-
       /**
        * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedSfixed32 to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedSfixed32(int index, int value) {
+      public Builder setRepeatedSfixed32(
+          int index, int value) {
 
         ensureRepeatedSfixed32IsMutable();
         repeatedSfixed32_.setInt(index, value);
@@ -16242,10 +14655,8 @@ public Builder setRepeatedSfixed32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-       *
        * @param value The repeatedSfixed32 to add.
        * @return This builder for chaining.
        */
@@ -16257,25 +14668,22 @@ public Builder addRepeatedSfixed32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-       *
        * @param values The repeatedSfixed32 to add.
        * @return This builder for chaining.
        */
       public Builder addAllRepeatedSfixed32(
           java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureRepeatedSfixed32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedSfixed32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedSfixed32_);
         bitField0_ |= 0x20000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedSfixed32() {
@@ -16286,58 +14694,50 @@ public Builder clearRepeatedSfixed32() {
       }
 
       private com.google.protobuf.Internal.LongList repeatedSfixed64_ = emptyLongList();
-
       private void ensureRepeatedSfixed64IsMutable() {
         if (!repeatedSfixed64_.isModifiable()) {
           repeatedSfixed64_ = makeMutableCopy(repeatedSfixed64_);
         }
         bitField0_ |= 0x40000000;
       }
-
       private void ensureRepeatedSfixed64IsMutable(int capacity) {
         if (!repeatedSfixed64_.isModifiable()) {
           repeatedSfixed64_ = makeMutableCopy(repeatedSfixed64_, capacity);
         }
         bitField0_ |= 0x40000000;
       }
-
       /**
        * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-       *
        * @return A list containing the repeatedSfixed64.
        */
-      public java.util.List<java.lang.Long> getRepeatedSfixed64List() {
+      public java.util.List<java.lang.Long>
+          getRepeatedSfixed64List() {
         repeatedSfixed64_.makeImmutable();
         return repeatedSfixed64_;
       }
-
       /**
        * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-       *
        * @return The count of repeatedSfixed64.
        */
       public int getRepeatedSfixed64Count() {
         return repeatedSfixed64_.size();
       }
-
       /**
        * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedSfixed64 at the given index.
        */
       public long getRepeatedSfixed64(int index) {
         return repeatedSfixed64_.getLong(index);
       }
-
       /**
        * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedSfixed64 to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedSfixed64(int index, long value) {
+      public Builder setRepeatedSfixed64(
+          int index, long value) {
 
         ensureRepeatedSfixed64IsMutable();
         repeatedSfixed64_.setLong(index, value);
@@ -16345,10 +14745,8 @@ public Builder setRepeatedSfixed64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-       *
        * @param value The repeatedSfixed64 to add.
        * @return This builder for chaining.
        */
@@ -16360,24 +14758,22 @@ public Builder addRepeatedSfixed64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-       *
        * @param values The repeatedSfixed64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedSfixed64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllRepeatedSfixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensureRepeatedSfixed64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedSfixed64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedSfixed64_);
         bitField0_ |= 0x40000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedSfixed64() {
@@ -16388,58 +14784,50 @@ public Builder clearRepeatedSfixed64() {
       }
 
       private com.google.protobuf.Internal.FloatList repeatedFloat_ = emptyFloatList();
-
       private void ensureRepeatedFloatIsMutable() {
         if (!repeatedFloat_.isModifiable()) {
           repeatedFloat_ = makeMutableCopy(repeatedFloat_);
         }
         bitField0_ |= 0x80000000;
       }
-
       private void ensureRepeatedFloatIsMutable(int capacity) {
         if (!repeatedFloat_.isModifiable()) {
           repeatedFloat_ = makeMutableCopy(repeatedFloat_, capacity);
         }
         bitField0_ |= 0x80000000;
       }
-
       /**
        * <code>repeated float repeated_float = 41;</code>
-       *
        * @return A list containing the repeatedFloat.
        */
-      public java.util.List<java.lang.Float> getRepeatedFloatList() {
+      public java.util.List<java.lang.Float>
+          getRepeatedFloatList() {
         repeatedFloat_.makeImmutable();
         return repeatedFloat_;
       }
-
       /**
        * <code>repeated float repeated_float = 41;</code>
-       *
        * @return The count of repeatedFloat.
        */
       public int getRepeatedFloatCount() {
         return repeatedFloat_.size();
       }
-
       /**
        * <code>repeated float repeated_float = 41;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedFloat at the given index.
        */
       public float getRepeatedFloat(int index) {
         return repeatedFloat_.getFloat(index);
       }
-
       /**
        * <code>repeated float repeated_float = 41;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedFloat to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedFloat(int index, float value) {
+      public Builder setRepeatedFloat(
+          int index, float value) {
 
         ensureRepeatedFloatIsMutable();
         repeatedFloat_.setFloat(index, value);
@@ -16447,10 +14835,8 @@ public Builder setRepeatedFloat(int index, float value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated float repeated_float = 41;</code>
-       *
        * @param value The repeatedFloat to add.
        * @return This builder for chaining.
        */
@@ -16462,24 +14848,22 @@ public Builder addRepeatedFloat(float value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated float repeated_float = 41;</code>
-       *
        * @param values The repeatedFloat to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedFloat(java.lang.Iterable<? extends java.lang.Float> values) {
+      public Builder addAllRepeatedFloat(
+          java.lang.Iterable<? extends java.lang.Float> values) {
         ensureRepeatedFloatIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedFloat_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedFloat_);
         bitField0_ |= 0x80000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated float repeated_float = 41;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedFloat() {
@@ -16490,58 +14874,50 @@ public Builder clearRepeatedFloat() {
       }
 
       private com.google.protobuf.Internal.DoubleList repeatedDouble_ = emptyDoubleList();
-
       private void ensureRepeatedDoubleIsMutable() {
         if (!repeatedDouble_.isModifiable()) {
           repeatedDouble_ = makeMutableCopy(repeatedDouble_);
         }
         bitField1_ |= 0x00000001;
       }
-
       private void ensureRepeatedDoubleIsMutable(int capacity) {
         if (!repeatedDouble_.isModifiable()) {
           repeatedDouble_ = makeMutableCopy(repeatedDouble_, capacity);
         }
         bitField1_ |= 0x00000001;
       }
-
       /**
        * <code>repeated double repeated_double = 42;</code>
-       *
        * @return A list containing the repeatedDouble.
        */
-      public java.util.List<java.lang.Double> getRepeatedDoubleList() {
+      public java.util.List<java.lang.Double>
+          getRepeatedDoubleList() {
         repeatedDouble_.makeImmutable();
         return repeatedDouble_;
       }
-
       /**
        * <code>repeated double repeated_double = 42;</code>
-       *
        * @return The count of repeatedDouble.
        */
       public int getRepeatedDoubleCount() {
         return repeatedDouble_.size();
       }
-
       /**
        * <code>repeated double repeated_double = 42;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedDouble at the given index.
        */
       public double getRepeatedDouble(int index) {
         return repeatedDouble_.getDouble(index);
       }
-
       /**
        * <code>repeated double repeated_double = 42;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedDouble to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedDouble(int index, double value) {
+      public Builder setRepeatedDouble(
+          int index, double value) {
 
         ensureRepeatedDoubleIsMutable();
         repeatedDouble_.setDouble(index, value);
@@ -16549,10 +14925,8 @@ public Builder setRepeatedDouble(int index, double value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated double repeated_double = 42;</code>
-       *
        * @param value The repeatedDouble to add.
        * @return This builder for chaining.
        */
@@ -16564,24 +14938,22 @@ public Builder addRepeatedDouble(double value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated double repeated_double = 42;</code>
-       *
        * @param values The repeatedDouble to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedDouble(java.lang.Iterable<? extends java.lang.Double> values) {
+      public Builder addAllRepeatedDouble(
+          java.lang.Iterable<? extends java.lang.Double> values) {
         ensureRepeatedDoubleIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedDouble_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedDouble_);
         bitField1_ |= 0x00000001;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated double repeated_double = 42;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedDouble() {
@@ -16592,58 +14964,50 @@ public Builder clearRepeatedDouble() {
       }
 
       private com.google.protobuf.Internal.BooleanList repeatedBool_ = emptyBooleanList();
-
       private void ensureRepeatedBoolIsMutable() {
         if (!repeatedBool_.isModifiable()) {
           repeatedBool_ = makeMutableCopy(repeatedBool_);
         }
         bitField1_ |= 0x00000002;
       }
-
       private void ensureRepeatedBoolIsMutable(int capacity) {
         if (!repeatedBool_.isModifiable()) {
           repeatedBool_ = makeMutableCopy(repeatedBool_, capacity);
         }
         bitField1_ |= 0x00000002;
       }
-
       /**
        * <code>repeated bool repeated_bool = 43;</code>
-       *
        * @return A list containing the repeatedBool.
        */
-      public java.util.List<java.lang.Boolean> getRepeatedBoolList() {
+      public java.util.List<java.lang.Boolean>
+          getRepeatedBoolList() {
         repeatedBool_.makeImmutable();
         return repeatedBool_;
       }
-
       /**
        * <code>repeated bool repeated_bool = 43;</code>
-       *
        * @return The count of repeatedBool.
        */
       public int getRepeatedBoolCount() {
         return repeatedBool_.size();
       }
-
       /**
        * <code>repeated bool repeated_bool = 43;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedBool at the given index.
        */
       public boolean getRepeatedBool(int index) {
         return repeatedBool_.getBoolean(index);
       }
-
       /**
        * <code>repeated bool repeated_bool = 43;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedBool to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedBool(int index, boolean value) {
+      public Builder setRepeatedBool(
+          int index, boolean value) {
 
         ensureRepeatedBoolIsMutable();
         repeatedBool_.setBoolean(index, value);
@@ -16651,10 +15015,8 @@ public Builder setRepeatedBool(int index, boolean value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bool repeated_bool = 43;</code>
-       *
        * @param value The repeatedBool to add.
        * @return This builder for chaining.
        */
@@ -16666,24 +15028,22 @@ public Builder addRepeatedBool(boolean value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bool repeated_bool = 43;</code>
-       *
        * @param values The repeatedBool to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedBool(java.lang.Iterable<? extends java.lang.Boolean> values) {
+      public Builder addAllRepeatedBool(
+          java.lang.Iterable<? extends java.lang.Boolean> values) {
         ensureRepeatedBoolIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedBool_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedBool_);
         bitField1_ |= 0x00000002;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bool repeated_bool = 43;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedBool() {
@@ -16695,125 +15055,107 @@ public Builder clearRepeatedBool() {
 
       private com.google.protobuf.LazyStringArrayList repeatedString_ =
           com.google.protobuf.LazyStringArrayList.emptyList();
-
       private void ensureRepeatedStringIsMutable() {
         if (!repeatedString_.isModifiable()) {
           repeatedString_ = new com.google.protobuf.LazyStringArrayList(repeatedString_);
         }
         bitField1_ |= 0x00000004;
       }
-
       /**
        * <code>repeated string repeated_string = 44;</code>
-       *
        * @return A list containing the repeatedString.
        */
-      public com.google.protobuf.ProtocolStringList getRepeatedStringList() {
+      public com.google.protobuf.ProtocolStringList
+          getRepeatedStringList() {
         repeatedString_.makeImmutable();
         return repeatedString_;
       }
-
       /**
        * <code>repeated string repeated_string = 44;</code>
-       *
        * @return The count of repeatedString.
        */
       public int getRepeatedStringCount() {
         return repeatedString_.size();
       }
-
       /**
        * <code>repeated string repeated_string = 44;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedString at the given index.
        */
       public java.lang.String getRepeatedString(int index) {
         return repeatedString_.get(index);
       }
-
       /**
        * <code>repeated string repeated_string = 44;</code>
-       *
        * @param index The index of the value to return.
        * @return The bytes of the repeatedString at the given index.
        */
-      public com.google.protobuf.ByteString getRepeatedStringBytes(int index) {
+      public com.google.protobuf.ByteString
+          getRepeatedStringBytes(int index) {
         return repeatedString_.getByteString(index);
       }
-
       /**
        * <code>repeated string repeated_string = 44;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedString to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedString(int index, java.lang.String value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setRepeatedString(
+          int index, java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
         ensureRepeatedStringIsMutable();
         repeatedString_.set(index, value);
         bitField1_ |= 0x00000004;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated string repeated_string = 44;</code>
-       *
        * @param value The repeatedString to add.
        * @return This builder for chaining.
        */
-      public Builder addRepeatedString(java.lang.String value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder addRepeatedString(
+          java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
         ensureRepeatedStringIsMutable();
         repeatedString_.add(value);
         bitField1_ |= 0x00000004;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated string repeated_string = 44;</code>
-       *
        * @param values The repeatedString to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedString(java.lang.Iterable<java.lang.String> values) {
+      public Builder addAllRepeatedString(
+          java.lang.Iterable<java.lang.String> values) {
         ensureRepeatedStringIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedString_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedString_);
         bitField1_ |= 0x00000004;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated string repeated_string = 44;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedString() {
-        repeatedString_ = com.google.protobuf.LazyStringArrayList.emptyList();
-        bitField1_ = (bitField1_ & ~0x00000004);
-        ;
+        repeatedString_ =
+          com.google.protobuf.LazyStringArrayList.emptyList();
+        bitField1_ = (bitField1_ & ~0x00000004);;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated string repeated_string = 44;</code>
-       *
        * @param value The bytes of the repeatedString to add.
        * @return This builder for chaining.
        */
-      public Builder addRepeatedStringBytes(com.google.protobuf.ByteString value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder addRepeatedStringBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
         checkByteStringIsUtf8(value);
         ensureRepeatedStringIsMutable();
         repeatedString_.add(value);
@@ -16822,98 +15164,81 @@ public Builder addRepeatedStringBytes(com.google.protobuf.ByteString value) {
         return this;
       }
 
-      private com.google.protobuf.Internal.ProtobufList<com.google.protobuf.ByteString>
-          repeatedBytes_ = emptyList(com.google.protobuf.ByteString.class);
-
+      private com.google.protobuf.Internal.ProtobufList<com.google.protobuf.ByteString> repeatedBytes_ = emptyList(com.google.protobuf.ByteString.class);
       private void ensureRepeatedBytesIsMutable() {
         if (!repeatedBytes_.isModifiable()) {
           repeatedBytes_ = makeMutableCopy(repeatedBytes_);
         }
         bitField1_ |= 0x00000008;
       }
-
       /**
        * <code>repeated bytes repeated_bytes = 45;</code>
-       *
        * @return A list containing the repeatedBytes.
        */
-      public java.util.List<com.google.protobuf.ByteString> getRepeatedBytesList() {
+      public java.util.List<com.google.protobuf.ByteString>
+          getRepeatedBytesList() {
         repeatedBytes_.makeImmutable();
         return repeatedBytes_;
       }
-
       /**
        * <code>repeated bytes repeated_bytes = 45;</code>
-       *
        * @return The count of repeatedBytes.
        */
       public int getRepeatedBytesCount() {
         return repeatedBytes_.size();
       }
-
       /**
        * <code>repeated bytes repeated_bytes = 45;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedBytes at the given index.
        */
       public com.google.protobuf.ByteString getRepeatedBytes(int index) {
         return repeatedBytes_.get(index);
       }
-
       /**
        * <code>repeated bytes repeated_bytes = 45;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedBytes to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedBytes(int index, com.google.protobuf.ByteString value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setRepeatedBytes(
+          int index, com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
         ensureRepeatedBytesIsMutable();
         repeatedBytes_.set(index, value);
         bitField1_ |= 0x00000008;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bytes repeated_bytes = 45;</code>
-       *
        * @param value The repeatedBytes to add.
        * @return This builder for chaining.
        */
       public Builder addRepeatedBytes(com.google.protobuf.ByteString value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         ensureRepeatedBytesIsMutable();
         repeatedBytes_.add(value);
         bitField1_ |= 0x00000008;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bytes repeated_bytes = 45;</code>
-       *
        * @param values The repeatedBytes to add.
        * @return This builder for chaining.
        */
       public Builder addAllRepeatedBytes(
           java.lang.Iterable<? extends com.google.protobuf.ByteString> values) {
         ensureRepeatedBytesIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedBytes_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedBytes_);
         bitField1_ |= 0x00000008;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bytes repeated_bytes = 45;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedBytes() {
@@ -16923,47 +15248,30 @@ public Builder clearRepeatedBytes() {
         return this;
       }
 
-      private java.util.List<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-          repeatedNestedMessage_ = java.util.Collections.emptyList();
-
+      private java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> repeatedNestedMessage_ =
+        java.util.Collections.emptyList();
       private void ensureRepeatedNestedMessageIsMutable() {
         if (!((bitField1_ & 0x00000010) != 0)) {
-          repeatedNestedMessage_ =
-              new java.util.ArrayList<
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage>(repeatedNestedMessage_);
+          repeatedNestedMessage_ = new java.util.ArrayList<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>(repeatedNestedMessage_);
           bitField1_ |= 0x00000010;
-        }
+         }
       }
 
       private com.google.protobuf.RepeatedFieldBuilderV3<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .NestedMessageOrBuilder>
-          repeatedNestedMessageBuilder_;
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> repeatedNestedMessageBuilder_;
 
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
-      public java.util.List<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-          getRepeatedNestedMessageList() {
+      public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> getRepeatedNestedMessageList() {
         if (repeatedNestedMessageBuilder_ == null) {
           return java.util.Collections.unmodifiableList(repeatedNestedMessage_);
         } else {
           return repeatedNestedMessageBuilder_.getMessageList();
         }
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
       public int getRepeatedNestedMessageCount() {
         if (repeatedNestedMessageBuilder_ == null) {
@@ -16972,30 +15280,21 @@ public int getRepeatedNestedMessageCount() {
           return repeatedNestedMessageBuilder_.getCount();
         }
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-          getRepeatedNestedMessage(int index) {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getRepeatedNestedMessage(int index) {
         if (repeatedNestedMessageBuilder_ == null) {
           return repeatedNestedMessage_.get(index);
         } else {
           return repeatedNestedMessageBuilder_.getMessage(index);
         }
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
       public Builder setRepeatedNestedMessage(
-          int index,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              value) {
+          int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage value) {
         if (repeatedNestedMessageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -17008,17 +15307,11 @@ public Builder setRepeatedNestedMessage(
         }
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
       public Builder setRepeatedNestedMessage(
-          int index,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder
-              builderForValue) {
+          int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder builderForValue) {
         if (repeatedNestedMessageBuilder_ == null) {
           ensureRepeatedNestedMessageIsMutable();
           repeatedNestedMessage_.set(index, builderForValue.build());
@@ -17028,15 +15321,10 @@ public Builder setRepeatedNestedMessage(
         }
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
-      public Builder addRepeatedNestedMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              value) {
+      public Builder addRepeatedNestedMessage(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage value) {
         if (repeatedNestedMessageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -17049,16 +15337,11 @@ public Builder addRepeatedNestedMessage(
         }
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
       public Builder addRepeatedNestedMessage(
-          int index,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              value) {
+          int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage value) {
         if (repeatedNestedMessageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -17071,16 +15354,11 @@ public Builder addRepeatedNestedMessage(
         }
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
       public Builder addRepeatedNestedMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder
-              builderForValue) {
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder builderForValue) {
         if (repeatedNestedMessageBuilder_ == null) {
           ensureRepeatedNestedMessageIsMutable();
           repeatedNestedMessage_.add(builderForValue.build());
@@ -17090,17 +15368,11 @@ public Builder addRepeatedNestedMessage(
         }
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
       public Builder addRepeatedNestedMessage(
-          int index,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder
-              builderForValue) {
+          int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder builderForValue) {
         if (repeatedNestedMessageBuilder_ == null) {
           ensureRepeatedNestedMessageIsMutable();
           repeatedNestedMessage_.add(index, builderForValue.build());
@@ -17110,32 +15382,23 @@ public Builder addRepeatedNestedMessage(
         }
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
       public Builder addAllRepeatedNestedMessage(
-          java.lang.Iterable<
-                  ? extends
-                      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                          .NestedMessage>
-              values) {
+          java.lang.Iterable<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> values) {
         if (repeatedNestedMessageBuilder_ == null) {
           ensureRepeatedNestedMessageIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedNestedMessage_);
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, repeatedNestedMessage_);
           onChanged();
         } else {
           repeatedNestedMessageBuilder_.addAllMessages(values);
         }
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
       public Builder clearRepeatedNestedMessage() {
         if (repeatedNestedMessageBuilder_ == null) {
@@ -17147,11 +15410,8 @@ public Builder clearRepeatedNestedMessage() {
         }
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
       public Builder removeRepeatedNestedMessage(int index) {
         if (repeatedNestedMessageBuilder_ == null) {
@@ -17163,107 +15423,62 @@ public Builder removeRepeatedNestedMessage(int index) {
         }
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .Builder
-          getRepeatedNestedMessageBuilder(int index) {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder getRepeatedNestedMessageBuilder(
+          int index) {
         return getRepeatedNestedMessageFieldBuilder().getBuilder(index);
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessageOrBuilder
-          getRepeatedNestedMessageOrBuilder(int index) {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder getRepeatedNestedMessageOrBuilder(
+          int index) {
         if (repeatedNestedMessageBuilder_ == null) {
-          return repeatedNestedMessage_.get(index);
-        } else {
+          return repeatedNestedMessage_.get(index);  } else {
           return repeatedNestedMessageBuilder_.getMessageOrBuilder(index);
         }
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
-      public java.util.List<
-              ? extends
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessageOrBuilder>
-          getRepeatedNestedMessageOrBuilderList() {
+      public java.util.List<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> 
+           getRepeatedNestedMessageOrBuilderList() {
         if (repeatedNestedMessageBuilder_ != null) {
           return repeatedNestedMessageBuilder_.getMessageOrBuilderList();
         } else {
           return java.util.Collections.unmodifiableList(repeatedNestedMessage_);
         }
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .Builder
-          addRepeatedNestedMessageBuilder() {
-        return getRepeatedNestedMessageFieldBuilder()
-            .addBuilder(
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                    .getDefaultInstance());
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder addRepeatedNestedMessageBuilder() {
+        return getRepeatedNestedMessageFieldBuilder().addBuilder(
+            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance());
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .Builder
-          addRepeatedNestedMessageBuilder(int index) {
-        return getRepeatedNestedMessageFieldBuilder()
-            .addBuilder(
-                index,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                    .getDefaultInstance());
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder addRepeatedNestedMessageBuilder(
+          int index) {
+        return getRepeatedNestedMessageFieldBuilder().addBuilder(
+            index, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance());
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
-      public java.util.List<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder>
-          getRepeatedNestedMessageBuilderList() {
+      public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder> 
+           getRepeatedNestedMessageBuilderList() {
         return getRepeatedNestedMessageFieldBuilder().getBuilderList();
       }
-
       private com.google.protobuf.RepeatedFieldBuilderV3<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .NestedMessageOrBuilder>
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> 
           getRepeatedNestedMessageFieldBuilder() {
         if (repeatedNestedMessageBuilder_ == null) {
-          repeatedNestedMessageBuilder_ =
-              new com.google.protobuf.RepeatedFieldBuilderV3<
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage.Builder,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessageOrBuilder>(
+          repeatedNestedMessageBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder>(
                   repeatedNestedMessage_,
                   ((bitField1_ & 0x00000010) != 0),
                   getParentForChildren(),
@@ -17273,41 +15488,30 @@ public Builder removeRepeatedNestedMessage(int index) {
         return repeatedNestedMessageBuilder_;
       }
 
-      private java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-          repeatedForeignMessage_ = java.util.Collections.emptyList();
-
+      private java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> repeatedForeignMessage_ =
+        java.util.Collections.emptyList();
       private void ensureRepeatedForeignMessageIsMutable() {
         if (!((bitField1_ & 0x00000020) != 0)) {
-          repeatedForeignMessage_ =
-              new java.util.ArrayList<
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>(
-                  repeatedForeignMessage_);
+          repeatedForeignMessage_ = new java.util.ArrayList<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>(repeatedForeignMessage_);
           bitField1_ |= 0x00000020;
-        }
+         }
       }
 
       private com.google.protobuf.RepeatedFieldBuilderV3<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>
-          repeatedForeignMessageBuilder_;
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder> repeatedForeignMessageBuilder_;
 
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
-      public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-          getRepeatedForeignMessageList() {
+      public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> getRepeatedForeignMessageList() {
         if (repeatedForeignMessageBuilder_ == null) {
           return java.util.Collections.unmodifiableList(repeatedForeignMessage_);
         } else {
           return repeatedForeignMessageBuilder_.getMessageList();
         }
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
       public int getRepeatedForeignMessageCount() {
         if (repeatedForeignMessageBuilder_ == null) {
@@ -17316,23 +15520,18 @@ public int getRepeatedForeignMessageCount() {
           return repeatedForeignMessageBuilder_.getCount();
         }
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-          getRepeatedForeignMessage(int index) {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedForeignMessage(int index) {
         if (repeatedForeignMessageBuilder_ == null) {
           return repeatedForeignMessage_.get(index);
         } else {
           return repeatedForeignMessageBuilder_.getMessage(index);
         }
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
       public Builder setRepeatedForeignMessage(
           int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage value) {
@@ -17348,15 +15547,11 @@ public Builder setRepeatedForeignMessage(
         }
         return this;
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
       public Builder setRepeatedForeignMessage(
-          int index,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder
-              builderForValue) {
+          int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder builderForValue) {
         if (repeatedForeignMessageBuilder_ == null) {
           ensureRepeatedForeignMessageIsMutable();
           repeatedForeignMessage_.set(index, builderForValue.build());
@@ -17366,13 +15561,10 @@ public Builder setRepeatedForeignMessage(
         }
         return this;
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
-      public Builder addRepeatedForeignMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage value) {
+      public Builder addRepeatedForeignMessage(legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage value) {
         if (repeatedForeignMessageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -17385,10 +15577,8 @@ public Builder addRepeatedForeignMessage(
         }
         return this;
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
       public Builder addRepeatedForeignMessage(
           int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage value) {
@@ -17404,14 +15594,11 @@ public Builder addRepeatedForeignMessage(
         }
         return this;
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
       public Builder addRepeatedForeignMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder
-              builderForValue) {
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder builderForValue) {
         if (repeatedForeignMessageBuilder_ == null) {
           ensureRepeatedForeignMessageIsMutable();
           repeatedForeignMessage_.add(builderForValue.build());
@@ -17421,15 +15608,11 @@ public Builder addRepeatedForeignMessage(
         }
         return this;
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
       public Builder addRepeatedForeignMessage(
-          int index,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder
-              builderForValue) {
+          int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder builderForValue) {
         if (repeatedForeignMessageBuilder_ == null) {
           ensureRepeatedForeignMessageIsMutable();
           repeatedForeignMessage_.add(index, builderForValue.build());
@@ -17439,28 +15622,23 @@ public Builder addRepeatedForeignMessage(
         }
         return this;
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
       public Builder addAllRepeatedForeignMessage(
-          java.lang.Iterable<
-                  ? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-              values) {
+          java.lang.Iterable<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> values) {
         if (repeatedForeignMessageBuilder_ == null) {
           ensureRepeatedForeignMessageIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedForeignMessage_);
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, repeatedForeignMessage_);
           onChanged();
         } else {
           repeatedForeignMessageBuilder_.addAllMessages(values);
         }
         return this;
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
       public Builder clearRepeatedForeignMessage() {
         if (repeatedForeignMessageBuilder_ == null) {
@@ -17472,10 +15650,8 @@ public Builder clearRepeatedForeignMessage() {
         }
         return this;
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
       public Builder removeRepeatedForeignMessage(int index) {
         if (repeatedForeignMessageBuilder_ == null) {
@@ -17487,89 +15663,62 @@ public Builder removeRepeatedForeignMessage(int index) {
         }
         return this;
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder
-          getRepeatedForeignMessageBuilder(int index) {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder getRepeatedForeignMessageBuilder(
+          int index) {
         return getRepeatedForeignMessageFieldBuilder().getBuilder(index);
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder
-          getRepeatedForeignMessageOrBuilder(int index) {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder getRepeatedForeignMessageOrBuilder(
+          int index) {
         if (repeatedForeignMessageBuilder_ == null) {
-          return repeatedForeignMessage_.get(index);
-        } else {
+          return repeatedForeignMessage_.get(index);  } else {
           return repeatedForeignMessageBuilder_.getMessageOrBuilder(index);
         }
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
-      public java.util.List<
-              ? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>
-          getRepeatedForeignMessageOrBuilderList() {
+      public java.util.List<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder> 
+           getRepeatedForeignMessageOrBuilderList() {
         if (repeatedForeignMessageBuilder_ != null) {
           return repeatedForeignMessageBuilder_.getMessageOrBuilderList();
         } else {
           return java.util.Collections.unmodifiableList(repeatedForeignMessage_);
         }
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder
-          addRepeatedForeignMessageBuilder() {
-        return getRepeatedForeignMessageFieldBuilder()
-            .addBuilder(
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-                    .getDefaultInstance());
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder addRepeatedForeignMessageBuilder() {
+        return getRepeatedForeignMessageFieldBuilder().addBuilder(
+            legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance());
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder
-          addRepeatedForeignMessageBuilder(int index) {
-        return getRepeatedForeignMessageFieldBuilder()
-            .addBuilder(
-                index,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-                    .getDefaultInstance());
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder addRepeatedForeignMessageBuilder(
+          int index) {
+        return getRepeatedForeignMessageFieldBuilder().addBuilder(
+            index, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance());
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
-      public java.util.List<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder>
-          getRepeatedForeignMessageBuilderList() {
+      public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder> 
+           getRepeatedForeignMessageBuilderList() {
         return getRepeatedForeignMessageFieldBuilder().getBuilderList();
       }
-
       private com.google.protobuf.RepeatedFieldBuilderV3<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder> 
           getRepeatedForeignMessageFieldBuilder() {
         if (repeatedForeignMessageBuilder_ == null) {
-          repeatedForeignMessageBuilder_ =
-              new com.google.protobuf.RepeatedFieldBuilderV3<
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>(
+          repeatedForeignMessageBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>(
                   repeatedForeignMessage_,
                   ((bitField1_ & 0x00000020) != 0),
                   getParentForChildren(),
@@ -17580,67 +15729,44 @@ public Builder removeRepeatedForeignMessage(int index) {
       }
 
       private java.util.List<java.lang.Integer> repeatedNestedEnum_ =
-          java.util.Collections.emptyList();
-
+        java.util.Collections.emptyList();
       private void ensureRepeatedNestedEnumIsMutable() {
         if (!((bitField1_ & 0x00000040) != 0)) {
           repeatedNestedEnum_ = new java.util.ArrayList<java.lang.Integer>(repeatedNestedEnum_);
           bitField1_ |= 0x00000040;
         }
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @return A list containing the repeatedNestedEnum.
        */
-      public java.util.List<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-          getRepeatedNestedEnumList() {
+      public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> getRepeatedNestedEnumList() {
         return new com.google.protobuf.Internal.ListAdapter<
-            java.lang.Integer,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(
-            repeatedNestedEnum_, repeatedNestedEnum_converter_);
+            java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(repeatedNestedEnum_, repeatedNestedEnum_converter_);
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @return The count of repeatedNestedEnum.
        */
       public int getRepeatedNestedEnumCount() {
         return repeatedNestedEnum_.size();
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @param index The index of the element to return.
        * @return The repeatedNestedEnum at the given index.
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-          getRepeatedNestedEnum(int index) {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getRepeatedNestedEnum(int index) {
         return repeatedNestedEnum_converter_.convert(repeatedNestedEnum_.get(index));
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @param index The index to set the value at.
        * @param value The repeatedNestedEnum to set.
        * @return This builder for chaining.
        */
       public Builder setRepeatedNestedEnum(
-          int index,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
+          int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -17649,17 +15775,12 @@ public Builder setRepeatedNestedEnum(
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @param value The repeatedNestedEnum to add.
        * @return This builder for chaining.
        */
-      public Builder addRepeatedNestedEnum(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
+      public Builder addRepeatedNestedEnum(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -17668,35 +15789,22 @@ public Builder addRepeatedNestedEnum(
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @param values The repeatedNestedEnum to add.
        * @return This builder for chaining.
        */
       public Builder addAllRepeatedNestedEnum(
-          java.lang.Iterable<
-                  ? extends
-                      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                          .NestedEnum>
-              values) {
+          java.lang.Iterable<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> values) {
         ensureRepeatedNestedEnumIsMutable();
-        for (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-            value : values) {
+        for (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value : values) {
           repeatedNestedEnum_.add(value.getNumber());
         }
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @return This builder for chaining.
        */
       public Builder clearRepeatedNestedEnum() {
@@ -17705,51 +15813,37 @@ public Builder clearRepeatedNestedEnum() {
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @return A list containing the enum numeric values on the wire for repeatedNestedEnum.
        */
-      public java.util.List<java.lang.Integer> getRepeatedNestedEnumValueList() {
+      public java.util.List<java.lang.Integer>
+      getRepeatedNestedEnumValueList() {
         return java.util.Collections.unmodifiableList(repeatedNestedEnum_);
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @param index The index of the value to return.
        * @return The enum numeric value on the wire of repeatedNestedEnum at the given index.
        */
       public int getRepeatedNestedEnumValue(int index) {
         return repeatedNestedEnum_.get(index);
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @param index The index to set the value at.
        * @param value The enum numeric value on the wire for repeatedNestedEnum to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedNestedEnumValue(int index, int value) {
+      public Builder setRepeatedNestedEnumValue(
+          int index, int value) {
         ensureRepeatedNestedEnumIsMutable();
         repeatedNestedEnum_.set(index, value);
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @param value The enum numeric value on the wire for repeatedNestedEnum to add.
        * @return This builder for chaining.
        */
@@ -17759,16 +15853,13 @@ public Builder addRepeatedNestedEnumValue(int value) {
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @param values The enum numeric values on the wire for repeatedNestedEnum to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedNestedEnumValue(java.lang.Iterable<java.lang.Integer> values) {
+      public Builder addAllRepeatedNestedEnumValue(
+          java.lang.Iterable<java.lang.Integer> values) {
         ensureRepeatedNestedEnumIsMutable();
         for (int value : values) {
           repeatedNestedEnum_.add(value);
@@ -17778,50 +15869,38 @@ public Builder addAllRepeatedNestedEnumValue(java.lang.Iterable<java.lang.Intege
       }
 
       private java.util.List<java.lang.Integer> repeatedForeignEnum_ =
-          java.util.Collections.emptyList();
-
+        java.util.Collections.emptyList();
       private void ensureRepeatedForeignEnumIsMutable() {
         if (!((bitField1_ & 0x00000080) != 0)) {
           repeatedForeignEnum_ = new java.util.ArrayList<java.lang.Integer>(repeatedForeignEnum_);
           bitField1_ |= 0x00000080;
         }
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @return A list containing the repeatedForeignEnum.
        */
-      public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-          getRepeatedForeignEnumList() {
+      public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum> getRepeatedForeignEnumList() {
         return new com.google.protobuf.Internal.ListAdapter<
-            java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>(
-            repeatedForeignEnum_, repeatedForeignEnum_converter_);
+            java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>(repeatedForeignEnum_, repeatedForeignEnum_converter_);
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @return The count of repeatedForeignEnum.
        */
       public int getRepeatedForeignEnumCount() {
         return repeatedForeignEnum_.size();
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedForeignEnum at the given index.
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getRepeatedForeignEnum(
-          int index) {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getRepeatedForeignEnum(int index) {
         return repeatedForeignEnum_converter_.convert(repeatedForeignEnum_.get(index));
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedForeignEnum to set.
        * @return This builder for chaining.
@@ -17836,15 +15915,12 @@ public Builder setRepeatedForeignEnum(
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @param value The repeatedForeignEnum to add.
        * @return This builder for chaining.
        */
-      public Builder addRepeatedForeignEnum(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum value) {
+      public Builder addRepeatedForeignEnum(legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -17853,17 +15929,13 @@ public Builder addRepeatedForeignEnum(
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @param values The repeatedForeignEnum to add.
        * @return This builder for chaining.
        */
       public Builder addAllRepeatedForeignEnum(
-          java.lang.Iterable<
-                  ? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-              values) {
+          java.lang.Iterable<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum> values) {
         ensureRepeatedForeignEnumIsMutable();
         for (legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum value : values) {
           repeatedForeignEnum_.add(value.getNumber());
@@ -17871,10 +15943,8 @@ public Builder addAllRepeatedForeignEnum(
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedForeignEnum() {
@@ -17883,43 +15953,37 @@ public Builder clearRepeatedForeignEnum() {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @return A list containing the enum numeric values on the wire for repeatedForeignEnum.
        */
-      public java.util.List<java.lang.Integer> getRepeatedForeignEnumValueList() {
+      public java.util.List<java.lang.Integer>
+      getRepeatedForeignEnumValueList() {
         return java.util.Collections.unmodifiableList(repeatedForeignEnum_);
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @param index The index of the value to return.
        * @return The enum numeric value on the wire of repeatedForeignEnum at the given index.
        */
       public int getRepeatedForeignEnumValue(int index) {
         return repeatedForeignEnum_.get(index);
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @param index The index to set the value at.
        * @param value The enum numeric value on the wire for repeatedForeignEnum to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedForeignEnumValue(int index, int value) {
+      public Builder setRepeatedForeignEnumValue(
+          int index, int value) {
         ensureRepeatedForeignEnumIsMutable();
         repeatedForeignEnum_.set(index, value);
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @param value The enum numeric value on the wire for repeatedForeignEnum to add.
        * @return This builder for chaining.
        */
@@ -17929,14 +15993,13 @@ public Builder addRepeatedForeignEnumValue(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @param values The enum numeric values on the wire for repeatedForeignEnum to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedForeignEnumValue(java.lang.Iterable<java.lang.Integer> values) {
+      public Builder addAllRepeatedForeignEnumValue(
+          java.lang.Iterable<java.lang.Integer> values) {
         ensureRepeatedForeignEnumIsMutable();
         for (int value : values) {
           repeatedForeignEnum_.add(value);
@@ -17946,75 +16009,60 @@ public Builder addAllRepeatedForeignEnumValue(java.lang.Iterable<java.lang.Integ
       }
 
       private com.google.protobuf.Internal.IntList packedInt32_ = emptyIntList();
-
       private void ensurePackedInt32IsMutable() {
         if (!packedInt32_.isModifiable()) {
           packedInt32_ = makeMutableCopy(packedInt32_);
         }
         bitField1_ |= 0x00000100;
       }
-
       /**
-       *
-       *
        * <pre>
        * Packed
        * </pre>
        *
        * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-       *
        * @return A list containing the packedInt32.
        */
-      public java.util.List<java.lang.Integer> getPackedInt32List() {
+      public java.util.List<java.lang.Integer>
+          getPackedInt32List() {
         packedInt32_.makeImmutable();
         return packedInt32_;
       }
-
       /**
-       *
-       *
        * <pre>
        * Packed
        * </pre>
        *
        * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-       *
        * @return The count of packedInt32.
        */
       public int getPackedInt32Count() {
         return packedInt32_.size();
       }
-
       /**
-       *
-       *
        * <pre>
        * Packed
        * </pre>
        *
        * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedInt32 at the given index.
        */
       public int getPackedInt32(int index) {
         return packedInt32_.getInt(index);
       }
-
       /**
-       *
-       *
        * <pre>
        * Packed
        * </pre>
        *
        * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedInt32 to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedInt32(int index, int value) {
+      public Builder setPackedInt32(
+          int index, int value) {
 
         ensurePackedInt32IsMutable();
         packedInt32_.setInt(index, value);
@@ -18022,16 +16070,12 @@ public Builder setPackedInt32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
-       *
-       *
        * <pre>
        * Packed
        * </pre>
        *
        * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-       *
        * @param value The packedInt32 to add.
        * @return This builder for chaining.
        */
@@ -18043,36 +16087,30 @@ public Builder addPackedInt32(int value) {
         onChanged();
         return this;
       }
-
       /**
-       *
-       *
        * <pre>
        * Packed
        * </pre>
        *
        * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-       *
        * @param values The packedInt32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedInt32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllPackedInt32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensurePackedInt32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedInt32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedInt32_);
         bitField1_ |= 0x00000100;
         onChanged();
         return this;
       }
-
       /**
-       *
-       *
        * <pre>
        * Packed
        * </pre>
        *
        * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedInt32() {
@@ -18083,51 +16121,44 @@ public Builder clearPackedInt32() {
       }
 
       private com.google.protobuf.Internal.LongList packedInt64_ = emptyLongList();
-
       private void ensurePackedInt64IsMutable() {
         if (!packedInt64_.isModifiable()) {
           packedInt64_ = makeMutableCopy(packedInt64_);
         }
         bitField1_ |= 0x00000200;
       }
-
       /**
        * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-       *
        * @return A list containing the packedInt64.
        */
-      public java.util.List<java.lang.Long> getPackedInt64List() {
+      public java.util.List<java.lang.Long>
+          getPackedInt64List() {
         packedInt64_.makeImmutable();
         return packedInt64_;
       }
-
       /**
        * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-       *
        * @return The count of packedInt64.
        */
       public int getPackedInt64Count() {
         return packedInt64_.size();
       }
-
       /**
        * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedInt64 at the given index.
        */
       public long getPackedInt64(int index) {
         return packedInt64_.getLong(index);
       }
-
       /**
        * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedInt64 to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedInt64(int index, long value) {
+      public Builder setPackedInt64(
+          int index, long value) {
 
         ensurePackedInt64IsMutable();
         packedInt64_.setLong(index, value);
@@ -18135,10 +16166,8 @@ public Builder setPackedInt64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-       *
        * @param value The packedInt64 to add.
        * @return This builder for chaining.
        */
@@ -18150,24 +16179,22 @@ public Builder addPackedInt64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-       *
        * @param values The packedInt64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedInt64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllPackedInt64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensurePackedInt64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedInt64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedInt64_);
         bitField1_ |= 0x00000200;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedInt64() {
@@ -18178,51 +16205,44 @@ public Builder clearPackedInt64() {
       }
 
       private com.google.protobuf.Internal.IntList packedUint32_ = emptyIntList();
-
       private void ensurePackedUint32IsMutable() {
         if (!packedUint32_.isModifiable()) {
           packedUint32_ = makeMutableCopy(packedUint32_);
         }
         bitField1_ |= 0x00000400;
       }
-
       /**
        * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-       *
        * @return A list containing the packedUint32.
        */
-      public java.util.List<java.lang.Integer> getPackedUint32List() {
+      public java.util.List<java.lang.Integer>
+          getPackedUint32List() {
         packedUint32_.makeImmutable();
         return packedUint32_;
       }
-
       /**
        * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-       *
        * @return The count of packedUint32.
        */
       public int getPackedUint32Count() {
         return packedUint32_.size();
       }
-
       /**
        * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedUint32 at the given index.
        */
       public int getPackedUint32(int index) {
         return packedUint32_.getInt(index);
       }
-
       /**
        * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedUint32 to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedUint32(int index, int value) {
+      public Builder setPackedUint32(
+          int index, int value) {
 
         ensurePackedUint32IsMutable();
         packedUint32_.setInt(index, value);
@@ -18230,10 +16250,8 @@ public Builder setPackedUint32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-       *
        * @param value The packedUint32 to add.
        * @return This builder for chaining.
        */
@@ -18245,24 +16263,22 @@ public Builder addPackedUint32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-       *
        * @param values The packedUint32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedUint32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllPackedUint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensurePackedUint32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedUint32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedUint32_);
         bitField1_ |= 0x00000400;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedUint32() {
@@ -18273,51 +16289,44 @@ public Builder clearPackedUint32() {
       }
 
       private com.google.protobuf.Internal.LongList packedUint64_ = emptyLongList();
-
       private void ensurePackedUint64IsMutable() {
         if (!packedUint64_.isModifiable()) {
           packedUint64_ = makeMutableCopy(packedUint64_);
         }
         bitField1_ |= 0x00000800;
       }
-
       /**
        * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-       *
        * @return A list containing the packedUint64.
        */
-      public java.util.List<java.lang.Long> getPackedUint64List() {
+      public java.util.List<java.lang.Long>
+          getPackedUint64List() {
         packedUint64_.makeImmutable();
         return packedUint64_;
       }
-
       /**
        * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-       *
        * @return The count of packedUint64.
        */
       public int getPackedUint64Count() {
         return packedUint64_.size();
       }
-
       /**
        * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedUint64 at the given index.
        */
       public long getPackedUint64(int index) {
         return packedUint64_.getLong(index);
       }
-
       /**
        * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedUint64 to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedUint64(int index, long value) {
+      public Builder setPackedUint64(
+          int index, long value) {
 
         ensurePackedUint64IsMutable();
         packedUint64_.setLong(index, value);
@@ -18325,10 +16334,8 @@ public Builder setPackedUint64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-       *
        * @param value The packedUint64 to add.
        * @return This builder for chaining.
        */
@@ -18340,24 +16347,22 @@ public Builder addPackedUint64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-       *
        * @param values The packedUint64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedUint64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllPackedUint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensurePackedUint64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedUint64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedUint64_);
         bitField1_ |= 0x00000800;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedUint64() {
@@ -18368,51 +16373,44 @@ public Builder clearPackedUint64() {
       }
 
       private com.google.protobuf.Internal.IntList packedSint32_ = emptyIntList();
-
       private void ensurePackedSint32IsMutable() {
         if (!packedSint32_.isModifiable()) {
           packedSint32_ = makeMutableCopy(packedSint32_);
         }
         bitField1_ |= 0x00001000;
       }
-
       /**
        * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-       *
        * @return A list containing the packedSint32.
        */
-      public java.util.List<java.lang.Integer> getPackedSint32List() {
+      public java.util.List<java.lang.Integer>
+          getPackedSint32List() {
         packedSint32_.makeImmutable();
         return packedSint32_;
       }
-
       /**
        * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-       *
        * @return The count of packedSint32.
        */
       public int getPackedSint32Count() {
         return packedSint32_.size();
       }
-
       /**
        * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedSint32 at the given index.
        */
       public int getPackedSint32(int index) {
         return packedSint32_.getInt(index);
       }
-
       /**
        * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedSint32 to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedSint32(int index, int value) {
+      public Builder setPackedSint32(
+          int index, int value) {
 
         ensurePackedSint32IsMutable();
         packedSint32_.setInt(index, value);
@@ -18420,10 +16418,8 @@ public Builder setPackedSint32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-       *
        * @param value The packedSint32 to add.
        * @return This builder for chaining.
        */
@@ -18435,24 +16431,22 @@ public Builder addPackedSint32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-       *
        * @param values The packedSint32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedSint32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllPackedSint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensurePackedSint32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedSint32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedSint32_);
         bitField1_ |= 0x00001000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedSint32() {
@@ -18463,51 +16457,44 @@ public Builder clearPackedSint32() {
       }
 
       private com.google.protobuf.Internal.LongList packedSint64_ = emptyLongList();
-
       private void ensurePackedSint64IsMutable() {
         if (!packedSint64_.isModifiable()) {
           packedSint64_ = makeMutableCopy(packedSint64_);
         }
         bitField1_ |= 0x00002000;
       }
-
       /**
        * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-       *
        * @return A list containing the packedSint64.
        */
-      public java.util.List<java.lang.Long> getPackedSint64List() {
+      public java.util.List<java.lang.Long>
+          getPackedSint64List() {
         packedSint64_.makeImmutable();
         return packedSint64_;
       }
-
       /**
        * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-       *
        * @return The count of packedSint64.
        */
       public int getPackedSint64Count() {
         return packedSint64_.size();
       }
-
       /**
        * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedSint64 at the given index.
        */
       public long getPackedSint64(int index) {
         return packedSint64_.getLong(index);
       }
-
       /**
        * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedSint64 to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedSint64(int index, long value) {
+      public Builder setPackedSint64(
+          int index, long value) {
 
         ensurePackedSint64IsMutable();
         packedSint64_.setLong(index, value);
@@ -18515,10 +16502,8 @@ public Builder setPackedSint64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-       *
        * @param value The packedSint64 to add.
        * @return This builder for chaining.
        */
@@ -18530,24 +16515,22 @@ public Builder addPackedSint64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-       *
        * @param values The packedSint64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedSint64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllPackedSint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensurePackedSint64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedSint64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedSint64_);
         bitField1_ |= 0x00002000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedSint64() {
@@ -18558,58 +16541,50 @@ public Builder clearPackedSint64() {
       }
 
       private com.google.protobuf.Internal.IntList packedFixed32_ = emptyIntList();
-
       private void ensurePackedFixed32IsMutable() {
         if (!packedFixed32_.isModifiable()) {
           packedFixed32_ = makeMutableCopy(packedFixed32_);
         }
         bitField1_ |= 0x00004000;
       }
-
       private void ensurePackedFixed32IsMutable(int capacity) {
         if (!packedFixed32_.isModifiable()) {
           packedFixed32_ = makeMutableCopy(packedFixed32_, capacity);
         }
         bitField1_ |= 0x00004000;
       }
-
       /**
        * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-       *
        * @return A list containing the packedFixed32.
        */
-      public java.util.List<java.lang.Integer> getPackedFixed32List() {
+      public java.util.List<java.lang.Integer>
+          getPackedFixed32List() {
         packedFixed32_.makeImmutable();
         return packedFixed32_;
       }
-
       /**
        * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-       *
        * @return The count of packedFixed32.
        */
       public int getPackedFixed32Count() {
         return packedFixed32_.size();
       }
-
       /**
        * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedFixed32 at the given index.
        */
       public int getPackedFixed32(int index) {
         return packedFixed32_.getInt(index);
       }
-
       /**
        * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedFixed32 to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedFixed32(int index, int value) {
+      public Builder setPackedFixed32(
+          int index, int value) {
 
         ensurePackedFixed32IsMutable();
         packedFixed32_.setInt(index, value);
@@ -18617,10 +16592,8 @@ public Builder setPackedFixed32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-       *
        * @param value The packedFixed32 to add.
        * @return This builder for chaining.
        */
@@ -18632,24 +16605,22 @@ public Builder addPackedFixed32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-       *
        * @param values The packedFixed32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedFixed32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllPackedFixed32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensurePackedFixed32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedFixed32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedFixed32_);
         bitField1_ |= 0x00004000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedFixed32() {
@@ -18660,58 +16631,50 @@ public Builder clearPackedFixed32() {
       }
 
       private com.google.protobuf.Internal.LongList packedFixed64_ = emptyLongList();
-
       private void ensurePackedFixed64IsMutable() {
         if (!packedFixed64_.isModifiable()) {
           packedFixed64_ = makeMutableCopy(packedFixed64_);
         }
         bitField1_ |= 0x00008000;
       }
-
       private void ensurePackedFixed64IsMutable(int capacity) {
         if (!packedFixed64_.isModifiable()) {
           packedFixed64_ = makeMutableCopy(packedFixed64_, capacity);
         }
         bitField1_ |= 0x00008000;
       }
-
       /**
        * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-       *
        * @return A list containing the packedFixed64.
        */
-      public java.util.List<java.lang.Long> getPackedFixed64List() {
+      public java.util.List<java.lang.Long>
+          getPackedFixed64List() {
         packedFixed64_.makeImmutable();
         return packedFixed64_;
       }
-
       /**
        * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-       *
        * @return The count of packedFixed64.
        */
       public int getPackedFixed64Count() {
         return packedFixed64_.size();
       }
-
       /**
        * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedFixed64 at the given index.
        */
       public long getPackedFixed64(int index) {
         return packedFixed64_.getLong(index);
       }
-
       /**
        * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedFixed64 to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedFixed64(int index, long value) {
+      public Builder setPackedFixed64(
+          int index, long value) {
 
         ensurePackedFixed64IsMutable();
         packedFixed64_.setLong(index, value);
@@ -18719,10 +16682,8 @@ public Builder setPackedFixed64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-       *
        * @param value The packedFixed64 to add.
        * @return This builder for chaining.
        */
@@ -18734,24 +16695,22 @@ public Builder addPackedFixed64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-       *
        * @param values The packedFixed64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedFixed64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllPackedFixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensurePackedFixed64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedFixed64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedFixed64_);
         bitField1_ |= 0x00008000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedFixed64() {
@@ -18762,58 +16721,50 @@ public Builder clearPackedFixed64() {
       }
 
       private com.google.protobuf.Internal.IntList packedSfixed32_ = emptyIntList();
-
       private void ensurePackedSfixed32IsMutable() {
         if (!packedSfixed32_.isModifiable()) {
           packedSfixed32_ = makeMutableCopy(packedSfixed32_);
         }
         bitField1_ |= 0x00010000;
       }
-
       private void ensurePackedSfixed32IsMutable(int capacity) {
         if (!packedSfixed32_.isModifiable()) {
           packedSfixed32_ = makeMutableCopy(packedSfixed32_, capacity);
         }
         bitField1_ |= 0x00010000;
       }
-
       /**
        * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-       *
        * @return A list containing the packedSfixed32.
        */
-      public java.util.List<java.lang.Integer> getPackedSfixed32List() {
+      public java.util.List<java.lang.Integer>
+          getPackedSfixed32List() {
         packedSfixed32_.makeImmutable();
         return packedSfixed32_;
       }
-
       /**
        * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-       *
        * @return The count of packedSfixed32.
        */
       public int getPackedSfixed32Count() {
         return packedSfixed32_.size();
       }
-
       /**
        * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedSfixed32 at the given index.
        */
       public int getPackedSfixed32(int index) {
         return packedSfixed32_.getInt(index);
       }
-
       /**
        * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedSfixed32 to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedSfixed32(int index, int value) {
+      public Builder setPackedSfixed32(
+          int index, int value) {
 
         ensurePackedSfixed32IsMutable();
         packedSfixed32_.setInt(index, value);
@@ -18821,10 +16772,8 @@ public Builder setPackedSfixed32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-       *
        * @param value The packedSfixed32 to add.
        * @return This builder for chaining.
        */
@@ -18836,24 +16785,22 @@ public Builder addPackedSfixed32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-       *
        * @param values The packedSfixed32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedSfixed32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllPackedSfixed32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensurePackedSfixed32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedSfixed32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedSfixed32_);
         bitField1_ |= 0x00010000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedSfixed32() {
@@ -18864,58 +16811,50 @@ public Builder clearPackedSfixed32() {
       }
 
       private com.google.protobuf.Internal.LongList packedSfixed64_ = emptyLongList();
-
       private void ensurePackedSfixed64IsMutable() {
         if (!packedSfixed64_.isModifiable()) {
           packedSfixed64_ = makeMutableCopy(packedSfixed64_);
         }
         bitField1_ |= 0x00020000;
       }
-
       private void ensurePackedSfixed64IsMutable(int capacity) {
         if (!packedSfixed64_.isModifiable()) {
           packedSfixed64_ = makeMutableCopy(packedSfixed64_, capacity);
         }
         bitField1_ |= 0x00020000;
       }
-
       /**
        * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-       *
        * @return A list containing the packedSfixed64.
        */
-      public java.util.List<java.lang.Long> getPackedSfixed64List() {
+      public java.util.List<java.lang.Long>
+          getPackedSfixed64List() {
         packedSfixed64_.makeImmutable();
         return packedSfixed64_;
       }
-
       /**
        * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-       *
        * @return The count of packedSfixed64.
        */
       public int getPackedSfixed64Count() {
         return packedSfixed64_.size();
       }
-
       /**
        * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedSfixed64 at the given index.
        */
       public long getPackedSfixed64(int index) {
         return packedSfixed64_.getLong(index);
       }
-
       /**
        * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedSfixed64 to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedSfixed64(int index, long value) {
+      public Builder setPackedSfixed64(
+          int index, long value) {
 
         ensurePackedSfixed64IsMutable();
         packedSfixed64_.setLong(index, value);
@@ -18923,10 +16862,8 @@ public Builder setPackedSfixed64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-       *
        * @param value The packedSfixed64 to add.
        * @return This builder for chaining.
        */
@@ -18938,24 +16875,22 @@ public Builder addPackedSfixed64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-       *
        * @param values The packedSfixed64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedSfixed64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllPackedSfixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensurePackedSfixed64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedSfixed64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedSfixed64_);
         bitField1_ |= 0x00020000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedSfixed64() {
@@ -18966,58 +16901,50 @@ public Builder clearPackedSfixed64() {
       }
 
       private com.google.protobuf.Internal.FloatList packedFloat_ = emptyFloatList();
-
       private void ensurePackedFloatIsMutable() {
         if (!packedFloat_.isModifiable()) {
           packedFloat_ = makeMutableCopy(packedFloat_);
         }
         bitField1_ |= 0x00040000;
       }
-
       private void ensurePackedFloatIsMutable(int capacity) {
         if (!packedFloat_.isModifiable()) {
           packedFloat_ = makeMutableCopy(packedFloat_, capacity);
         }
         bitField1_ |= 0x00040000;
       }
-
       /**
        * <code>repeated float packed_float = 85 [packed = true];</code>
-       *
        * @return A list containing the packedFloat.
        */
-      public java.util.List<java.lang.Float> getPackedFloatList() {
+      public java.util.List<java.lang.Float>
+          getPackedFloatList() {
         packedFloat_.makeImmutable();
         return packedFloat_;
       }
-
       /**
        * <code>repeated float packed_float = 85 [packed = true];</code>
-       *
        * @return The count of packedFloat.
        */
       public int getPackedFloatCount() {
         return packedFloat_.size();
       }
-
       /**
        * <code>repeated float packed_float = 85 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedFloat at the given index.
        */
       public float getPackedFloat(int index) {
         return packedFloat_.getFloat(index);
       }
-
       /**
        * <code>repeated float packed_float = 85 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedFloat to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedFloat(int index, float value) {
+      public Builder setPackedFloat(
+          int index, float value) {
 
         ensurePackedFloatIsMutable();
         packedFloat_.setFloat(index, value);
@@ -19025,10 +16952,8 @@ public Builder setPackedFloat(int index, float value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated float packed_float = 85 [packed = true];</code>
-       *
        * @param value The packedFloat to add.
        * @return This builder for chaining.
        */
@@ -19040,24 +16965,22 @@ public Builder addPackedFloat(float value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated float packed_float = 85 [packed = true];</code>
-       *
        * @param values The packedFloat to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedFloat(java.lang.Iterable<? extends java.lang.Float> values) {
+      public Builder addAllPackedFloat(
+          java.lang.Iterable<? extends java.lang.Float> values) {
         ensurePackedFloatIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedFloat_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedFloat_);
         bitField1_ |= 0x00040000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated float packed_float = 85 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedFloat() {
@@ -19068,58 +16991,50 @@ public Builder clearPackedFloat() {
       }
 
       private com.google.protobuf.Internal.DoubleList packedDouble_ = emptyDoubleList();
-
       private void ensurePackedDoubleIsMutable() {
         if (!packedDouble_.isModifiable()) {
           packedDouble_ = makeMutableCopy(packedDouble_);
         }
         bitField1_ |= 0x00080000;
       }
-
       private void ensurePackedDoubleIsMutable(int capacity) {
         if (!packedDouble_.isModifiable()) {
           packedDouble_ = makeMutableCopy(packedDouble_, capacity);
         }
         bitField1_ |= 0x00080000;
       }
-
       /**
        * <code>repeated double packed_double = 86 [packed = true];</code>
-       *
        * @return A list containing the packedDouble.
        */
-      public java.util.List<java.lang.Double> getPackedDoubleList() {
+      public java.util.List<java.lang.Double>
+          getPackedDoubleList() {
         packedDouble_.makeImmutable();
         return packedDouble_;
       }
-
       /**
        * <code>repeated double packed_double = 86 [packed = true];</code>
-       *
        * @return The count of packedDouble.
        */
       public int getPackedDoubleCount() {
         return packedDouble_.size();
       }
-
       /**
        * <code>repeated double packed_double = 86 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedDouble at the given index.
        */
       public double getPackedDouble(int index) {
         return packedDouble_.getDouble(index);
       }
-
       /**
        * <code>repeated double packed_double = 86 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedDouble to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedDouble(int index, double value) {
+      public Builder setPackedDouble(
+          int index, double value) {
 
         ensurePackedDoubleIsMutable();
         packedDouble_.setDouble(index, value);
@@ -19127,10 +17042,8 @@ public Builder setPackedDouble(int index, double value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated double packed_double = 86 [packed = true];</code>
-       *
        * @param value The packedDouble to add.
        * @return This builder for chaining.
        */
@@ -19142,24 +17055,22 @@ public Builder addPackedDouble(double value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated double packed_double = 86 [packed = true];</code>
-       *
        * @param values The packedDouble to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedDouble(java.lang.Iterable<? extends java.lang.Double> values) {
+      public Builder addAllPackedDouble(
+          java.lang.Iterable<? extends java.lang.Double> values) {
         ensurePackedDoubleIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedDouble_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedDouble_);
         bitField1_ |= 0x00080000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated double packed_double = 86 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedDouble() {
@@ -19170,58 +17081,50 @@ public Builder clearPackedDouble() {
       }
 
       private com.google.protobuf.Internal.BooleanList packedBool_ = emptyBooleanList();
-
       private void ensurePackedBoolIsMutable() {
         if (!packedBool_.isModifiable()) {
           packedBool_ = makeMutableCopy(packedBool_);
         }
         bitField1_ |= 0x00100000;
       }
-
       private void ensurePackedBoolIsMutable(int capacity) {
         if (!packedBool_.isModifiable()) {
           packedBool_ = makeMutableCopy(packedBool_, capacity);
         }
         bitField1_ |= 0x00100000;
       }
-
       /**
        * <code>repeated bool packed_bool = 87 [packed = true];</code>
-       *
        * @return A list containing the packedBool.
        */
-      public java.util.List<java.lang.Boolean> getPackedBoolList() {
+      public java.util.List<java.lang.Boolean>
+          getPackedBoolList() {
         packedBool_.makeImmutable();
         return packedBool_;
       }
-
       /**
        * <code>repeated bool packed_bool = 87 [packed = true];</code>
-       *
        * @return The count of packedBool.
        */
       public int getPackedBoolCount() {
         return packedBool_.size();
       }
-
       /**
        * <code>repeated bool packed_bool = 87 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedBool at the given index.
        */
       public boolean getPackedBool(int index) {
         return packedBool_.getBoolean(index);
       }
-
       /**
        * <code>repeated bool packed_bool = 87 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedBool to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedBool(int index, boolean value) {
+      public Builder setPackedBool(
+          int index, boolean value) {
 
         ensurePackedBoolIsMutable();
         packedBool_.setBoolean(index, value);
@@ -19229,10 +17132,8 @@ public Builder setPackedBool(int index, boolean value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bool packed_bool = 87 [packed = true];</code>
-       *
        * @param value The packedBool to add.
        * @return This builder for chaining.
        */
@@ -19244,24 +17145,22 @@ public Builder addPackedBool(boolean value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bool packed_bool = 87 [packed = true];</code>
-       *
        * @param values The packedBool to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedBool(java.lang.Iterable<? extends java.lang.Boolean> values) {
+      public Builder addAllPackedBool(
+          java.lang.Iterable<? extends java.lang.Boolean> values) {
         ensurePackedBoolIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedBool_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedBool_);
         bitField1_ |= 0x00100000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bool packed_bool = 87 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedBool() {
@@ -19272,67 +17171,44 @@ public Builder clearPackedBool() {
       }
 
       private java.util.List<java.lang.Integer> packedNestedEnum_ =
-          java.util.Collections.emptyList();
-
+        java.util.Collections.emptyList();
       private void ensurePackedNestedEnumIsMutable() {
         if (!((bitField1_ & 0x00200000) != 0)) {
           packedNestedEnum_ = new java.util.ArrayList<java.lang.Integer>(packedNestedEnum_);
           bitField1_ |= 0x00200000;
         }
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @return A list containing the packedNestedEnum.
        */
-      public java.util.List<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-          getPackedNestedEnumList() {
+      public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> getPackedNestedEnumList() {
         return new com.google.protobuf.Internal.ListAdapter<
-            java.lang.Integer,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(
-            packedNestedEnum_, packedNestedEnum_converter_);
+            java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(packedNestedEnum_, packedNestedEnum_converter_);
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @return The count of packedNestedEnum.
        */
       public int getPackedNestedEnumCount() {
         return packedNestedEnum_.size();
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @param index The index of the element to return.
        * @return The packedNestedEnum at the given index.
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-          getPackedNestedEnum(int index) {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getPackedNestedEnum(int index) {
         return packedNestedEnum_converter_.convert(packedNestedEnum_.get(index));
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @param index The index to set the value at.
        * @param value The packedNestedEnum to set.
        * @return This builder for chaining.
        */
       public Builder setPackedNestedEnum(
-          int index,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
+          int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -19341,17 +17217,12 @@ public Builder setPackedNestedEnum(
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @param value The packedNestedEnum to add.
        * @return This builder for chaining.
        */
-      public Builder addPackedNestedEnum(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
+      public Builder addPackedNestedEnum(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -19360,35 +17231,22 @@ public Builder addPackedNestedEnum(
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @param values The packedNestedEnum to add.
        * @return This builder for chaining.
        */
       public Builder addAllPackedNestedEnum(
-          java.lang.Iterable<
-                  ? extends
-                      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                          .NestedEnum>
-              values) {
+          java.lang.Iterable<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> values) {
         ensurePackedNestedEnumIsMutable();
-        for (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-            value : values) {
+        for (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value : values) {
           packedNestedEnum_.add(value.getNumber());
         }
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @return This builder for chaining.
        */
       public Builder clearPackedNestedEnum() {
@@ -19397,51 +17255,37 @@ public Builder clearPackedNestedEnum() {
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @return A list containing the enum numeric values on the wire for packedNestedEnum.
        */
-      public java.util.List<java.lang.Integer> getPackedNestedEnumValueList() {
+      public java.util.List<java.lang.Integer>
+      getPackedNestedEnumValueList() {
         return java.util.Collections.unmodifiableList(packedNestedEnum_);
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @param index The index of the value to return.
        * @return The enum numeric value on the wire of packedNestedEnum at the given index.
        */
       public int getPackedNestedEnumValue(int index) {
         return packedNestedEnum_.get(index);
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @param index The index to set the value at.
        * @param value The enum numeric value on the wire for packedNestedEnum to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedNestedEnumValue(int index, int value) {
+      public Builder setPackedNestedEnumValue(
+          int index, int value) {
         ensurePackedNestedEnumIsMutable();
         packedNestedEnum_.set(index, value);
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @param value The enum numeric value on the wire for packedNestedEnum to add.
        * @return This builder for chaining.
        */
@@ -19451,16 +17295,13 @@ public Builder addPackedNestedEnumValue(int value) {
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @param values The enum numeric values on the wire for packedNestedEnum to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedNestedEnumValue(java.lang.Iterable<java.lang.Integer> values) {
+      public Builder addAllPackedNestedEnumValue(
+          java.lang.Iterable<java.lang.Integer> values) {
         ensurePackedNestedEnumIsMutable();
         for (int value : values) {
           packedNestedEnum_.add(value);
@@ -19470,75 +17311,60 @@ public Builder addAllPackedNestedEnumValue(java.lang.Iterable<java.lang.Integer>
       }
 
       private com.google.protobuf.Internal.IntList unpackedInt32_ = emptyIntList();
-
       private void ensureUnpackedInt32IsMutable() {
         if (!unpackedInt32_.isModifiable()) {
           unpackedInt32_ = makeMutableCopy(unpackedInt32_);
         }
         bitField1_ |= 0x00400000;
       }
-
       /**
-       *
-       *
        * <pre>
        * Unpacked
        * </pre>
        *
        * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-       *
        * @return A list containing the unpackedInt32.
        */
-      public java.util.List<java.lang.Integer> getUnpackedInt32List() {
+      public java.util.List<java.lang.Integer>
+          getUnpackedInt32List() {
         unpackedInt32_.makeImmutable();
         return unpackedInt32_;
       }
-
       /**
-       *
-       *
        * <pre>
        * Unpacked
        * </pre>
        *
        * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-       *
        * @return The count of unpackedInt32.
        */
       public int getUnpackedInt32Count() {
         return unpackedInt32_.size();
       }
-
       /**
-       *
-       *
        * <pre>
        * Unpacked
        * </pre>
        *
        * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedInt32 at the given index.
        */
       public int getUnpackedInt32(int index) {
         return unpackedInt32_.getInt(index);
       }
-
       /**
-       *
-       *
        * <pre>
        * Unpacked
        * </pre>
        *
        * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedInt32 to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedInt32(int index, int value) {
+      public Builder setUnpackedInt32(
+          int index, int value) {
 
         ensureUnpackedInt32IsMutable();
         unpackedInt32_.setInt(index, value);
@@ -19546,16 +17372,12 @@ public Builder setUnpackedInt32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
-       *
-       *
        * <pre>
        * Unpacked
        * </pre>
        *
        * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-       *
        * @param value The unpackedInt32 to add.
        * @return This builder for chaining.
        */
@@ -19567,36 +17389,30 @@ public Builder addUnpackedInt32(int value) {
         onChanged();
         return this;
       }
-
       /**
-       *
-       *
        * <pre>
        * Unpacked
        * </pre>
        *
        * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-       *
        * @param values The unpackedInt32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedInt32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllUnpackedInt32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureUnpackedInt32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedInt32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedInt32_);
         bitField1_ |= 0x00400000;
         onChanged();
         return this;
       }
-
       /**
-       *
-       *
        * <pre>
        * Unpacked
        * </pre>
        *
        * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedInt32() {
@@ -19607,51 +17423,44 @@ public Builder clearUnpackedInt32() {
       }
 
       private com.google.protobuf.Internal.LongList unpackedInt64_ = emptyLongList();
-
       private void ensureUnpackedInt64IsMutable() {
         if (!unpackedInt64_.isModifiable()) {
           unpackedInt64_ = makeMutableCopy(unpackedInt64_);
         }
         bitField1_ |= 0x00800000;
       }
-
       /**
        * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-       *
        * @return A list containing the unpackedInt64.
        */
-      public java.util.List<java.lang.Long> getUnpackedInt64List() {
+      public java.util.List<java.lang.Long>
+          getUnpackedInt64List() {
         unpackedInt64_.makeImmutable();
         return unpackedInt64_;
       }
-
       /**
        * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-       *
        * @return The count of unpackedInt64.
        */
       public int getUnpackedInt64Count() {
         return unpackedInt64_.size();
       }
-
       /**
        * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedInt64 at the given index.
        */
       public long getUnpackedInt64(int index) {
         return unpackedInt64_.getLong(index);
       }
-
       /**
        * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedInt64 to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedInt64(int index, long value) {
+      public Builder setUnpackedInt64(
+          int index, long value) {
 
         ensureUnpackedInt64IsMutable();
         unpackedInt64_.setLong(index, value);
@@ -19659,10 +17468,8 @@ public Builder setUnpackedInt64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-       *
        * @param value The unpackedInt64 to add.
        * @return This builder for chaining.
        */
@@ -19674,24 +17481,22 @@ public Builder addUnpackedInt64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-       *
        * @param values The unpackedInt64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedInt64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllUnpackedInt64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensureUnpackedInt64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedInt64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedInt64_);
         bitField1_ |= 0x00800000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedInt64() {
@@ -19702,51 +17507,44 @@ public Builder clearUnpackedInt64() {
       }
 
       private com.google.protobuf.Internal.IntList unpackedUint32_ = emptyIntList();
-
       private void ensureUnpackedUint32IsMutable() {
         if (!unpackedUint32_.isModifiable()) {
           unpackedUint32_ = makeMutableCopy(unpackedUint32_);
         }
         bitField1_ |= 0x01000000;
       }
-
       /**
        * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-       *
        * @return A list containing the unpackedUint32.
        */
-      public java.util.List<java.lang.Integer> getUnpackedUint32List() {
+      public java.util.List<java.lang.Integer>
+          getUnpackedUint32List() {
         unpackedUint32_.makeImmutable();
         return unpackedUint32_;
       }
-
       /**
        * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-       *
        * @return The count of unpackedUint32.
        */
       public int getUnpackedUint32Count() {
         return unpackedUint32_.size();
       }
-
       /**
        * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedUint32 at the given index.
        */
       public int getUnpackedUint32(int index) {
         return unpackedUint32_.getInt(index);
       }
-
       /**
        * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedUint32 to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedUint32(int index, int value) {
+      public Builder setUnpackedUint32(
+          int index, int value) {
 
         ensureUnpackedUint32IsMutable();
         unpackedUint32_.setInt(index, value);
@@ -19754,10 +17552,8 @@ public Builder setUnpackedUint32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-       *
        * @param value The unpackedUint32 to add.
        * @return This builder for chaining.
        */
@@ -19769,24 +17565,22 @@ public Builder addUnpackedUint32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-       *
        * @param values The unpackedUint32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedUint32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllUnpackedUint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureUnpackedUint32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedUint32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedUint32_);
         bitField1_ |= 0x01000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedUint32() {
@@ -19797,51 +17591,44 @@ public Builder clearUnpackedUint32() {
       }
 
       private com.google.protobuf.Internal.LongList unpackedUint64_ = emptyLongList();
-
       private void ensureUnpackedUint64IsMutable() {
         if (!unpackedUint64_.isModifiable()) {
           unpackedUint64_ = makeMutableCopy(unpackedUint64_);
         }
         bitField1_ |= 0x02000000;
       }
-
       /**
        * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-       *
        * @return A list containing the unpackedUint64.
        */
-      public java.util.List<java.lang.Long> getUnpackedUint64List() {
+      public java.util.List<java.lang.Long>
+          getUnpackedUint64List() {
         unpackedUint64_.makeImmutable();
         return unpackedUint64_;
       }
-
       /**
        * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-       *
        * @return The count of unpackedUint64.
        */
       public int getUnpackedUint64Count() {
         return unpackedUint64_.size();
       }
-
       /**
        * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedUint64 at the given index.
        */
       public long getUnpackedUint64(int index) {
         return unpackedUint64_.getLong(index);
       }
-
       /**
        * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedUint64 to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedUint64(int index, long value) {
+      public Builder setUnpackedUint64(
+          int index, long value) {
 
         ensureUnpackedUint64IsMutable();
         unpackedUint64_.setLong(index, value);
@@ -19849,10 +17636,8 @@ public Builder setUnpackedUint64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-       *
        * @param value The unpackedUint64 to add.
        * @return This builder for chaining.
        */
@@ -19864,24 +17649,22 @@ public Builder addUnpackedUint64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-       *
        * @param values The unpackedUint64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedUint64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllUnpackedUint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensureUnpackedUint64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedUint64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedUint64_);
         bitField1_ |= 0x02000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedUint64() {
@@ -19892,51 +17675,44 @@ public Builder clearUnpackedUint64() {
       }
 
       private com.google.protobuf.Internal.IntList unpackedSint32_ = emptyIntList();
-
       private void ensureUnpackedSint32IsMutable() {
         if (!unpackedSint32_.isModifiable()) {
           unpackedSint32_ = makeMutableCopy(unpackedSint32_);
         }
         bitField1_ |= 0x04000000;
       }
-
       /**
        * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-       *
        * @return A list containing the unpackedSint32.
        */
-      public java.util.List<java.lang.Integer> getUnpackedSint32List() {
+      public java.util.List<java.lang.Integer>
+          getUnpackedSint32List() {
         unpackedSint32_.makeImmutable();
         return unpackedSint32_;
       }
-
       /**
        * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-       *
        * @return The count of unpackedSint32.
        */
       public int getUnpackedSint32Count() {
         return unpackedSint32_.size();
       }
-
       /**
        * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedSint32 at the given index.
        */
       public int getUnpackedSint32(int index) {
         return unpackedSint32_.getInt(index);
       }
-
       /**
        * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedSint32 to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedSint32(int index, int value) {
+      public Builder setUnpackedSint32(
+          int index, int value) {
 
         ensureUnpackedSint32IsMutable();
         unpackedSint32_.setInt(index, value);
@@ -19944,10 +17720,8 @@ public Builder setUnpackedSint32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-       *
        * @param value The unpackedSint32 to add.
        * @return This builder for chaining.
        */
@@ -19959,24 +17733,22 @@ public Builder addUnpackedSint32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-       *
        * @param values The unpackedSint32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedSint32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllUnpackedSint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureUnpackedSint32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedSint32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedSint32_);
         bitField1_ |= 0x04000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedSint32() {
@@ -19987,51 +17759,44 @@ public Builder clearUnpackedSint32() {
       }
 
       private com.google.protobuf.Internal.LongList unpackedSint64_ = emptyLongList();
-
       private void ensureUnpackedSint64IsMutable() {
         if (!unpackedSint64_.isModifiable()) {
           unpackedSint64_ = makeMutableCopy(unpackedSint64_);
         }
         bitField1_ |= 0x08000000;
       }
-
       /**
        * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-       *
        * @return A list containing the unpackedSint64.
        */
-      public java.util.List<java.lang.Long> getUnpackedSint64List() {
+      public java.util.List<java.lang.Long>
+          getUnpackedSint64List() {
         unpackedSint64_.makeImmutable();
         return unpackedSint64_;
       }
-
       /**
        * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-       *
        * @return The count of unpackedSint64.
        */
       public int getUnpackedSint64Count() {
         return unpackedSint64_.size();
       }
-
       /**
        * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedSint64 at the given index.
        */
       public long getUnpackedSint64(int index) {
         return unpackedSint64_.getLong(index);
       }
-
       /**
        * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedSint64 to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedSint64(int index, long value) {
+      public Builder setUnpackedSint64(
+          int index, long value) {
 
         ensureUnpackedSint64IsMutable();
         unpackedSint64_.setLong(index, value);
@@ -20039,10 +17804,8 @@ public Builder setUnpackedSint64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-       *
        * @param value The unpackedSint64 to add.
        * @return This builder for chaining.
        */
@@ -20054,24 +17817,22 @@ public Builder addUnpackedSint64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-       *
        * @param values The unpackedSint64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedSint64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllUnpackedSint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensureUnpackedSint64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedSint64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedSint64_);
         bitField1_ |= 0x08000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedSint64() {
@@ -20082,58 +17843,50 @@ public Builder clearUnpackedSint64() {
       }
 
       private com.google.protobuf.Internal.IntList unpackedFixed32_ = emptyIntList();
-
       private void ensureUnpackedFixed32IsMutable() {
         if (!unpackedFixed32_.isModifiable()) {
           unpackedFixed32_ = makeMutableCopy(unpackedFixed32_);
         }
         bitField1_ |= 0x10000000;
       }
-
       private void ensureUnpackedFixed32IsMutable(int capacity) {
         if (!unpackedFixed32_.isModifiable()) {
           unpackedFixed32_ = makeMutableCopy(unpackedFixed32_, capacity);
         }
         bitField1_ |= 0x10000000;
       }
-
       /**
        * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-       *
        * @return A list containing the unpackedFixed32.
        */
-      public java.util.List<java.lang.Integer> getUnpackedFixed32List() {
+      public java.util.List<java.lang.Integer>
+          getUnpackedFixed32List() {
         unpackedFixed32_.makeImmutable();
         return unpackedFixed32_;
       }
-
       /**
        * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-       *
        * @return The count of unpackedFixed32.
        */
       public int getUnpackedFixed32Count() {
         return unpackedFixed32_.size();
       }
-
       /**
        * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedFixed32 at the given index.
        */
       public int getUnpackedFixed32(int index) {
         return unpackedFixed32_.getInt(index);
       }
-
       /**
        * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedFixed32 to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedFixed32(int index, int value) {
+      public Builder setUnpackedFixed32(
+          int index, int value) {
 
         ensureUnpackedFixed32IsMutable();
         unpackedFixed32_.setInt(index, value);
@@ -20141,10 +17894,8 @@ public Builder setUnpackedFixed32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-       *
        * @param value The unpackedFixed32 to add.
        * @return This builder for chaining.
        */
@@ -20156,24 +17907,22 @@ public Builder addUnpackedFixed32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-       *
        * @param values The unpackedFixed32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedFixed32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllUnpackedFixed32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureUnpackedFixed32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedFixed32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedFixed32_);
         bitField1_ |= 0x10000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedFixed32() {
@@ -20184,58 +17933,50 @@ public Builder clearUnpackedFixed32() {
       }
 
       private com.google.protobuf.Internal.LongList unpackedFixed64_ = emptyLongList();
-
       private void ensureUnpackedFixed64IsMutable() {
         if (!unpackedFixed64_.isModifiable()) {
           unpackedFixed64_ = makeMutableCopy(unpackedFixed64_);
         }
         bitField1_ |= 0x20000000;
       }
-
       private void ensureUnpackedFixed64IsMutable(int capacity) {
         if (!unpackedFixed64_.isModifiable()) {
           unpackedFixed64_ = makeMutableCopy(unpackedFixed64_, capacity);
         }
         bitField1_ |= 0x20000000;
       }
-
       /**
        * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-       *
        * @return A list containing the unpackedFixed64.
        */
-      public java.util.List<java.lang.Long> getUnpackedFixed64List() {
+      public java.util.List<java.lang.Long>
+          getUnpackedFixed64List() {
         unpackedFixed64_.makeImmutable();
         return unpackedFixed64_;
       }
-
       /**
        * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-       *
        * @return The count of unpackedFixed64.
        */
       public int getUnpackedFixed64Count() {
         return unpackedFixed64_.size();
       }
-
       /**
        * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedFixed64 at the given index.
        */
       public long getUnpackedFixed64(int index) {
         return unpackedFixed64_.getLong(index);
       }
-
       /**
        * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedFixed64 to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedFixed64(int index, long value) {
+      public Builder setUnpackedFixed64(
+          int index, long value) {
 
         ensureUnpackedFixed64IsMutable();
         unpackedFixed64_.setLong(index, value);
@@ -20243,10 +17984,8 @@ public Builder setUnpackedFixed64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-       *
        * @param value The unpackedFixed64 to add.
        * @return This builder for chaining.
        */
@@ -20258,24 +17997,22 @@ public Builder addUnpackedFixed64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-       *
        * @param values The unpackedFixed64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedFixed64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllUnpackedFixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensureUnpackedFixed64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedFixed64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedFixed64_);
         bitField1_ |= 0x20000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedFixed64() {
@@ -20286,58 +18023,50 @@ public Builder clearUnpackedFixed64() {
       }
 
       private com.google.protobuf.Internal.IntList unpackedSfixed32_ = emptyIntList();
-
       private void ensureUnpackedSfixed32IsMutable() {
         if (!unpackedSfixed32_.isModifiable()) {
           unpackedSfixed32_ = makeMutableCopy(unpackedSfixed32_);
         }
         bitField1_ |= 0x40000000;
       }
-
       private void ensureUnpackedSfixed32IsMutable(int capacity) {
         if (!unpackedSfixed32_.isModifiable()) {
           unpackedSfixed32_ = makeMutableCopy(unpackedSfixed32_, capacity);
         }
         bitField1_ |= 0x40000000;
       }
-
       /**
        * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-       *
        * @return A list containing the unpackedSfixed32.
        */
-      public java.util.List<java.lang.Integer> getUnpackedSfixed32List() {
+      public java.util.List<java.lang.Integer>
+          getUnpackedSfixed32List() {
         unpackedSfixed32_.makeImmutable();
         return unpackedSfixed32_;
       }
-
       /**
        * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-       *
        * @return The count of unpackedSfixed32.
        */
       public int getUnpackedSfixed32Count() {
         return unpackedSfixed32_.size();
       }
-
       /**
        * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedSfixed32 at the given index.
        */
       public int getUnpackedSfixed32(int index) {
         return unpackedSfixed32_.getInt(index);
       }
-
       /**
        * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedSfixed32 to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedSfixed32(int index, int value) {
+      public Builder setUnpackedSfixed32(
+          int index, int value) {
 
         ensureUnpackedSfixed32IsMutable();
         unpackedSfixed32_.setInt(index, value);
@@ -20345,10 +18074,8 @@ public Builder setUnpackedSfixed32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-       *
        * @param value The unpackedSfixed32 to add.
        * @return This builder for chaining.
        */
@@ -20360,25 +18087,22 @@ public Builder addUnpackedSfixed32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-       *
        * @param values The unpackedSfixed32 to add.
        * @return This builder for chaining.
        */
       public Builder addAllUnpackedSfixed32(
           java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureUnpackedSfixed32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedSfixed32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedSfixed32_);
         bitField1_ |= 0x40000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedSfixed32() {
@@ -20389,58 +18113,50 @@ public Builder clearUnpackedSfixed32() {
       }
 
       private com.google.protobuf.Internal.LongList unpackedSfixed64_ = emptyLongList();
-
       private void ensureUnpackedSfixed64IsMutable() {
         if (!unpackedSfixed64_.isModifiable()) {
           unpackedSfixed64_ = makeMutableCopy(unpackedSfixed64_);
         }
         bitField1_ |= 0x80000000;
       }
-
       private void ensureUnpackedSfixed64IsMutable(int capacity) {
         if (!unpackedSfixed64_.isModifiable()) {
           unpackedSfixed64_ = makeMutableCopy(unpackedSfixed64_, capacity);
         }
         bitField1_ |= 0x80000000;
       }
-
       /**
        * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-       *
        * @return A list containing the unpackedSfixed64.
        */
-      public java.util.List<java.lang.Long> getUnpackedSfixed64List() {
+      public java.util.List<java.lang.Long>
+          getUnpackedSfixed64List() {
         unpackedSfixed64_.makeImmutable();
         return unpackedSfixed64_;
       }
-
       /**
        * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-       *
        * @return The count of unpackedSfixed64.
        */
       public int getUnpackedSfixed64Count() {
         return unpackedSfixed64_.size();
       }
-
       /**
        * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedSfixed64 at the given index.
        */
       public long getUnpackedSfixed64(int index) {
         return unpackedSfixed64_.getLong(index);
       }
-
       /**
        * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedSfixed64 to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedSfixed64(int index, long value) {
+      public Builder setUnpackedSfixed64(
+          int index, long value) {
 
         ensureUnpackedSfixed64IsMutable();
         unpackedSfixed64_.setLong(index, value);
@@ -20448,10 +18164,8 @@ public Builder setUnpackedSfixed64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-       *
        * @param value The unpackedSfixed64 to add.
        * @return This builder for chaining.
        */
@@ -20463,24 +18177,22 @@ public Builder addUnpackedSfixed64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-       *
        * @param values The unpackedSfixed64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedSfixed64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllUnpackedSfixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensureUnpackedSfixed64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedSfixed64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedSfixed64_);
         bitField1_ |= 0x80000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedSfixed64() {
@@ -20491,58 +18203,50 @@ public Builder clearUnpackedSfixed64() {
       }
 
       private com.google.protobuf.Internal.FloatList unpackedFloat_ = emptyFloatList();
-
       private void ensureUnpackedFloatIsMutable() {
         if (!unpackedFloat_.isModifiable()) {
           unpackedFloat_ = makeMutableCopy(unpackedFloat_);
         }
         bitField2_ |= 0x00000001;
       }
-
       private void ensureUnpackedFloatIsMutable(int capacity) {
         if (!unpackedFloat_.isModifiable()) {
           unpackedFloat_ = makeMutableCopy(unpackedFloat_, capacity);
         }
         bitField2_ |= 0x00000001;
       }
-
       /**
        * <code>repeated float unpacked_float = 99 [packed = false];</code>
-       *
        * @return A list containing the unpackedFloat.
        */
-      public java.util.List<java.lang.Float> getUnpackedFloatList() {
+      public java.util.List<java.lang.Float>
+          getUnpackedFloatList() {
         unpackedFloat_.makeImmutable();
         return unpackedFloat_;
       }
-
       /**
        * <code>repeated float unpacked_float = 99 [packed = false];</code>
-       *
        * @return The count of unpackedFloat.
        */
       public int getUnpackedFloatCount() {
         return unpackedFloat_.size();
       }
-
       /**
        * <code>repeated float unpacked_float = 99 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedFloat at the given index.
        */
       public float getUnpackedFloat(int index) {
         return unpackedFloat_.getFloat(index);
       }
-
       /**
        * <code>repeated float unpacked_float = 99 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedFloat to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedFloat(int index, float value) {
+      public Builder setUnpackedFloat(
+          int index, float value) {
 
         ensureUnpackedFloatIsMutable();
         unpackedFloat_.setFloat(index, value);
@@ -20550,10 +18254,8 @@ public Builder setUnpackedFloat(int index, float value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated float unpacked_float = 99 [packed = false];</code>
-       *
        * @param value The unpackedFloat to add.
        * @return This builder for chaining.
        */
@@ -20565,24 +18267,22 @@ public Builder addUnpackedFloat(float value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated float unpacked_float = 99 [packed = false];</code>
-       *
        * @param values The unpackedFloat to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedFloat(java.lang.Iterable<? extends java.lang.Float> values) {
+      public Builder addAllUnpackedFloat(
+          java.lang.Iterable<? extends java.lang.Float> values) {
         ensureUnpackedFloatIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedFloat_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedFloat_);
         bitField2_ |= 0x00000001;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated float unpacked_float = 99 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedFloat() {
@@ -20593,58 +18293,50 @@ public Builder clearUnpackedFloat() {
       }
 
       private com.google.protobuf.Internal.DoubleList unpackedDouble_ = emptyDoubleList();
-
       private void ensureUnpackedDoubleIsMutable() {
         if (!unpackedDouble_.isModifiable()) {
           unpackedDouble_ = makeMutableCopy(unpackedDouble_);
         }
         bitField2_ |= 0x00000002;
       }
-
       private void ensureUnpackedDoubleIsMutable(int capacity) {
         if (!unpackedDouble_.isModifiable()) {
           unpackedDouble_ = makeMutableCopy(unpackedDouble_, capacity);
         }
         bitField2_ |= 0x00000002;
       }
-
       /**
        * <code>repeated double unpacked_double = 100 [packed = false];</code>
-       *
        * @return A list containing the unpackedDouble.
        */
-      public java.util.List<java.lang.Double> getUnpackedDoubleList() {
+      public java.util.List<java.lang.Double>
+          getUnpackedDoubleList() {
         unpackedDouble_.makeImmutable();
         return unpackedDouble_;
       }
-
       /**
        * <code>repeated double unpacked_double = 100 [packed = false];</code>
-       *
        * @return The count of unpackedDouble.
        */
       public int getUnpackedDoubleCount() {
         return unpackedDouble_.size();
       }
-
       /**
        * <code>repeated double unpacked_double = 100 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedDouble at the given index.
        */
       public double getUnpackedDouble(int index) {
         return unpackedDouble_.getDouble(index);
       }
-
       /**
        * <code>repeated double unpacked_double = 100 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedDouble to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedDouble(int index, double value) {
+      public Builder setUnpackedDouble(
+          int index, double value) {
 
         ensureUnpackedDoubleIsMutable();
         unpackedDouble_.setDouble(index, value);
@@ -20652,10 +18344,8 @@ public Builder setUnpackedDouble(int index, double value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated double unpacked_double = 100 [packed = false];</code>
-       *
        * @param value The unpackedDouble to add.
        * @return This builder for chaining.
        */
@@ -20667,24 +18357,22 @@ public Builder addUnpackedDouble(double value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated double unpacked_double = 100 [packed = false];</code>
-       *
        * @param values The unpackedDouble to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedDouble(java.lang.Iterable<? extends java.lang.Double> values) {
+      public Builder addAllUnpackedDouble(
+          java.lang.Iterable<? extends java.lang.Double> values) {
         ensureUnpackedDoubleIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedDouble_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedDouble_);
         bitField2_ |= 0x00000002;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated double unpacked_double = 100 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedDouble() {
@@ -20695,58 +18383,50 @@ public Builder clearUnpackedDouble() {
       }
 
       private com.google.protobuf.Internal.BooleanList unpackedBool_ = emptyBooleanList();
-
       private void ensureUnpackedBoolIsMutable() {
         if (!unpackedBool_.isModifiable()) {
           unpackedBool_ = makeMutableCopy(unpackedBool_);
         }
         bitField2_ |= 0x00000004;
       }
-
       private void ensureUnpackedBoolIsMutable(int capacity) {
         if (!unpackedBool_.isModifiable()) {
           unpackedBool_ = makeMutableCopy(unpackedBool_, capacity);
         }
         bitField2_ |= 0x00000004;
       }
-
       /**
        * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-       *
        * @return A list containing the unpackedBool.
        */
-      public java.util.List<java.lang.Boolean> getUnpackedBoolList() {
+      public java.util.List<java.lang.Boolean>
+          getUnpackedBoolList() {
         unpackedBool_.makeImmutable();
         return unpackedBool_;
       }
-
       /**
        * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-       *
        * @return The count of unpackedBool.
        */
       public int getUnpackedBoolCount() {
         return unpackedBool_.size();
       }
-
       /**
        * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedBool at the given index.
        */
       public boolean getUnpackedBool(int index) {
         return unpackedBool_.getBoolean(index);
       }
-
       /**
        * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedBool to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedBool(int index, boolean value) {
+      public Builder setUnpackedBool(
+          int index, boolean value) {
 
         ensureUnpackedBoolIsMutable();
         unpackedBool_.setBoolean(index, value);
@@ -20754,10 +18434,8 @@ public Builder setUnpackedBool(int index, boolean value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-       *
        * @param value The unpackedBool to add.
        * @return This builder for chaining.
        */
@@ -20769,24 +18447,22 @@ public Builder addUnpackedBool(boolean value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-       *
        * @param values The unpackedBool to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedBool(java.lang.Iterable<? extends java.lang.Boolean> values) {
+      public Builder addAllUnpackedBool(
+          java.lang.Iterable<? extends java.lang.Boolean> values) {
         ensureUnpackedBoolIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedBool_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedBool_);
         bitField2_ |= 0x00000004;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedBool() {
@@ -20797,67 +18473,44 @@ public Builder clearUnpackedBool() {
       }
 
       private java.util.List<java.lang.Integer> unpackedNestedEnum_ =
-          java.util.Collections.emptyList();
-
+        java.util.Collections.emptyList();
       private void ensureUnpackedNestedEnumIsMutable() {
         if (!((bitField2_ & 0x00000008) != 0)) {
           unpackedNestedEnum_ = new java.util.ArrayList<java.lang.Integer>(unpackedNestedEnum_);
           bitField2_ |= 0x00000008;
         }
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @return A list containing the unpackedNestedEnum.
        */
-      public java.util.List<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-          getUnpackedNestedEnumList() {
+      public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> getUnpackedNestedEnumList() {
         return new com.google.protobuf.Internal.ListAdapter<
-            java.lang.Integer,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(
-            unpackedNestedEnum_, unpackedNestedEnum_converter_);
+            java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(unpackedNestedEnum_, unpackedNestedEnum_converter_);
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @return The count of unpackedNestedEnum.
        */
       public int getUnpackedNestedEnumCount() {
         return unpackedNestedEnum_.size();
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @param index The index of the element to return.
        * @return The unpackedNestedEnum at the given index.
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-          getUnpackedNestedEnum(int index) {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getUnpackedNestedEnum(int index) {
         return unpackedNestedEnum_converter_.convert(unpackedNestedEnum_.get(index));
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @param index The index to set the value at.
        * @param value The unpackedNestedEnum to set.
        * @return This builder for chaining.
        */
       public Builder setUnpackedNestedEnum(
-          int index,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
+          int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -20866,17 +18519,12 @@ public Builder setUnpackedNestedEnum(
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @param value The unpackedNestedEnum to add.
        * @return This builder for chaining.
        */
-      public Builder addUnpackedNestedEnum(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
+      public Builder addUnpackedNestedEnum(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -20885,35 +18533,22 @@ public Builder addUnpackedNestedEnum(
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @param values The unpackedNestedEnum to add.
        * @return This builder for chaining.
        */
       public Builder addAllUnpackedNestedEnum(
-          java.lang.Iterable<
-                  ? extends
-                      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                          .NestedEnum>
-              values) {
+          java.lang.Iterable<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> values) {
         ensureUnpackedNestedEnumIsMutable();
-        for (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-            value : values) {
+        for (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value : values) {
           unpackedNestedEnum_.add(value.getNumber());
         }
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @return This builder for chaining.
        */
       public Builder clearUnpackedNestedEnum() {
@@ -20922,51 +18557,37 @@ public Builder clearUnpackedNestedEnum() {
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @return A list containing the enum numeric values on the wire for unpackedNestedEnum.
        */
-      public java.util.List<java.lang.Integer> getUnpackedNestedEnumValueList() {
+      public java.util.List<java.lang.Integer>
+      getUnpackedNestedEnumValueList() {
         return java.util.Collections.unmodifiableList(unpackedNestedEnum_);
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @param index The index of the value to return.
        * @return The enum numeric value on the wire of unpackedNestedEnum at the given index.
        */
       public int getUnpackedNestedEnumValue(int index) {
         return unpackedNestedEnum_.get(index);
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @param index The index to set the value at.
        * @param value The enum numeric value on the wire for unpackedNestedEnum to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedNestedEnumValue(int index, int value) {
+      public Builder setUnpackedNestedEnumValue(
+          int index, int value) {
         ensureUnpackedNestedEnumIsMutable();
         unpackedNestedEnum_.set(index, value);
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @param value The enum numeric value on the wire for unpackedNestedEnum to add.
        * @return This builder for chaining.
        */
@@ -20976,16 +18597,13 @@ public Builder addUnpackedNestedEnumValue(int value) {
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @param values The enum numeric values on the wire for unpackedNestedEnum to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedNestedEnumValue(java.lang.Iterable<java.lang.Integer> values) {
+      public Builder addAllUnpackedNestedEnumValue(
+          java.lang.Iterable<java.lang.Integer> values) {
         ensureUnpackedNestedEnumIsMutable();
         for (int value : values) {
           unpackedNestedEnum_.add(value);
@@ -20994,8 +18612,8 @@ public Builder addAllUnpackedNestedEnumValue(java.lang.Iterable<java.lang.Intege
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer> mapInt32Int32_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> mapInt32Int32_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
           internalGetMapInt32Int32() {
         if (mapInt32Int32_ == null) {
@@ -21004,13 +18622,11 @@ public Builder addAllUnpackedNestedEnumValue(java.lang.Iterable<java.lang.Intege
         }
         return mapInt32Int32_;
       }
-
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
           internalGetMutableMapInt32Int32() {
         if (mapInt32Int32_ == null) {
-          mapInt32Int32_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapInt32Int32DefaultEntryHolder.defaultEntry);
+          mapInt32Int32_ = com.google.protobuf.MapField.newMapField(
+              MapInt32Int32DefaultEntryHolder.defaultEntry);
         }
         if (!mapInt32Int32_.isMutable()) {
           mapInt32Int32_ = mapInt32Int32_.copy();
@@ -21019,14 +18635,10 @@ public Builder addAllUnpackedNestedEnumValue(java.lang.Iterable<java.lang.Intege
         onChanged();
         return mapInt32Int32_;
       }
-
       public int getMapInt32Int32Count() {
         return internalGetMapInt32Int32().getMap().size();
       }
-
       /**
-       *
-       *
        * <pre>
        * Map
        * </pre>
@@ -21034,21 +18646,20 @@ public int getMapInt32Int32Count() {
        * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
        */
       @java.lang.Override
-      public boolean containsMapInt32Int32(int key) {
+      public boolean containsMapInt32Int32(
+          int key) {
 
         return internalGetMapInt32Int32().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapInt32Int32Map()} instead. */
+      /**
+       * Use {@link #getMapInt32Int32Map()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32() {
         return getMapInt32Int32Map();
       }
-
       /**
-       *
-       *
        * <pre>
        * Map
        * </pre>
@@ -21059,10 +18670,7 @@ public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32() {
       public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32Map() {
         return internalGetMapInt32Int32().getMap();
       }
-
       /**
-       *
-       *
        * <pre>
        * Map
        * </pre>
@@ -21070,16 +18678,15 @@ public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32Map()
        * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
        */
       @java.lang.Override
-      public int getMapInt32Int32OrDefault(int key, int defaultValue) {
+      public int getMapInt32Int32OrDefault(
+          int key,
+          int defaultValue) {
 
         java.util.Map<java.lang.Integer, java.lang.Integer> map =
             internalGetMapInt32Int32().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
       /**
-       *
-       *
        * <pre>
        * Map
        * </pre>
@@ -21087,7 +18694,8 @@ public int getMapInt32Int32OrDefault(int key, int defaultValue) {
        * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
        */
       @java.lang.Override
-      public int getMapInt32Int32OrThrow(int key) {
+      public int getMapInt32Int32OrThrow(
+          int key) {
 
         java.util.Map<java.lang.Integer, java.lang.Integer> map =
             internalGetMapInt32Int32().getMap();
@@ -21096,54 +18704,53 @@ public int getMapInt32Int32OrThrow(int key) {
         }
         return map.get(key);
       }
-
       public Builder clearMapInt32Int32() {
         bitField2_ = (bitField2_ & ~0x00000010);
-        internalGetMutableMapInt32Int32().getMutableMap().clear();
+        internalGetMutableMapInt32Int32().getMutableMap()
+            .clear();
         return this;
       }
-
       /**
-       *
-       *
        * <pre>
        * Map
        * </pre>
        *
        * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
        */
-      public Builder removeMapInt32Int32(int key) {
+      public Builder removeMapInt32Int32(
+          int key) {
 
-        internalGetMutableMapInt32Int32().getMutableMap().remove(key);
+        internalGetMutableMapInt32Int32().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getMutableMapInt32Int32() {
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+          getMutableMapInt32Int32() {
         bitField2_ |= 0x00000010;
         return internalGetMutableMapInt32Int32().getMutableMap();
       }
-
       /**
-       *
-       *
        * <pre>
        * Map
        * </pre>
        *
        * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
        */
-      public Builder putMapInt32Int32(int key, int value) {
+      public Builder putMapInt32Int32(
+          int key,
+          int value) {
 
-        internalGetMutableMapInt32Int32().getMutableMap().put(key, value);
+
+        internalGetMutableMapInt32Int32().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00000010;
         return this;
       }
-
       /**
-       *
-       *
        * <pre>
        * Map
        * </pre>
@@ -21152,13 +18759,14 @@ public Builder putMapInt32Int32(int key, int value) {
        */
       public Builder putAllMapInt32Int32(
           java.util.Map<java.lang.Integer, java.lang.Integer> values) {
-        internalGetMutableMapInt32Int32().getMutableMap().putAll(values);
+        internalGetMutableMapInt32Int32().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00000010;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long> mapInt64Int64_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Long, java.lang.Long> mapInt64Int64_;
       private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
           internalGetMapInt64Int64() {
         if (mapInt64Int64_ == null) {
@@ -21167,13 +18775,11 @@ public Builder putAllMapInt32Int32(
         }
         return mapInt64Int64_;
       }
-
       private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
           internalGetMutableMapInt64Int64() {
         if (mapInt64Int64_ == null) {
-          mapInt64Int64_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapInt64Int64DefaultEntryHolder.defaultEntry);
+          mapInt64Int64_ = com.google.protobuf.MapField.newMapField(
+              MapInt64Int64DefaultEntryHolder.defaultEntry);
         }
         if (!mapInt64Int64_.isMutable()) {
           mapInt64Int64_ = mapInt64Int64_.copy();
@@ -21182,87 +18788,110 @@ public Builder putAllMapInt32Int32(
         onChanged();
         return mapInt64Int64_;
       }
-
       public int getMapInt64Int64Count() {
         return internalGetMapInt64Int64().getMap().size();
       }
-
-      /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
       @java.lang.Override
-      public boolean containsMapInt64Int64(long key) {
+      public boolean containsMapInt64Int64(
+          long key) {
 
         return internalGetMapInt64Int64().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapInt64Int64Map()} instead. */
+      /**
+       * Use {@link #getMapInt64Int64Map()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Long, java.lang.Long> getMapInt64Int64() {
         return getMapInt64Int64Map();
       }
-
-      /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Long, java.lang.Long> getMapInt64Int64Map() {
         return internalGetMapInt64Int64().getMap();
       }
-
-      /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
       @java.lang.Override
-      public long getMapInt64Int64OrDefault(long key, long defaultValue) {
+      public long getMapInt64Int64OrDefault(
+          long key,
+          long defaultValue) {
 
-        java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapInt64Int64().getMap();
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapInt64Int64().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
       @java.lang.Override
-      public long getMapInt64Int64OrThrow(long key) {
+      public long getMapInt64Int64OrThrow(
+          long key) {
 
-        java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapInt64Int64().getMap();
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapInt64Int64().getMap();
         if (!map.containsKey(key)) {
           throw new java.lang.IllegalArgumentException();
         }
         return map.get(key);
       }
-
       public Builder clearMapInt64Int64() {
         bitField2_ = (bitField2_ & ~0x00000020);
-        internalGetMutableMapInt64Int64().getMutableMap().clear();
+        internalGetMutableMapInt64Int64().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
+      public Builder removeMapInt64Int64(
+          long key) {
 
-      /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
-      public Builder removeMapInt64Int64(long key) {
-
-        internalGetMutableMapInt64Int64().getMutableMap().remove(key);
+        internalGetMutableMapInt64Int64().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Long, java.lang.Long> getMutableMapInt64Int64() {
+      public java.util.Map<java.lang.Long, java.lang.Long>
+          getMutableMapInt64Int64() {
         bitField2_ |= 0x00000020;
         return internalGetMutableMapInt64Int64().getMutableMap();
       }
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
+      public Builder putMapInt64Int64(
+          long key,
+          long value) {
 
-      /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
-      public Builder putMapInt64Int64(long key, long value) {
 
-        internalGetMutableMapInt64Int64().getMutableMap().put(key, value);
+        internalGetMutableMapInt64Int64().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00000020;
         return this;
       }
-
-      /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
-      public Builder putAllMapInt64Int64(java.util.Map<java.lang.Long, java.lang.Long> values) {
-        internalGetMutableMapInt64Int64().getMutableMap().putAll(values);
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
+      public Builder putAllMapInt64Int64(
+          java.util.Map<java.lang.Long, java.lang.Long> values) {
+        internalGetMutableMapInt64Int64().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00000020;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer> mapUint32Uint32_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> mapUint32Uint32_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
           internalGetMapUint32Uint32() {
         if (mapUint32Uint32_ == null) {
@@ -21271,13 +18900,11 @@ public Builder putAllMapInt64Int64(java.util.Map<java.lang.Long, java.lang.Long>
         }
         return mapUint32Uint32_;
       }
-
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
           internalGetMutableMapUint32Uint32() {
         if (mapUint32Uint32_ == null) {
-          mapUint32Uint32_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapUint32Uint32DefaultEntryHolder.defaultEntry);
+          mapUint32Uint32_ = com.google.protobuf.MapField.newMapField(
+              MapUint32Uint32DefaultEntryHolder.defaultEntry);
         }
         if (!mapUint32Uint32_.isMutable()) {
           mapUint32Uint32_ = mapUint32Uint32_.copy();
@@ -21286,43 +18913,51 @@ public Builder putAllMapInt64Int64(java.util.Map<java.lang.Long, java.lang.Long>
         onChanged();
         return mapUint32Uint32_;
       }
-
       public int getMapUint32Uint32Count() {
         return internalGetMapUint32Uint32().getMap().size();
       }
-
-      /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
       @java.lang.Override
-      public boolean containsMapUint32Uint32(int key) {
+      public boolean containsMapUint32Uint32(
+          int key) {
 
         return internalGetMapUint32Uint32().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapUint32Uint32Map()} instead. */
+      /**
+       * Use {@link #getMapUint32Uint32Map()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Integer, java.lang.Integer> getMapUint32Uint32() {
         return getMapUint32Uint32Map();
       }
-
-      /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Integer, java.lang.Integer> getMapUint32Uint32Map() {
         return internalGetMapUint32Uint32().getMap();
       }
-
-      /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
       @java.lang.Override
-      public int getMapUint32Uint32OrDefault(int key, int defaultValue) {
+      public int getMapUint32Uint32OrDefault(
+          int key,
+          int defaultValue) {
 
         java.util.Map<java.lang.Integer, java.lang.Integer> map =
             internalGetMapUint32Uint32().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
       @java.lang.Override
-      public int getMapUint32Uint32OrThrow(int key) {
+      public int getMapUint32Uint32OrThrow(
+          int key) {
 
         java.util.Map<java.lang.Integer, java.lang.Integer> map =
             internalGetMapUint32Uint32().getMap();
@@ -21331,45 +18966,57 @@ public int getMapUint32Uint32OrThrow(int key) {
         }
         return map.get(key);
       }
-
       public Builder clearMapUint32Uint32() {
         bitField2_ = (bitField2_ & ~0x00000040);
-        internalGetMutableMapUint32Uint32().getMutableMap().clear();
+        internalGetMutableMapUint32Uint32().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
+      public Builder removeMapUint32Uint32(
+          int key) {
 
-      /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
-      public Builder removeMapUint32Uint32(int key) {
-
-        internalGetMutableMapUint32Uint32().getMutableMap().remove(key);
+        internalGetMutableMapUint32Uint32().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getMutableMapUint32Uint32() {
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+          getMutableMapUint32Uint32() {
         bitField2_ |= 0x00000040;
         return internalGetMutableMapUint32Uint32().getMutableMap();
       }
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
+      public Builder putMapUint32Uint32(
+          int key,
+          int value) {
 
-      /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
-      public Builder putMapUint32Uint32(int key, int value) {
 
-        internalGetMutableMapUint32Uint32().getMutableMap().put(key, value);
+        internalGetMutableMapUint32Uint32().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00000040;
         return this;
       }
-
-      /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
       public Builder putAllMapUint32Uint32(
           java.util.Map<java.lang.Integer, java.lang.Integer> values) {
-        internalGetMutableMapUint32Uint32().getMutableMap().putAll(values);
+        internalGetMutableMapUint32Uint32().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00000040;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long> mapUint64Uint64_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Long, java.lang.Long> mapUint64Uint64_;
       private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
           internalGetMapUint64Uint64() {
         if (mapUint64Uint64_ == null) {
@@ -21378,13 +19025,11 @@ public Builder putAllMapUint32Uint32(
         }
         return mapUint64Uint64_;
       }
-
       private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
           internalGetMutableMapUint64Uint64() {
         if (mapUint64Uint64_ == null) {
-          mapUint64Uint64_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapUint64Uint64DefaultEntryHolder.defaultEntry);
+          mapUint64Uint64_ = com.google.protobuf.MapField.newMapField(
+              MapUint64Uint64DefaultEntryHolder.defaultEntry);
         }
         if (!mapUint64Uint64_.isMutable()) {
           mapUint64Uint64_ = mapUint64Uint64_.copy();
@@ -21393,87 +19038,110 @@ public Builder putAllMapUint32Uint32(
         onChanged();
         return mapUint64Uint64_;
       }
-
       public int getMapUint64Uint64Count() {
         return internalGetMapUint64Uint64().getMap().size();
       }
-
-      /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
       @java.lang.Override
-      public boolean containsMapUint64Uint64(long key) {
+      public boolean containsMapUint64Uint64(
+          long key) {
 
         return internalGetMapUint64Uint64().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapUint64Uint64Map()} instead. */
+      /**
+       * Use {@link #getMapUint64Uint64Map()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Long, java.lang.Long> getMapUint64Uint64() {
         return getMapUint64Uint64Map();
       }
-
-      /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Long, java.lang.Long> getMapUint64Uint64Map() {
         return internalGetMapUint64Uint64().getMap();
       }
-
-      /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
       @java.lang.Override
-      public long getMapUint64Uint64OrDefault(long key, long defaultValue) {
+      public long getMapUint64Uint64OrDefault(
+          long key,
+          long defaultValue) {
 
-        java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapUint64Uint64().getMap();
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapUint64Uint64().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
       @java.lang.Override
-      public long getMapUint64Uint64OrThrow(long key) {
+      public long getMapUint64Uint64OrThrow(
+          long key) {
 
-        java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapUint64Uint64().getMap();
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapUint64Uint64().getMap();
         if (!map.containsKey(key)) {
           throw new java.lang.IllegalArgumentException();
         }
         return map.get(key);
       }
-
       public Builder clearMapUint64Uint64() {
         bitField2_ = (bitField2_ & ~0x00000080);
-        internalGetMutableMapUint64Uint64().getMutableMap().clear();
+        internalGetMutableMapUint64Uint64().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
+      public Builder removeMapUint64Uint64(
+          long key) {
 
-      /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
-      public Builder removeMapUint64Uint64(long key) {
-
-        internalGetMutableMapUint64Uint64().getMutableMap().remove(key);
+        internalGetMutableMapUint64Uint64().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Long, java.lang.Long> getMutableMapUint64Uint64() {
+      public java.util.Map<java.lang.Long, java.lang.Long>
+          getMutableMapUint64Uint64() {
         bitField2_ |= 0x00000080;
         return internalGetMutableMapUint64Uint64().getMutableMap();
       }
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
+      public Builder putMapUint64Uint64(
+          long key,
+          long value) {
 
-      /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
-      public Builder putMapUint64Uint64(long key, long value) {
 
-        internalGetMutableMapUint64Uint64().getMutableMap().put(key, value);
+        internalGetMutableMapUint64Uint64().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00000080;
         return this;
       }
-
-      /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
-      public Builder putAllMapUint64Uint64(java.util.Map<java.lang.Long, java.lang.Long> values) {
-        internalGetMutableMapUint64Uint64().getMutableMap().putAll(values);
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
+      public Builder putAllMapUint64Uint64(
+          java.util.Map<java.lang.Long, java.lang.Long> values) {
+        internalGetMutableMapUint64Uint64().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00000080;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer> mapSint32Sint32_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> mapSint32Sint32_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
           internalGetMapSint32Sint32() {
         if (mapSint32Sint32_ == null) {
@@ -21482,13 +19150,11 @@ public Builder putAllMapUint64Uint64(java.util.Map<java.lang.Long, java.lang.Lon
         }
         return mapSint32Sint32_;
       }
-
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
           internalGetMutableMapSint32Sint32() {
         if (mapSint32Sint32_ == null) {
-          mapSint32Sint32_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapSint32Sint32DefaultEntryHolder.defaultEntry);
+          mapSint32Sint32_ = com.google.protobuf.MapField.newMapField(
+              MapSint32Sint32DefaultEntryHolder.defaultEntry);
         }
         if (!mapSint32Sint32_.isMutable()) {
           mapSint32Sint32_ = mapSint32Sint32_.copy();
@@ -21497,43 +19163,51 @@ public Builder putAllMapUint64Uint64(java.util.Map<java.lang.Long, java.lang.Lon
         onChanged();
         return mapSint32Sint32_;
       }
-
       public int getMapSint32Sint32Count() {
         return internalGetMapSint32Sint32().getMap().size();
       }
-
-      /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
       @java.lang.Override
-      public boolean containsMapSint32Sint32(int key) {
+      public boolean containsMapSint32Sint32(
+          int key) {
 
         return internalGetMapSint32Sint32().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapSint32Sint32Map()} instead. */
+      /**
+       * Use {@link #getMapSint32Sint32Map()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSint32Sint32() {
         return getMapSint32Sint32Map();
       }
-
-      /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSint32Sint32Map() {
         return internalGetMapSint32Sint32().getMap();
       }
-
-      /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
       @java.lang.Override
-      public int getMapSint32Sint32OrDefault(int key, int defaultValue) {
+      public int getMapSint32Sint32OrDefault(
+          int key,
+          int defaultValue) {
 
         java.util.Map<java.lang.Integer, java.lang.Integer> map =
             internalGetMapSint32Sint32().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
       @java.lang.Override
-      public int getMapSint32Sint32OrThrow(int key) {
+      public int getMapSint32Sint32OrThrow(
+          int key) {
 
         java.util.Map<java.lang.Integer, java.lang.Integer> map =
             internalGetMapSint32Sint32().getMap();
@@ -21542,45 +19216,57 @@ public int getMapSint32Sint32OrThrow(int key) {
         }
         return map.get(key);
       }
-
       public Builder clearMapSint32Sint32() {
         bitField2_ = (bitField2_ & ~0x00000100);
-        internalGetMutableMapSint32Sint32().getMutableMap().clear();
+        internalGetMutableMapSint32Sint32().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
+      public Builder removeMapSint32Sint32(
+          int key) {
 
-      /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
-      public Builder removeMapSint32Sint32(int key) {
-
-        internalGetMutableMapSint32Sint32().getMutableMap().remove(key);
+        internalGetMutableMapSint32Sint32().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getMutableMapSint32Sint32() {
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+          getMutableMapSint32Sint32() {
         bitField2_ |= 0x00000100;
         return internalGetMutableMapSint32Sint32().getMutableMap();
       }
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
+      public Builder putMapSint32Sint32(
+          int key,
+          int value) {
 
-      /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
-      public Builder putMapSint32Sint32(int key, int value) {
 
-        internalGetMutableMapSint32Sint32().getMutableMap().put(key, value);
+        internalGetMutableMapSint32Sint32().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00000100;
         return this;
       }
-
-      /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
       public Builder putAllMapSint32Sint32(
           java.util.Map<java.lang.Integer, java.lang.Integer> values) {
-        internalGetMutableMapSint32Sint32().getMutableMap().putAll(values);
+        internalGetMutableMapSint32Sint32().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00000100;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long> mapSint64Sint64_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Long, java.lang.Long> mapSint64Sint64_;
       private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
           internalGetMapSint64Sint64() {
         if (mapSint64Sint64_ == null) {
@@ -21589,13 +19275,11 @@ public Builder putAllMapSint32Sint32(
         }
         return mapSint64Sint64_;
       }
-
       private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
           internalGetMutableMapSint64Sint64() {
         if (mapSint64Sint64_ == null) {
-          mapSint64Sint64_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapSint64Sint64DefaultEntryHolder.defaultEntry);
+          mapSint64Sint64_ = com.google.protobuf.MapField.newMapField(
+              MapSint64Sint64DefaultEntryHolder.defaultEntry);
         }
         if (!mapSint64Sint64_.isMutable()) {
           mapSint64Sint64_ = mapSint64Sint64_.copy();
@@ -21604,87 +19288,110 @@ public Builder putAllMapSint32Sint32(
         onChanged();
         return mapSint64Sint64_;
       }
-
       public int getMapSint64Sint64Count() {
         return internalGetMapSint64Sint64().getMap().size();
       }
-
-      /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
       @java.lang.Override
-      public boolean containsMapSint64Sint64(long key) {
+      public boolean containsMapSint64Sint64(
+          long key) {
 
         return internalGetMapSint64Sint64().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapSint64Sint64Map()} instead. */
+      /**
+       * Use {@link #getMapSint64Sint64Map()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Long, java.lang.Long> getMapSint64Sint64() {
         return getMapSint64Sint64Map();
       }
-
-      /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Long, java.lang.Long> getMapSint64Sint64Map() {
         return internalGetMapSint64Sint64().getMap();
       }
-
-      /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
       @java.lang.Override
-      public long getMapSint64Sint64OrDefault(long key, long defaultValue) {
+      public long getMapSint64Sint64OrDefault(
+          long key,
+          long defaultValue) {
 
-        java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapSint64Sint64().getMap();
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapSint64Sint64().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
       @java.lang.Override
-      public long getMapSint64Sint64OrThrow(long key) {
+      public long getMapSint64Sint64OrThrow(
+          long key) {
 
-        java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapSint64Sint64().getMap();
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapSint64Sint64().getMap();
         if (!map.containsKey(key)) {
           throw new java.lang.IllegalArgumentException();
         }
         return map.get(key);
       }
-
       public Builder clearMapSint64Sint64() {
         bitField2_ = (bitField2_ & ~0x00000200);
-        internalGetMutableMapSint64Sint64().getMutableMap().clear();
+        internalGetMutableMapSint64Sint64().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
+      public Builder removeMapSint64Sint64(
+          long key) {
 
-      /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
-      public Builder removeMapSint64Sint64(long key) {
-
-        internalGetMutableMapSint64Sint64().getMutableMap().remove(key);
+        internalGetMutableMapSint64Sint64().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Long, java.lang.Long> getMutableMapSint64Sint64() {
+      public java.util.Map<java.lang.Long, java.lang.Long>
+          getMutableMapSint64Sint64() {
         bitField2_ |= 0x00000200;
         return internalGetMutableMapSint64Sint64().getMutableMap();
       }
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
+      public Builder putMapSint64Sint64(
+          long key,
+          long value) {
 
-      /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
-      public Builder putMapSint64Sint64(long key, long value) {
 
-        internalGetMutableMapSint64Sint64().getMutableMap().put(key, value);
+        internalGetMutableMapSint64Sint64().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00000200;
         return this;
       }
-
-      /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
-      public Builder putAllMapSint64Sint64(java.util.Map<java.lang.Long, java.lang.Long> values) {
-        internalGetMutableMapSint64Sint64().getMutableMap().putAll(values);
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
+      public Builder putAllMapSint64Sint64(
+          java.util.Map<java.lang.Long, java.lang.Long> values) {
+        internalGetMutableMapSint64Sint64().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00000200;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer> mapFixed32Fixed32_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> mapFixed32Fixed32_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
           internalGetMapFixed32Fixed32() {
         if (mapFixed32Fixed32_ == null) {
@@ -21693,13 +19400,11 @@ public Builder putAllMapSint64Sint64(java.util.Map<java.lang.Long, java.lang.Lon
         }
         return mapFixed32Fixed32_;
       }
-
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
           internalGetMutableMapFixed32Fixed32() {
         if (mapFixed32Fixed32_ == null) {
-          mapFixed32Fixed32_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapFixed32Fixed32DefaultEntryHolder.defaultEntry);
+          mapFixed32Fixed32_ = com.google.protobuf.MapField.newMapField(
+              MapFixed32Fixed32DefaultEntryHolder.defaultEntry);
         }
         if (!mapFixed32Fixed32_.isMutable()) {
           mapFixed32Fixed32_ = mapFixed32Fixed32_.copy();
@@ -21708,43 +19413,51 @@ public Builder putAllMapSint64Sint64(java.util.Map<java.lang.Long, java.lang.Lon
         onChanged();
         return mapFixed32Fixed32_;
       }
-
       public int getMapFixed32Fixed32Count() {
         return internalGetMapFixed32Fixed32().getMap().size();
       }
-
-      /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
       @java.lang.Override
-      public boolean containsMapFixed32Fixed32(int key) {
+      public boolean containsMapFixed32Fixed32(
+          int key) {
 
         return internalGetMapFixed32Fixed32().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapFixed32Fixed32Map()} instead. */
+      /**
+       * Use {@link #getMapFixed32Fixed32Map()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Integer, java.lang.Integer> getMapFixed32Fixed32() {
         return getMapFixed32Fixed32Map();
       }
-
-      /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Integer, java.lang.Integer> getMapFixed32Fixed32Map() {
         return internalGetMapFixed32Fixed32().getMap();
       }
-
-      /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
       @java.lang.Override
-      public int getMapFixed32Fixed32OrDefault(int key, int defaultValue) {
+      public int getMapFixed32Fixed32OrDefault(
+          int key,
+          int defaultValue) {
 
         java.util.Map<java.lang.Integer, java.lang.Integer> map =
             internalGetMapFixed32Fixed32().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
       @java.lang.Override
-      public int getMapFixed32Fixed32OrThrow(int key) {
+      public int getMapFixed32Fixed32OrThrow(
+          int key) {
 
         java.util.Map<java.lang.Integer, java.lang.Integer> map =
             internalGetMapFixed32Fixed32().getMap();
@@ -21753,45 +19466,57 @@ public int getMapFixed32Fixed32OrThrow(int key) {
         }
         return map.get(key);
       }
-
       public Builder clearMapFixed32Fixed32() {
         bitField2_ = (bitField2_ & ~0x00000400);
-        internalGetMutableMapFixed32Fixed32().getMutableMap().clear();
+        internalGetMutableMapFixed32Fixed32().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
+      public Builder removeMapFixed32Fixed32(
+          int key) {
 
-      /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
-      public Builder removeMapFixed32Fixed32(int key) {
-
-        internalGetMutableMapFixed32Fixed32().getMutableMap().remove(key);
+        internalGetMutableMapFixed32Fixed32().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getMutableMapFixed32Fixed32() {
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+          getMutableMapFixed32Fixed32() {
         bitField2_ |= 0x00000400;
         return internalGetMutableMapFixed32Fixed32().getMutableMap();
       }
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
+      public Builder putMapFixed32Fixed32(
+          int key,
+          int value) {
 
-      /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
-      public Builder putMapFixed32Fixed32(int key, int value) {
 
-        internalGetMutableMapFixed32Fixed32().getMutableMap().put(key, value);
+        internalGetMutableMapFixed32Fixed32().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00000400;
         return this;
       }
-
-      /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
       public Builder putAllMapFixed32Fixed32(
           java.util.Map<java.lang.Integer, java.lang.Integer> values) {
-        internalGetMutableMapFixed32Fixed32().getMutableMap().putAll(values);
+        internalGetMutableMapFixed32Fixed32().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00000400;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long> mapFixed64Fixed64_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Long, java.lang.Long> mapFixed64Fixed64_;
       private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
           internalGetMapFixed64Fixed64() {
         if (mapFixed64Fixed64_ == null) {
@@ -21800,13 +19525,11 @@ public Builder putAllMapFixed32Fixed32(
         }
         return mapFixed64Fixed64_;
       }
-
       private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
           internalGetMutableMapFixed64Fixed64() {
         if (mapFixed64Fixed64_ == null) {
-          mapFixed64Fixed64_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapFixed64Fixed64DefaultEntryHolder.defaultEntry);
+          mapFixed64Fixed64_ = com.google.protobuf.MapField.newMapField(
+              MapFixed64Fixed64DefaultEntryHolder.defaultEntry);
         }
         if (!mapFixed64Fixed64_.isMutable()) {
           mapFixed64Fixed64_ = mapFixed64Fixed64_.copy();
@@ -21815,88 +19538,110 @@ public Builder putAllMapFixed32Fixed32(
         onChanged();
         return mapFixed64Fixed64_;
       }
-
       public int getMapFixed64Fixed64Count() {
         return internalGetMapFixed64Fixed64().getMap().size();
       }
-
-      /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
       @java.lang.Override
-      public boolean containsMapFixed64Fixed64(long key) {
+      public boolean containsMapFixed64Fixed64(
+          long key) {
 
         return internalGetMapFixed64Fixed64().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapFixed64Fixed64Map()} instead. */
+      /**
+       * Use {@link #getMapFixed64Fixed64Map()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Long, java.lang.Long> getMapFixed64Fixed64() {
         return getMapFixed64Fixed64Map();
       }
-
-      /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Long, java.lang.Long> getMapFixed64Fixed64Map() {
         return internalGetMapFixed64Fixed64().getMap();
       }
-
-      /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
       @java.lang.Override
-      public long getMapFixed64Fixed64OrDefault(long key, long defaultValue) {
+      public long getMapFixed64Fixed64OrDefault(
+          long key,
+          long defaultValue) {
 
-        java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapFixed64Fixed64().getMap();
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapFixed64Fixed64().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
       @java.lang.Override
-      public long getMapFixed64Fixed64OrThrow(long key) {
+      public long getMapFixed64Fixed64OrThrow(
+          long key) {
 
-        java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapFixed64Fixed64().getMap();
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapFixed64Fixed64().getMap();
         if (!map.containsKey(key)) {
           throw new java.lang.IllegalArgumentException();
         }
         return map.get(key);
       }
-
       public Builder clearMapFixed64Fixed64() {
         bitField2_ = (bitField2_ & ~0x00000800);
-        internalGetMutableMapFixed64Fixed64().getMutableMap().clear();
+        internalGetMutableMapFixed64Fixed64().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
+      public Builder removeMapFixed64Fixed64(
+          long key) {
 
-      /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
-      public Builder removeMapFixed64Fixed64(long key) {
-
-        internalGetMutableMapFixed64Fixed64().getMutableMap().remove(key);
+        internalGetMutableMapFixed64Fixed64().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Long, java.lang.Long> getMutableMapFixed64Fixed64() {
+      public java.util.Map<java.lang.Long, java.lang.Long>
+          getMutableMapFixed64Fixed64() {
         bitField2_ |= 0x00000800;
         return internalGetMutableMapFixed64Fixed64().getMutableMap();
       }
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
+      public Builder putMapFixed64Fixed64(
+          long key,
+          long value) {
 
-      /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
-      public Builder putMapFixed64Fixed64(long key, long value) {
 
-        internalGetMutableMapFixed64Fixed64().getMutableMap().put(key, value);
+        internalGetMutableMapFixed64Fixed64().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00000800;
         return this;
       }
-
-      /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
-      public Builder putAllMapFixed64Fixed64(java.util.Map<java.lang.Long, java.lang.Long> values) {
-        internalGetMutableMapFixed64Fixed64().getMutableMap().putAll(values);
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
+      public Builder putAllMapFixed64Fixed64(
+          java.util.Map<java.lang.Long, java.lang.Long> values) {
+        internalGetMutableMapFixed64Fixed64().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00000800;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-          mapSfixed32Sfixed32_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> mapSfixed32Sfixed32_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
           internalGetMapSfixed32Sfixed32() {
         if (mapSfixed32Sfixed32_ == null) {
@@ -21905,13 +19650,11 @@ public Builder putAllMapFixed64Fixed64(java.util.Map<java.lang.Long, java.lang.L
         }
         return mapSfixed32Sfixed32_;
       }
-
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
           internalGetMutableMapSfixed32Sfixed32() {
         if (mapSfixed32Sfixed32_ == null) {
-          mapSfixed32Sfixed32_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry);
+          mapSfixed32Sfixed32_ = com.google.protobuf.MapField.newMapField(
+              MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry);
         }
         if (!mapSfixed32Sfixed32_.isMutable()) {
           mapSfixed32Sfixed32_ = mapSfixed32Sfixed32_.copy();
@@ -21920,43 +19663,51 @@ public Builder putAllMapFixed64Fixed64(java.util.Map<java.lang.Long, java.lang.L
         onChanged();
         return mapSfixed32Sfixed32_;
       }
-
       public int getMapSfixed32Sfixed32Count() {
         return internalGetMapSfixed32Sfixed32().getMap().size();
       }
-
-      /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
       @java.lang.Override
-      public boolean containsMapSfixed32Sfixed32(int key) {
+      public boolean containsMapSfixed32Sfixed32(
+          int key) {
 
         return internalGetMapSfixed32Sfixed32().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapSfixed32Sfixed32Map()} instead. */
+      /**
+       * Use {@link #getMapSfixed32Sfixed32Map()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSfixed32Sfixed32() {
         return getMapSfixed32Sfixed32Map();
       }
-
-      /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSfixed32Sfixed32Map() {
         return internalGetMapSfixed32Sfixed32().getMap();
       }
-
-      /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
       @java.lang.Override
-      public int getMapSfixed32Sfixed32OrDefault(int key, int defaultValue) {
+      public int getMapSfixed32Sfixed32OrDefault(
+          int key,
+          int defaultValue) {
 
         java.util.Map<java.lang.Integer, java.lang.Integer> map =
             internalGetMapSfixed32Sfixed32().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
       @java.lang.Override
-      public int getMapSfixed32Sfixed32OrThrow(int key) {
+      public int getMapSfixed32Sfixed32OrThrow(
+          int key) {
 
         java.util.Map<java.lang.Integer, java.lang.Integer> map =
             internalGetMapSfixed32Sfixed32().getMap();
@@ -21965,45 +19716,57 @@ public int getMapSfixed32Sfixed32OrThrow(int key) {
         }
         return map.get(key);
       }
-
       public Builder clearMapSfixed32Sfixed32() {
         bitField2_ = (bitField2_ & ~0x00001000);
-        internalGetMutableMapSfixed32Sfixed32().getMutableMap().clear();
+        internalGetMutableMapSfixed32Sfixed32().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
+      public Builder removeMapSfixed32Sfixed32(
+          int key) {
 
-      /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
-      public Builder removeMapSfixed32Sfixed32(int key) {
-
-        internalGetMutableMapSfixed32Sfixed32().getMutableMap().remove(key);
+        internalGetMutableMapSfixed32Sfixed32().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getMutableMapSfixed32Sfixed32() {
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+          getMutableMapSfixed32Sfixed32() {
         bitField2_ |= 0x00001000;
         return internalGetMutableMapSfixed32Sfixed32().getMutableMap();
       }
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
+      public Builder putMapSfixed32Sfixed32(
+          int key,
+          int value) {
 
-      /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
-      public Builder putMapSfixed32Sfixed32(int key, int value) {
 
-        internalGetMutableMapSfixed32Sfixed32().getMutableMap().put(key, value);
+        internalGetMutableMapSfixed32Sfixed32().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00001000;
         return this;
       }
-
-      /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
       public Builder putAllMapSfixed32Sfixed32(
           java.util.Map<java.lang.Integer, java.lang.Integer> values) {
-        internalGetMutableMapSfixed32Sfixed32().getMutableMap().putAll(values);
+        internalGetMutableMapSfixed32Sfixed32().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00001000;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long> mapSfixed64Sfixed64_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Long, java.lang.Long> mapSfixed64Sfixed64_;
       private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
           internalGetMapSfixed64Sfixed64() {
         if (mapSfixed64Sfixed64_ == null) {
@@ -22012,13 +19775,11 @@ public Builder putAllMapSfixed32Sfixed32(
         }
         return mapSfixed64Sfixed64_;
       }
-
       private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
           internalGetMutableMapSfixed64Sfixed64() {
         if (mapSfixed64Sfixed64_ == null) {
-          mapSfixed64Sfixed64_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry);
+          mapSfixed64Sfixed64_ = com.google.protobuf.MapField.newMapField(
+              MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry);
         }
         if (!mapSfixed64Sfixed64_.isMutable()) {
           mapSfixed64Sfixed64_ = mapSfixed64Sfixed64_.copy();
@@ -22027,43 +19788,51 @@ public Builder putAllMapSfixed32Sfixed32(
         onChanged();
         return mapSfixed64Sfixed64_;
       }
-
       public int getMapSfixed64Sfixed64Count() {
         return internalGetMapSfixed64Sfixed64().getMap().size();
       }
-
-      /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
       @java.lang.Override
-      public boolean containsMapSfixed64Sfixed64(long key) {
+      public boolean containsMapSfixed64Sfixed64(
+          long key) {
 
         return internalGetMapSfixed64Sfixed64().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapSfixed64Sfixed64Map()} instead. */
+      /**
+       * Use {@link #getMapSfixed64Sfixed64Map()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Long, java.lang.Long> getMapSfixed64Sfixed64() {
         return getMapSfixed64Sfixed64Map();
       }
-
-      /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Long, java.lang.Long> getMapSfixed64Sfixed64Map() {
         return internalGetMapSfixed64Sfixed64().getMap();
       }
-
-      /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
       @java.lang.Override
-      public long getMapSfixed64Sfixed64OrDefault(long key, long defaultValue) {
+      public long getMapSfixed64Sfixed64OrDefault(
+          long key,
+          long defaultValue) {
 
         java.util.Map<java.lang.Long, java.lang.Long> map =
             internalGetMapSfixed64Sfixed64().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
       @java.lang.Override
-      public long getMapSfixed64Sfixed64OrThrow(long key) {
+      public long getMapSfixed64Sfixed64OrThrow(
+          long key) {
 
         java.util.Map<java.lang.Long, java.lang.Long> map =
             internalGetMapSfixed64Sfixed64().getMap();
@@ -22072,45 +19841,57 @@ public long getMapSfixed64Sfixed64OrThrow(long key) {
         }
         return map.get(key);
       }
-
       public Builder clearMapSfixed64Sfixed64() {
         bitField2_ = (bitField2_ & ~0x00002000);
-        internalGetMutableMapSfixed64Sfixed64().getMutableMap().clear();
+        internalGetMutableMapSfixed64Sfixed64().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
+      public Builder removeMapSfixed64Sfixed64(
+          long key) {
 
-      /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
-      public Builder removeMapSfixed64Sfixed64(long key) {
-
-        internalGetMutableMapSfixed64Sfixed64().getMutableMap().remove(key);
+        internalGetMutableMapSfixed64Sfixed64().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Long, java.lang.Long> getMutableMapSfixed64Sfixed64() {
+      public java.util.Map<java.lang.Long, java.lang.Long>
+          getMutableMapSfixed64Sfixed64() {
         bitField2_ |= 0x00002000;
         return internalGetMutableMapSfixed64Sfixed64().getMutableMap();
       }
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
+      public Builder putMapSfixed64Sfixed64(
+          long key,
+          long value) {
 
-      /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
-      public Builder putMapSfixed64Sfixed64(long key, long value) {
 
-        internalGetMutableMapSfixed64Sfixed64().getMutableMap().put(key, value);
+        internalGetMutableMapSfixed64Sfixed64().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00002000;
         return this;
       }
-
-      /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
       public Builder putAllMapSfixed64Sfixed64(
           java.util.Map<java.lang.Long, java.lang.Long> values) {
-        internalGetMutableMapSfixed64Sfixed64().getMutableMap().putAll(values);
+        internalGetMutableMapSfixed64Sfixed64().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00002000;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float> mapInt32Float_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Float> mapInt32Float_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float>
           internalGetMapInt32Float() {
         if (mapInt32Float_ == null) {
@@ -22119,13 +19900,11 @@ public Builder putAllMapSfixed64Sfixed64(
         }
         return mapInt32Float_;
       }
-
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float>
           internalGetMutableMapInt32Float() {
         if (mapInt32Float_ == null) {
-          mapInt32Float_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapInt32FloatDefaultEntryHolder.defaultEntry);
+          mapInt32Float_ = com.google.protobuf.MapField.newMapField(
+              MapInt32FloatDefaultEntryHolder.defaultEntry);
         }
         if (!mapInt32Float_.isMutable()) {
           mapInt32Float_ = mapInt32Float_.copy();
@@ -22134,87 +19913,110 @@ public Builder putAllMapSfixed64Sfixed64(
         onChanged();
         return mapInt32Float_;
       }
-
       public int getMapInt32FloatCount() {
         return internalGetMapInt32Float().getMap().size();
       }
-
-      /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
       @java.lang.Override
-      public boolean containsMapInt32Float(int key) {
+      public boolean containsMapInt32Float(
+          int key) {
 
         return internalGetMapInt32Float().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapInt32FloatMap()} instead. */
+      /**
+       * Use {@link #getMapInt32FloatMap()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Integer, java.lang.Float> getMapInt32Float() {
         return getMapInt32FloatMap();
       }
-
-      /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Integer, java.lang.Float> getMapInt32FloatMap() {
         return internalGetMapInt32Float().getMap();
       }
-
-      /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
       @java.lang.Override
-      public float getMapInt32FloatOrDefault(int key, float defaultValue) {
+      public float getMapInt32FloatOrDefault(
+          int key,
+          float defaultValue) {
 
-        java.util.Map<java.lang.Integer, java.lang.Float> map = internalGetMapInt32Float().getMap();
+        java.util.Map<java.lang.Integer, java.lang.Float> map =
+            internalGetMapInt32Float().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
       @java.lang.Override
-      public float getMapInt32FloatOrThrow(int key) {
+      public float getMapInt32FloatOrThrow(
+          int key) {
 
-        java.util.Map<java.lang.Integer, java.lang.Float> map = internalGetMapInt32Float().getMap();
+        java.util.Map<java.lang.Integer, java.lang.Float> map =
+            internalGetMapInt32Float().getMap();
         if (!map.containsKey(key)) {
           throw new java.lang.IllegalArgumentException();
         }
         return map.get(key);
       }
-
       public Builder clearMapInt32Float() {
         bitField2_ = (bitField2_ & ~0x00004000);
-        internalGetMutableMapInt32Float().getMutableMap().clear();
+        internalGetMutableMapInt32Float().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
+      public Builder removeMapInt32Float(
+          int key) {
 
-      /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
-      public Builder removeMapInt32Float(int key) {
-
-        internalGetMutableMapInt32Float().getMutableMap().remove(key);
+        internalGetMutableMapInt32Float().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Float> getMutableMapInt32Float() {
+      public java.util.Map<java.lang.Integer, java.lang.Float>
+          getMutableMapInt32Float() {
         bitField2_ |= 0x00004000;
         return internalGetMutableMapInt32Float().getMutableMap();
       }
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
+      public Builder putMapInt32Float(
+          int key,
+          float value) {
 
-      /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
-      public Builder putMapInt32Float(int key, float value) {
 
-        internalGetMutableMapInt32Float().getMutableMap().put(key, value);
+        internalGetMutableMapInt32Float().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00004000;
         return this;
       }
-
-      /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
-      public Builder putAllMapInt32Float(java.util.Map<java.lang.Integer, java.lang.Float> values) {
-        internalGetMutableMapInt32Float().getMutableMap().putAll(values);
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
+      public Builder putAllMapInt32Float(
+          java.util.Map<java.lang.Integer, java.lang.Float> values) {
+        internalGetMutableMapInt32Float().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00004000;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Double> mapInt32Double_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Double> mapInt32Double_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Double>
           internalGetMapInt32Double() {
         if (mapInt32Double_ == null) {
@@ -22223,13 +20025,11 @@ public Builder putAllMapInt32Float(java.util.Map<java.lang.Integer, java.lang.Fl
         }
         return mapInt32Double_;
       }
-
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Double>
           internalGetMutableMapInt32Double() {
         if (mapInt32Double_ == null) {
-          mapInt32Double_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapInt32DoubleDefaultEntryHolder.defaultEntry);
+          mapInt32Double_ = com.google.protobuf.MapField.newMapField(
+              MapInt32DoubleDefaultEntryHolder.defaultEntry);
         }
         if (!mapInt32Double_.isMutable()) {
           mapInt32Double_ = mapInt32Double_.copy();
@@ -22238,43 +20038,51 @@ public Builder putAllMapInt32Float(java.util.Map<java.lang.Integer, java.lang.Fl
         onChanged();
         return mapInt32Double_;
       }
-
       public int getMapInt32DoubleCount() {
         return internalGetMapInt32Double().getMap().size();
       }
-
-      /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
       @java.lang.Override
-      public boolean containsMapInt32Double(int key) {
+      public boolean containsMapInt32Double(
+          int key) {
 
         return internalGetMapInt32Double().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapInt32DoubleMap()} instead. */
+      /**
+       * Use {@link #getMapInt32DoubleMap()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Integer, java.lang.Double> getMapInt32Double() {
         return getMapInt32DoubleMap();
       }
-
-      /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Integer, java.lang.Double> getMapInt32DoubleMap() {
         return internalGetMapInt32Double().getMap();
       }
-
-      /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
       @java.lang.Override
-      public double getMapInt32DoubleOrDefault(int key, double defaultValue) {
+      public double getMapInt32DoubleOrDefault(
+          int key,
+          double defaultValue) {
 
         java.util.Map<java.lang.Integer, java.lang.Double> map =
             internalGetMapInt32Double().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
       @java.lang.Override
-      public double getMapInt32DoubleOrThrow(int key) {
+      public double getMapInt32DoubleOrThrow(
+          int key) {
 
         java.util.Map<java.lang.Integer, java.lang.Double> map =
             internalGetMapInt32Double().getMap();
@@ -22283,45 +20091,57 @@ public double getMapInt32DoubleOrThrow(int key) {
         }
         return map.get(key);
       }
-
       public Builder clearMapInt32Double() {
         bitField2_ = (bitField2_ & ~0x00008000);
-        internalGetMutableMapInt32Double().getMutableMap().clear();
+        internalGetMutableMapInt32Double().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
+      public Builder removeMapInt32Double(
+          int key) {
 
-      /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
-      public Builder removeMapInt32Double(int key) {
-
-        internalGetMutableMapInt32Double().getMutableMap().remove(key);
+        internalGetMutableMapInt32Double().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Double> getMutableMapInt32Double() {
+      public java.util.Map<java.lang.Integer, java.lang.Double>
+          getMutableMapInt32Double() {
         bitField2_ |= 0x00008000;
         return internalGetMutableMapInt32Double().getMutableMap();
       }
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
+      public Builder putMapInt32Double(
+          int key,
+          double value) {
 
-      /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
-      public Builder putMapInt32Double(int key, double value) {
 
-        internalGetMutableMapInt32Double().getMutableMap().put(key, value);
+        internalGetMutableMapInt32Double().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00008000;
         return this;
       }
-
-      /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
       public Builder putAllMapInt32Double(
           java.util.Map<java.lang.Integer, java.lang.Double> values) {
-        internalGetMutableMapInt32Double().getMutableMap().putAll(values);
+        internalGetMutableMapInt32Double().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00008000;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Boolean, java.lang.Boolean> mapBoolBool_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Boolean, java.lang.Boolean> mapBoolBool_;
       private com.google.protobuf.MapField<java.lang.Boolean, java.lang.Boolean>
           internalGetMapBoolBool() {
         if (mapBoolBool_ == null) {
@@ -22330,12 +20150,11 @@ public Builder putAllMapInt32Double(
         }
         return mapBoolBool_;
       }
-
       private com.google.protobuf.MapField<java.lang.Boolean, java.lang.Boolean>
           internalGetMutableMapBoolBool() {
         if (mapBoolBool_ == null) {
-          mapBoolBool_ =
-              com.google.protobuf.MapField.newMapField(MapBoolBoolDefaultEntryHolder.defaultEntry);
+          mapBoolBool_ = com.google.protobuf.MapField.newMapField(
+              MapBoolBoolDefaultEntryHolder.defaultEntry);
         }
         if (!mapBoolBool_.isMutable()) {
           mapBoolBool_ = mapBoolBool_.copy();
@@ -22344,87 +20163,110 @@ public Builder putAllMapInt32Double(
         onChanged();
         return mapBoolBool_;
       }
-
       public int getMapBoolBoolCount() {
         return internalGetMapBoolBool().getMap().size();
       }
-
-      /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
       @java.lang.Override
-      public boolean containsMapBoolBool(boolean key) {
+      public boolean containsMapBoolBool(
+          boolean key) {
 
         return internalGetMapBoolBool().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapBoolBoolMap()} instead. */
+      /**
+       * Use {@link #getMapBoolBoolMap()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Boolean, java.lang.Boolean> getMapBoolBool() {
         return getMapBoolBoolMap();
       }
-
-      /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Boolean, java.lang.Boolean> getMapBoolBoolMap() {
         return internalGetMapBoolBool().getMap();
       }
-
-      /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
       @java.lang.Override
-      public boolean getMapBoolBoolOrDefault(boolean key, boolean defaultValue) {
+      public boolean getMapBoolBoolOrDefault(
+          boolean key,
+          boolean defaultValue) {
 
-        java.util.Map<java.lang.Boolean, java.lang.Boolean> map = internalGetMapBoolBool().getMap();
+        java.util.Map<java.lang.Boolean, java.lang.Boolean> map =
+            internalGetMapBoolBool().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
       @java.lang.Override
-      public boolean getMapBoolBoolOrThrow(boolean key) {
+      public boolean getMapBoolBoolOrThrow(
+          boolean key) {
 
-        java.util.Map<java.lang.Boolean, java.lang.Boolean> map = internalGetMapBoolBool().getMap();
+        java.util.Map<java.lang.Boolean, java.lang.Boolean> map =
+            internalGetMapBoolBool().getMap();
         if (!map.containsKey(key)) {
           throw new java.lang.IllegalArgumentException();
         }
         return map.get(key);
       }
-
       public Builder clearMapBoolBool() {
         bitField2_ = (bitField2_ & ~0x00010000);
-        internalGetMutableMapBoolBool().getMutableMap().clear();
+        internalGetMutableMapBoolBool().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
+      public Builder removeMapBoolBool(
+          boolean key) {
 
-      /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
-      public Builder removeMapBoolBool(boolean key) {
-
-        internalGetMutableMapBoolBool().getMutableMap().remove(key);
+        internalGetMutableMapBoolBool().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Boolean, java.lang.Boolean> getMutableMapBoolBool() {
+      public java.util.Map<java.lang.Boolean, java.lang.Boolean>
+          getMutableMapBoolBool() {
         bitField2_ |= 0x00010000;
         return internalGetMutableMapBoolBool().getMutableMap();
       }
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
+      public Builder putMapBoolBool(
+          boolean key,
+          boolean value) {
 
-      /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
-      public Builder putMapBoolBool(boolean key, boolean value) {
 
-        internalGetMutableMapBoolBool().getMutableMap().put(key, value);
+        internalGetMutableMapBoolBool().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00010000;
         return this;
       }
-
-      /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
-      public Builder putAllMapBoolBool(java.util.Map<java.lang.Boolean, java.lang.Boolean> values) {
-        internalGetMutableMapBoolBool().getMutableMap().putAll(values);
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
+      public Builder putAllMapBoolBool(
+          java.util.Map<java.lang.Boolean, java.lang.Boolean> values) {
+        internalGetMutableMapBoolBool().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00010000;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.String, java.lang.String> mapStringString_;
-
+      private com.google.protobuf.MapField<
+          java.lang.String, java.lang.String> mapStringString_;
       private com.google.protobuf.MapField<java.lang.String, java.lang.String>
           internalGetMapStringString() {
         if (mapStringString_ == null) {
@@ -22433,13 +20275,11 @@ public Builder putAllMapBoolBool(java.util.Map<java.lang.Boolean, java.lang.Bool
         }
         return mapStringString_;
       }
-
       private com.google.protobuf.MapField<java.lang.String, java.lang.String>
           internalGetMutableMapStringString() {
         if (mapStringString_ == null) {
-          mapStringString_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapStringStringDefaultEntryHolder.defaultEntry);
+          mapStringString_ = com.google.protobuf.MapField.newMapField(
+              MapStringStringDefaultEntryHolder.defaultEntry);
         }
         if (!mapStringString_.isMutable()) {
           mapStringString_ = mapStringString_.copy();
@@ -22448,53 +20288,54 @@ public Builder putAllMapBoolBool(java.util.Map<java.lang.Boolean, java.lang.Bool
         onChanged();
         return mapStringString_;
       }
-
       public int getMapStringStringCount() {
         return internalGetMapStringString().getMap().size();
       }
-
-      /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
       @java.lang.Override
-      public boolean containsMapStringString(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public boolean containsMapStringString(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         return internalGetMapStringString().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapStringStringMap()} instead. */
+      /**
+       * Use {@link #getMapStringStringMap()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.String, java.lang.String> getMapStringString() {
         return getMapStringStringMap();
       }
-
-      /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.String, java.lang.String> getMapStringStringMap() {
         return internalGetMapStringString().getMap();
       }
-
-      /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
       @java.lang.Override
-      public /* nullable */ java.lang.String getMapStringStringOrDefault(
+      public /* nullable */
+java.lang.String getMapStringStringOrDefault(
           java.lang.String key,
           /* nullable */
-          java.lang.String defaultValue) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+java.lang.String defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, java.lang.String> map =
             internalGetMapStringString().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
       @java.lang.Override
-      public java.lang.String getMapStringStringOrThrow(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public java.lang.String getMapStringStringOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, java.lang.String> map =
             internalGetMapStringString().getMap();
         if (!map.containsKey(key)) {
@@ -22502,53 +20343,57 @@ public java.lang.String getMapStringStringOrThrow(java.lang.String key) {
         }
         return map.get(key);
       }
-
       public Builder clearMapStringString() {
         bitField2_ = (bitField2_ & ~0x00020000);
-        internalGetMutableMapStringString().getMutableMap().clear();
+        internalGetMutableMapStringString().getMutableMap()
+            .clear();
         return this;
       }
-
-      /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
-      public Builder removeMapStringString(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        internalGetMutableMapStringString().getMutableMap().remove(key);
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
+      public Builder removeMapStringString(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringString().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.String, java.lang.String> getMutableMapStringString() {
+      public java.util.Map<java.lang.String, java.lang.String>
+          getMutableMapStringString() {
         bitField2_ |= 0x00020000;
         return internalGetMutableMapStringString().getMutableMap();
       }
-
-      /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
-      public Builder putMapStringString(java.lang.String key, java.lang.String value) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        if (value == null) {
-          throw new NullPointerException("map value");
-        }
-        internalGetMutableMapStringString().getMutableMap().put(key, value);
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
+      public Builder putMapStringString(
+          java.lang.String key,
+          java.lang.String value) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        if (value == null) { throw new NullPointerException("map value"); }
+        internalGetMutableMapStringString().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00020000;
         return this;
       }
-
-      /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
       public Builder putAllMapStringString(
           java.util.Map<java.lang.String, java.lang.String> values) {
-        internalGetMutableMapStringString().getMutableMap().putAll(values);
+        internalGetMutableMapStringString().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00020000;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.String, com.google.protobuf.ByteString>
-          mapStringBytes_;
-
+      private com.google.protobuf.MapField<
+          java.lang.String, com.google.protobuf.ByteString> mapStringBytes_;
       private com.google.protobuf.MapField<java.lang.String, com.google.protobuf.ByteString>
           internalGetMapStringBytes() {
         if (mapStringBytes_ == null) {
@@ -22557,13 +20402,11 @@ public Builder putAllMapStringString(
         }
         return mapStringBytes_;
       }
-
       private com.google.protobuf.MapField<java.lang.String, com.google.protobuf.ByteString>
           internalGetMutableMapStringBytes() {
         if (mapStringBytes_ == null) {
-          mapStringBytes_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapStringBytesDefaultEntryHolder.defaultEntry);
+          mapStringBytes_ = com.google.protobuf.MapField.newMapField(
+              MapStringBytesDefaultEntryHolder.defaultEntry);
         }
         if (!mapStringBytes_.isMutable()) {
           mapStringBytes_ = mapStringBytes_.copy();
@@ -22572,54 +20415,54 @@ public Builder putAllMapStringString(
         onChanged();
         return mapStringBytes_;
       }
-
       public int getMapStringBytesCount() {
         return internalGetMapStringBytes().getMap().size();
       }
-
-      /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
       @java.lang.Override
-      public boolean containsMapStringBytes(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public boolean containsMapStringBytes(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         return internalGetMapStringBytes().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapStringBytesMap()} instead. */
+      /**
+       * Use {@link #getMapStringBytesMap()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.String, com.google.protobuf.ByteString> getMapStringBytes() {
         return getMapStringBytesMap();
       }
-
-      /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
       @java.lang.Override
-      public java.util.Map<java.lang.String, com.google.protobuf.ByteString>
-          getMapStringBytesMap() {
+      public java.util.Map<java.lang.String, com.google.protobuf.ByteString> getMapStringBytesMap() {
         return internalGetMapStringBytes().getMap();
       }
-
-      /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
       @java.lang.Override
-      public /* nullable */ com.google.protobuf.ByteString getMapStringBytesOrDefault(
+      public /* nullable */
+com.google.protobuf.ByteString getMapStringBytesOrDefault(
           java.lang.String key,
           /* nullable */
-          com.google.protobuf.ByteString defaultValue) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+com.google.protobuf.ByteString defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, com.google.protobuf.ByteString> map =
             internalGetMapStringBytes().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
       @java.lang.Override
-      public com.google.protobuf.ByteString getMapStringBytesOrThrow(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public com.google.protobuf.ByteString getMapStringBytesOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, com.google.protobuf.ByteString> map =
             internalGetMapStringBytes().getMap();
         if (!map.containsKey(key)) {
@@ -22627,566 +20470,367 @@ public com.google.protobuf.ByteString getMapStringBytesOrThrow(java.lang.String
         }
         return map.get(key);
       }
-
       public Builder clearMapStringBytes() {
         bitField2_ = (bitField2_ & ~0x00040000);
-        internalGetMutableMapStringBytes().getMutableMap().clear();
+        internalGetMutableMapStringBytes().getMutableMap()
+            .clear();
         return this;
       }
-
-      /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
-      public Builder removeMapStringBytes(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        internalGetMutableMapStringBytes().getMutableMap().remove(key);
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
+      public Builder removeMapStringBytes(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringBytes().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
       public java.util.Map<java.lang.String, com.google.protobuf.ByteString>
           getMutableMapStringBytes() {
         bitField2_ |= 0x00040000;
         return internalGetMutableMapStringBytes().getMutableMap();
       }
-
-      /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
-      public Builder putMapStringBytes(java.lang.String key, com.google.protobuf.ByteString value) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        if (value == null) {
-          throw new NullPointerException("map value");
-        }
-        internalGetMutableMapStringBytes().getMutableMap().put(key, value);
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
+      public Builder putMapStringBytes(
+          java.lang.String key,
+          com.google.protobuf.ByteString value) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        if (value == null) { throw new NullPointerException("map value"); }
+        internalGetMutableMapStringBytes().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00040000;
         return this;
       }
-
-      /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
       public Builder putAllMapStringBytes(
           java.util.Map<java.lang.String, com.google.protobuf.ByteString> values) {
-        internalGetMutableMapStringBytes().getMutableMap().putAll(values);
+        internalGetMutableMapStringBytes().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00040000;
         return this;
       }
 
-      private static final class MapStringNestedMessageConverter
-          implements com.google.protobuf.MapFieldBuilder.Converter<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .NestedMessageOrBuilder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> {
+      private static final class MapStringNestedMessageConverter implements com.google.protobuf.MapFieldBuilder.Converter<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> {
         @java.lang.Override
-        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-            build(
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                        .NestedMessageOrBuilder
-                    val) {
-          if (val
-              instanceof
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) {
-            return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .NestedMessage)
-                val;
-          }
-          return ((legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage.Builder)
-                  val)
-              .build();
+        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage build(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder val) {
+          if (val instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) { return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) val; }
+          return ((legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder) val).build();
         }
 
         @java.lang.Override
-        public com.google.protobuf.MapEntry<
-                java.lang.String,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-            defaultEntry() {
+        public com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> defaultEntry() {
           return MapStringNestedMessageDefaultEntryHolder.defaultEntry;
         }
-      }
-      ;
-
-      private static final MapStringNestedMessageConverter mapStringNestedMessageConverter =
-          new MapStringNestedMessageConverter();
+      };
+      private static final MapStringNestedMessageConverter mapStringNestedMessageConverter = new MapStringNestedMessageConverter();
 
       private com.google.protobuf.MapFieldBuilder<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .NestedMessageOrBuilder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder>
-          mapStringNestedMessage_;
-
-      private com.google.protobuf.MapFieldBuilder<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .NestedMessageOrBuilder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder>
+          java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder> mapStringNestedMessage_;
+      private com.google.protobuf.MapFieldBuilder<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder>
           internalGetMapStringNestedMessage() {
         if (mapStringNestedMessage_ == null) {
           return new com.google.protobuf.MapFieldBuilder<>(mapStringNestedMessageConverter);
         }
         return mapStringNestedMessage_;
       }
-
-      private com.google.protobuf.MapFieldBuilder<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .NestedMessageOrBuilder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder>
+      private com.google.protobuf.MapFieldBuilder<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder>
           internalGetMutableMapStringNestedMessage() {
         if (mapStringNestedMessage_ == null) {
-          mapStringNestedMessage_ =
-              new com.google.protobuf.MapFieldBuilder<>(mapStringNestedMessageConverter);
+          mapStringNestedMessage_ = new com.google.protobuf.MapFieldBuilder<>(mapStringNestedMessageConverter);
         }
         bitField2_ |= 0x00080000;
         onChanged();
         return mapStringNestedMessage_;
       }
-
       public int getMapStringNestedMessageCount() {
         return internalGetMapStringNestedMessage().ensureBuilderMap().size();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
        */
       @java.lang.Override
-      public boolean containsMapStringNestedMessage(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public boolean containsMapStringNestedMessage(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         return internalGetMapStringNestedMessage().ensureBuilderMap().containsKey(key);
       }
-
-      /** Use {@link #getMapStringNestedMessageMap()} instead. */
+      /**
+       * Use {@link #getMapStringNestedMessageMap()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
-      public java.util.Map<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-          getMapStringNestedMessage() {
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> getMapStringNestedMessage() {
         return getMapStringNestedMessageMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
        */
       @java.lang.Override
-      public java.util.Map<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-          getMapStringNestedMessageMap() {
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> getMapStringNestedMessageMap() {
         return internalGetMapStringNestedMessage().getImmutableMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
        */
       @java.lang.Override
-      public /* nullable */ legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          getMapStringNestedMessageOrDefault(
-              java.lang.String key,
-              /* nullable */
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  defaultValue) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        java.util.Map<
-                java.lang.String,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .NestedMessageOrBuilder>
-            map = internalGetMutableMapStringNestedMessage().ensureBuilderMap();
-        return map.containsKey(key)
-            ? mapStringNestedMessageConverter.build(map.get(key))
-            : defaultValue;
+      public /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getMapStringNestedMessageOrDefault(
+          java.lang.String key,
+          /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> map = internalGetMutableMapStringNestedMessage().ensureBuilderMap();
+        return map.containsKey(key) ? mapStringNestedMessageConverter.build(map.get(key)) : defaultValue;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
        */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-          getMapStringNestedMessageOrThrow(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        java.util.Map<
-                java.lang.String,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .NestedMessageOrBuilder>
-            map = internalGetMutableMapStringNestedMessage().ensureBuilderMap();
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getMapStringNestedMessageOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> map = internalGetMutableMapStringNestedMessage().ensureBuilderMap();
         if (!map.containsKey(key)) {
           throw new java.lang.IllegalArgumentException();
         }
         return mapStringNestedMessageConverter.build(map.get(key));
       }
-
       public Builder clearMapStringNestedMessage() {
         bitField2_ = (bitField2_ & ~0x00080000);
         internalGetMutableMapStringNestedMessage().clear();
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
        */
-      public Builder removeMapStringNestedMessage(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        internalGetMutableMapStringNestedMessage().ensureBuilderMap().remove(key);
+      public Builder removeMapStringNestedMessage(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringNestedMessage().ensureBuilderMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
           getMutableMapStringNestedMessage() {
         bitField2_ |= 0x00080000;
         return internalGetMutableMapStringNestedMessage().ensureMessageMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
        */
       public Builder putMapStringNestedMessage(
           java.lang.String key,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              value) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        if (value == null) {
-          throw new NullPointerException("map value");
-        }
-        internalGetMutableMapStringNestedMessage().ensureBuilderMap().put(key, value);
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage value) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        if (value == null) { throw new NullPointerException("map value"); }
+        internalGetMutableMapStringNestedMessage().ensureBuilderMap()
+            .put(key, value);
         bitField2_ |= 0x00080000;
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
        */
       public Builder putAllMapStringNestedMessage(
-          java.util.Map<
-                  java.lang.String,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage>
-              values) {
-        for (java.util.Map.Entry<
-                java.lang.String,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-            e : values.entrySet()) {
+          java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> values) {
+        for (java.util.Map.Entry<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> e : values.entrySet()) {
           if (e.getKey() == null || e.getValue() == null) {
             throw new NullPointerException();
           }
         }
-        internalGetMutableMapStringNestedMessage().ensureBuilderMap().putAll(values);
+        internalGetMutableMapStringNestedMessage().ensureBuilderMap()
+            .putAll(values);
         bitField2_ |= 0x00080000;
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .Builder
-          putMapStringNestedMessageBuilderIfAbsent(java.lang.String key) {
-        java.util.Map<
-                java.lang.String,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .NestedMessageOrBuilder>
-            builderMap = internalGetMutableMapStringNestedMessage().ensureBuilderMap();
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder
-            entry = builderMap.get(key);
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder putMapStringNestedMessageBuilderIfAbsent(
+          java.lang.String key) {
+        java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> builderMap = internalGetMutableMapStringNestedMessage().ensureBuilderMap();
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder entry = builderMap.get(key);
         if (entry == null) {
-          entry =
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .newBuilder();
+          entry = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.newBuilder();
           builderMap.put(key, entry);
         }
-        if (entry
-            instanceof
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) {
-          entry =
-              ((legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage)
-                      entry)
-                  .toBuilder();
+        if (entry instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) {
+          entry = ((legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) entry).toBuilder();
           builderMap.put(key, entry);
         }
-        return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                .Builder)
-            entry;
+        return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder) entry;
       }
 
-      private static final class MapStringForeignMessageConverter
-          implements com.google.protobuf.MapFieldBuilder.Converter<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> {
+      private static final class MapStringForeignMessageConverter implements com.google.protobuf.MapFieldBuilder.Converter<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> {
         @java.lang.Override
-        public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage build(
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder val) {
-          if (val instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage) {
-            return (legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage) val;
-          }
-          return ((legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder) val)
-              .build();
+        public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage build(legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder val) {
+          if (val instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage) { return (legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage) val; }
+          return ((legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder) val).build();
         }
 
         @java.lang.Override
-        public com.google.protobuf.MapEntry<
-                java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-            defaultEntry() {
+        public com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> defaultEntry() {
           return MapStringForeignMessageDefaultEntryHolder.defaultEntry;
         }
-      }
-      ;
-
-      private static final MapStringForeignMessageConverter mapStringForeignMessageConverter =
-          new MapStringForeignMessageConverter();
-
-      private com.google.protobuf.MapFieldBuilder<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder>
-          mapStringForeignMessage_;
+      };
+      private static final MapStringForeignMessageConverter mapStringForeignMessageConverter = new MapStringForeignMessageConverter();
 
       private com.google.protobuf.MapFieldBuilder<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder>
+          java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder> mapStringForeignMessage_;
+      private com.google.protobuf.MapFieldBuilder<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder>
           internalGetMapStringForeignMessage() {
         if (mapStringForeignMessage_ == null) {
           return new com.google.protobuf.MapFieldBuilder<>(mapStringForeignMessageConverter);
         }
         return mapStringForeignMessage_;
       }
-
-      private com.google.protobuf.MapFieldBuilder<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder>
+      private com.google.protobuf.MapFieldBuilder<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder>
           internalGetMutableMapStringForeignMessage() {
         if (mapStringForeignMessage_ == null) {
-          mapStringForeignMessage_ =
-              new com.google.protobuf.MapFieldBuilder<>(mapStringForeignMessageConverter);
+          mapStringForeignMessage_ = new com.google.protobuf.MapFieldBuilder<>(mapStringForeignMessageConverter);
         }
         bitField2_ |= 0x00100000;
         onChanged();
         return mapStringForeignMessage_;
       }
-
       public int getMapStringForeignMessageCount() {
         return internalGetMapStringForeignMessage().ensureBuilderMap().size();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
        */
       @java.lang.Override
-      public boolean containsMapStringForeignMessage(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public boolean containsMapStringForeignMessage(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         return internalGetMapStringForeignMessage().ensureBuilderMap().containsKey(key);
       }
-
-      /** Use {@link #getMapStringForeignMessageMap()} instead. */
+      /**
+       * Use {@link #getMapStringForeignMessageMap()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
-      public java.util.Map<
-              java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-          getMapStringForeignMessage() {
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> getMapStringForeignMessage() {
         return getMapStringForeignMessageMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
        */
       @java.lang.Override
-      public java.util.Map<
-              java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-          getMapStringForeignMessageMap() {
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> getMapStringForeignMessageMap() {
         return internalGetMapStringForeignMessage().getImmutableMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
        */
       @java.lang.Override
-      public /* nullable */ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-          getMapStringForeignMessageOrDefault(
-              java.lang.String key,
-              /* nullable */
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage defaultValue) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        java.util.Map<
-                java.lang.String,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>
-            map = internalGetMutableMapStringForeignMessage().ensureBuilderMap();
-        return map.containsKey(key)
-            ? mapStringForeignMessageConverter.build(map.get(key))
-            : defaultValue;
+      public /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getMapStringForeignMessageOrDefault(
+          java.lang.String key,
+          /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder> map = internalGetMutableMapStringForeignMessage().ensureBuilderMap();
+        return map.containsKey(key) ? mapStringForeignMessageConverter.build(map.get(key)) : defaultValue;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
        */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-          getMapStringForeignMessageOrThrow(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        java.util.Map<
-                java.lang.String,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>
-            map = internalGetMutableMapStringForeignMessage().ensureBuilderMap();
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getMapStringForeignMessageOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder> map = internalGetMutableMapStringForeignMessage().ensureBuilderMap();
         if (!map.containsKey(key)) {
           throw new java.lang.IllegalArgumentException();
         }
         return mapStringForeignMessageConverter.build(map.get(key));
       }
-
       public Builder clearMapStringForeignMessage() {
         bitField2_ = (bitField2_ & ~0x00100000);
         internalGetMutableMapStringForeignMessage().clear();
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
        */
-      public Builder removeMapStringForeignMessage(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        internalGetMutableMapStringForeignMessage().ensureBuilderMap().remove(key);
+      public Builder removeMapStringForeignMessage(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringForeignMessage().ensureBuilderMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<
-              java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
           getMutableMapStringForeignMessage() {
         bitField2_ |= 0x00100000;
         return internalGetMutableMapStringForeignMessage().ensureMessageMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
        */
       public Builder putMapStringForeignMessage(
           java.lang.String key,
           legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage value) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        if (value == null) {
-          throw new NullPointerException("map value");
-        }
-        internalGetMutableMapStringForeignMessage().ensureBuilderMap().put(key, value);
+        if (key == null) { throw new NullPointerException("map key"); }
+        if (value == null) { throw new NullPointerException("map value"); }
+        internalGetMutableMapStringForeignMessage().ensureBuilderMap()
+            .put(key, value);
         bitField2_ |= 0x00100000;
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
        */
       public Builder putAllMapStringForeignMessage(
-          java.util.Map<
-                  java.lang.String,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-              values) {
-        for (java.util.Map.Entry<
-                java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-            e : values.entrySet()) {
+          java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> values) {
+        for (java.util.Map.Entry<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> e : values.entrySet()) {
           if (e.getKey() == null || e.getValue() == null) {
             throw new NullPointerException();
           }
         }
-        internalGetMutableMapStringForeignMessage().ensureBuilderMap().putAll(values);
+        internalGetMutableMapStringForeignMessage().ensureBuilderMap()
+            .putAll(values);
         bitField2_ |= 0x00100000;
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder
-          putMapStringForeignMessageBuilderIfAbsent(java.lang.String key) {
-        java.util.Map<
-                java.lang.String,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>
-            builderMap = internalGetMutableMapStringForeignMessage().ensureBuilderMap();
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder entry =
-            builderMap.get(key);
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder putMapStringForeignMessageBuilderIfAbsent(
+          java.lang.String key) {
+        java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder> builderMap = internalGetMutableMapStringForeignMessage().ensureBuilderMap();
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder entry = builderMap.get(key);
         if (entry == null) {
           entry = legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.newBuilder();
           builderMap.put(key, entry);
         }
         if (entry instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage) {
-          entry =
-              ((legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage) entry)
-                  .toBuilder();
+          entry = ((legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage) entry).toBuilder();
           builderMap.put(key, entry);
         }
         return (legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder) entry;
       }
 
-      private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
-          mapStringNestedEnum_;
-
+      private com.google.protobuf.MapField<
+          java.lang.String, java.lang.Integer> mapStringNestedEnum_;
       private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
           internalGetMapStringNestedEnum() {
         if (mapStringNestedEnum_ == null) {
@@ -23195,13 +20839,11 @@ public Builder putAllMapStringForeignMessage(
         }
         return mapStringNestedEnum_;
       }
-
       private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
           internalGetMutableMapStringNestedEnum() {
         if (mapStringNestedEnum_ == null) {
-          mapStringNestedEnum_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapStringNestedEnumDefaultEntryHolder.defaultEntry);
+          mapStringNestedEnum_ = com.google.protobuf.MapField.newMapField(
+              MapStringNestedEnumDefaultEntryHolder.defaultEntry);
         }
         if (!mapStringNestedEnum_.isMutable()) {
           mapStringNestedEnum_ = mapStringNestedEnum_.copy();
@@ -23210,81 +20852,58 @@ public Builder putAllMapStringForeignMessage(
         onChanged();
         return mapStringNestedEnum_;
       }
-
       public int getMapStringNestedEnumCount() {
         return internalGetMapStringNestedEnum().getMap().size();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
       @java.lang.Override
-      public boolean containsMapStringNestedEnum(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public boolean containsMapStringNestedEnum(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         return internalGetMapStringNestedEnum().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapStringNestedEnumMap()} instead. */
+      /**
+       * Use {@link #getMapStringNestedEnumMap()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
-      public java.util.Map<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-          getMapStringNestedEnum() {
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
+      getMapStringNestedEnum() {
         return getMapStringNestedEnumMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
       @java.lang.Override
-      public java.util.Map<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-          getMapStringNestedEnumMap() {
-        return internalGetAdaptedMapStringNestedEnumMap(internalGetMapStringNestedEnum().getMap());
-      }
-
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
+      getMapStringNestedEnumMap() {
+        return internalGetAdaptedMapStringNestedEnumMap(
+            internalGetMapStringNestedEnum().getMap());}
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
       @java.lang.Override
-      public /* nullable */ legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedEnum
-          getMapStringNestedEnumOrDefault(
-              java.lang.String key,
-              /* nullable */
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                  defaultValue) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getMapStringNestedEnumOrDefault(
+          java.lang.String key,
+          /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, java.lang.Integer> map =
             internalGetMapStringNestedEnum().getMap();
         return map.containsKey(key)
-            ? mapStringNestedEnumValueConverter.doForward(map.get(key))
-            : defaultValue;
+               ? mapStringNestedEnumValueConverter.doForward(map.get(key))
+               : defaultValue;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-          getMapStringNestedEnumOrThrow(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getMapStringNestedEnumOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, java.lang.Integer> map =
             internalGetMapStringNestedEnum().getMap();
         if (!map.containsKey(key)) {
@@ -23292,49 +20911,42 @@ public boolean containsMapStringNestedEnum(java.lang.String key) {
         }
         return mapStringNestedEnumValueConverter.doForward(map.get(key));
       }
-
-      /** Use {@link #getMapStringNestedEnumValueMap()} instead. */
+      /**
+       * Use {@link #getMapStringNestedEnumValueMap()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
-      public java.util.Map<java.lang.String, java.lang.Integer> getMapStringNestedEnumValue() {
+      public java.util.Map<java.lang.String, java.lang.Integer>
+      getMapStringNestedEnumValue() {
         return getMapStringNestedEnumValueMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
       @java.lang.Override
-      public java.util.Map<java.lang.String, java.lang.Integer> getMapStringNestedEnumValueMap() {
+      public java.util.Map<java.lang.String, java.lang.Integer>
+      getMapStringNestedEnumValueMap() {
         return internalGetMapStringNestedEnum().getMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
       @java.lang.Override
-      public int getMapStringNestedEnumValueOrDefault(java.lang.String key, int defaultValue) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public int getMapStringNestedEnumValueOrDefault(
+          java.lang.String key,
+          int defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, java.lang.Integer> map =
             internalGetMapStringNestedEnum().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
       @java.lang.Override
-      public int getMapStringNestedEnumValueOrThrow(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public int getMapStringNestedEnumValueOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, java.lang.Integer> map =
             internalGetMapStringNestedEnum().getMap();
         if (!map.containsKey(key)) {
@@ -23342,111 +20954,91 @@ public int getMapStringNestedEnumValueOrThrow(java.lang.String key) {
         }
         return map.get(key);
       }
-
       public Builder clearMapStringNestedEnum() {
         bitField2_ = (bitField2_ & ~0x00200000);
-        internalGetMutableMapStringNestedEnum().getMutableMap().clear();
+        internalGetMutableMapStringNestedEnum().getMutableMap()
+            .clear();
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
-      public Builder removeMapStringNestedEnum(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        internalGetMutableMapStringNestedEnum().getMutableMap().remove(key);
+      public Builder removeMapStringNestedEnum(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringNestedEnum().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
           getMutableMapStringNestedEnum() {
         bitField2_ |= 0x00200000;
         return internalGetAdaptedMapStringNestedEnumMap(
-            internalGetMutableMapStringNestedEnum().getMutableMap());
+             internalGetMutableMapStringNestedEnum().getMutableMap());
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
       public Builder putMapStringNestedEnum(
           java.lang.String key,
           legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+        if (key == null) { throw new NullPointerException("map key"); }
 
-        internalGetMutableMapStringNestedEnum()
-            .getMutableMap()
+        internalGetMutableMapStringNestedEnum().getMutableMap()
             .put(key, mapStringNestedEnumValueConverter.doBackward(value));
         bitField2_ |= 0x00200000;
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
       public Builder putAllMapStringNestedEnum(
-          java.util.Map<
-                  java.lang.String,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-              values) {
+          java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> values) {
         internalGetAdaptedMapStringNestedEnumMap(
-                internalGetMutableMapStringNestedEnum().getMutableMap())
-            .putAll(values);
+            internalGetMutableMapStringNestedEnum().getMutableMap())
+                .putAll(values);
         bitField2_ |= 0x00200000;
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
       public java.util.Map<java.lang.String, java.lang.Integer>
-          getMutableMapStringNestedEnumValue() {
+      getMutableMapStringNestedEnumValue() {
         bitField2_ |= 0x00200000;
         return internalGetMutableMapStringNestedEnum().getMutableMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
-      public Builder putMapStringNestedEnumValue(java.lang.String key, int value) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public Builder putMapStringNestedEnumValue(
+          java.lang.String key,
+          int value) {
+        if (key == null) { throw new NullPointerException("map key"); }
 
-        internalGetMutableMapStringNestedEnum().getMutableMap().put(key, value);
+        internalGetMutableMapStringNestedEnum().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00200000;
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
       public Builder putAllMapStringNestedEnumValue(
           java.util.Map<java.lang.String, java.lang.Integer> values) {
-        internalGetMutableMapStringNestedEnum().getMutableMap().putAll(values);
+        internalGetMutableMapStringNestedEnum().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00200000;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
-          mapStringForeignEnum_;
-
+      private com.google.protobuf.MapField<
+          java.lang.String, java.lang.Integer> mapStringForeignEnum_;
       private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
           internalGetMapStringForeignEnum() {
         if (mapStringForeignEnum_ == null) {
@@ -23455,13 +21047,11 @@ public Builder putAllMapStringNestedEnumValue(
         }
         return mapStringForeignEnum_;
       }
-
       private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
           internalGetMutableMapStringForeignEnum() {
         if (mapStringForeignEnum_ == null) {
-          mapStringForeignEnum_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapStringForeignEnumDefaultEntryHolder.defaultEntry);
+          mapStringForeignEnum_ = com.google.protobuf.MapField.newMapField(
+              MapStringForeignEnumDefaultEntryHolder.defaultEntry);
         }
         if (!mapStringForeignEnum_.isMutable()) {
           mapStringForeignEnum_ = mapStringForeignEnum_.copy();
@@ -23470,78 +21060,58 @@ public Builder putAllMapStringNestedEnumValue(
         onChanged();
         return mapStringForeignEnum_;
       }
-
       public int getMapStringForeignEnumCount() {
         return internalGetMapStringForeignEnum().getMap().size();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
       @java.lang.Override
-      public boolean containsMapStringForeignEnum(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public boolean containsMapStringForeignEnum(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         return internalGetMapStringForeignEnum().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapStringForeignEnumMap()} instead. */
+      /**
+       * Use {@link #getMapStringForeignEnumMap()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
-      public java.util.Map<
-              java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-          getMapStringForeignEnum() {
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
+      getMapStringForeignEnum() {
         return getMapStringForeignEnumMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
       @java.lang.Override
-      public java.util.Map<
-              java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-          getMapStringForeignEnumMap() {
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
+      getMapStringForeignEnumMap() {
         return internalGetAdaptedMapStringForeignEnumMap(
-            internalGetMapStringForeignEnum().getMap());
-      }
-
+            internalGetMapStringForeignEnum().getMap());}
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
       @java.lang.Override
-      public /* nullable */ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum
-          getMapStringForeignEnumOrDefault(
-              java.lang.String key,
-              /* nullable */
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum defaultValue) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getMapStringForeignEnumOrDefault(
+          java.lang.String key,
+          /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, java.lang.Integer> map =
             internalGetMapStringForeignEnum().getMap();
         return map.containsKey(key)
-            ? mapStringForeignEnumValueConverter.doForward(map.get(key))
-            : defaultValue;
+               ? mapStringForeignEnumValueConverter.doForward(map.get(key))
+               : defaultValue;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum
-          getMapStringForeignEnumOrThrow(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getMapStringForeignEnumOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, java.lang.Integer> map =
             internalGetMapStringForeignEnum().getMap();
         if (!map.containsKey(key)) {
@@ -23549,49 +21119,42 @@ public boolean containsMapStringForeignEnum(java.lang.String key) {
         }
         return mapStringForeignEnumValueConverter.doForward(map.get(key));
       }
-
-      /** Use {@link #getMapStringForeignEnumValueMap()} instead. */
+      /**
+       * Use {@link #getMapStringForeignEnumValueMap()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
-      public java.util.Map<java.lang.String, java.lang.Integer> getMapStringForeignEnumValue() {
+      public java.util.Map<java.lang.String, java.lang.Integer>
+      getMapStringForeignEnumValue() {
         return getMapStringForeignEnumValueMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
       @java.lang.Override
-      public java.util.Map<java.lang.String, java.lang.Integer> getMapStringForeignEnumValueMap() {
+      public java.util.Map<java.lang.String, java.lang.Integer>
+      getMapStringForeignEnumValueMap() {
         return internalGetMapStringForeignEnum().getMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
       @java.lang.Override
-      public int getMapStringForeignEnumValueOrDefault(java.lang.String key, int defaultValue) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public int getMapStringForeignEnumValueOrDefault(
+          java.lang.String key,
+          int defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, java.lang.Integer> map =
             internalGetMapStringForeignEnum().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
       @java.lang.Override
-      public int getMapStringForeignEnumValueOrThrow(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public int getMapStringForeignEnumValueOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, java.lang.Integer> map =
             internalGetMapStringForeignEnum().getMap();
         if (!map.containsKey(key)) {
@@ -23599,118 +21162,98 @@ public int getMapStringForeignEnumValueOrThrow(java.lang.String key) {
         }
         return map.get(key);
       }
-
       public Builder clearMapStringForeignEnum() {
         bitField2_ = (bitField2_ & ~0x00400000);
-        internalGetMutableMapStringForeignEnum().getMutableMap().clear();
+        internalGetMutableMapStringForeignEnum().getMutableMap()
+            .clear();
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
-      public Builder removeMapStringForeignEnum(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        internalGetMutableMapStringForeignEnum().getMutableMap().remove(key);
+      public Builder removeMapStringForeignEnum(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringForeignEnum().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<
-              java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
           getMutableMapStringForeignEnum() {
         bitField2_ |= 0x00400000;
         return internalGetAdaptedMapStringForeignEnumMap(
-            internalGetMutableMapStringForeignEnum().getMutableMap());
+             internalGetMutableMapStringForeignEnum().getMutableMap());
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
       public Builder putMapStringForeignEnum(
           java.lang.String key,
           legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum value) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+        if (key == null) { throw new NullPointerException("map key"); }
 
-        internalGetMutableMapStringForeignEnum()
-            .getMutableMap()
+        internalGetMutableMapStringForeignEnum().getMutableMap()
             .put(key, mapStringForeignEnumValueConverter.doBackward(value));
         bitField2_ |= 0x00400000;
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
       public Builder putAllMapStringForeignEnum(
-          java.util.Map<
-                  java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-              values) {
+          java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum> values) {
         internalGetAdaptedMapStringForeignEnumMap(
-                internalGetMutableMapStringForeignEnum().getMutableMap())
-            .putAll(values);
+            internalGetMutableMapStringForeignEnum().getMutableMap())
+                .putAll(values);
         bitField2_ |= 0x00400000;
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
       public java.util.Map<java.lang.String, java.lang.Integer>
-          getMutableMapStringForeignEnumValue() {
+      getMutableMapStringForeignEnumValue() {
         bitField2_ |= 0x00400000;
         return internalGetMutableMapStringForeignEnum().getMutableMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
-      public Builder putMapStringForeignEnumValue(java.lang.String key, int value) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public Builder putMapStringForeignEnumValue(
+          java.lang.String key,
+          int value) {
+        if (key == null) { throw new NullPointerException("map key"); }
 
-        internalGetMutableMapStringForeignEnum().getMutableMap().put(key, value);
+        internalGetMutableMapStringForeignEnum().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00400000;
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
       public Builder putAllMapStringForeignEnumValue(
           java.util.Map<java.lang.String, java.lang.Integer> values) {
-        internalGetMutableMapStringForeignEnum().getMutableMap().putAll(values);
+        internalGetMutableMapStringForeignEnum().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00400000;
         return this;
       }
 
       /**
        * <code>uint32 oneof_uint32 = 111;</code>
-       *
        * @return Whether the oneofUint32 field is set.
        */
       public boolean hasOneofUint32() {
         return oneofFieldCase_ == 111;
       }
-
       /**
        * <code>uint32 oneof_uint32 = 111;</code>
-       *
        * @return The oneofUint32.
        */
       public int getOneofUint32() {
@@ -23719,10 +21262,8 @@ public int getOneofUint32() {
         }
         return 0;
       }
-
       /**
        * <code>uint32 oneof_uint32 = 111;</code>
-       *
        * @param value The oneofUint32 to set.
        * @return This builder for chaining.
        */
@@ -23733,10 +21274,8 @@ public Builder setOneofUint32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>uint32 oneof_uint32 = 111;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOneofUint32() {
@@ -23749,60 +21288,37 @@ public Builder clearOneofUint32() {
       }
 
       private com.google.protobuf.SingleFieldBuilderV3<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .NestedMessageOrBuilder>
-          oneofNestedMessageBuilder_;
-
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> oneofNestedMessageBuilder_;
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
        * @return Whether the oneofNestedMessage field is set.
        */
       @java.lang.Override
       public boolean hasOneofNestedMessage() {
         return oneofFieldCase_ == 112;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
        * @return The oneofNestedMessage.
        */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-          getOneofNestedMessage() {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getOneofNestedMessage() {
         if (oneofNestedMessageBuilder_ == null) {
           if (oneofFieldCase_ == 112) {
-            return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .NestedMessage)
-                oneofField_;
+            return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) oneofField_;
           }
-          return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .getDefaultInstance();
+          return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance();
         } else {
           if (oneofFieldCase_ == 112) {
             return oneofNestedMessageBuilder_.getMessage();
           }
-          return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .getDefaultInstance();
+          return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance();
         }
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
        */
-      public Builder setOneofNestedMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              value) {
+      public Builder setOneofNestedMessage(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage value) {
         if (oneofNestedMessageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -23815,16 +21331,11 @@ public Builder setOneofNestedMessage(
         oneofFieldCase_ = 112;
         return this;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
        */
       public Builder setOneofNestedMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder
-              builderForValue) {
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder builderForValue) {
         if (oneofNestedMessageBuilder_ == null) {
           oneofField_ = builderForValue.build();
           onChanged();
@@ -23834,28 +21345,15 @@ public Builder setOneofNestedMessage(
         oneofFieldCase_ = 112;
         return this;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
        */
-      public Builder mergeOneofNestedMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              value) {
+      public Builder mergeOneofNestedMessage(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage value) {
         if (oneofNestedMessageBuilder_ == null) {
-          if (oneofFieldCase_ == 112
-              && oneofField_
-                  != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage.getDefaultInstance()) {
-            oneofField_ =
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                    .newBuilder(
-                        (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                                .NestedMessage)
-                            oneofField_)
-                    .mergeFrom(value)
-                    .buildPartial();
+          if (oneofFieldCase_ == 112 &&
+              oneofField_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance()) {
+            oneofField_ = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.newBuilder((legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) oneofField_)
+                .mergeFrom(value).buildPartial();
           } else {
             oneofField_ = value;
           }
@@ -23870,11 +21368,8 @@ public Builder mergeOneofNestedMessage(
         oneofFieldCase_ = 112;
         return this;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
        */
       public Builder clearOneofNestedMessage() {
         if (oneofNestedMessageBuilder_ == null) {
@@ -23892,69 +21387,39 @@ public Builder clearOneofNestedMessage() {
         }
         return this;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .Builder
-          getOneofNestedMessageBuilder() {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder getOneofNestedMessageBuilder() {
         return getOneofNestedMessageFieldBuilder().getBuilder();
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
        */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessageOrBuilder
-          getOneofNestedMessageOrBuilder() {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder getOneofNestedMessageOrBuilder() {
         if ((oneofFieldCase_ == 112) && (oneofNestedMessageBuilder_ != null)) {
           return oneofNestedMessageBuilder_.getMessageOrBuilder();
         } else {
           if (oneofFieldCase_ == 112) {
-            return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .NestedMessage)
-                oneofField_;
+            return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) oneofField_;
           }
-          return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .getDefaultInstance();
+          return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance();
         }
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .NestedMessageOrBuilder>
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> 
           getOneofNestedMessageFieldBuilder() {
         if (oneofNestedMessageBuilder_ == null) {
           if (!(oneofFieldCase_ == 112)) {
-            oneofField_ =
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                    .getDefaultInstance();
+            oneofField_ = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance();
           }
-          oneofNestedMessageBuilder_ =
-              new com.google.protobuf.SingleFieldBuilderV3<
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage.Builder,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessageOrBuilder>(
-                  (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                          .NestedMessage)
-                      oneofField_,
+          oneofNestedMessageBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder>(
+                  (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) oneofField_,
                   getParentForChildren(),
                   isClean());
           oneofField_ = null;
@@ -23966,17 +21431,14 @@ public Builder clearOneofNestedMessage() {
 
       /**
        * <code>string oneof_string = 113;</code>
-       *
        * @return Whether the oneofString field is set.
        */
       @java.lang.Override
       public boolean hasOneofString() {
         return oneofFieldCase_ == 113;
       }
-
       /**
        * <code>string oneof_string = 113;</code>
-       *
        * @return The oneofString.
        */
       @java.lang.Override
@@ -23986,7 +21448,8 @@ public java.lang.String getOneofString() {
           ref = oneofField_;
         }
         if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (oneofFieldCase_ == 113) {
             oneofField_ = s;
@@ -23996,21 +21459,21 @@ public java.lang.String getOneofString() {
           return (java.lang.String) ref;
         }
       }
-
       /**
        * <code>string oneof_string = 113;</code>
-       *
        * @return The bytes for oneofString.
        */
       @java.lang.Override
-      public com.google.protobuf.ByteString getOneofStringBytes() {
+      public com.google.protobuf.ByteString
+          getOneofStringBytes() {
         java.lang.Object ref = "";
         if (oneofFieldCase_ == 113) {
           ref = oneofField_;
         }
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
-              com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
           if (oneofFieldCase_ == 113) {
             oneofField_ = b;
           }
@@ -24019,26 +21482,21 @@ public com.google.protobuf.ByteString getOneofStringBytes() {
           return (com.google.protobuf.ByteString) ref;
         }
       }
-
       /**
        * <code>string oneof_string = 113;</code>
-       *
        * @param value The oneofString to set.
        * @return This builder for chaining.
        */
-      public Builder setOneofString(java.lang.String value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setOneofString(
+          java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
         oneofFieldCase_ = 113;
         oneofField_ = value;
         onChanged();
         return this;
       }
-
       /**
        * <code>string oneof_string = 113;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOneofString() {
@@ -24049,17 +21507,14 @@ public Builder clearOneofString() {
         }
         return this;
       }
-
       /**
        * <code>string oneof_string = 113;</code>
-       *
        * @param value The bytes for oneofString to set.
        * @return This builder for chaining.
        */
-      public Builder setOneofStringBytes(com.google.protobuf.ByteString value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setOneofStringBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
         checkByteStringIsUtf8(value);
         oneofFieldCase_ = 113;
         oneofField_ = value;
@@ -24069,16 +21524,13 @@ public Builder setOneofStringBytes(com.google.protobuf.ByteString value) {
 
       /**
        * <code>bytes oneof_bytes = 114;</code>
-       *
        * @return Whether the oneofBytes field is set.
        */
       public boolean hasOneofBytes() {
         return oneofFieldCase_ == 114;
       }
-
       /**
        * <code>bytes oneof_bytes = 114;</code>
-       *
        * @return The oneofBytes.
        */
       public com.google.protobuf.ByteString getOneofBytes() {
@@ -24087,26 +21539,20 @@ public com.google.protobuf.ByteString getOneofBytes() {
         }
         return com.google.protobuf.ByteString.EMPTY;
       }
-
       /**
        * <code>bytes oneof_bytes = 114;</code>
-       *
        * @param value The oneofBytes to set.
        * @return This builder for chaining.
        */
       public Builder setOneofBytes(com.google.protobuf.ByteString value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         oneofFieldCase_ = 114;
         oneofField_ = value;
         onChanged();
         return this;
       }
-
       /**
        * <code>bytes oneof_bytes = 114;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOneofBytes() {
@@ -24120,16 +21566,13 @@ public Builder clearOneofBytes() {
 
       /**
        * <code>bool oneof_bool = 115;</code>
-       *
        * @return Whether the oneofBool field is set.
        */
       public boolean hasOneofBool() {
         return oneofFieldCase_ == 115;
       }
-
       /**
        * <code>bool oneof_bool = 115;</code>
-       *
        * @return The oneofBool.
        */
       public boolean getOneofBool() {
@@ -24138,10 +21581,8 @@ public boolean getOneofBool() {
         }
         return false;
       }
-
       /**
        * <code>bool oneof_bool = 115;</code>
-       *
        * @param value The oneofBool to set.
        * @return This builder for chaining.
        */
@@ -24152,10 +21593,8 @@ public Builder setOneofBool(boolean value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>bool oneof_bool = 115;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOneofBool() {
@@ -24169,16 +21608,13 @@ public Builder clearOneofBool() {
 
       /**
        * <code>uint64 oneof_uint64 = 116;</code>
-       *
        * @return Whether the oneofUint64 field is set.
        */
       public boolean hasOneofUint64() {
         return oneofFieldCase_ == 116;
       }
-
       /**
        * <code>uint64 oneof_uint64 = 116;</code>
-       *
        * @return The oneofUint64.
        */
       public long getOneofUint64() {
@@ -24187,10 +21623,8 @@ public long getOneofUint64() {
         }
         return 0L;
       }
-
       /**
        * <code>uint64 oneof_uint64 = 116;</code>
-       *
        * @param value The oneofUint64 to set.
        * @return This builder for chaining.
        */
@@ -24201,10 +21635,8 @@ public Builder setOneofUint64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>uint64 oneof_uint64 = 116;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOneofUint64() {
@@ -24218,16 +21650,13 @@ public Builder clearOneofUint64() {
 
       /**
        * <code>float oneof_float = 117;</code>
-       *
        * @return Whether the oneofFloat field is set.
        */
       public boolean hasOneofFloat() {
         return oneofFieldCase_ == 117;
       }
-
       /**
        * <code>float oneof_float = 117;</code>
-       *
        * @return The oneofFloat.
        */
       public float getOneofFloat() {
@@ -24236,10 +21665,8 @@ public float getOneofFloat() {
         }
         return 0F;
       }
-
       /**
        * <code>float oneof_float = 117;</code>
-       *
        * @param value The oneofFloat to set.
        * @return This builder for chaining.
        */
@@ -24250,10 +21677,8 @@ public Builder setOneofFloat(float value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>float oneof_float = 117;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOneofFloat() {
@@ -24267,16 +21692,13 @@ public Builder clearOneofFloat() {
 
       /**
        * <code>double oneof_double = 118;</code>
-       *
        * @return Whether the oneofDouble field is set.
        */
       public boolean hasOneofDouble() {
         return oneofFieldCase_ == 118;
       }
-
       /**
        * <code>double oneof_double = 118;</code>
-       *
        * @return The oneofDouble.
        */
       public double getOneofDouble() {
@@ -24285,10 +21707,8 @@ public double getOneofDouble() {
         }
         return 0D;
       }
-
       /**
        * <code>double oneof_double = 118;</code>
-       *
        * @param value The oneofDouble to set.
        * @return This builder for chaining.
        */
@@ -24299,10 +21719,8 @@ public Builder setOneofDouble(double value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>double oneof_double = 118;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOneofDouble() {
@@ -24316,17 +21734,14 @@ public Builder clearOneofDouble() {
 
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-       *
        * @return Whether the oneofEnum field is set.
        */
       @java.lang.Override
       public boolean hasOneofEnum() {
         return oneofFieldCase_ == 119;
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-       *
        * @return The enum numeric value on the wire for oneofEnum.
        */
       @java.lang.Override
@@ -24336,10 +21751,8 @@ public int getOneofEnumValue() {
         }
         return 0;
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-       *
        * @param value The enum numeric value on the wire for oneofEnum to set.
        * @return This builder for chaining.
        */
@@ -24349,35 +21762,25 @@ public Builder setOneofEnumValue(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-       *
        * @return The oneofEnum.
        */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-          getOneofEnum() {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getOneofEnum() {
         if (oneofFieldCase_ == 119) {
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum result =
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                  .forNumber((java.lang.Integer) oneofField_);
-          return result == null
-              ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                  .UNRECOGNIZED
-              : result;
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.forNumber(
+              (java.lang.Integer) oneofField_);
+          return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.UNRECOGNIZED : result;
         }
         return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.FOO;
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-       *
        * @param value The oneofEnum to set.
        * @return This builder for chaining.
        */
-      public Builder setOneofEnum(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
+      public Builder setOneofEnum(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -24386,10 +21789,8 @@ public Builder setOneofEnum(
         onChanged();
         return this;
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOneofEnum() {
@@ -24400,7 +21801,6 @@ public Builder clearOneofEnum() {
         }
         return this;
       }
-
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -24413,45 +21813,41 @@ public final Builder mergeUnknownFields(
         return super.mergeUnknownFields(unknownFields);
       }
 
+
       // @@protoc_insertion_point(builder_scope:legacy_gencode_test.proto3.TestMostTypesProto3)
     }
 
     // @@protoc_insertion_point(class_scope:legacy_gencode_test.proto3.TestMostTypesProto3)
-    private static final legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-        DEFAULT_INSTANCE;
-
+    private static final legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE =
-          new legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3();
+      DEFAULT_INSTANCE = new legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3();
     }
 
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-        getDefaultInstance() {
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    private static final com.google.protobuf.Parser<TestMostTypesProto3> PARSER =
-        new com.google.protobuf.AbstractParser<TestMostTypesProto3>() {
-          @java.lang.Override
-          public TestMostTypesProto3 parsePartialFrom(
-              com.google.protobuf.CodedInputStream input,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
-          }
-        };
+    private static final com.google.protobuf.Parser<TestMostTypesProto3>
+        PARSER = new com.google.protobuf.AbstractParser<TestMostTypesProto3>() {
+      @java.lang.Override
+      public TestMostTypesProto3 parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (com.google.protobuf.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new com.google.protobuf.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
+      }
+    };
 
     public static com.google.protobuf.Parser<TestMostTypesProto3> parser() {
       return PARSER;
@@ -24463,66 +21859,61 @@ public com.google.protobuf.Parser<TestMostTypesProto3> getParserForType() {
     }
 
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-        getDefaultInstanceForType() {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
+
   }
 
-  public interface ForeignMessageOrBuilder
-      extends
+  public interface ForeignMessageOrBuilder extends
       // @@protoc_insertion_point(interface_extends:legacy_gencode_test.proto3.ForeignMessage)
       com.google.protobuf.MessageOrBuilder {
 
     /**
      * <code>int32 c = 1;</code>
-     *
      * @return The c.
      */
     int getC();
   }
-
-  /** Protobuf type {@code legacy_gencode_test.proto3.ForeignMessage} */
-  public static final class ForeignMessage extends com.google.protobuf.GeneratedMessageV3
-      implements
+  /**
+   * Protobuf type {@code legacy_gencode_test.proto3.ForeignMessage}
+   */
+  public static final class ForeignMessage extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:legacy_gencode_test.proto3.ForeignMessage)
       ForeignMessageOrBuilder {
-    private static final long serialVersionUID = 0L;
-
+  private static final long serialVersionUID = 0L;
     // Use ForeignMessage.newBuilder() to construct.
     private ForeignMessage(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
     }
-
-    private ForeignMessage() {}
+    private ForeignMessage() {
+    }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
-    protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
       return new ForeignMessage();
     }
 
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return legacy_gencode_test.proto3.Proto3GencodeTestProto
-          .internal_static_legacy_gencode_test_proto3_ForeignMessage_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_ForeignMessage_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return legacy_gencode_test.proto3.Proto3GencodeTestProto
-          .internal_static_legacy_gencode_test_proto3_ForeignMessage_fieldAccessorTable
+      return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_ForeignMessage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.class,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder.class);
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.class, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder.class);
     }
 
     public static final int C_FIELD_NUMBER = 1;
     private int c_ = 0;
-
     /**
      * <code>int32 c = 1;</code>
-     *
      * @return The c.
      */
     @java.lang.Override
@@ -24531,7 +21922,6 @@ public int getC() {
     }
 
     private byte memoizedIsInitialized = -1;
-
     @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
@@ -24543,7 +21933,8 @@ public final boolean isInitialized() {
     }
 
     @java.lang.Override
-    public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
       if (c_ != 0) {
         output.writeInt32(1, c_);
       }
@@ -24557,7 +21948,8 @@ public int getSerializedSize() {
 
       size = 0;
       if (c_ != 0) {
-        size += com.google.protobuf.CodedOutputStream.computeInt32Size(1, c_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(1, c_);
       }
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
@@ -24567,15 +21959,15 @@ public int getSerializedSize() {
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
-        return true;
+       return true;
       }
       if (!(obj instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage)) {
         return super.equals(obj);
       }
-      legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage other =
-          (legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage) obj;
+      legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage other = (legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage) obj;
 
-      if (getC() != other.getC()) return false;
+      if (getC()
+          != other.getC()) return false;
       if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
@@ -24595,95 +21987,89 @@ public int hashCode() {
     }
 
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(
-        java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(
-        java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(
-        byte[] data) throws com.google.protobuf.InvalidProtocolBufferException {
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(
-        byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(
-        java.io.InputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(
-        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        parseDelimitedFrom(
-            java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-          PARSER, input, extensionRegistry);
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(
-        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
     @java.lang.Override
-    public Builder newBuilderForType() {
-      return newBuilder();
-    }
-
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-
-    public static Builder newBuilder(
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage prototype) {
+    public static Builder newBuilder(legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-
     @java.lang.Override
     public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
 
     @java.lang.Override
@@ -24692,36 +22078,36 @@ protected Builder newBuilderForType(
       Builder builder = new Builder(parent);
       return builder;
     }
-
-    /** Protobuf type {@code legacy_gencode_test.proto3.ForeignMessage} */
-    public static final class Builder
-        extends com.google.protobuf.GeneratedMessageV3.Builder<Builder>
-        implements
+    /**
+     * Protobuf type {@code legacy_gencode_test.proto3.ForeignMessage}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:legacy_gencode_test.proto3.ForeignMessage)
         legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_ForeignMessage_descriptor;
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_ForeignMessage_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_ForeignMessage_fieldAccessorTable
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_ForeignMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.class,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder.class);
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.class, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder.class);
       }
 
-      // Construct using
-      // legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.newBuilder()
-      private Builder() {}
+      // Construct using legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.newBuilder()
+      private Builder() {
+
+      }
 
-      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-      }
 
+      }
       @java.lang.Override
       public Builder clear() {
         super.clear();
@@ -24731,16 +22117,14 @@ public Builder clear() {
       }
 
       @java.lang.Override
-      public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_ForeignMessage_descriptor;
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_ForeignMessage_descriptor;
       }
 
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-          getDefaultInstanceForType() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-            .getDefaultInstance();
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getDefaultInstanceForType() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance();
       }
 
       @java.lang.Override
@@ -24754,17 +22138,13 @@ public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage build()
 
       @java.lang.Override
       public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage buildPartial() {
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage result =
-            new legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage result = new legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage result) {
+      private void buildPartial0(legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.c_ = c_;
@@ -24775,53 +22155,46 @@ private void buildPartial0(
       public Builder clone() {
         return super.clone();
       }
-
       @java.lang.Override
       public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.setField(field, value);
       }
-
       @java.lang.Override
-      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
-
       @java.lang.Override
-      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
-
       @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index,
-          java.lang.Object value) {
+          int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
-
       @java.lang.Override
       public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
-
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage) {
-          return mergeFrom(
-              (legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage) other);
+          return mergeFrom((legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage other) {
-        if (other
-            == legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-                .getDefaultInstance()) return this;
+      public Builder mergeFrom(legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage other) {
+        if (other == legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance()) return this;
         if (other.getC() != 0) {
           setC(other.getC());
         }
@@ -24851,19 +22224,17 @@ public Builder mergeFrom(
               case 0:
                 done = true;
                 break;
-              case 8:
-                {
-                  c_ = input.readInt32();
-                  bitField0_ |= 0x00000001;
-                  break;
-                } // case 8
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
+              case 8: {
+                c_ = input.readInt32();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
             } // switch (tag)
           } // while (!done)
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -24873,24 +22244,19 @@ public Builder mergeFrom(
         } // finally
         return this;
       }
-
       private int bitField0_;
 
-      private int c_;
-
+      private int c_ ;
       /**
        * <code>int32 c = 1;</code>
-       *
        * @return The c.
        */
       @java.lang.Override
       public int getC() {
         return c_;
       }
-
       /**
        * <code>int32 c = 1;</code>
-       *
        * @param value The c to set.
        * @return This builder for chaining.
        */
@@ -24901,10 +22267,8 @@ public Builder setC(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>int32 c = 1;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearC() {
@@ -24913,7 +22277,6 @@ public Builder clearC() {
         onChanged();
         return this;
       }
-
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -24926,44 +22289,41 @@ public final Builder mergeUnknownFields(
         return super.mergeUnknownFields(unknownFields);
       }
 
+
       // @@protoc_insertion_point(builder_scope:legacy_gencode_test.proto3.ForeignMessage)
     }
 
     // @@protoc_insertion_point(class_scope:legacy_gencode_test.proto3.ForeignMessage)
-    private static final legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        DEFAULT_INSTANCE;
-
+    private static final legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage DEFAULT_INSTANCE;
     static {
       DEFAULT_INSTANCE = new legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage();
     }
 
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        getDefaultInstance() {
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    private static final com.google.protobuf.Parser<ForeignMessage> PARSER =
-        new com.google.protobuf.AbstractParser<ForeignMessage>() {
-          @java.lang.Override
-          public ForeignMessage parsePartialFrom(
-              com.google.protobuf.CodedInputStream input,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
-          }
-        };
+    private static final com.google.protobuf.Parser<ForeignMessage>
+        PARSER = new com.google.protobuf.AbstractParser<ForeignMessage>() {
+      @java.lang.Override
+      public ForeignMessage parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (com.google.protobuf.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new com.google.protobuf.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
+      }
+    };
 
     public static com.google.protobuf.Parser<ForeignMessage> parser() {
       return PARSER;
@@ -24975,680 +22335,456 @@ public com.google.protobuf.Parser<ForeignMessage> getParserForType() {
     }
 
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        getDefaultInstanceForType() {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
+
   }
 
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMessage_descriptor;
-  private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMessage_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMessage_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_NestedTestMessage_descriptor;
-  private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_NestedTestMessage_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_NestedTestMessage_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor;
-  private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_descriptor;
-  private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32Int32Entry_descriptor;
-  private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32Int32Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32Int32Entry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt64Int64Entry_descriptor;
-  private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt64Int64Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt64Int64Entry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint32Uint32Entry_descriptor;
-  private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint32Uint32Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint32Uint32Entry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint64Uint64Entry_descriptor;
-  private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint64Uint64Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint64Uint64Entry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint32Sint32Entry_descriptor;
-  private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint32Sint32Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint32Sint32Entry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint64Sint64Entry_descriptor;
-  private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint64Sint64Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint64Sint64Entry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed32Fixed32Entry_descriptor;
-  private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed32Fixed32Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed32Fixed32Entry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed64Fixed64Entry_descriptor;
-  private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed64Fixed64Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed64Fixed64Entry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed32Sfixed32Entry_descriptor;
-  private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed32Sfixed32Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed32Sfixed32Entry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed64Sfixed64Entry_descriptor;
-  private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed64Sfixed64Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed64Sfixed64Entry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32FloatEntry_descriptor;
-  private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32FloatEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32FloatEntry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32DoubleEntry_descriptor;
-  private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32DoubleEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32DoubleEntry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapBoolBoolEntry_descriptor;
-  private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapBoolBoolEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapBoolBoolEntry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringStringEntry_descriptor;
-  private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringStringEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringStringEntry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringBytesEntry_descriptor;
-  private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringBytesEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringBytesEntry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedMessageEntry_descriptor;
-  private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedMessageEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedMessageEntry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignMessageEntry_descriptor;
-  private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignMessageEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignMessageEntry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedEnumEntry_descriptor;
-  private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedEnumEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedEnumEntry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignEnumEntry_descriptor;
-  private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignEnumEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignEnumEntry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_ForeignMessage_descriptor;
-  private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_ForeignMessage_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_ForeignMessage_fieldAccessorTable;
 
-  public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
     return descriptor;
   }
-
-  private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
-
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n"
-          + "\031proto3_gencode_test.proto\022\032legacy_gencode_test.proto3\"R\n"
-          + "\013TestMessage\022\t\n"
-          + "\001x\030\002 \001(\t\0228\n"
-          + "\001y\030\003 \001(\0132-.legacy_gencode_test.proto3.NestedTestMessage\"\036\n"
-          + "\021NestedTestMessage\022\t\n"
-          + "\001z\030\001 \003(\005\"\2621\n"
-          + "\023TestMostTypesProto3\022\026\n"
-          + "\016optional_int32\030\001 \001(\005\022\026\n"
-          + "\016optional_int64\030\002 \001(\003\022\027\n"
-          + "\017optional_uint32\030\003 \001(\r"
-          + "\022\027\n"
-          + "\017optional_uint64\030\004 \001(\004\022\027\n"
-          + "\017optional_sint32\030\005 \001(\021\022\027\n"
-          + "\017optional_sint64\030\006 \001(\022\022\030\n"
-          + "\020optional_fixed32\030\007 \001(\007\022\030\n"
-          + "\020optional_fixed64\030\010 \001(\006\022\031\n"
-          + "\021optional_sfixed32\030\t \001(\017\022\031\n"
-          + "\021optional_sfixed64\030\n"
-          + " \001(\020\022\026\n"
-          + "\016optional_float\030\013 \001(\002\022\027\n"
-          + "\017optional_double\030\014 \001(\001\022\025\n\r"
-          + "optional_bool\030\r"
-          + " \001(\010\022\027\n"
-          + "\017optional_string\030\016 \001(\t\022\026\n"
-          + "\016optional_bytes\030\017 \001(\014\022^\n"
-          + "\027optional_nested_message\030\022 "
-          + "\001(\0132=.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage\022L\n"
-          + "\030optional_foreign_message\030\023"
-          + " \001(\0132*.legacy_gencode_test.proto3.ForeignMessage\022X\n"
-          + "\024optional_nested_enum\030\025"
-          + " \001(\0162:.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum\022F\n"
-          + "\025optional_foreign_enum\030\026"
-          + " \001(\0162\'.legacy_gencode_test.proto3.ForeignEnum\022Z\n"
-          + "\025optional_aliased_enum\030\027 \001(\0162;.legacy_gencode_test."
-          + "proto3.TestMostTypesProto3.AliasedEnum\022J\n"
-          + "\021recursive_message\030\033"
-          + " \001(\0132/.legacy_gencode_test.proto3.TestMostTypesProto3\022\026\n"
-          + "\016repeated_int32\030\037 \003(\005\022\026\n"
-          + "\016repeated_int64\030  \003(\003\022\027\n"
-          + "\017repeated_uint32\030! \003(\r"
-          + "\022\027\n"
-          + "\017repeated_uint64\030\" \003(\004\022\027\n"
-          + "\017repeated_sint32\030# \003(\021\022\027\n"
-          + "\017repeated_sint64\030$ \003(\022\022\030\n"
-          + "\020repeated_fixed32\030% \003(\007\022\030\n"
-          + "\020repeated_fixed64\030& \003(\006\022\031\n"
-          + "\021repeated_sfixed32\030\' \003(\017\022\031\n"
-          + "\021repeated_sfixed64\030( \003(\020\022\026\n"
-          + "\016repeated_float\030) \003(\002\022\027\n"
-          + "\017repeated_double\030* \003(\001\022\025\n\r"
-          + "repeated_bool\030+ \003(\010\022\027\n"
-          + "\017repeated_string\030, \003(\t\022\026\n"
-          + "\016repeated_bytes\030- \003(\014\022^\n"
-          + "\027repeated_nested_message\0300 \003"
-          + "(\0132=.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage\022L\n"
-          + "\030repeated_foreign_message\0301"
-          + " \003(\0132*.legacy_gencode_test.proto3.ForeignMessage\022X\n"
-          + "\024repeated_nested_enum\0303"
-          + " \003(\0162:.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum\022F\n"
-          + "\025repeated_foreign_enum\0304"
-          + " \003(\0162\'.legacy_gencode_test.proto3.ForeignEnum\022\030\n"
-          + "\014packed_int32\030K \003(\005B\002\020\001\022\030\n"
-          + "\014packed_int64\030L \003(\003B\002\020\001\022\031\n"
-          + "\r"
-          + "packed_uint32\030M \003(\r"
-          + "B\002\020\001\022\031\n\r"
-          + "packed_uint64\030N \003(\004B\002\020\001\022\031\n\r"
-          + "packed_sint32\030O \003(\021B\002\020\001\022\031\n\r"
-          + "packed_sint64\030P \003(\022B\002\020\001\022\032\n"
-          + "\016packed_fixed32\030Q \003(\007B\002\020\001\022\032\n"
-          + "\016packed_fixed64\030R \003(\006B\002\020\001\022\033\n"
-          + "\017packed_sfixed32\030S \003(\017B\002\020\001\022\033\n"
-          + "\017packed_sfixed64\030T \003(\020B\002\020\001\022\030\n"
-          + "\014packed_float\030U \003(\002B\002\020\001\022\031\n\r"
-          + "packed_double\030V \003(\001B\002\020\001\022\027\n"
-          + "\013packed_bool\030W \003(\010B\002\020\001\022Z\n"
-          + "\022packed_nested_enum\030X"
-          + " \003(\0162:.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnumB\002\020\001\022\032\n"
-          + "\016unpacked_int32\030Y \003(\005B\002\020\000\022\032\n"
-          + "\016unpacked_int64\030Z \003(\003B\002\020\000\022\033\n"
-          + "\017unpacked_uint32\030[ \003(\r"
-          + "B\002\020\000\022\033\n"
-          + "\017unpacked_uint64\030\\ \003(\004B\002\020\000\022\033\n"
-          + "\017unpacked_sint32\030] \003(\021B\002\020\000\022\033\n"
-          + "\017unpacked_sint64\030^ \003(\022B\002\020\000\022\034\n"
-          + "\020unpacked_fixed32\030_ \003(\007B\002\020\000\022\034\n"
-          + "\020unpacked_fixed64\030` \003(\006B\002\020\000\022\035\n"
-          + "\021unpacked_sfixed32\030a \003(\017B\002\020\000\022\035\n"
-          + "\021unpacked_sfixed64\030b \003(\020B\002\020\000\022\032\n"
-          + "\016unpacked_float\030c \003(\002B\002\020\000\022\033\n"
-          + "\017unpacked_double\030d \003(\001B\002\020\000\022\031\n\r"
-          + "unpacked_bool\030e \003(\010B\002\020\000\022\\\n"
-          + "\024unpacked_nested_enum\030f \003(\0162:."
-          + "legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnumB\002\020\000\022[\n"
-          + "\017map_int32_int32\0308"
-          + " \003(\0132B.legacy_gencode_test.proto3.TestMostTypesProto3.MapInt32Int32Entry\022[\n"
-          + "\017map_int64_int64\0309 \003(\0132B.legacy_gencode_tes"
-          + "t.proto3.TestMostTypesProto3.MapInt64Int64Entry\022_\n"
-          + "\021map_uint32_uint32\030: \003(\0132D.leg"
-          + "acy_gencode_test.proto3.TestMostTypesProto3.MapUint32Uint32Entry\022_\n"
-          + "\021map_uint64_uint64\030; \003(\0132D.legacy_gencode_test.proto3"
-          + ".TestMostTypesProto3.MapUint64Uint64Entry\022_\n"
-          + "\021map_sint32_sint32\030< \003(\0132D.legacy_ge"
-          + "ncode_test.proto3.TestMostTypesProto3.MapSint32Sint32Entry\022_\n"
-          + "\021map_sint64_sint64\030="
-          + " \003(\0132D.legacy_gencode_test.proto3.TestMostTypesProto3.MapSint64Sint64Entry\022c\n"
-          + "\023map_fixed32_fixed32\030> \003(\0132F.legacy_gencod"
-          + "e_test.proto3.TestMostTypesProto3.MapFixed32Fixed32Entry\022c\n"
-          + "\023map_fixed64_fixed64\030?"
-          + " \003(\0132F.legacy_gencode_test.proto3.TestMostTypesProto3.MapFixed64Fixed64Entry\022g\n"
-          + "\025map_sfixed32_sfixed32\030@ \003(\0132H.legacy_ge"
-          + "ncode_test.proto3.TestMostTypesProto3.MapSfixed32Sfixed32Entry\022g\n"
-          + "\025map_sfixed64_sfixed64\030A \003(\0132H.legacy_gencode_test.prot"
-          + "o3.TestMostTypesProto3.MapSfixed64Sfixed64Entry\022[\n"
-          + "\017map_int32_float\030B \003(\0132B.legac"
-          + "y_gencode_test.proto3.TestMostTypesProto3.MapInt32FloatEntry\022]\n"
-          + "\020map_int32_double\030C"
-          + " \003(\0132C.legacy_gencode_test.proto3.TestMostTypesProto3.MapInt32DoubleEntry\022W\n\r"
-          + "map_bool_bool\030D \003(\0132@.legacy_gencode_test"
-          + ".proto3.TestMostTypesProto3.MapBoolBoolEntry\022_\n"
-          + "\021map_string_string\030E \003(\0132D.legacy"
-          + "_gencode_test.proto3.TestMostTypesProto3.MapStringStringEntry\022]\n"
-          + "\020map_string_bytes\030F"
-          + " \003(\0132C.legacy_gencode_test.proto3.TestMostTypesProto3.MapStringBytesEntry\022n\n"
-          + "\031map_string_nested_message\030G \003(\0132K.legacy"
-          + "_gencode_test.proto3.TestMostTypesProto3.MapStringNestedMessageEntry\022p\n"
-          + "\032map_string_foreign_message\030H \003(\0132L.legacy_gencod"
-          + "e_test.proto3.TestMostTypesProto3.MapStringForeignMessageEntry\022h\n"
-          + "\026map_string_nested_enum\030I \003(\0132H.legacy_gencode_test.pro"
-          + "to3.TestMostTypesProto3.MapStringNestedEnumEntry\022j\n"
-          + "\027map_string_foreign_enum\030J \003("
-          + "\0132I.legacy_gencode_test.proto3.TestMostTypesProto3.MapStringForeignEnumEntry\022\026\n"
-          + "\014oneof_uint32\030o \001(\r"
-          + "H\000\022]\n"
-          + "\024oneof_nested_message\030p"
-          + " \001(\0132=.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessageH\000\022\026\n"
-          + "\014oneof_string\030q \001(\tH\000\022\025\n"
-          + "\013oneof_bytes\030r \001(\014H\000\022\024\n\n"
-          + "oneof_bool\030s \001(\010H\000\022\026\n"
-          + "\014oneof_uint64\030t \001(\004H\000\022\025\n"
-          + "\013oneof_float\030u \001(\002H\000\022\026\n"
-          + "\014oneof_double\030v \001(\001H\000\022P\n\n"
-          + "oneof_enum\030w \001(\0162:.le"
-          + "gacy_gencode_test.proto3.TestMostTypesProto3.NestedEnumH\000\032`\n\r"
-          + "NestedMessage\022\t\n"
-          + "\001a\030\001 \001(\005\022D\n"
-          + "\013corecursive\030\002"
-          + " \001(\0132/.legacy_gencode_test.proto3.TestMostTypesProto3\0324\n"
-          + "\022MapInt32Int32Entry\022\013\n"
-          + "\003key\030\001 \001(\005\022\r\n"
-          + "\005value\030\002 \001(\005:\0028\001\0324\n"
-          + "\022MapInt64Int64Entry\022\013\n"
-          + "\003key\030\001 \001(\003\022\r\n"
-          + "\005value\030\002 \001(\003:\0028\001\0326\n"
-          + "\024MapUint32Uint32Entry\022\013\n"
-          + "\003key\030\001 \001(\r"
-          + "\022\r\n"
-          + "\005value\030\002 \001(\r"
-          + ":\0028\001\0326\n"
-          + "\024MapUint64Uint64Entry\022\013\n"
-          + "\003key\030\001 \001(\004\022\r\n"
-          + "\005value\030\002 \001(\004:\0028\001\0326\n"
-          + "\024MapSint32Sint32Entry\022\013\n"
-          + "\003key\030\001 \001(\021\022\r\n"
-          + "\005value\030\002 \001(\021:\0028\001\0326\n"
-          + "\024MapSint64Sint64Entry\022\013\n"
-          + "\003key\030\001 \001(\022\022\r\n"
-          + "\005value\030\002 \001(\022:\0028\001\0328\n"
-          + "\026MapFixed32Fixed32Entry\022\013\n"
-          + "\003key\030\001 \001(\007\022\r\n"
-          + "\005value\030\002 \001(\007:\0028\001\0328\n"
-          + "\026MapFixed64Fixed64Entry\022\013\n"
-          + "\003key\030\001 \001(\006\022\r\n"
-          + "\005value\030\002 \001(\006:\0028\001\032:\n"
-          + "\030MapSfixed32Sfixed32Entry\022\013\n"
-          + "\003key\030\001 \001(\017\022\r\n"
-          + "\005value\030\002 \001(\017:\0028\001\032:\n"
-          + "\030MapSfixed64Sfixed64Entry\022\013\n"
-          + "\003key\030\001 \001(\020\022\r\n"
-          + "\005value\030\002 \001(\020:\0028\001\0324\n"
-          + "\022MapInt32FloatEntry\022\013\n"
-          + "\003key\030\001 \001(\005\022\r"
-          + "\n"
-          + "\005value\030\002 \001(\002:\0028\001\0325\n"
-          + "\023MapInt32DoubleEntry\022\013\n"
-          + "\003key\030\001 \001(\005\022\r\n"
-          + "\005value\030\002 \001(\001:\0028\001\0322\n"
-          + "\020MapBoolBoolEntry\022\013\n"
-          + "\003key\030\001 \001(\010\022\r\n"
-          + "\005value\030\002 \001(\010:\0028\001\0326\n"
-          + "\024MapStringStringEntry\022\013\n"
-          + "\003key\030\001 \001(\t\022\r\n"
-          + "\005value\030\002 \001(\t:\0028\001\0325\n"
-          + "\023MapStringBytesEntry\022\013\n"
-          + "\003key\030\001 \001(\t\022\r\n"
-          + "\005value\030\002 \001(\014:\0028\001\032|\n"
-          + "\033MapStringNestedMessageEntry\022\013\n"
-          + "\003key\030\001 \001(\t\022L\n"
-          + "\005value\030\002 \001(\0132=.legacy_gencode_test.pro"
-          + "to3.TestMostTypesProto3.NestedMessage:\0028\001\032j\n"
-          + "\034MapStringForeignMessageEntry\022\013\n"
-          + "\003key\030\001 \001(\t\0229\n"
-          + "\005value\030\002"
-          + " \001(\0132*.legacy_gencode_test.proto3.ForeignMessage:\0028\001\032v\n"
-          + "\030MapStringNestedEnumEntry\022\013\n"
-          + "\003key\030\001 \001(\t\022I\n"
-          + "\005value\030\002"
-          + " \001(\0162:.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum:\0028\001\032d\n"
-          + "\031MapStringForeignEnumEntry\022\013\n"
-          + "\003key\030\001 \001(\t\0226\n"
-          + "\005value\030\002 \001(\0162\'.legacy_gencode_test.proto3.ForeignEnum:\0028\001\"9\n\n"
-          + "NestedEnum\022\007\n"
-          + "\003FOO\020\000\022\007\n"
-          + "\003BAR\020\001\022\007\n"
-          + "\003BAZ\020\002\022\020\n"
-          + "\003NEG\020\377\377\377\377\377\377\377\377\377\001\"Y\n"
-          + "\013AliasedEnum\022\r\n"
-          + "\tALIAS_FOO\020\000\022\r\n"
-          + "\tALIAS_BAR\020\001\022\r\n"
-          + "\tALIAS_BAZ\020\002\022\007\n"
-          + "\003MOO\020\002\022\007\n"
-          + "\003moo\020\002\022\007\n"
-          + "\003bAz\020\002\032\002\020\001B\r\n"
-          + "\013oneof_field\"\033\n"
-          + "\016ForeignMessage\022\t\n"
-          + "\001c\030\001 \001(\005*@\n"
-          + "\013ForeignEnum\022\017\n"
-          + "\013FOREIGN_FOO\020\000\022\017\n"
-          + "\013FOREIGN_BAR\020\001\022\017\n"
-          + "\013FOREIGN_BAZ\020\002B\030B\026Proto3GencodeTestProtob\006proto3"
+      "\n\031proto3_gencode_test.proto\022\032legacy_genc" +
+      "ode_test.proto3\"R\n\013TestMessage\022\t\n\001x\030\002 \001(" +
+      "\t\0228\n\001y\030\003 \001(\0132-.legacy_gencode_test.proto" +
+      "3.NestedTestMessage\"\036\n\021NestedTestMessage" +
+      "\022\t\n\001z\030\001 \003(\005\"\2621\n\023TestMostTypesProto3\022\026\n\016o" +
+      "ptional_int32\030\001 \001(\005\022\026\n\016optional_int64\030\002 " +
+      "\001(\003\022\027\n\017optional_uint32\030\003 \001(\r\022\027\n\017optional" +
+      "_uint64\030\004 \001(\004\022\027\n\017optional_sint32\030\005 \001(\021\022\027" +
+      "\n\017optional_sint64\030\006 \001(\022\022\030\n\020optional_fixe" +
+      "d32\030\007 \001(\007\022\030\n\020optional_fixed64\030\010 \001(\006\022\031\n\021o" +
+      "ptional_sfixed32\030\t \001(\017\022\031\n\021optional_sfixe" +
+      "d64\030\n \001(\020\022\026\n\016optional_float\030\013 \001(\002\022\027\n\017opt" +
+      "ional_double\030\014 \001(\001\022\025\n\roptional_bool\030\r \001(" +
+      "\010\022\027\n\017optional_string\030\016 \001(\t\022\026\n\016optional_b" +
+      "ytes\030\017 \001(\014\022^\n\027optional_nested_message\030\022 " +
+      "\001(\0132=.legacy_gencode_test.proto3.TestMos" +
+      "tTypesProto3.NestedMessage\022L\n\030optional_f" +
+      "oreign_message\030\023 \001(\0132*.legacy_gencode_te" +
+      "st.proto3.ForeignMessage\022X\n\024optional_nes" +
+      "ted_enum\030\025 \001(\0162:.legacy_gencode_test.pro" +
+      "to3.TestMostTypesProto3.NestedEnum\022F\n\025op" +
+      "tional_foreign_enum\030\026 \001(\0162\'.legacy_genco" +
+      "de_test.proto3.ForeignEnum\022Z\n\025optional_a" +
+      "liased_enum\030\027 \001(\0162;.legacy_gencode_test." +
+      "proto3.TestMostTypesProto3.AliasedEnum\022J" +
+      "\n\021recursive_message\030\033 \001(\0132/.legacy_genco" +
+      "de_test.proto3.TestMostTypesProto3\022\026\n\016re" +
+      "peated_int32\030\037 \003(\005\022\026\n\016repeated_int64\030  \003" +
+      "(\003\022\027\n\017repeated_uint32\030! \003(\r\022\027\n\017repeated_" +
+      "uint64\030\" \003(\004\022\027\n\017repeated_sint32\030# \003(\021\022\027\n" +
+      "\017repeated_sint64\030$ \003(\022\022\030\n\020repeated_fixed" +
+      "32\030% \003(\007\022\030\n\020repeated_fixed64\030& \003(\006\022\031\n\021re" +
+      "peated_sfixed32\030\' \003(\017\022\031\n\021repeated_sfixed" +
+      "64\030( \003(\020\022\026\n\016repeated_float\030) \003(\002\022\027\n\017repe" +
+      "ated_double\030* \003(\001\022\025\n\rrepeated_bool\030+ \003(\010" +
+      "\022\027\n\017repeated_string\030, \003(\t\022\026\n\016repeated_by" +
+      "tes\030- \003(\014\022^\n\027repeated_nested_message\0300 \003" +
+      "(\0132=.legacy_gencode_test.proto3.TestMost" +
+      "TypesProto3.NestedMessage\022L\n\030repeated_fo" +
+      "reign_message\0301 \003(\0132*.legacy_gencode_tes" +
+      "t.proto3.ForeignMessage\022X\n\024repeated_nest" +
+      "ed_enum\0303 \003(\0162:.legacy_gencode_test.prot" +
+      "o3.TestMostTypesProto3.NestedEnum\022F\n\025rep" +
+      "eated_foreign_enum\0304 \003(\0162\'.legacy_gencod" +
+      "e_test.proto3.ForeignEnum\022\030\n\014packed_int3" +
+      "2\030K \003(\005B\002\020\001\022\030\n\014packed_int64\030L \003(\003B\002\020\001\022\031\n" +
+      "\rpacked_uint32\030M \003(\rB\002\020\001\022\031\n\rpacked_uint6" +
+      "4\030N \003(\004B\002\020\001\022\031\n\rpacked_sint32\030O \003(\021B\002\020\001\022\031" +
+      "\n\rpacked_sint64\030P \003(\022B\002\020\001\022\032\n\016packed_fixe" +
+      "d32\030Q \003(\007B\002\020\001\022\032\n\016packed_fixed64\030R \003(\006B\002\020" +
+      "\001\022\033\n\017packed_sfixed32\030S \003(\017B\002\020\001\022\033\n\017packed" +
+      "_sfixed64\030T \003(\020B\002\020\001\022\030\n\014packed_float\030U \003(" +
+      "\002B\002\020\001\022\031\n\rpacked_double\030V \003(\001B\002\020\001\022\027\n\013pack" +
+      "ed_bool\030W \003(\010B\002\020\001\022Z\n\022packed_nested_enum\030" +
+      "X \003(\0162:.legacy_gencode_test.proto3.TestM" +
+      "ostTypesProto3.NestedEnumB\002\020\001\022\032\n\016unpacke" +
+      "d_int32\030Y \003(\005B\002\020\000\022\032\n\016unpacked_int64\030Z \003(" +
+      "\003B\002\020\000\022\033\n\017unpacked_uint32\030[ \003(\rB\002\020\000\022\033\n\017un" +
+      "packed_uint64\030\\ \003(\004B\002\020\000\022\033\n\017unpacked_sint" +
+      "32\030] \003(\021B\002\020\000\022\033\n\017unpacked_sint64\030^ \003(\022B\002\020" +
+      "\000\022\034\n\020unpacked_fixed32\030_ \003(\007B\002\020\000\022\034\n\020unpac" +
+      "ked_fixed64\030` \003(\006B\002\020\000\022\035\n\021unpacked_sfixed" +
+      "32\030a \003(\017B\002\020\000\022\035\n\021unpacked_sfixed64\030b \003(\020B" +
+      "\002\020\000\022\032\n\016unpacked_float\030c \003(\002B\002\020\000\022\033\n\017unpac" +
+      "ked_double\030d \003(\001B\002\020\000\022\031\n\runpacked_bool\030e " +
+      "\003(\010B\002\020\000\022\\\n\024unpacked_nested_enum\030f \003(\0162:." +
+      "legacy_gencode_test.proto3.TestMostTypes" +
+      "Proto3.NestedEnumB\002\020\000\022[\n\017map_int32_int32" +
+      "\0308 \003(\0132B.legacy_gencode_test.proto3.Test" +
+      "MostTypesProto3.MapInt32Int32Entry\022[\n\017ma" +
+      "p_int64_int64\0309 \003(\0132B.legacy_gencode_tes" +
+      "t.proto3.TestMostTypesProto3.MapInt64Int" +
+      "64Entry\022_\n\021map_uint32_uint32\030: \003(\0132D.leg" +
+      "acy_gencode_test.proto3.TestMostTypesPro" +
+      "to3.MapUint32Uint32Entry\022_\n\021map_uint64_u" +
+      "int64\030; \003(\0132D.legacy_gencode_test.proto3" +
+      ".TestMostTypesProto3.MapUint64Uint64Entr" +
+      "y\022_\n\021map_sint32_sint32\030< \003(\0132D.legacy_ge" +
+      "ncode_test.proto3.TestMostTypesProto3.Ma" +
+      "pSint32Sint32Entry\022_\n\021map_sint64_sint64\030" +
+      "= \003(\0132D.legacy_gencode_test.proto3.TestM" +
+      "ostTypesProto3.MapSint64Sint64Entry\022c\n\023m" +
+      "ap_fixed32_fixed32\030> \003(\0132F.legacy_gencod" +
+      "e_test.proto3.TestMostTypesProto3.MapFix" +
+      "ed32Fixed32Entry\022c\n\023map_fixed64_fixed64\030" +
+      "? \003(\0132F.legacy_gencode_test.proto3.TestM" +
+      "ostTypesProto3.MapFixed64Fixed64Entry\022g\n" +
+      "\025map_sfixed32_sfixed32\030@ \003(\0132H.legacy_ge" +
+      "ncode_test.proto3.TestMostTypesProto3.Ma" +
+      "pSfixed32Sfixed32Entry\022g\n\025map_sfixed64_s" +
+      "fixed64\030A \003(\0132H.legacy_gencode_test.prot" +
+      "o3.TestMostTypesProto3.MapSfixed64Sfixed" +
+      "64Entry\022[\n\017map_int32_float\030B \003(\0132B.legac" +
+      "y_gencode_test.proto3.TestMostTypesProto" +
+      "3.MapInt32FloatEntry\022]\n\020map_int32_double" +
+      "\030C \003(\0132C.legacy_gencode_test.proto3.Test" +
+      "MostTypesProto3.MapInt32DoubleEntry\022W\n\rm" +
+      "ap_bool_bool\030D \003(\0132@.legacy_gencode_test" +
+      ".proto3.TestMostTypesProto3.MapBoolBoolE" +
+      "ntry\022_\n\021map_string_string\030E \003(\0132D.legacy" +
+      "_gencode_test.proto3.TestMostTypesProto3" +
+      ".MapStringStringEntry\022]\n\020map_string_byte" +
+      "s\030F \003(\0132C.legacy_gencode_test.proto3.Tes" +
+      "tMostTypesProto3.MapStringBytesEntry\022n\n\031" +
+      "map_string_nested_message\030G \003(\0132K.legacy" +
+      "_gencode_test.proto3.TestMostTypesProto3" +
+      ".MapStringNestedMessageEntry\022p\n\032map_stri" +
+      "ng_foreign_message\030H \003(\0132L.legacy_gencod" +
+      "e_test.proto3.TestMostTypesProto3.MapStr" +
+      "ingForeignMessageEntry\022h\n\026map_string_nes" +
+      "ted_enum\030I \003(\0132H.legacy_gencode_test.pro" +
+      "to3.TestMostTypesProto3.MapStringNestedE" +
+      "numEntry\022j\n\027map_string_foreign_enum\030J \003(" +
+      "\0132I.legacy_gencode_test.proto3.TestMostT" +
+      "ypesProto3.MapStringForeignEnumEntry\022\026\n\014" +
+      "oneof_uint32\030o \001(\rH\000\022]\n\024oneof_nested_mes" +
+      "sage\030p \001(\0132=.legacy_gencode_test.proto3." +
+      "TestMostTypesProto3.NestedMessageH\000\022\026\n\014o" +
+      "neof_string\030q \001(\tH\000\022\025\n\013oneof_bytes\030r \001(\014" +
+      "H\000\022\024\n\noneof_bool\030s \001(\010H\000\022\026\n\014oneof_uint64" +
+      "\030t \001(\004H\000\022\025\n\013oneof_float\030u \001(\002H\000\022\026\n\014oneof" +
+      "_double\030v \001(\001H\000\022P\n\noneof_enum\030w \001(\0162:.le" +
+      "gacy_gencode_test.proto3.TestMostTypesPr" +
+      "oto3.NestedEnumH\000\032`\n\rNestedMessage\022\t\n\001a\030" +
+      "\001 \001(\005\022D\n\013corecursive\030\002 \001(\0132/.legacy_genc" +
+      "ode_test.proto3.TestMostTypesProto3\0324\n\022M" +
+      "apInt32Int32Entry\022\013\n\003key\030\001 \001(\005\022\r\n\005value\030" +
+      "\002 \001(\005:\0028\001\0324\n\022MapInt64Int64Entry\022\013\n\003key\030\001" +
+      " \001(\003\022\r\n\005value\030\002 \001(\003:\0028\001\0326\n\024MapUint32Uint" +
+      "32Entry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001\032" +
+      "6\n\024MapUint64Uint64Entry\022\013\n\003key\030\001 \001(\004\022\r\n\005" +
+      "value\030\002 \001(\004:\0028\001\0326\n\024MapSint32Sint32Entry\022" +
+      "\013\n\003key\030\001 \001(\021\022\r\n\005value\030\002 \001(\021:\0028\001\0326\n\024MapSi" +
+      "nt64Sint64Entry\022\013\n\003key\030\001 \001(\022\022\r\n\005value\030\002 " +
+      "\001(\022:\0028\001\0328\n\026MapFixed32Fixed32Entry\022\013\n\003key" +
+      "\030\001 \001(\007\022\r\n\005value\030\002 \001(\007:\0028\001\0328\n\026MapFixed64F" +
+      "ixed64Entry\022\013\n\003key\030\001 \001(\006\022\r\n\005value\030\002 \001(\006:" +
+      "\0028\001\032:\n\030MapSfixed32Sfixed32Entry\022\013\n\003key\030\001" +
+      " \001(\017\022\r\n\005value\030\002 \001(\017:\0028\001\032:\n\030MapSfixed64Sf" +
+      "ixed64Entry\022\013\n\003key\030\001 \001(\020\022\r\n\005value\030\002 \001(\020:" +
+      "\0028\001\0324\n\022MapInt32FloatEntry\022\013\n\003key\030\001 \001(\005\022\r" +
+      "\n\005value\030\002 \001(\002:\0028\001\0325\n\023MapInt32DoubleEntry" +
+      "\022\013\n\003key\030\001 \001(\005\022\r\n\005value\030\002 \001(\001:\0028\001\0322\n\020MapB" +
+      "oolBoolEntry\022\013\n\003key\030\001 \001(\010\022\r\n\005value\030\002 \001(\010" +
+      ":\0028\001\0326\n\024MapStringStringEntry\022\013\n\003key\030\001 \001(" +
+      "\t\022\r\n\005value\030\002 \001(\t:\0028\001\0325\n\023MapStringBytesEn" +
+      "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\014:\0028\001\032|\n\033M" +
+      "apStringNestedMessageEntry\022\013\n\003key\030\001 \001(\t\022" +
+      "L\n\005value\030\002 \001(\0132=.legacy_gencode_test.pro" +
+      "to3.TestMostTypesProto3.NestedMessage:\0028" +
+      "\001\032j\n\034MapStringForeignMessageEntry\022\013\n\003key" +
+      "\030\001 \001(\t\0229\n\005value\030\002 \001(\0132*.legacy_gencode_t" +
+      "est.proto3.ForeignMessage:\0028\001\032v\n\030MapStri" +
+      "ngNestedEnumEntry\022\013\n\003key\030\001 \001(\t\022I\n\005value\030" +
+      "\002 \001(\0162:.legacy_gencode_test.proto3.TestM" +
+      "ostTypesProto3.NestedEnum:\0028\001\032d\n\031MapStri" +
+      "ngForeignEnumEntry\022\013\n\003key\030\001 \001(\t\0226\n\005value" +
+      "\030\002 \001(\0162\'.legacy_gencode_test.proto3.Fore" +
+      "ignEnum:\0028\001\"9\n\nNestedEnum\022\007\n\003FOO\020\000\022\007\n\003BA" +
+      "R\020\001\022\007\n\003BAZ\020\002\022\020\n\003NEG\020\377\377\377\377\377\377\377\377\377\001\"Y\n\013Aliase" +
+      "dEnum\022\r\n\tALIAS_FOO\020\000\022\r\n\tALIAS_BAR\020\001\022\r\n\tA" +
+      "LIAS_BAZ\020\002\022\007\n\003MOO\020\002\022\007\n\003moo\020\002\022\007\n\003bAz\020\002\032\002\020" +
+      "\001B\r\n\013oneof_field\"\033\n\016ForeignMessage\022\t\n\001c\030" +
+      "\001 \001(\005*@\n\013ForeignEnum\022\017\n\013FOREIGN_FOO\020\000\022\017\n" +
+      "\013FOREIGN_BAR\020\001\022\017\n\013FOREIGN_BAZ\020\002B\030B\026Proto" +
+      "3GencodeTestProtob\006proto3"
     };
-    descriptor =
-        com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
-            descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] {});
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
     internal_static_legacy_gencode_test_proto3_TestMessage_descriptor =
-        getDescriptor().getMessageTypes().get(0);
-    internal_static_legacy_gencode_test_proto3_TestMessage_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMessage_descriptor,
-            new java.lang.String[] {
-              "X", "Y",
-            });
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_legacy_gencode_test_proto3_TestMessage_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMessage_descriptor,
+        new java.lang.String[] { "X", "Y", });
     internal_static_legacy_gencode_test_proto3_NestedTestMessage_descriptor =
-        getDescriptor().getMessageTypes().get(1);
-    internal_static_legacy_gencode_test_proto3_NestedTestMessage_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_NestedTestMessage_descriptor,
-            new java.lang.String[] {
-              "Z",
-            });
+      getDescriptor().getMessageTypes().get(1);
+    internal_static_legacy_gencode_test_proto3_NestedTestMessage_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_NestedTestMessage_descriptor,
+        new java.lang.String[] { "Z", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor =
-        getDescriptor().getMessageTypes().get(2);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor,
-            new java.lang.String[] {
-              "OptionalInt32",
-              "OptionalInt64",
-              "OptionalUint32",
-              "OptionalUint64",
-              "OptionalSint32",
-              "OptionalSint64",
-              "OptionalFixed32",
-              "OptionalFixed64",
-              "OptionalSfixed32",
-              "OptionalSfixed64",
-              "OptionalFloat",
-              "OptionalDouble",
-              "OptionalBool",
-              "OptionalString",
-              "OptionalBytes",
-              "OptionalNestedMessage",
-              "OptionalForeignMessage",
-              "OptionalNestedEnum",
-              "OptionalForeignEnum",
-              "OptionalAliasedEnum",
-              "RecursiveMessage",
-              "RepeatedInt32",
-              "RepeatedInt64",
-              "RepeatedUint32",
-              "RepeatedUint64",
-              "RepeatedSint32",
-              "RepeatedSint64",
-              "RepeatedFixed32",
-              "RepeatedFixed64",
-              "RepeatedSfixed32",
-              "RepeatedSfixed64",
-              "RepeatedFloat",
-              "RepeatedDouble",
-              "RepeatedBool",
-              "RepeatedString",
-              "RepeatedBytes",
-              "RepeatedNestedMessage",
-              "RepeatedForeignMessage",
-              "RepeatedNestedEnum",
-              "RepeatedForeignEnum",
-              "PackedInt32",
-              "PackedInt64",
-              "PackedUint32",
-              "PackedUint64",
-              "PackedSint32",
-              "PackedSint64",
-              "PackedFixed32",
-              "PackedFixed64",
-              "PackedSfixed32",
-              "PackedSfixed64",
-              "PackedFloat",
-              "PackedDouble",
-              "PackedBool",
-              "PackedNestedEnum",
-              "UnpackedInt32",
-              "UnpackedInt64",
-              "UnpackedUint32",
-              "UnpackedUint64",
-              "UnpackedSint32",
-              "UnpackedSint64",
-              "UnpackedFixed32",
-              "UnpackedFixed64",
-              "UnpackedSfixed32",
-              "UnpackedSfixed64",
-              "UnpackedFloat",
-              "UnpackedDouble",
-              "UnpackedBool",
-              "UnpackedNestedEnum",
-              "MapInt32Int32",
-              "MapInt64Int64",
-              "MapUint32Uint32",
-              "MapUint64Uint64",
-              "MapSint32Sint32",
-              "MapSint64Sint64",
-              "MapFixed32Fixed32",
-              "MapFixed64Fixed64",
-              "MapSfixed32Sfixed32",
-              "MapSfixed64Sfixed64",
-              "MapInt32Float",
-              "MapInt32Double",
-              "MapBoolBool",
-              "MapStringString",
-              "MapStringBytes",
-              "MapStringNestedMessage",
-              "MapStringForeignMessage",
-              "MapStringNestedEnum",
-              "MapStringForeignEnum",
-              "OneofUint32",
-              "OneofNestedMessage",
-              "OneofString",
-              "OneofBytes",
-              "OneofBool",
-              "OneofUint64",
-              "OneofFloat",
-              "OneofDouble",
-              "OneofEnum",
-              "OneofField",
-            });
+      getDescriptor().getMessageTypes().get(2);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor,
+        new java.lang.String[] { "OptionalInt32", "OptionalInt64", "OptionalUint32", "OptionalUint64", "OptionalSint32", "OptionalSint64", "OptionalFixed32", "OptionalFixed64", "OptionalSfixed32", "OptionalSfixed64", "OptionalFloat", "OptionalDouble", "OptionalBool", "OptionalString", "OptionalBytes", "OptionalNestedMessage", "OptionalForeignMessage", "OptionalNestedEnum", "OptionalForeignEnum", "OptionalAliasedEnum", "RecursiveMessage", "RepeatedInt32", "RepeatedInt64", "RepeatedUint32", "RepeatedUint64", "RepeatedSint32", "RepeatedSint64", "RepeatedFixed32", "RepeatedFixed64", "RepeatedSfixed32", "RepeatedSfixed64", "RepeatedFloat", "RepeatedDouble", "RepeatedBool", "RepeatedString", "RepeatedBytes", "RepeatedNestedMessage", "RepeatedForeignMessage", "RepeatedNestedEnum", "RepeatedForeignEnum", "PackedInt32", "PackedInt64", "PackedUint32", "PackedUint64", "PackedSint32", "PackedSint64", "PackedFixed32", "PackedFixed64", "PackedSfixed32", "PackedSfixed64", "PackedFloat", "PackedDouble", "PackedBool", "PackedNestedEnum", "UnpackedInt32", "UnpackedInt64", "UnpackedUint32", "UnpackedUint64", "UnpackedSint32", "UnpackedSint64", "UnpackedFixed32", "UnpackedFixed64", "UnpackedSfixed32", "UnpackedSfixed64", "UnpackedFloat", "UnpackedDouble", "UnpackedBool", "UnpackedNestedEnum", "MapInt32Int32", "MapInt64Int64", "MapUint32Uint32", "MapUint64Uint64", "MapSint32Sint32", "MapSint64Sint64", "MapFixed32Fixed32", "MapFixed64Fixed64", "MapSfixed32Sfixed32", "MapSfixed64Sfixed64", "MapInt32Float", "MapInt32Double", "MapBoolBool", "MapStringString", "MapStringBytes", "MapStringNestedMessage", "MapStringForeignMessage", "MapStringNestedEnum", "MapStringForeignEnum", "OneofUint32", "OneofNestedMessage", "OneofString", "OneofBytes", "OneofBool", "OneofUint64", "OneofFloat", "OneofDouble", "OneofEnum", "OneofField", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(0);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_descriptor,
-            new java.lang.String[] {
-              "A", "Corecursive",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(0);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_descriptor,
+        new java.lang.String[] { "A", "Corecursive", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32Int32Entry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(1);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32Int32Entry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32Int32Entry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(1);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32Int32Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32Int32Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt64Int64Entry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(2);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt64Int64Entry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt64Int64Entry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(2);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt64Int64Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt64Int64Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint32Uint32Entry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(3);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint32Uint32Entry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint32Uint32Entry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(3);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint32Uint32Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint32Uint32Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint64Uint64Entry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(4);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint64Uint64Entry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint64Uint64Entry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(4);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint64Uint64Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint64Uint64Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint32Sint32Entry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(5);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint32Sint32Entry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint32Sint32Entry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(5);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint32Sint32Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint32Sint32Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint64Sint64Entry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(6);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint64Sint64Entry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint64Sint64Entry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(6);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint64Sint64Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint64Sint64Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed32Fixed32Entry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(7);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed32Fixed32Entry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed32Fixed32Entry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(7);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed32Fixed32Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed32Fixed32Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed64Fixed64Entry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(8);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed64Fixed64Entry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed64Fixed64Entry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(8);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed64Fixed64Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed64Fixed64Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed32Sfixed32Entry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(9);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed32Sfixed32Entry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed32Sfixed32Entry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(9);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed32Sfixed32Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed32Sfixed32Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed64Sfixed64Entry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(10);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed64Sfixed64Entry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed64Sfixed64Entry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(10);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed64Sfixed64Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed64Sfixed64Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32FloatEntry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(11);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32FloatEntry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32FloatEntry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(11);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32FloatEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32FloatEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32DoubleEntry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(12);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32DoubleEntry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32DoubleEntry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(12);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32DoubleEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32DoubleEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapBoolBoolEntry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(13);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapBoolBoolEntry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapBoolBoolEntry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(13);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapBoolBoolEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapBoolBoolEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringStringEntry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(14);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringStringEntry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringStringEntry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(14);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringStringEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringStringEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringBytesEntry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(15);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringBytesEntry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringBytesEntry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(15);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringBytesEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringBytesEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedMessageEntry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(16);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedMessageEntry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedMessageEntry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(16);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedMessageEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedMessageEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignMessageEntry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(17);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignMessageEntry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignMessageEntry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(17);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignMessageEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignMessageEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedEnumEntry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(18);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedEnumEntry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedEnumEntry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(18);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedEnumEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedEnumEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignEnumEntry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(19);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignEnumEntry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignEnumEntry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(19);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignEnumEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignEnumEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_ForeignMessage_descriptor =
-        getDescriptor().getMessageTypes().get(3);
-    internal_static_legacy_gencode_test_proto3_ForeignMessage_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_ForeignMessage_descriptor,
-            new java.lang.String[] {
-              "C",
-            });
+      getDescriptor().getMessageTypes().get(3);
+    internal_static_legacy_gencode_test_proto3_ForeignMessage_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_ForeignMessage_descriptor,
+        new java.lang.String[] { "C", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/compatibility/smoke/v26.0/BUILD.bazel b/compatibility/smoke/v26.0/BUILD.bazel
index 599ca4733284a..3194d76786471 100644
--- a/compatibility/smoke/v26.0/BUILD.bazel
+++ b/compatibility/smoke/v26.0/BUILD.bazel
@@ -1,8 +1,8 @@
 load("@rules_java//java:java_library.bzl", "java_library")
 
 java_library(
-    name = "checked_in_gencode",
-    srcs = glob(["**/*.java"]),
-    visibility = ["//compatibility:__subpackages__"],
-    deps = ["//:protobuf_java"],
+	name = "checked_in_gencode",
+	srcs = glob(["**/*.java"]),
+	deps = ["//:protobuf_java"],
+	visibility = ["//compatibility:__subpackages__"],
 )
diff --git a/compatibility/smoke/v26.0/legacy_gencode_test/proto2/Proto2GencodeTestProto.java b/compatibility/smoke/v26.0/legacy_gencode_test/proto2/Proto2GencodeTestProto.java
new file mode 100644
index 0000000000000..5aa962ce20eee
--- /dev/null
+++ b/compatibility/smoke/v26.0/legacy_gencode_test/proto2/Proto2GencodeTestProto.java
@@ -0,0 +1,22439 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: proto2_gencode_test.proto
+// Protobuf Java Version: 4.26.0
+
+package legacy_gencode_test.proto2;
+
+public final class Proto2GencodeTestProto {
+  private Proto2GencodeTestProto() {}
+  static {
+    com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
+      com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+      /* major= */ 4,
+      /* minor= */ 26,
+      /* patch= */ 0,
+      /* suffix= */ "",
+      Proto2GencodeTestProto.class.getName());
+  }
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+    registry.add(legacy_gencode_test.proto2.Proto2GencodeTestProto.extensionInt32);
+    registry.add(legacy_gencode_test.proto2.Proto2GencodeTestProto.extensionMessage);
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  /**
+   * Protobuf enum {@code legacy_gencode_test.proto2.ForeignEnum}
+   */
+  public enum ForeignEnum
+      implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     * <code>FOREIGN_FOO = 0;</code>
+     */
+    FOREIGN_FOO(0),
+    /**
+     * <code>FOREIGN_BAR = 1;</code>
+     */
+    FOREIGN_BAR(1),
+    /**
+     * <code>FOREIGN_BAZ = 2;</code>
+     */
+    FOREIGN_BAZ(2),
+    ;
+
+    static {
+      com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
+        com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+        /* major= */ 4,
+        /* minor= */ 26,
+        /* patch= */ 0,
+        /* suffix= */ "",
+        ForeignEnum.class.getName());
+    }
+    /**
+     * <code>FOREIGN_FOO = 0;</code>
+     */
+    public static final int FOREIGN_FOO_VALUE = 0;
+    /**
+     * <code>FOREIGN_BAR = 1;</code>
+     */
+    public static final int FOREIGN_BAR_VALUE = 1;
+    /**
+     * <code>FOREIGN_BAZ = 2;</code>
+     */
+    public static final int FOREIGN_BAZ_VALUE = 2;
+
+
+    public final int getNumber() {
+      return value;
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static ForeignEnum valueOf(int value) {
+      return forNumber(value);
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     */
+    public static ForeignEnum forNumber(int value) {
+      switch (value) {
+        case 0: return FOREIGN_FOO;
+        case 1: return FOREIGN_BAR;
+        case 2: return FOREIGN_BAZ;
+        default: return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap<ForeignEnum>
+        internalGetValueMap() {
+      return internalValueMap;
+    }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        ForeignEnum> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap<ForeignEnum>() {
+            public ForeignEnum findValueByNumber(int number) {
+              return ForeignEnum.forNumber(number);
+            }
+          };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
+      return getDescriptor().getValues().get(ordinal());
+    }
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
+      return getDescriptor();
+    }
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.getDescriptor().getEnumTypes().get(0);
+    }
+
+    private static final ForeignEnum[] VALUES = values();
+
+    public static ForeignEnum valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private ForeignEnum(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:legacy_gencode_test.proto2.ForeignEnum)
+  }
+
+  public interface TestMessageOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:legacy_gencode_test.proto2.TestMessage)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>optional string x = 2;</code>
+     * @return Whether the x field is set.
+     */
+    boolean hasX();
+    /**
+     * <code>optional string x = 2;</code>
+     * @return The x.
+     */
+    java.lang.String getX();
+    /**
+     * <code>optional string x = 2;</code>
+     * @return The bytes for x.
+     */
+    com.google.protobuf.ByteString
+        getXBytes();
+
+    /**
+     * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+     * @return Whether the y field is set.
+     */
+    boolean hasY();
+    /**
+     * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+     * @return The y.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage getY();
+    /**
+     * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessageOrBuilder getYOrBuilder();
+  }
+  /**
+   * Protobuf type {@code legacy_gencode_test.proto2.TestMessage}
+   */
+  public static final class TestMessage extends
+      com.google.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:legacy_gencode_test.proto2.TestMessage)
+      TestMessageOrBuilder {
+  private static final long serialVersionUID = 0L;
+    static {
+      com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
+        com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+        /* major= */ 4,
+        /* minor= */ 26,
+        /* patch= */ 0,
+        /* suffix= */ "",
+        TestMessage.class.getName());
+    }
+    // Use TestMessage.newBuilder() to construct.
+    private TestMessage(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      super(builder);
+    }
+    private TestMessage() {
+      x_ = "";
+    }
+
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMessage_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMessage_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage.class, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage.Builder.class);
+    }
+
+    private int bitField0_;
+    public static final int X_FIELD_NUMBER = 2;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object x_ = "";
+    /**
+     * <code>optional string x = 2;</code>
+     * @return Whether the x field is set.
+     */
+    @java.lang.Override
+    public boolean hasX() {
+      return ((bitField0_ & 0x00000001) != 0);
+    }
+    /**
+     * <code>optional string x = 2;</code>
+     * @return The x.
+     */
+    @java.lang.Override
+    public java.lang.String getX() {
+      java.lang.Object ref = x_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
+          x_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     * <code>optional string x = 2;</code>
+     * @return The bytes for x.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getXBytes() {
+      java.lang.Object ref = x_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        x_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int Y_FIELD_NUMBER = 3;
+    private legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage y_;
+    /**
+     * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+     * @return Whether the y field is set.
+     */
+    @java.lang.Override
+    public boolean hasY() {
+      return ((bitField0_ & 0x00000002) != 0);
+    }
+    /**
+     * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+     * @return The y.
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage getY() {
+      return y_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.getDefaultInstance() : y_;
+    }
+    /**
+     * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessageOrBuilder getYOrBuilder() {
+      return y_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.getDefaultInstance() : y_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (((bitField0_ & 0x00000001) != 0)) {
+        com.google.protobuf.GeneratedMessage.writeString(output, 2, x_);
+      }
+      if (((bitField0_ & 0x00000002) != 0)) {
+        output.writeMessage(3, getY());
+      }
+      getUnknownFields().writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        size += com.google.protobuf.GeneratedMessage.computeStringSize(2, x_);
+      }
+      if (((bitField0_ & 0x00000002) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(3, getY());
+      }
+      size += getUnknownFields().getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage)) {
+        return super.equals(obj);
+      }
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage other = (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage) obj;
+
+      if (hasX() != other.hasX()) return false;
+      if (hasX()) {
+        if (!getX()
+            .equals(other.getX())) return false;
+      }
+      if (hasY() != other.hasY()) return false;
+      if (hasY()) {
+        if (!getY()
+            .equals(other.getY())) return false;
+      }
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasX()) {
+        hash = (37 * hash) + X_FIELD_NUMBER;
+        hash = (53 * hash) + getX().hashCode();
+      }
+      if (hasY()) {
+        hash = (37 * hash) + Y_FIELD_NUMBER;
+        hash = (53 * hash) + getY().hashCode();
+      }
+      hash = (29 * hash) + getUnknownFields().hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code legacy_gencode_test.proto2.TestMessage}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:legacy_gencode_test.proto2.TestMessage)
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessageOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMessage_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMessage_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage.class, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage.Builder.class);
+      }
+
+      // Construct using legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessage
+                .alwaysUseFieldBuilders) {
+          getYFieldBuilder();
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        bitField0_ = 0;
+        x_ = "";
+        y_ = null;
+        if (yBuilder_ != null) {
+          yBuilder_.dispose();
+          yBuilder_ = null;
+        }
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMessage_descriptor;
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage getDefaultInstanceForType() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage build() {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage buildPartial() {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage result = new legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage result) {
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.x_ = x_;
+          to_bitField0_ |= 0x00000001;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.y_ = yBuilder_ == null
+              ? y_
+              : yBuilder_.build();
+          to_bitField0_ |= 0x00000002;
+        }
+        result.bitField0_ |= to_bitField0_;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage) {
+          return mergeFrom((legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage other) {
+        if (other == legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage.getDefaultInstance()) return this;
+        if (other.hasX()) {
+          x_ = other.x_;
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
+        if (other.hasY()) {
+          mergeY(other.getY());
+        }
+        this.mergeUnknownFields(other.getUnknownFields());
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
+        try {
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 18: {
+                x_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 18
+              case 26: {
+                input.readMessage(
+                    getYFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 26
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.unwrapIOException();
+        } finally {
+          onChanged();
+        } // finally
+        return this;
+      }
+      private int bitField0_;
+
+      private java.lang.Object x_ = "";
+      /**
+       * <code>optional string x = 2;</code>
+       * @return Whether the x field is set.
+       */
+      public boolean hasX() {
+        return ((bitField0_ & 0x00000001) != 0);
+      }
+      /**
+       * <code>optional string x = 2;</code>
+       * @return The x.
+       */
+      public java.lang.String getX() {
+        java.lang.Object ref = x_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          if (bs.isValidUtf8()) {
+            x_ = s;
+          }
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>optional string x = 2;</code>
+       * @return The bytes for x.
+       */
+      public com.google.protobuf.ByteString
+          getXBytes() {
+        java.lang.Object ref = x_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          x_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>optional string x = 2;</code>
+       * @param value The x to set.
+       * @return This builder for chaining.
+       */
+      public Builder setX(
+          java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
+        x_ = value;
+        bitField0_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string x = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearX() {
+        x_ = getDefaultInstance().getX();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string x = 2;</code>
+       * @param value The bytes for x to set.
+       * @return This builder for chaining.
+       */
+      public Builder setXBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
+        x_ = value;
+        bitField0_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+
+      private legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage y_;
+      private com.google.protobuf.SingleFieldBuilder<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessageOrBuilder> yBuilder_;
+      /**
+       * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+       * @return Whether the y field is set.
+       */
+      public boolean hasY() {
+        return ((bitField0_ & 0x00000002) != 0);
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+       * @return The y.
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage getY() {
+        if (yBuilder_ == null) {
+          return y_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.getDefaultInstance() : y_;
+        } else {
+          return yBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+       */
+      public Builder setY(legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage value) {
+        if (yBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          y_ = value;
+        } else {
+          yBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00000002;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+       */
+      public Builder setY(
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.Builder builderForValue) {
+        if (yBuilder_ == null) {
+          y_ = builderForValue.build();
+        } else {
+          yBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00000002;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+       */
+      public Builder mergeY(legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage value) {
+        if (yBuilder_ == null) {
+          if (((bitField0_ & 0x00000002) != 0) &&
+            y_ != null &&
+            y_ != legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.getDefaultInstance()) {
+            getYBuilder().mergeFrom(value);
+          } else {
+            y_ = value;
+          }
+        } else {
+          yBuilder_.mergeFrom(value);
+        }
+        if (y_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+       */
+      public Builder clearY() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        y_ = null;
+        if (yBuilder_ != null) {
+          yBuilder_.dispose();
+          yBuilder_ = null;
+        }
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.Builder getYBuilder() {
+        bitField0_ |= 0x00000002;
+        onChanged();
+        return getYFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessageOrBuilder getYOrBuilder() {
+        if (yBuilder_ != null) {
+          return yBuilder_.getMessageOrBuilder();
+        } else {
+          return y_ == null ?
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.getDefaultInstance() : y_;
+        }
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilder<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessageOrBuilder> 
+          getYFieldBuilder() {
+        if (yBuilder_ == null) {
+          yBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessageOrBuilder>(
+                  getY(),
+                  getParentForChildren(),
+                  isClean());
+          y_ = null;
+        }
+        return yBuilder_;
+      }
+
+      // @@protoc_insertion_point(builder_scope:legacy_gencode_test.proto2.TestMessage)
+    }
+
+    // @@protoc_insertion_point(class_scope:legacy_gencode_test.proto2.TestMessage)
+    private static final legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage();
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<TestMessage>
+        PARSER = new com.google.protobuf.AbstractParser<TestMessage>() {
+      @java.lang.Override
+      public TestMessage parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (com.google.protobuf.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new com.google.protobuf.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
+      }
+    };
+
+    public static com.google.protobuf.Parser<TestMessage> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<TestMessage> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  public interface NestedTestMessageOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:legacy_gencode_test.proto2.NestedTestMessage)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>repeated int32 z = 1;</code>
+     * @return A list containing the z.
+     */
+    java.util.List<java.lang.Integer> getZList();
+    /**
+     * <code>repeated int32 z = 1;</code>
+     * @return The count of z.
+     */
+    int getZCount();
+    /**
+     * <code>repeated int32 z = 1;</code>
+     * @param index The index of the element to return.
+     * @return The z at the given index.
+     */
+    int getZ(int index);
+  }
+  /**
+   * Protobuf type {@code legacy_gencode_test.proto2.NestedTestMessage}
+   */
+  public static final class NestedTestMessage extends
+      com.google.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:legacy_gencode_test.proto2.NestedTestMessage)
+      NestedTestMessageOrBuilder {
+  private static final long serialVersionUID = 0L;
+    static {
+      com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
+        com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+        /* major= */ 4,
+        /* minor= */ 26,
+        /* patch= */ 0,
+        /* suffix= */ "",
+        NestedTestMessage.class.getName());
+    }
+    // Use NestedTestMessage.newBuilder() to construct.
+    private NestedTestMessage(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      super(builder);
+    }
+    private NestedTestMessage() {
+      z_ = emptyIntList();
+    }
+
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_NestedTestMessage_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_NestedTestMessage_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.class, legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.Builder.class);
+    }
+
+    public static final int Z_FIELD_NUMBER = 1;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList z_ =
+        emptyIntList();
+    /**
+     * <code>repeated int32 z = 1;</code>
+     * @return A list containing the z.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getZList() {
+      return z_;
+    }
+    /**
+     * <code>repeated int32 z = 1;</code>
+     * @return The count of z.
+     */
+    public int getZCount() {
+      return z_.size();
+    }
+    /**
+     * <code>repeated int32 z = 1;</code>
+     * @param index The index of the element to return.
+     * @return The z at the given index.
+     */
+    public int getZ(int index) {
+      return z_.getInt(index);
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      for (int i = 0; i < z_.size(); i++) {
+        output.writeInt32(1, z_.getInt(i));
+      }
+      getUnknownFields().writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      {
+        int dataSize = 0;
+        for (int i = 0; i < z_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt32SizeNoTag(z_.getInt(i));
+        }
+        size += dataSize;
+        size += 1 * getZList().size();
+      }
+      size += getUnknownFields().getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage)) {
+        return super.equals(obj);
+      }
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage other = (legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage) obj;
+
+      if (!getZList()
+          .equals(other.getZList())) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (getZCount() > 0) {
+        hash = (37 * hash) + Z_FIELD_NUMBER;
+        hash = (53 * hash) + getZList().hashCode();
+      }
+      hash = (29 * hash) + getUnknownFields().hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code legacy_gencode_test.proto2.NestedTestMessage}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:legacy_gencode_test.proto2.NestedTestMessage)
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessageOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_NestedTestMessage_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_NestedTestMessage_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.class, legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.Builder.class);
+      }
+
+      // Construct using legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.newBuilder()
+      private Builder() {
+
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        super(parent);
+
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        bitField0_ = 0;
+        z_ = emptyIntList();
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_NestedTestMessage_descriptor;
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage getDefaultInstanceForType() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage build() {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage buildPartial() {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage result = new legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          z_.makeImmutable();
+          result.z_ = z_;
+        }
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage) {
+          return mergeFrom((legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage other) {
+        if (other == legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.getDefaultInstance()) return this;
+        if (!other.z_.isEmpty()) {
+          if (z_.isEmpty()) {
+            z_ = other.z_;
+            z_.makeImmutable();
+            bitField0_ |= 0x00000001;
+          } else {
+            ensureZIsMutable();
+            z_.addAll(other.z_);
+          }
+          onChanged();
+        }
+        this.mergeUnknownFields(other.getUnknownFields());
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
+        try {
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                int v = input.readInt32();
+                ensureZIsMutable();
+                z_.addInt(v);
+                break;
+              } // case 8
+              case 10: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureZIsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  z_.addInt(input.readInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.unwrapIOException();
+        } finally {
+          onChanged();
+        } // finally
+        return this;
+      }
+      private int bitField0_;
+
+      private com.google.protobuf.Internal.IntList z_ = emptyIntList();
+      private void ensureZIsMutable() {
+        if (!z_.isModifiable()) {
+          z_ = makeMutableCopy(z_);
+        }
+        bitField0_ |= 0x00000001;
+      }
+      /**
+       * <code>repeated int32 z = 1;</code>
+       * @return A list containing the z.
+       */
+      public java.util.List<java.lang.Integer>
+          getZList() {
+        z_.makeImmutable();
+        return z_;
+      }
+      /**
+       * <code>repeated int32 z = 1;</code>
+       * @return The count of z.
+       */
+      public int getZCount() {
+        return z_.size();
+      }
+      /**
+       * <code>repeated int32 z = 1;</code>
+       * @param index The index of the element to return.
+       * @return The z at the given index.
+       */
+      public int getZ(int index) {
+        return z_.getInt(index);
+      }
+      /**
+       * <code>repeated int32 z = 1;</code>
+       * @param index The index to set the value at.
+       * @param value The z to set.
+       * @return This builder for chaining.
+       */
+      public Builder setZ(
+          int index, int value) {
+
+        ensureZIsMutable();
+        z_.setInt(index, value);
+        bitField0_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 z = 1;</code>
+       * @param value The z to add.
+       * @return This builder for chaining.
+       */
+      public Builder addZ(int value) {
+
+        ensureZIsMutable();
+        z_.addInt(value);
+        bitField0_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 z = 1;</code>
+       * @param values The z to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllZ(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureZIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, z_);
+        bitField0_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 z = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearZ() {
+        z_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
+      // @@protoc_insertion_point(builder_scope:legacy_gencode_test.proto2.NestedTestMessage)
+    }
+
+    // @@protoc_insertion_point(class_scope:legacy_gencode_test.proto2.NestedTestMessage)
+    private static final legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage();
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<NestedTestMessage>
+        PARSER = new com.google.protobuf.AbstractParser<NestedTestMessage>() {
+      @java.lang.Override
+      public NestedTestMessage parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (com.google.protobuf.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new com.google.protobuf.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
+      }
+    };
+
+    public static com.google.protobuf.Parser<NestedTestMessage> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<NestedTestMessage> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  public interface TestMostTypesProto2OrBuilder extends
+      // @@protoc_insertion_point(interface_extends:legacy_gencode_test.proto2.TestMostTypesProto2)
+      com.google.protobuf.GeneratedMessage.
+          ExtendableMessageOrBuilder<TestMostTypesProto2> {
+
+    /**
+     * <code>optional int32 optional_int32 = 1;</code>
+     * @return Whether the optionalInt32 field is set.
+     */
+    boolean hasOptionalInt32();
+    /**
+     * <code>optional int32 optional_int32 = 1;</code>
+     * @return The optionalInt32.
+     */
+    int getOptionalInt32();
+
+    /**
+     * <code>optional int64 optional_int64 = 2;</code>
+     * @return Whether the optionalInt64 field is set.
+     */
+    boolean hasOptionalInt64();
+    /**
+     * <code>optional int64 optional_int64 = 2;</code>
+     * @return The optionalInt64.
+     */
+    long getOptionalInt64();
+
+    /**
+     * <code>optional uint32 optional_uint32 = 3;</code>
+     * @return Whether the optionalUint32 field is set.
+     */
+    boolean hasOptionalUint32();
+    /**
+     * <code>optional uint32 optional_uint32 = 3;</code>
+     * @return The optionalUint32.
+     */
+    int getOptionalUint32();
+
+    /**
+     * <code>optional uint64 optional_uint64 = 4;</code>
+     * @return Whether the optionalUint64 field is set.
+     */
+    boolean hasOptionalUint64();
+    /**
+     * <code>optional uint64 optional_uint64 = 4;</code>
+     * @return The optionalUint64.
+     */
+    long getOptionalUint64();
+
+    /**
+     * <code>optional sint32 optional_sint32 = 5;</code>
+     * @return Whether the optionalSint32 field is set.
+     */
+    boolean hasOptionalSint32();
+    /**
+     * <code>optional sint32 optional_sint32 = 5;</code>
+     * @return The optionalSint32.
+     */
+    int getOptionalSint32();
+
+    /**
+     * <code>optional sint64 optional_sint64 = 6;</code>
+     * @return Whether the optionalSint64 field is set.
+     */
+    boolean hasOptionalSint64();
+    /**
+     * <code>optional sint64 optional_sint64 = 6;</code>
+     * @return The optionalSint64.
+     */
+    long getOptionalSint64();
+
+    /**
+     * <code>optional fixed32 optional_fixed32 = 7;</code>
+     * @return Whether the optionalFixed32 field is set.
+     */
+    boolean hasOptionalFixed32();
+    /**
+     * <code>optional fixed32 optional_fixed32 = 7;</code>
+     * @return The optionalFixed32.
+     */
+    int getOptionalFixed32();
+
+    /**
+     * <code>optional fixed64 optional_fixed64 = 8;</code>
+     * @return Whether the optionalFixed64 field is set.
+     */
+    boolean hasOptionalFixed64();
+    /**
+     * <code>optional fixed64 optional_fixed64 = 8;</code>
+     * @return The optionalFixed64.
+     */
+    long getOptionalFixed64();
+
+    /**
+     * <code>optional sfixed32 optional_sfixed32 = 9;</code>
+     * @return Whether the optionalSfixed32 field is set.
+     */
+    boolean hasOptionalSfixed32();
+    /**
+     * <code>optional sfixed32 optional_sfixed32 = 9;</code>
+     * @return The optionalSfixed32.
+     */
+    int getOptionalSfixed32();
+
+    /**
+     * <code>optional sfixed64 optional_sfixed64 = 10;</code>
+     * @return Whether the optionalSfixed64 field is set.
+     */
+    boolean hasOptionalSfixed64();
+    /**
+     * <code>optional sfixed64 optional_sfixed64 = 10;</code>
+     * @return The optionalSfixed64.
+     */
+    long getOptionalSfixed64();
+
+    /**
+     * <code>optional float optional_float = 11;</code>
+     * @return Whether the optionalFloat field is set.
+     */
+    boolean hasOptionalFloat();
+    /**
+     * <code>optional float optional_float = 11;</code>
+     * @return The optionalFloat.
+     */
+    float getOptionalFloat();
+
+    /**
+     * <code>optional double optional_double = 12;</code>
+     * @return Whether the optionalDouble field is set.
+     */
+    boolean hasOptionalDouble();
+    /**
+     * <code>optional double optional_double = 12;</code>
+     * @return The optionalDouble.
+     */
+    double getOptionalDouble();
+
+    /**
+     * <code>optional bool optional_bool = 13;</code>
+     * @return Whether the optionalBool field is set.
+     */
+    boolean hasOptionalBool();
+    /**
+     * <code>optional bool optional_bool = 13;</code>
+     * @return The optionalBool.
+     */
+    boolean getOptionalBool();
+
+    /**
+     * <code>optional string optional_string = 14;</code>
+     * @return Whether the optionalString field is set.
+     */
+    boolean hasOptionalString();
+    /**
+     * <code>optional string optional_string = 14;</code>
+     * @return The optionalString.
+     */
+    java.lang.String getOptionalString();
+    /**
+     * <code>optional string optional_string = 14;</code>
+     * @return The bytes for optionalString.
+     */
+    com.google.protobuf.ByteString
+        getOptionalStringBytes();
+
+    /**
+     * <code>optional bytes optional_bytes = 15;</code>
+     * @return Whether the optionalBytes field is set.
+     */
+    boolean hasOptionalBytes();
+    /**
+     * <code>optional bytes optional_bytes = 15;</code>
+     * @return The optionalBytes.
+     */
+    com.google.protobuf.ByteString getOptionalBytes();
+
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+     * @return Whether the optionalNestedMessage field is set.
+     */
+    boolean hasOptionalNestedMessage();
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+     * @return The optionalNestedMessage.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getOptionalNestedMessage();
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder getOptionalNestedMessageOrBuilder();
+
+    /**
+     * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+     * @return Whether the optionalForeignMessage field is set.
+     */
+    boolean hasOptionalForeignMessage();
+    /**
+     * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+     * @return The optionalForeignMessage.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getOptionalForeignMessage();
+    /**
+     * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder getOptionalForeignMessageOrBuilder();
+
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum optional_nested_enum = 21;</code>
+     * @return Whether the optionalNestedEnum field is set.
+     */
+    boolean hasOptionalNestedEnum();
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum optional_nested_enum = 21;</code>
+     * @return The optionalNestedEnum.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getOptionalNestedEnum();
+
+    /**
+     * <code>optional .legacy_gencode_test.proto2.ForeignEnum optional_foreign_enum = 22;</code>
+     * @return Whether the optionalForeignEnum field is set.
+     */
+    boolean hasOptionalForeignEnum();
+    /**
+     * <code>optional .legacy_gencode_test.proto2.ForeignEnum optional_foreign_enum = 22;</code>
+     * @return The optionalForeignEnum.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getOptionalForeignEnum();
+
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.AliasedEnum optional_aliased_enum = 23;</code>
+     * @return Whether the optionalAliasedEnum field is set.
+     */
+    boolean hasOptionalAliasedEnum();
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.AliasedEnum optional_aliased_enum = 23;</code>
+     * @return The optionalAliasedEnum.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum getOptionalAliasedEnum();
+
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+     * @return Whether the recursiveMessage field is set.
+     */
+    boolean hasRecursiveMessage();
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+     * @return The recursiveMessage.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 getRecursiveMessage();
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder getRecursiveMessageOrBuilder();
+
+    /**
+     * <pre>
+     * Repeated
+     * </pre>
+     *
+     * <code>repeated int32 repeated_int32 = 31;</code>
+     * @return A list containing the repeatedInt32.
+     */
+    java.util.List<java.lang.Integer> getRepeatedInt32List();
+    /**
+     * <pre>
+     * Repeated
+     * </pre>
+     *
+     * <code>repeated int32 repeated_int32 = 31;</code>
+     * @return The count of repeatedInt32.
+     */
+    int getRepeatedInt32Count();
+    /**
+     * <pre>
+     * Repeated
+     * </pre>
+     *
+     * <code>repeated int32 repeated_int32 = 31;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedInt32 at the given index.
+     */
+    int getRepeatedInt32(int index);
+
+    /**
+     * <code>repeated int64 repeated_int64 = 32;</code>
+     * @return A list containing the repeatedInt64.
+     */
+    java.util.List<java.lang.Long> getRepeatedInt64List();
+    /**
+     * <code>repeated int64 repeated_int64 = 32;</code>
+     * @return The count of repeatedInt64.
+     */
+    int getRepeatedInt64Count();
+    /**
+     * <code>repeated int64 repeated_int64 = 32;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedInt64 at the given index.
+     */
+    long getRepeatedInt64(int index);
+
+    /**
+     * <code>repeated uint32 repeated_uint32 = 33;</code>
+     * @return A list containing the repeatedUint32.
+     */
+    java.util.List<java.lang.Integer> getRepeatedUint32List();
+    /**
+     * <code>repeated uint32 repeated_uint32 = 33;</code>
+     * @return The count of repeatedUint32.
+     */
+    int getRepeatedUint32Count();
+    /**
+     * <code>repeated uint32 repeated_uint32 = 33;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedUint32 at the given index.
+     */
+    int getRepeatedUint32(int index);
+
+    /**
+     * <code>repeated uint64 repeated_uint64 = 34;</code>
+     * @return A list containing the repeatedUint64.
+     */
+    java.util.List<java.lang.Long> getRepeatedUint64List();
+    /**
+     * <code>repeated uint64 repeated_uint64 = 34;</code>
+     * @return The count of repeatedUint64.
+     */
+    int getRepeatedUint64Count();
+    /**
+     * <code>repeated uint64 repeated_uint64 = 34;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedUint64 at the given index.
+     */
+    long getRepeatedUint64(int index);
+
+    /**
+     * <code>repeated sint32 repeated_sint32 = 35;</code>
+     * @return A list containing the repeatedSint32.
+     */
+    java.util.List<java.lang.Integer> getRepeatedSint32List();
+    /**
+     * <code>repeated sint32 repeated_sint32 = 35;</code>
+     * @return The count of repeatedSint32.
+     */
+    int getRepeatedSint32Count();
+    /**
+     * <code>repeated sint32 repeated_sint32 = 35;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedSint32 at the given index.
+     */
+    int getRepeatedSint32(int index);
+
+    /**
+     * <code>repeated sint64 repeated_sint64 = 36;</code>
+     * @return A list containing the repeatedSint64.
+     */
+    java.util.List<java.lang.Long> getRepeatedSint64List();
+    /**
+     * <code>repeated sint64 repeated_sint64 = 36;</code>
+     * @return The count of repeatedSint64.
+     */
+    int getRepeatedSint64Count();
+    /**
+     * <code>repeated sint64 repeated_sint64 = 36;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedSint64 at the given index.
+     */
+    long getRepeatedSint64(int index);
+
+    /**
+     * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+     * @return A list containing the repeatedFixed32.
+     */
+    java.util.List<java.lang.Integer> getRepeatedFixed32List();
+    /**
+     * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+     * @return The count of repeatedFixed32.
+     */
+    int getRepeatedFixed32Count();
+    /**
+     * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedFixed32 at the given index.
+     */
+    int getRepeatedFixed32(int index);
+
+    /**
+     * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+     * @return A list containing the repeatedFixed64.
+     */
+    java.util.List<java.lang.Long> getRepeatedFixed64List();
+    /**
+     * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+     * @return The count of repeatedFixed64.
+     */
+    int getRepeatedFixed64Count();
+    /**
+     * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedFixed64 at the given index.
+     */
+    long getRepeatedFixed64(int index);
+
+    /**
+     * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+     * @return A list containing the repeatedSfixed32.
+     */
+    java.util.List<java.lang.Integer> getRepeatedSfixed32List();
+    /**
+     * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+     * @return The count of repeatedSfixed32.
+     */
+    int getRepeatedSfixed32Count();
+    /**
+     * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedSfixed32 at the given index.
+     */
+    int getRepeatedSfixed32(int index);
+
+    /**
+     * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+     * @return A list containing the repeatedSfixed64.
+     */
+    java.util.List<java.lang.Long> getRepeatedSfixed64List();
+    /**
+     * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+     * @return The count of repeatedSfixed64.
+     */
+    int getRepeatedSfixed64Count();
+    /**
+     * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedSfixed64 at the given index.
+     */
+    long getRepeatedSfixed64(int index);
+
+    /**
+     * <code>repeated float repeated_float = 41;</code>
+     * @return A list containing the repeatedFloat.
+     */
+    java.util.List<java.lang.Float> getRepeatedFloatList();
+    /**
+     * <code>repeated float repeated_float = 41;</code>
+     * @return The count of repeatedFloat.
+     */
+    int getRepeatedFloatCount();
+    /**
+     * <code>repeated float repeated_float = 41;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedFloat at the given index.
+     */
+    float getRepeatedFloat(int index);
+
+    /**
+     * <code>repeated double repeated_double = 42;</code>
+     * @return A list containing the repeatedDouble.
+     */
+    java.util.List<java.lang.Double> getRepeatedDoubleList();
+    /**
+     * <code>repeated double repeated_double = 42;</code>
+     * @return The count of repeatedDouble.
+     */
+    int getRepeatedDoubleCount();
+    /**
+     * <code>repeated double repeated_double = 42;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedDouble at the given index.
+     */
+    double getRepeatedDouble(int index);
+
+    /**
+     * <code>repeated bool repeated_bool = 43;</code>
+     * @return A list containing the repeatedBool.
+     */
+    java.util.List<java.lang.Boolean> getRepeatedBoolList();
+    /**
+     * <code>repeated bool repeated_bool = 43;</code>
+     * @return The count of repeatedBool.
+     */
+    int getRepeatedBoolCount();
+    /**
+     * <code>repeated bool repeated_bool = 43;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedBool at the given index.
+     */
+    boolean getRepeatedBool(int index);
+
+    /**
+     * <code>repeated string repeated_string = 44;</code>
+     * @return A list containing the repeatedString.
+     */
+    java.util.List<java.lang.String>
+        getRepeatedStringList();
+    /**
+     * <code>repeated string repeated_string = 44;</code>
+     * @return The count of repeatedString.
+     */
+    int getRepeatedStringCount();
+    /**
+     * <code>repeated string repeated_string = 44;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedString at the given index.
+     */
+    java.lang.String getRepeatedString(int index);
+    /**
+     * <code>repeated string repeated_string = 44;</code>
+     * @param index The index of the value to return.
+     * @return The bytes of the repeatedString at the given index.
+     */
+    com.google.protobuf.ByteString
+        getRepeatedStringBytes(int index);
+
+    /**
+     * <code>repeated bytes repeated_bytes = 45;</code>
+     * @return A list containing the repeatedBytes.
+     */
+    java.util.List<com.google.protobuf.ByteString> getRepeatedBytesList();
+    /**
+     * <code>repeated bytes repeated_bytes = 45;</code>
+     * @return The count of repeatedBytes.
+     */
+    int getRepeatedBytesCount();
+    /**
+     * <code>repeated bytes repeated_bytes = 45;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedBytes at the given index.
+     */
+    com.google.protobuf.ByteString getRepeatedBytes(int index);
+
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+     */
+    java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> 
+        getRepeatedNestedMessageList();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getRepeatedNestedMessage(int index);
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+     */
+    int getRepeatedNestedMessageCount();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+     */
+    java.util.List<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> 
+        getRepeatedNestedMessageOrBuilderList();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder getRepeatedNestedMessageOrBuilder(
+        int index);
+
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+     */
+    java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> 
+        getRepeatedForeignMessageList();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getRepeatedForeignMessage(int index);
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+     */
+    int getRepeatedForeignMessageCount();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+     */
+    java.util.List<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder> 
+        getRepeatedForeignMessageOrBuilderList();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder getRepeatedForeignMessageOrBuilder(
+        int index);
+
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+     * @return A list containing the repeatedNestedEnum.
+     */
+    java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> getRepeatedNestedEnumList();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+     * @return The count of repeatedNestedEnum.
+     */
+    int getRepeatedNestedEnumCount();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedNestedEnum at the given index.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getRepeatedNestedEnum(int index);
+
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+     * @return A list containing the repeatedForeignEnum.
+     */
+    java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum> getRepeatedForeignEnumList();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+     * @return The count of repeatedForeignEnum.
+     */
+    int getRepeatedForeignEnumCount();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedForeignEnum at the given index.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getRepeatedForeignEnum(int index);
+
+    /**
+     * <pre>
+     * Packed
+     * </pre>
+     *
+     * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+     * @return A list containing the packedInt32.
+     */
+    java.util.List<java.lang.Integer> getPackedInt32List();
+    /**
+     * <pre>
+     * Packed
+     * </pre>
+     *
+     * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+     * @return The count of packedInt32.
+     */
+    int getPackedInt32Count();
+    /**
+     * <pre>
+     * Packed
+     * </pre>
+     *
+     * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedInt32 at the given index.
+     */
+    int getPackedInt32(int index);
+
+    /**
+     * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+     * @return A list containing the packedInt64.
+     */
+    java.util.List<java.lang.Long> getPackedInt64List();
+    /**
+     * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+     * @return The count of packedInt64.
+     */
+    int getPackedInt64Count();
+    /**
+     * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedInt64 at the given index.
+     */
+    long getPackedInt64(int index);
+
+    /**
+     * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+     * @return A list containing the packedUint32.
+     */
+    java.util.List<java.lang.Integer> getPackedUint32List();
+    /**
+     * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+     * @return The count of packedUint32.
+     */
+    int getPackedUint32Count();
+    /**
+     * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedUint32 at the given index.
+     */
+    int getPackedUint32(int index);
+
+    /**
+     * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+     * @return A list containing the packedUint64.
+     */
+    java.util.List<java.lang.Long> getPackedUint64List();
+    /**
+     * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+     * @return The count of packedUint64.
+     */
+    int getPackedUint64Count();
+    /**
+     * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedUint64 at the given index.
+     */
+    long getPackedUint64(int index);
+
+    /**
+     * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+     * @return A list containing the packedSint32.
+     */
+    java.util.List<java.lang.Integer> getPackedSint32List();
+    /**
+     * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+     * @return The count of packedSint32.
+     */
+    int getPackedSint32Count();
+    /**
+     * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedSint32 at the given index.
+     */
+    int getPackedSint32(int index);
+
+    /**
+     * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+     * @return A list containing the packedSint64.
+     */
+    java.util.List<java.lang.Long> getPackedSint64List();
+    /**
+     * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+     * @return The count of packedSint64.
+     */
+    int getPackedSint64Count();
+    /**
+     * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedSint64 at the given index.
+     */
+    long getPackedSint64(int index);
+
+    /**
+     * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+     * @return A list containing the packedFixed32.
+     */
+    java.util.List<java.lang.Integer> getPackedFixed32List();
+    /**
+     * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+     * @return The count of packedFixed32.
+     */
+    int getPackedFixed32Count();
+    /**
+     * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedFixed32 at the given index.
+     */
+    int getPackedFixed32(int index);
+
+    /**
+     * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+     * @return A list containing the packedFixed64.
+     */
+    java.util.List<java.lang.Long> getPackedFixed64List();
+    /**
+     * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+     * @return The count of packedFixed64.
+     */
+    int getPackedFixed64Count();
+    /**
+     * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedFixed64 at the given index.
+     */
+    long getPackedFixed64(int index);
+
+    /**
+     * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+     * @return A list containing the packedSfixed32.
+     */
+    java.util.List<java.lang.Integer> getPackedSfixed32List();
+    /**
+     * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+     * @return The count of packedSfixed32.
+     */
+    int getPackedSfixed32Count();
+    /**
+     * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedSfixed32 at the given index.
+     */
+    int getPackedSfixed32(int index);
+
+    /**
+     * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+     * @return A list containing the packedSfixed64.
+     */
+    java.util.List<java.lang.Long> getPackedSfixed64List();
+    /**
+     * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+     * @return The count of packedSfixed64.
+     */
+    int getPackedSfixed64Count();
+    /**
+     * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedSfixed64 at the given index.
+     */
+    long getPackedSfixed64(int index);
+
+    /**
+     * <code>repeated float packed_float = 85 [packed = true];</code>
+     * @return A list containing the packedFloat.
+     */
+    java.util.List<java.lang.Float> getPackedFloatList();
+    /**
+     * <code>repeated float packed_float = 85 [packed = true];</code>
+     * @return The count of packedFloat.
+     */
+    int getPackedFloatCount();
+    /**
+     * <code>repeated float packed_float = 85 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedFloat at the given index.
+     */
+    float getPackedFloat(int index);
+
+    /**
+     * <code>repeated double packed_double = 86 [packed = true];</code>
+     * @return A list containing the packedDouble.
+     */
+    java.util.List<java.lang.Double> getPackedDoubleList();
+    /**
+     * <code>repeated double packed_double = 86 [packed = true];</code>
+     * @return The count of packedDouble.
+     */
+    int getPackedDoubleCount();
+    /**
+     * <code>repeated double packed_double = 86 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedDouble at the given index.
+     */
+    double getPackedDouble(int index);
+
+    /**
+     * <code>repeated bool packed_bool = 87 [packed = true];</code>
+     * @return A list containing the packedBool.
+     */
+    java.util.List<java.lang.Boolean> getPackedBoolList();
+    /**
+     * <code>repeated bool packed_bool = 87 [packed = true];</code>
+     * @return The count of packedBool.
+     */
+    int getPackedBoolCount();
+    /**
+     * <code>repeated bool packed_bool = 87 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedBool at the given index.
+     */
+    boolean getPackedBool(int index);
+
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+     * @return A list containing the packedNestedEnum.
+     */
+    java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> getPackedNestedEnumList();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+     * @return The count of packedNestedEnum.
+     */
+    int getPackedNestedEnumCount();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedNestedEnum at the given index.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getPackedNestedEnum(int index);
+
+    /**
+     * <pre>
+     * Unpacked
+     * </pre>
+     *
+     * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+     * @return A list containing the unpackedInt32.
+     */
+    java.util.List<java.lang.Integer> getUnpackedInt32List();
+    /**
+     * <pre>
+     * Unpacked
+     * </pre>
+     *
+     * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+     * @return The count of unpackedInt32.
+     */
+    int getUnpackedInt32Count();
+    /**
+     * <pre>
+     * Unpacked
+     * </pre>
+     *
+     * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedInt32 at the given index.
+     */
+    int getUnpackedInt32(int index);
+
+    /**
+     * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+     * @return A list containing the unpackedInt64.
+     */
+    java.util.List<java.lang.Long> getUnpackedInt64List();
+    /**
+     * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+     * @return The count of unpackedInt64.
+     */
+    int getUnpackedInt64Count();
+    /**
+     * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedInt64 at the given index.
+     */
+    long getUnpackedInt64(int index);
+
+    /**
+     * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+     * @return A list containing the unpackedUint32.
+     */
+    java.util.List<java.lang.Integer> getUnpackedUint32List();
+    /**
+     * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+     * @return The count of unpackedUint32.
+     */
+    int getUnpackedUint32Count();
+    /**
+     * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedUint32 at the given index.
+     */
+    int getUnpackedUint32(int index);
+
+    /**
+     * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+     * @return A list containing the unpackedUint64.
+     */
+    java.util.List<java.lang.Long> getUnpackedUint64List();
+    /**
+     * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+     * @return The count of unpackedUint64.
+     */
+    int getUnpackedUint64Count();
+    /**
+     * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedUint64 at the given index.
+     */
+    long getUnpackedUint64(int index);
+
+    /**
+     * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+     * @return A list containing the unpackedSint32.
+     */
+    java.util.List<java.lang.Integer> getUnpackedSint32List();
+    /**
+     * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+     * @return The count of unpackedSint32.
+     */
+    int getUnpackedSint32Count();
+    /**
+     * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedSint32 at the given index.
+     */
+    int getUnpackedSint32(int index);
+
+    /**
+     * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+     * @return A list containing the unpackedSint64.
+     */
+    java.util.List<java.lang.Long> getUnpackedSint64List();
+    /**
+     * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+     * @return The count of unpackedSint64.
+     */
+    int getUnpackedSint64Count();
+    /**
+     * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedSint64 at the given index.
+     */
+    long getUnpackedSint64(int index);
+
+    /**
+     * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+     * @return A list containing the unpackedFixed32.
+     */
+    java.util.List<java.lang.Integer> getUnpackedFixed32List();
+    /**
+     * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+     * @return The count of unpackedFixed32.
+     */
+    int getUnpackedFixed32Count();
+    /**
+     * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedFixed32 at the given index.
+     */
+    int getUnpackedFixed32(int index);
+
+    /**
+     * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+     * @return A list containing the unpackedFixed64.
+     */
+    java.util.List<java.lang.Long> getUnpackedFixed64List();
+    /**
+     * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+     * @return The count of unpackedFixed64.
+     */
+    int getUnpackedFixed64Count();
+    /**
+     * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedFixed64 at the given index.
+     */
+    long getUnpackedFixed64(int index);
+
+    /**
+     * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+     * @return A list containing the unpackedSfixed32.
+     */
+    java.util.List<java.lang.Integer> getUnpackedSfixed32List();
+    /**
+     * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+     * @return The count of unpackedSfixed32.
+     */
+    int getUnpackedSfixed32Count();
+    /**
+     * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedSfixed32 at the given index.
+     */
+    int getUnpackedSfixed32(int index);
+
+    /**
+     * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+     * @return A list containing the unpackedSfixed64.
+     */
+    java.util.List<java.lang.Long> getUnpackedSfixed64List();
+    /**
+     * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+     * @return The count of unpackedSfixed64.
+     */
+    int getUnpackedSfixed64Count();
+    /**
+     * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedSfixed64 at the given index.
+     */
+    long getUnpackedSfixed64(int index);
+
+    /**
+     * <code>repeated float unpacked_float = 99 [packed = false];</code>
+     * @return A list containing the unpackedFloat.
+     */
+    java.util.List<java.lang.Float> getUnpackedFloatList();
+    /**
+     * <code>repeated float unpacked_float = 99 [packed = false];</code>
+     * @return The count of unpackedFloat.
+     */
+    int getUnpackedFloatCount();
+    /**
+     * <code>repeated float unpacked_float = 99 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedFloat at the given index.
+     */
+    float getUnpackedFloat(int index);
+
+    /**
+     * <code>repeated double unpacked_double = 100 [packed = false];</code>
+     * @return A list containing the unpackedDouble.
+     */
+    java.util.List<java.lang.Double> getUnpackedDoubleList();
+    /**
+     * <code>repeated double unpacked_double = 100 [packed = false];</code>
+     * @return The count of unpackedDouble.
+     */
+    int getUnpackedDoubleCount();
+    /**
+     * <code>repeated double unpacked_double = 100 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedDouble at the given index.
+     */
+    double getUnpackedDouble(int index);
+
+    /**
+     * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+     * @return A list containing the unpackedBool.
+     */
+    java.util.List<java.lang.Boolean> getUnpackedBoolList();
+    /**
+     * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+     * @return The count of unpackedBool.
+     */
+    int getUnpackedBoolCount();
+    /**
+     * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedBool at the given index.
+     */
+    boolean getUnpackedBool(int index);
+
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+     * @return A list containing the unpackedNestedEnum.
+     */
+    java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> getUnpackedNestedEnumList();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+     * @return The count of unpackedNestedEnum.
+     */
+    int getUnpackedNestedEnumCount();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedNestedEnum at the given index.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getUnpackedNestedEnum(int index);
+
+    /**
+     * <pre>
+     * Map
+     * </pre>
+     *
+     * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+     */
+    int getMapInt32Int32Count();
+    /**
+     * <pre>
+     * Map
+     * </pre>
+     *
+     * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+     */
+    boolean containsMapInt32Int32(
+        int key);
+    /**
+     * Use {@link #getMapInt32Int32Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapInt32Int32();
+    /**
+     * <pre>
+     * Map
+     * </pre>
+     *
+     * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapInt32Int32Map();
+    /**
+     * <pre>
+     * Map
+     * </pre>
+     *
+     * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+     */
+    int getMapInt32Int32OrDefault(
+        int key,
+        int defaultValue);
+    /**
+     * <pre>
+     * Map
+     * </pre>
+     *
+     * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+     */
+    int getMapInt32Int32OrThrow(
+        int key);
+
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
+    int getMapInt64Int64Count();
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
+    boolean containsMapInt64Int64(
+        long key);
+    /**
+     * Use {@link #getMapInt64Int64Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapInt64Int64();
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapInt64Int64Map();
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
+    long getMapInt64Int64OrDefault(
+        long key,
+        long defaultValue);
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
+    long getMapInt64Int64OrThrow(
+        long key);
+
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
+    int getMapUint32Uint32Count();
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
+    boolean containsMapUint32Uint32(
+        int key);
+    /**
+     * Use {@link #getMapUint32Uint32Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapUint32Uint32();
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapUint32Uint32Map();
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
+    int getMapUint32Uint32OrDefault(
+        int key,
+        int defaultValue);
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
+    int getMapUint32Uint32OrThrow(
+        int key);
+
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
+    int getMapUint64Uint64Count();
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
+    boolean containsMapUint64Uint64(
+        long key);
+    /**
+     * Use {@link #getMapUint64Uint64Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapUint64Uint64();
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapUint64Uint64Map();
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
+    long getMapUint64Uint64OrDefault(
+        long key,
+        long defaultValue);
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
+    long getMapUint64Uint64OrThrow(
+        long key);
+
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
+    int getMapSint32Sint32Count();
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
+    boolean containsMapSint32Sint32(
+        int key);
+    /**
+     * Use {@link #getMapSint32Sint32Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapSint32Sint32();
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapSint32Sint32Map();
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
+    int getMapSint32Sint32OrDefault(
+        int key,
+        int defaultValue);
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
+    int getMapSint32Sint32OrThrow(
+        int key);
+
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
+    int getMapSint64Sint64Count();
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
+    boolean containsMapSint64Sint64(
+        long key);
+    /**
+     * Use {@link #getMapSint64Sint64Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapSint64Sint64();
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapSint64Sint64Map();
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
+    long getMapSint64Sint64OrDefault(
+        long key,
+        long defaultValue);
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
+    long getMapSint64Sint64OrThrow(
+        long key);
+
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
+    int getMapFixed32Fixed32Count();
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
+    boolean containsMapFixed32Fixed32(
+        int key);
+    /**
+     * Use {@link #getMapFixed32Fixed32Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapFixed32Fixed32();
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapFixed32Fixed32Map();
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
+    int getMapFixed32Fixed32OrDefault(
+        int key,
+        int defaultValue);
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
+    int getMapFixed32Fixed32OrThrow(
+        int key);
+
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
+    int getMapFixed64Fixed64Count();
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
+    boolean containsMapFixed64Fixed64(
+        long key);
+    /**
+     * Use {@link #getMapFixed64Fixed64Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapFixed64Fixed64();
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapFixed64Fixed64Map();
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
+    long getMapFixed64Fixed64OrDefault(
+        long key,
+        long defaultValue);
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
+    long getMapFixed64Fixed64OrThrow(
+        long key);
+
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    int getMapSfixed32Sfixed32Count();
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    boolean containsMapSfixed32Sfixed32(
+        int key);
+    /**
+     * Use {@link #getMapSfixed32Sfixed32Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapSfixed32Sfixed32();
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapSfixed32Sfixed32Map();
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    int getMapSfixed32Sfixed32OrDefault(
+        int key,
+        int defaultValue);
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    int getMapSfixed32Sfixed32OrThrow(
+        int key);
+
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    int getMapSfixed64Sfixed64Count();
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    boolean containsMapSfixed64Sfixed64(
+        long key);
+    /**
+     * Use {@link #getMapSfixed64Sfixed64Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapSfixed64Sfixed64();
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapSfixed64Sfixed64Map();
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    long getMapSfixed64Sfixed64OrDefault(
+        long key,
+        long defaultValue);
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    long getMapSfixed64Sfixed64OrThrow(
+        long key);
+
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    int getMapInt32FloatCount();
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    boolean containsMapInt32Float(
+        int key);
+    /**
+     * Use {@link #getMapInt32FloatMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Float>
+    getMapInt32Float();
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Float>
+    getMapInt32FloatMap();
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    float getMapInt32FloatOrDefault(
+        int key,
+        float defaultValue);
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    float getMapInt32FloatOrThrow(
+        int key);
+
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    int getMapInt32DoubleCount();
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    boolean containsMapInt32Double(
+        int key);
+    /**
+     * Use {@link #getMapInt32DoubleMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Double>
+    getMapInt32Double();
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Double>
+    getMapInt32DoubleMap();
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    double getMapInt32DoubleOrDefault(
+        int key,
+        double defaultValue);
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    double getMapInt32DoubleOrThrow(
+        int key);
+
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    int getMapBoolBoolCount();
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    boolean containsMapBoolBool(
+        boolean key);
+    /**
+     * Use {@link #getMapBoolBoolMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Boolean, java.lang.Boolean>
+    getMapBoolBool();
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    java.util.Map<java.lang.Boolean, java.lang.Boolean>
+    getMapBoolBoolMap();
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    boolean getMapBoolBoolOrDefault(
+        boolean key,
+        boolean defaultValue);
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    boolean getMapBoolBoolOrThrow(
+        boolean key);
+
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    int getMapStringStringCount();
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    boolean containsMapStringString(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringStringMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, java.lang.String>
+    getMapStringString();
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    java.util.Map<java.lang.String, java.lang.String>
+    getMapStringStringMap();
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    /* nullable */
+java.lang.String getMapStringStringOrDefault(
+        java.lang.String key,
+        /* nullable */
+java.lang.String defaultValue);
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    java.lang.String getMapStringStringOrThrow(
+        java.lang.String key);
+
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    int getMapStringBytesCount();
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    boolean containsMapStringBytes(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringBytesMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, com.google.protobuf.ByteString>
+    getMapStringBytes();
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    java.util.Map<java.lang.String, com.google.protobuf.ByteString>
+    getMapStringBytesMap();
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    /* nullable */
+com.google.protobuf.ByteString getMapStringBytesOrDefault(
+        java.lang.String key,
+        /* nullable */
+com.google.protobuf.ByteString defaultValue);
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    com.google.protobuf.ByteString getMapStringBytesOrThrow(
+        java.lang.String key);
+
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    int getMapStringNestedMessageCount();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    boolean containsMapStringNestedMessage(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringNestedMessageMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage>
+    getMapStringNestedMessage();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage>
+    getMapStringNestedMessageMap();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getMapStringNestedMessageOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage defaultValue);
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getMapStringNestedMessageOrThrow(
+        java.lang.String key);
+
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    int getMapStringForeignMessageCount();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    boolean containsMapStringForeignMessage(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringForeignMessageMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage>
+    getMapStringForeignMessage();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage>
+    getMapStringForeignMessageMap();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getMapStringForeignMessageOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage defaultValue);
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getMapStringForeignMessageOrThrow(
+        java.lang.String key);
+
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    int getMapStringNestedEnumCount();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    boolean containsMapStringNestedEnum(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringNestedEnumMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>
+    getMapStringNestedEnum();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>
+    getMapStringNestedEnumMap();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getMapStringNestedEnumOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum         defaultValue);
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getMapStringNestedEnumOrThrow(
+        java.lang.String key);
+
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    int getMapStringForeignEnumCount();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    boolean containsMapStringForeignEnum(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringForeignEnumMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum>
+    getMapStringForeignEnum();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum>
+    getMapStringForeignEnumMap();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getMapStringForeignEnumOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum         defaultValue);
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getMapStringForeignEnumOrThrow(
+        java.lang.String key);
+
+    /**
+     * <code>uint32 oneof_uint32 = 111;</code>
+     * @return Whether the oneofUint32 field is set.
+     */
+    boolean hasOneofUint32();
+    /**
+     * <code>uint32 oneof_uint32 = 111;</code>
+     * @return The oneofUint32.
+     */
+    int getOneofUint32();
+
+    /**
+     * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+     * @return Whether the oneofNestedMessage field is set.
+     */
+    boolean hasOneofNestedMessage();
+    /**
+     * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+     * @return The oneofNestedMessage.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getOneofNestedMessage();
+    /**
+     * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder getOneofNestedMessageOrBuilder();
+
+    /**
+     * <code>string oneof_string = 113;</code>
+     * @return Whether the oneofString field is set.
+     */
+    boolean hasOneofString();
+    /**
+     * <code>string oneof_string = 113;</code>
+     * @return The oneofString.
+     */
+    java.lang.String getOneofString();
+    /**
+     * <code>string oneof_string = 113;</code>
+     * @return The bytes for oneofString.
+     */
+    com.google.protobuf.ByteString
+        getOneofStringBytes();
+
+    /**
+     * <code>bytes oneof_bytes = 114;</code>
+     * @return Whether the oneofBytes field is set.
+     */
+    boolean hasOneofBytes();
+    /**
+     * <code>bytes oneof_bytes = 114;</code>
+     * @return The oneofBytes.
+     */
+    com.google.protobuf.ByteString getOneofBytes();
+
+    /**
+     * <code>bool oneof_bool = 115;</code>
+     * @return Whether the oneofBool field is set.
+     */
+    boolean hasOneofBool();
+    /**
+     * <code>bool oneof_bool = 115;</code>
+     * @return The oneofBool.
+     */
+    boolean getOneofBool();
+
+    /**
+     * <code>uint64 oneof_uint64 = 116;</code>
+     * @return Whether the oneofUint64 field is set.
+     */
+    boolean hasOneofUint64();
+    /**
+     * <code>uint64 oneof_uint64 = 116;</code>
+     * @return The oneofUint64.
+     */
+    long getOneofUint64();
+
+    /**
+     * <code>float oneof_float = 117;</code>
+     * @return Whether the oneofFloat field is set.
+     */
+    boolean hasOneofFloat();
+    /**
+     * <code>float oneof_float = 117;</code>
+     * @return The oneofFloat.
+     */
+    float getOneofFloat();
+
+    /**
+     * <code>double oneof_double = 118;</code>
+     * @return Whether the oneofDouble field is set.
+     */
+    boolean hasOneofDouble();
+    /**
+     * <code>double oneof_double = 118;</code>
+     * @return The oneofDouble.
+     */
+    double getOneofDouble();
+
+    /**
+     * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum oneof_enum = 119;</code>
+     * @return Whether the oneofEnum field is set.
+     */
+    boolean hasOneofEnum();
+    /**
+     * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum oneof_enum = 119;</code>
+     * @return The oneofEnum.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getOneofEnum();
+
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.OneofFieldCase getOneofFieldCase();
+  }
+  /**
+   * <pre>
+   * Proto2 version of TestMostTypesProto3
+   * </pre>
+   *
+   * Protobuf type {@code legacy_gencode_test.proto2.TestMostTypesProto2}
+   */
+  public static final class TestMostTypesProto2 extends
+      com.google.protobuf.GeneratedMessage.ExtendableMessage<
+        TestMostTypesProto2> implements
+      // @@protoc_insertion_point(message_implements:legacy_gencode_test.proto2.TestMostTypesProto2)
+      TestMostTypesProto2OrBuilder {
+  private static final long serialVersionUID = 0L;
+    static {
+      com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
+        com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+        /* major= */ 4,
+        /* minor= */ 26,
+        /* patch= */ 0,
+        /* suffix= */ "",
+        TestMostTypesProto2.class.getName());
+    }
+    // Use TestMostTypesProto2.newBuilder() to construct.
+    private TestMostTypesProto2(com.google.protobuf.GeneratedMessage.ExtendableBuilder<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2, ?> builder) {
+      super(builder);
+    }
+    private TestMostTypesProto2() {
+      optionalString_ = "";
+      optionalBytes_ = com.google.protobuf.ByteString.EMPTY;
+      optionalNestedEnum_ = 0;
+      optionalForeignEnum_ = 0;
+      optionalAliasedEnum_ = 0;
+      repeatedInt32_ = emptyIntList();
+      repeatedInt64_ = emptyLongList();
+      repeatedUint32_ = emptyIntList();
+      repeatedUint64_ = emptyLongList();
+      repeatedSint32_ = emptyIntList();
+      repeatedSint64_ = emptyLongList();
+      repeatedFixed32_ = emptyIntList();
+      repeatedFixed64_ = emptyLongList();
+      repeatedSfixed32_ = emptyIntList();
+      repeatedSfixed64_ = emptyLongList();
+      repeatedFloat_ = emptyFloatList();
+      repeatedDouble_ = emptyDoubleList();
+      repeatedBool_ = emptyBooleanList();
+      repeatedString_ =
+          com.google.protobuf.LazyStringArrayList.emptyList();
+      repeatedBytes_ = emptyList(com.google.protobuf.ByteString.class);
+      repeatedNestedMessage_ = java.util.Collections.emptyList();
+      repeatedForeignMessage_ = java.util.Collections.emptyList();
+      repeatedNestedEnum_ = java.util.Collections.emptyList();
+      repeatedForeignEnum_ = java.util.Collections.emptyList();
+      packedInt32_ = emptyIntList();
+      packedInt64_ = emptyLongList();
+      packedUint32_ = emptyIntList();
+      packedUint64_ = emptyLongList();
+      packedSint32_ = emptyIntList();
+      packedSint64_ = emptyLongList();
+      packedFixed32_ = emptyIntList();
+      packedFixed64_ = emptyLongList();
+      packedSfixed32_ = emptyIntList();
+      packedSfixed64_ = emptyLongList();
+      packedFloat_ = emptyFloatList();
+      packedDouble_ = emptyDoubleList();
+      packedBool_ = emptyBooleanList();
+      packedNestedEnum_ = java.util.Collections.emptyList();
+      unpackedInt32_ = emptyIntList();
+      unpackedInt64_ = emptyLongList();
+      unpackedUint32_ = emptyIntList();
+      unpackedUint64_ = emptyLongList();
+      unpackedSint32_ = emptyIntList();
+      unpackedSint64_ = emptyLongList();
+      unpackedFixed32_ = emptyIntList();
+      unpackedFixed64_ = emptyLongList();
+      unpackedSfixed32_ = emptyIntList();
+      unpackedSfixed64_ = emptyLongList();
+      unpackedFloat_ = emptyFloatList();
+      unpackedDouble_ = emptyDoubleList();
+      unpackedBool_ = emptyBooleanList();
+      unpackedNestedEnum_ = java.util.Collections.emptyList();
+    }
+
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor;
+    }
+
+    @SuppressWarnings({"rawtypes"})
+    @java.lang.Override
+    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
+        int number) {
+      switch (number) {
+        case 56:
+          return internalGetMapInt32Int32();
+        case 57:
+          return internalGetMapInt64Int64();
+        case 58:
+          return internalGetMapUint32Uint32();
+        case 59:
+          return internalGetMapUint64Uint64();
+        case 60:
+          return internalGetMapSint32Sint32();
+        case 61:
+          return internalGetMapSint64Sint64();
+        case 62:
+          return internalGetMapFixed32Fixed32();
+        case 63:
+          return internalGetMapFixed64Fixed64();
+        case 64:
+          return internalGetMapSfixed32Sfixed32();
+        case 65:
+          return internalGetMapSfixed64Sfixed64();
+        case 66:
+          return internalGetMapInt32Float();
+        case 67:
+          return internalGetMapInt32Double();
+        case 68:
+          return internalGetMapBoolBool();
+        case 69:
+          return internalGetMapStringString();
+        case 70:
+          return internalGetMapStringBytes();
+        case 71:
+          return internalGetMapStringNestedMessage();
+        case 72:
+          return internalGetMapStringForeignMessage();
+        case 73:
+          return internalGetMapStringNestedEnum();
+        case 74:
+          return internalGetMapStringForeignEnum();
+        default:
+          throw new RuntimeException(
+              "Invalid map field number: " + number);
+      }
+    }
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.class, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder.class);
+    }
+
+    /**
+     * Protobuf enum {@code legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum}
+     */
+    public enum NestedEnum
+        implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * <code>FOO = 0;</code>
+       */
+      FOO(0),
+      /**
+       * <code>BAR = 1;</code>
+       */
+      BAR(1),
+      /**
+       * <code>BAZ = 2;</code>
+       */
+      BAZ(2),
+      /**
+       * <code>NEG = -1;</code>
+       */
+      NEG(-1),
+      ;
+
+      static {
+        com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
+          com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+          /* major= */ 4,
+          /* minor= */ 26,
+          /* patch= */ 0,
+          /* suffix= */ "",
+          NestedEnum.class.getName());
+      }
+      /**
+       * <code>FOO = 0;</code>
+       */
+      public static final int FOO_VALUE = 0;
+      /**
+       * <code>BAR = 1;</code>
+       */
+      public static final int BAR_VALUE = 1;
+      /**
+       * <code>BAZ = 2;</code>
+       */
+      public static final int BAZ_VALUE = 2;
+      /**
+       * <code>NEG = -1;</code>
+       */
+      public static final int NEG_VALUE = -1;
+
+
+      public final int getNumber() {
+        return value;
+      }
+
+      /**
+       * @param value The numeric wire value of the corresponding enum entry.
+       * @return The enum associated with the given numeric wire value.
+       * @deprecated Use {@link #forNumber(int)} instead.
+       */
+      @java.lang.Deprecated
+      public static NestedEnum valueOf(int value) {
+        return forNumber(value);
+      }
+
+      /**
+       * @param value The numeric wire value of the corresponding enum entry.
+       * @return The enum associated with the given numeric wire value.
+       */
+      public static NestedEnum forNumber(int value) {
+        switch (value) {
+          case 0: return FOO;
+          case 1: return BAR;
+          case 2: return BAZ;
+          case -1: return NEG;
+          default: return null;
+        }
+      }
+
+      public static com.google.protobuf.Internal.EnumLiteMap<NestedEnum>
+          internalGetValueMap() {
+        return internalValueMap;
+      }
+      private static final com.google.protobuf.Internal.EnumLiteMap<
+          NestedEnum> internalValueMap =
+            new com.google.protobuf.Internal.EnumLiteMap<NestedEnum>() {
+              public NestedEnum findValueByNumber(int number) {
+                return NestedEnum.forNumber(number);
+              }
+            };
+
+      public final com.google.protobuf.Descriptors.EnumValueDescriptor
+          getValueDescriptor() {
+        return getDescriptor().getValues().get(ordinal());
+      }
+      public final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptorForType() {
+        return getDescriptor();
+      }
+      public static final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDescriptor().getEnumTypes().get(0);
+      }
+
+      private static final NestedEnum[] VALUES = values();
+
+      public static NestedEnum valueOf(
+          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+        if (desc.getType() != getDescriptor()) {
+          throw new java.lang.IllegalArgumentException(
+            "EnumValueDescriptor is not for this type.");
+        }
+        return VALUES[desc.getIndex()];
+      }
+
+      private final int value;
+
+      private NestedEnum(int value) {
+        this.value = value;
+      }
+
+      // @@protoc_insertion_point(enum_scope:legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum)
+    }
+
+    /**
+     * Protobuf enum {@code legacy_gencode_test.proto2.TestMostTypesProto2.AliasedEnum}
+     */
+    public enum AliasedEnum
+        implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * <code>ALIAS_FOO = 0;</code>
+       */
+      ALIAS_FOO(0),
+      /**
+       * <code>ALIAS_BAR = 1;</code>
+       */
+      ALIAS_BAR(1),
+      /**
+       * <code>ALIAS_BAZ = 2;</code>
+       */
+      ALIAS_BAZ(2),
+      ;
+
+      static {
+        com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
+          com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+          /* major= */ 4,
+          /* minor= */ 26,
+          /* patch= */ 0,
+          /* suffix= */ "",
+          AliasedEnum.class.getName());
+      }
+      /**
+       * <code>MOO = 2;</code>
+       */
+      public static final AliasedEnum MOO = ALIAS_BAZ;
+      /**
+       * <code>moo = 2;</code>
+       */
+      public static final AliasedEnum moo = ALIAS_BAZ;
+      /**
+       * <code>bAz = 2;</code>
+       */
+      public static final AliasedEnum bAz = ALIAS_BAZ;
+      /**
+       * <code>ALIAS_FOO = 0;</code>
+       */
+      public static final int ALIAS_FOO_VALUE = 0;
+      /**
+       * <code>ALIAS_BAR = 1;</code>
+       */
+      public static final int ALIAS_BAR_VALUE = 1;
+      /**
+       * <code>ALIAS_BAZ = 2;</code>
+       */
+      public static final int ALIAS_BAZ_VALUE = 2;
+      /**
+       * <code>MOO = 2;</code>
+       */
+      public static final int MOO_VALUE = 2;
+      /**
+       * <code>moo = 2;</code>
+       */
+      public static final int moo_VALUE = 2;
+      /**
+       * <code>bAz = 2;</code>
+       */
+      public static final int bAz_VALUE = 2;
+
+
+      public final int getNumber() {
+        return value;
+      }
+
+      /**
+       * @param value The numeric wire value of the corresponding enum entry.
+       * @return The enum associated with the given numeric wire value.
+       * @deprecated Use {@link #forNumber(int)} instead.
+       */
+      @java.lang.Deprecated
+      public static AliasedEnum valueOf(int value) {
+        return forNumber(value);
+      }
+
+      /**
+       * @param value The numeric wire value of the corresponding enum entry.
+       * @return The enum associated with the given numeric wire value.
+       */
+      public static AliasedEnum forNumber(int value) {
+        switch (value) {
+          case 0: return ALIAS_FOO;
+          case 1: return ALIAS_BAR;
+          case 2: return ALIAS_BAZ;
+          default: return null;
+        }
+      }
+
+      public static com.google.protobuf.Internal.EnumLiteMap<AliasedEnum>
+          internalGetValueMap() {
+        return internalValueMap;
+      }
+      private static final com.google.protobuf.Internal.EnumLiteMap<
+          AliasedEnum> internalValueMap =
+            new com.google.protobuf.Internal.EnumLiteMap<AliasedEnum>() {
+              public AliasedEnum findValueByNumber(int number) {
+                return AliasedEnum.forNumber(number);
+              }
+            };
+
+      public final com.google.protobuf.Descriptors.EnumValueDescriptor
+          getValueDescriptor() {
+        return getDescriptor().getValues().get(ordinal());
+      }
+      public final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptorForType() {
+        return getDescriptor();
+      }
+      public static final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDescriptor().getEnumTypes().get(1);
+      }
+
+      private static final AliasedEnum[] VALUES = getStaticValuesArray();
+      private static AliasedEnum[] getStaticValuesArray() {
+        return new AliasedEnum[] {
+        ALIAS_FOO, ALIAS_BAR, ALIAS_BAZ, MOO, moo, bAz, 
+        };
+      }
+      public static AliasedEnum valueOf(
+          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+        if (desc.getType() != getDescriptor()) {
+          throw new java.lang.IllegalArgumentException(
+            "EnumValueDescriptor is not for this type.");
+        }
+        return VALUES[desc.getIndex()];
+      }
+
+      private final int value;
+
+      private AliasedEnum(int value) {
+        this.value = value;
+      }
+
+      // @@protoc_insertion_point(enum_scope:legacy_gencode_test.proto2.TestMostTypesProto2.AliasedEnum)
+    }
+
+    public interface NestedMessageOrBuilder extends
+        // @@protoc_insertion_point(interface_extends:legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage)
+        com.google.protobuf.MessageOrBuilder {
+
+      /**
+       * <code>optional int32 a = 1;</code>
+       * @return Whether the a field is set.
+       */
+      boolean hasA();
+      /**
+       * <code>optional int32 a = 1;</code>
+       * @return The a.
+       */
+      int getA();
+
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+       * @return Whether the corecursive field is set.
+       */
+      boolean hasCorecursive();
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+       * @return The corecursive.
+       */
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 getCorecursive();
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+       */
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder getCorecursiveOrBuilder();
+    }
+    /**
+     * Protobuf type {@code legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage}
+     */
+    public static final class NestedMessage extends
+        com.google.protobuf.GeneratedMessage implements
+        // @@protoc_insertion_point(message_implements:legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage)
+        NestedMessageOrBuilder {
+    private static final long serialVersionUID = 0L;
+      static {
+        com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
+          com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+          /* major= */ 4,
+          /* minor= */ 26,
+          /* patch= */ 0,
+          /* suffix= */ "",
+          NestedMessage.class.getName());
+      }
+      // Use NestedMessage.newBuilder() to construct.
+      private NestedMessage(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+        super(builder);
+      }
+      private NestedMessage() {
+      }
+
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_NestedMessage_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_NestedMessage_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.class, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder.class);
+      }
+
+      private int bitField0_;
+      public static final int A_FIELD_NUMBER = 1;
+      private int a_ = 0;
+      /**
+       * <code>optional int32 a = 1;</code>
+       * @return Whether the a field is set.
+       */
+      @java.lang.Override
+      public boolean hasA() {
+        return ((bitField0_ & 0x00000001) != 0);
+      }
+      /**
+       * <code>optional int32 a = 1;</code>
+       * @return The a.
+       */
+      @java.lang.Override
+      public int getA() {
+        return a_;
+      }
+
+      public static final int CORECURSIVE_FIELD_NUMBER = 2;
+      private legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 corecursive_;
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+       * @return Whether the corecursive field is set.
+       */
+      @java.lang.Override
+      public boolean hasCorecursive() {
+        return ((bitField0_ & 0x00000002) != 0);
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+       * @return The corecursive.
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 getCorecursive() {
+        return corecursive_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance() : corecursive_;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder getCorecursiveOrBuilder() {
+        return corecursive_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance() : corecursive_;
+      }
+
+      private byte memoizedIsInitialized = -1;
+      @java.lang.Override
+      public final boolean isInitialized() {
+        byte isInitialized = memoizedIsInitialized;
+        if (isInitialized == 1) return true;
+        if (isInitialized == 0) return false;
+
+        if (hasCorecursive()) {
+          if (!getCorecursive().isInitialized()) {
+            memoizedIsInitialized = 0;
+            return false;
+          }
+        }
+        memoizedIsInitialized = 1;
+        return true;
+      }
+
+      @java.lang.Override
+      public void writeTo(com.google.protobuf.CodedOutputStream output)
+                          throws java.io.IOException {
+        if (((bitField0_ & 0x00000001) != 0)) {
+          output.writeInt32(1, a_);
+        }
+        if (((bitField0_ & 0x00000002) != 0)) {
+          output.writeMessage(2, getCorecursive());
+        }
+        getUnknownFields().writeTo(output);
+      }
+
+      @java.lang.Override
+      public int getSerializedSize() {
+        int size = memoizedSize;
+        if (size != -1) return size;
+
+        size = 0;
+        if (((bitField0_ & 0x00000001) != 0)) {
+          size += com.google.protobuf.CodedOutputStream
+            .computeInt32Size(1, a_);
+        }
+        if (((bitField0_ & 0x00000002) != 0)) {
+          size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(2, getCorecursive());
+        }
+        size += getUnknownFields().getSerializedSize();
+        memoizedSize = size;
+        return size;
+      }
+
+      @java.lang.Override
+      public boolean equals(final java.lang.Object obj) {
+        if (obj == this) {
+         return true;
+        }
+        if (!(obj instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage)) {
+          return super.equals(obj);
+        }
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage other = (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) obj;
+
+        if (hasA() != other.hasA()) return false;
+        if (hasA()) {
+          if (getA()
+              != other.getA()) return false;
+        }
+        if (hasCorecursive() != other.hasCorecursive()) return false;
+        if (hasCorecursive()) {
+          if (!getCorecursive()
+              .equals(other.getCorecursive())) return false;
+        }
+        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+        return true;
+      }
+
+      @java.lang.Override
+      public int hashCode() {
+        if (memoizedHashCode != 0) {
+          return memoizedHashCode;
+        }
+        int hash = 41;
+        hash = (19 * hash) + getDescriptor().hashCode();
+        if (hasA()) {
+          hash = (37 * hash) + A_FIELD_NUMBER;
+          hash = (53 * hash) + getA();
+        }
+        if (hasCorecursive()) {
+          hash = (37 * hash) + CORECURSIVE_FIELD_NUMBER;
+          hash = (53 * hash) + getCorecursive().hashCode();
+        }
+        hash = (29 * hash) + getUnknownFields().hashCode();
+        memoizedHashCode = hash;
+        return hash;
+      }
+
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseFrom(
+          java.nio.ByteBuffer data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data);
+      }
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseFrom(
+          java.nio.ByteBuffer data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data, extensionRegistry);
+      }
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseFrom(
+          com.google.protobuf.ByteString data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data);
+      }
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseFrom(
+          com.google.protobuf.ByteString data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data, extensionRegistry);
+      }
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseFrom(byte[] data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data);
+      }
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseFrom(
+          byte[] data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data, extensionRegistry);
+      }
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseFrom(java.io.InputStream input)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessage
+            .parseWithIOException(PARSER, input);
+      }
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseFrom(
+          java.io.InputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessage
+            .parseWithIOException(PARSER, input, extensionRegistry);
+      }
+
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseDelimitedFrom(java.io.InputStream input)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessage
+            .parseDelimitedWithIOException(PARSER, input);
+      }
+
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseDelimitedFrom(
+          java.io.InputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessage
+            .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+      }
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseFrom(
+          com.google.protobuf.CodedInputStream input)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessage
+            .parseWithIOException(PARSER, input);
+      }
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessage
+            .parseWithIOException(PARSER, input, extensionRegistry);
+      }
+
+      @java.lang.Override
+      public Builder newBuilderForType() { return newBuilder(); }
+      public static Builder newBuilder() {
+        return DEFAULT_INSTANCE.toBuilder();
+      }
+      public static Builder newBuilder(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage prototype) {
+        return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+      }
+      @java.lang.Override
+      public Builder toBuilder() {
+        return this == DEFAULT_INSTANCE
+            ? new Builder() : new Builder().mergeFrom(this);
+      }
+
+      @java.lang.Override
+      protected Builder newBuilderForType(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        Builder builder = new Builder(parent);
+        return builder;
+      }
+      /**
+       * Protobuf type {@code legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage}
+       */
+      public static final class Builder extends
+          com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+          // @@protoc_insertion_point(builder_implements:legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage)
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder {
+        public static final com.google.protobuf.Descriptors.Descriptor
+            getDescriptor() {
+          return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_NestedMessage_descriptor;
+        }
+
+        @java.lang.Override
+        protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+            internalGetFieldAccessorTable() {
+          return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_NestedMessage_fieldAccessorTable
+              .ensureFieldAccessorsInitialized(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.class, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder.class);
+        }
+
+        // Construct using legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.newBuilder()
+        private Builder() {
+          maybeForceBuilderInitialization();
+        }
+
+        private Builder(
+            com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          super(parent);
+          maybeForceBuilderInitialization();
+        }
+        private void maybeForceBuilderInitialization() {
+          if (com.google.protobuf.GeneratedMessage
+                  .alwaysUseFieldBuilders) {
+            getCorecursiveFieldBuilder();
+          }
+        }
+        @java.lang.Override
+        public Builder clear() {
+          super.clear();
+          bitField0_ = 0;
+          a_ = 0;
+          corecursive_ = null;
+          if (corecursiveBuilder_ != null) {
+            corecursiveBuilder_.dispose();
+            corecursiveBuilder_ = null;
+          }
+          return this;
+        }
+
+        @java.lang.Override
+        public com.google.protobuf.Descriptors.Descriptor
+            getDescriptorForType() {
+          return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_NestedMessage_descriptor;
+        }
+
+        @java.lang.Override
+        public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getDefaultInstanceForType() {
+          return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance();
+        }
+
+        @java.lang.Override
+        public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage build() {
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage result = buildPartial();
+          if (!result.isInitialized()) {
+            throw newUninitializedMessageException(result);
+          }
+          return result;
+        }
+
+        @java.lang.Override
+        public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage buildPartial() {
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage result = new legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage(this);
+          if (bitField0_ != 0) { buildPartial0(result); }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartial0(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage result) {
+          int from_bitField0_ = bitField0_;
+          int to_bitField0_ = 0;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.a_ = a_;
+            to_bitField0_ |= 0x00000001;
+          }
+          if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.corecursive_ = corecursiveBuilder_ == null
+                ? corecursive_
+                : corecursiveBuilder_.build();
+            to_bitField0_ |= 0x00000002;
+          }
+          result.bitField0_ |= to_bitField0_;
+        }
+
+        @java.lang.Override
+        public Builder mergeFrom(com.google.protobuf.Message other) {
+          if (other instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) {
+            return mergeFrom((legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage)other);
+          } else {
+            super.mergeFrom(other);
+            return this;
+          }
+        }
+
+        public Builder mergeFrom(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage other) {
+          if (other == legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance()) return this;
+          if (other.hasA()) {
+            setA(other.getA());
+          }
+          if (other.hasCorecursive()) {
+            mergeCorecursive(other.getCorecursive());
+          }
+          this.mergeUnknownFields(other.getUnknownFields());
+          onChanged();
+          return this;
+        }
+
+        @java.lang.Override
+        public final boolean isInitialized() {
+          if (hasCorecursive()) {
+            if (!getCorecursive().isInitialized()) {
+              return false;
+            }
+          }
+          return true;
+        }
+
+        @java.lang.Override
+        public Builder mergeFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+          if (extensionRegistry == null) {
+            throw new java.lang.NullPointerException();
+          }
+          try {
+            boolean done = false;
+            while (!done) {
+              int tag = input.readTag();
+              switch (tag) {
+                case 0:
+                  done = true;
+                  break;
+                case 8: {
+                  a_ = input.readInt32();
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 8
+                case 18: {
+                  input.readMessage(
+                      getCorecursiveFieldBuilder().getBuilder(),
+                      extensionRegistry);
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 18
+                default: {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+              } // switch (tag)
+            } // while (!done)
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.unwrapIOException();
+          } finally {
+            onChanged();
+          } // finally
+          return this;
+        }
+        private int bitField0_;
+
+        private int a_ ;
+        /**
+         * <code>optional int32 a = 1;</code>
+         * @return Whether the a field is set.
+         */
+        @java.lang.Override
+        public boolean hasA() {
+          return ((bitField0_ & 0x00000001) != 0);
+        }
+        /**
+         * <code>optional int32 a = 1;</code>
+         * @return The a.
+         */
+        @java.lang.Override
+        public int getA() {
+          return a_;
+        }
+        /**
+         * <code>optional int32 a = 1;</code>
+         * @param value The a to set.
+         * @return This builder for chaining.
+         */
+        public Builder setA(int value) {
+
+          a_ = value;
+          bitField0_ |= 0x00000001;
+          onChanged();
+          return this;
+        }
+        /**
+         * <code>optional int32 a = 1;</code>
+         * @return This builder for chaining.
+         */
+        public Builder clearA() {
+          bitField0_ = (bitField0_ & ~0x00000001);
+          a_ = 0;
+          onChanged();
+          return this;
+        }
+
+        private legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 corecursive_;
+        private com.google.protobuf.SingleFieldBuilder<
+            legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder> corecursiveBuilder_;
+        /**
+         * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+         * @return Whether the corecursive field is set.
+         */
+        public boolean hasCorecursive() {
+          return ((bitField0_ & 0x00000002) != 0);
+        }
+        /**
+         * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+         * @return The corecursive.
+         */
+        public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 getCorecursive() {
+          if (corecursiveBuilder_ == null) {
+            return corecursive_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance() : corecursive_;
+          } else {
+            return corecursiveBuilder_.getMessage();
+          }
+        }
+        /**
+         * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+         */
+        public Builder setCorecursive(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 value) {
+          if (corecursiveBuilder_ == null) {
+            if (value == null) {
+              throw new NullPointerException();
+            }
+            corecursive_ = value;
+          } else {
+            corecursiveBuilder_.setMessage(value);
+          }
+          bitField0_ |= 0x00000002;
+          onChanged();
+          return this;
+        }
+        /**
+         * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+         */
+        public Builder setCorecursive(
+            legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder builderForValue) {
+          if (corecursiveBuilder_ == null) {
+            corecursive_ = builderForValue.build();
+          } else {
+            corecursiveBuilder_.setMessage(builderForValue.build());
+          }
+          bitField0_ |= 0x00000002;
+          onChanged();
+          return this;
+        }
+        /**
+         * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+         */
+        public Builder mergeCorecursive(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 value) {
+          if (corecursiveBuilder_ == null) {
+            if (((bitField0_ & 0x00000002) != 0) &&
+              corecursive_ != null &&
+              corecursive_ != legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance()) {
+              getCorecursiveBuilder().mergeFrom(value);
+            } else {
+              corecursive_ = value;
+            }
+          } else {
+            corecursiveBuilder_.mergeFrom(value);
+          }
+          if (corecursive_ != null) {
+            bitField0_ |= 0x00000002;
+            onChanged();
+          }
+          return this;
+        }
+        /**
+         * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+         */
+        public Builder clearCorecursive() {
+          bitField0_ = (bitField0_ & ~0x00000002);
+          corecursive_ = null;
+          if (corecursiveBuilder_ != null) {
+            corecursiveBuilder_.dispose();
+            corecursiveBuilder_ = null;
+          }
+          onChanged();
+          return this;
+        }
+        /**
+         * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+         */
+        public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder getCorecursiveBuilder() {
+          bitField0_ |= 0x00000002;
+          onChanged();
+          return getCorecursiveFieldBuilder().getBuilder();
+        }
+        /**
+         * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+         */
+        public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder getCorecursiveOrBuilder() {
+          if (corecursiveBuilder_ != null) {
+            return corecursiveBuilder_.getMessageOrBuilder();
+          } else {
+            return corecursive_ == null ?
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance() : corecursive_;
+          }
+        }
+        /**
+         * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+         */
+        private com.google.protobuf.SingleFieldBuilder<
+            legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder> 
+            getCorecursiveFieldBuilder() {
+          if (corecursiveBuilder_ == null) {
+            corecursiveBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder>(
+                    getCorecursive(),
+                    getParentForChildren(),
+                    isClean());
+            corecursive_ = null;
+          }
+          return corecursiveBuilder_;
+        }
+
+        // @@protoc_insertion_point(builder_scope:legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage)
+      }
+
+      // @@protoc_insertion_point(class_scope:legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage)
+      private static final legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage DEFAULT_INSTANCE;
+      static {
+        DEFAULT_INSTANCE = new legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage();
+      }
+
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getDefaultInstance() {
+        return DEFAULT_INSTANCE;
+      }
+
+      private static final com.google.protobuf.Parser<NestedMessage>
+          PARSER = new com.google.protobuf.AbstractParser<NestedMessage>() {
+        @java.lang.Override
+        public NestedMessage parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
+        }
+      };
+
+      public static com.google.protobuf.Parser<NestedMessage> parser() {
+        return PARSER;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Parser<NestedMessage> getParserForType() {
+        return PARSER;
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getDefaultInstanceForType() {
+        return DEFAULT_INSTANCE;
+      }
+
+    }
+
+    private int bitField0_;
+    private int oneofFieldCase_ = 0;
+    @SuppressWarnings("serial")
+    private java.lang.Object oneofField_;
+    public enum OneofFieldCase
+        implements com.google.protobuf.Internal.EnumLite,
+            com.google.protobuf.AbstractMessage.InternalOneOfEnum {
+      ONEOF_UINT32(111),
+      ONEOF_NESTED_MESSAGE(112),
+      ONEOF_STRING(113),
+      ONEOF_BYTES(114),
+      ONEOF_BOOL(115),
+      ONEOF_UINT64(116),
+      ONEOF_FLOAT(117),
+      ONEOF_DOUBLE(118),
+      ONEOF_ENUM(119),
+      ONEOFFIELD_NOT_SET(0);
+      private final int value;
+      private OneofFieldCase(int value) {
+        this.value = value;
+      }
+      /**
+       * @param value The number of the enum to look for.
+       * @return The enum associated with the given number.
+       * @deprecated Use {@link #forNumber(int)} instead.
+       */
+      @java.lang.Deprecated
+      public static OneofFieldCase valueOf(int value) {
+        return forNumber(value);
+      }
+
+      public static OneofFieldCase forNumber(int value) {
+        switch (value) {
+          case 111: return ONEOF_UINT32;
+          case 112: return ONEOF_NESTED_MESSAGE;
+          case 113: return ONEOF_STRING;
+          case 114: return ONEOF_BYTES;
+          case 115: return ONEOF_BOOL;
+          case 116: return ONEOF_UINT64;
+          case 117: return ONEOF_FLOAT;
+          case 118: return ONEOF_DOUBLE;
+          case 119: return ONEOF_ENUM;
+          case 0: return ONEOFFIELD_NOT_SET;
+          default: return null;
+        }
+      }
+      public int getNumber() {
+        return this.value;
+      }
+    };
+
+    public OneofFieldCase
+    getOneofFieldCase() {
+      return OneofFieldCase.forNumber(
+          oneofFieldCase_);
+    }
+
+    public static final int OPTIONAL_INT32_FIELD_NUMBER = 1;
+    private int optionalInt32_ = 0;
+    /**
+     * <code>optional int32 optional_int32 = 1;</code>
+     * @return Whether the optionalInt32 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalInt32() {
+      return ((bitField0_ & 0x00000001) != 0);
+    }
+    /**
+     * <code>optional int32 optional_int32 = 1;</code>
+     * @return The optionalInt32.
+     */
+    @java.lang.Override
+    public int getOptionalInt32() {
+      return optionalInt32_;
+    }
+
+    public static final int OPTIONAL_INT64_FIELD_NUMBER = 2;
+    private long optionalInt64_ = 0L;
+    /**
+     * <code>optional int64 optional_int64 = 2;</code>
+     * @return Whether the optionalInt64 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalInt64() {
+      return ((bitField0_ & 0x00000002) != 0);
+    }
+    /**
+     * <code>optional int64 optional_int64 = 2;</code>
+     * @return The optionalInt64.
+     */
+    @java.lang.Override
+    public long getOptionalInt64() {
+      return optionalInt64_;
+    }
+
+    public static final int OPTIONAL_UINT32_FIELD_NUMBER = 3;
+    private int optionalUint32_ = 0;
+    /**
+     * <code>optional uint32 optional_uint32 = 3;</code>
+     * @return Whether the optionalUint32 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalUint32() {
+      return ((bitField0_ & 0x00000004) != 0);
+    }
+    /**
+     * <code>optional uint32 optional_uint32 = 3;</code>
+     * @return The optionalUint32.
+     */
+    @java.lang.Override
+    public int getOptionalUint32() {
+      return optionalUint32_;
+    }
+
+    public static final int OPTIONAL_UINT64_FIELD_NUMBER = 4;
+    private long optionalUint64_ = 0L;
+    /**
+     * <code>optional uint64 optional_uint64 = 4;</code>
+     * @return Whether the optionalUint64 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalUint64() {
+      return ((bitField0_ & 0x00000008) != 0);
+    }
+    /**
+     * <code>optional uint64 optional_uint64 = 4;</code>
+     * @return The optionalUint64.
+     */
+    @java.lang.Override
+    public long getOptionalUint64() {
+      return optionalUint64_;
+    }
+
+    public static final int OPTIONAL_SINT32_FIELD_NUMBER = 5;
+    private int optionalSint32_ = 0;
+    /**
+     * <code>optional sint32 optional_sint32 = 5;</code>
+     * @return Whether the optionalSint32 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalSint32() {
+      return ((bitField0_ & 0x00000010) != 0);
+    }
+    /**
+     * <code>optional sint32 optional_sint32 = 5;</code>
+     * @return The optionalSint32.
+     */
+    @java.lang.Override
+    public int getOptionalSint32() {
+      return optionalSint32_;
+    }
+
+    public static final int OPTIONAL_SINT64_FIELD_NUMBER = 6;
+    private long optionalSint64_ = 0L;
+    /**
+     * <code>optional sint64 optional_sint64 = 6;</code>
+     * @return Whether the optionalSint64 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalSint64() {
+      return ((bitField0_ & 0x00000020) != 0);
+    }
+    /**
+     * <code>optional sint64 optional_sint64 = 6;</code>
+     * @return The optionalSint64.
+     */
+    @java.lang.Override
+    public long getOptionalSint64() {
+      return optionalSint64_;
+    }
+
+    public static final int OPTIONAL_FIXED32_FIELD_NUMBER = 7;
+    private int optionalFixed32_ = 0;
+    /**
+     * <code>optional fixed32 optional_fixed32 = 7;</code>
+     * @return Whether the optionalFixed32 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalFixed32() {
+      return ((bitField0_ & 0x00000040) != 0);
+    }
+    /**
+     * <code>optional fixed32 optional_fixed32 = 7;</code>
+     * @return The optionalFixed32.
+     */
+    @java.lang.Override
+    public int getOptionalFixed32() {
+      return optionalFixed32_;
+    }
+
+    public static final int OPTIONAL_FIXED64_FIELD_NUMBER = 8;
+    private long optionalFixed64_ = 0L;
+    /**
+     * <code>optional fixed64 optional_fixed64 = 8;</code>
+     * @return Whether the optionalFixed64 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalFixed64() {
+      return ((bitField0_ & 0x00000080) != 0);
+    }
+    /**
+     * <code>optional fixed64 optional_fixed64 = 8;</code>
+     * @return The optionalFixed64.
+     */
+    @java.lang.Override
+    public long getOptionalFixed64() {
+      return optionalFixed64_;
+    }
+
+    public static final int OPTIONAL_SFIXED32_FIELD_NUMBER = 9;
+    private int optionalSfixed32_ = 0;
+    /**
+     * <code>optional sfixed32 optional_sfixed32 = 9;</code>
+     * @return Whether the optionalSfixed32 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalSfixed32() {
+      return ((bitField0_ & 0x00000100) != 0);
+    }
+    /**
+     * <code>optional sfixed32 optional_sfixed32 = 9;</code>
+     * @return The optionalSfixed32.
+     */
+    @java.lang.Override
+    public int getOptionalSfixed32() {
+      return optionalSfixed32_;
+    }
+
+    public static final int OPTIONAL_SFIXED64_FIELD_NUMBER = 10;
+    private long optionalSfixed64_ = 0L;
+    /**
+     * <code>optional sfixed64 optional_sfixed64 = 10;</code>
+     * @return Whether the optionalSfixed64 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalSfixed64() {
+      return ((bitField0_ & 0x00000200) != 0);
+    }
+    /**
+     * <code>optional sfixed64 optional_sfixed64 = 10;</code>
+     * @return The optionalSfixed64.
+     */
+    @java.lang.Override
+    public long getOptionalSfixed64() {
+      return optionalSfixed64_;
+    }
+
+    public static final int OPTIONAL_FLOAT_FIELD_NUMBER = 11;
+    private float optionalFloat_ = 0F;
+    /**
+     * <code>optional float optional_float = 11;</code>
+     * @return Whether the optionalFloat field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalFloat() {
+      return ((bitField0_ & 0x00000400) != 0);
+    }
+    /**
+     * <code>optional float optional_float = 11;</code>
+     * @return The optionalFloat.
+     */
+    @java.lang.Override
+    public float getOptionalFloat() {
+      return optionalFloat_;
+    }
+
+    public static final int OPTIONAL_DOUBLE_FIELD_NUMBER = 12;
+    private double optionalDouble_ = 0D;
+    /**
+     * <code>optional double optional_double = 12;</code>
+     * @return Whether the optionalDouble field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalDouble() {
+      return ((bitField0_ & 0x00000800) != 0);
+    }
+    /**
+     * <code>optional double optional_double = 12;</code>
+     * @return The optionalDouble.
+     */
+    @java.lang.Override
+    public double getOptionalDouble() {
+      return optionalDouble_;
+    }
+
+    public static final int OPTIONAL_BOOL_FIELD_NUMBER = 13;
+    private boolean optionalBool_ = false;
+    /**
+     * <code>optional bool optional_bool = 13;</code>
+     * @return Whether the optionalBool field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalBool() {
+      return ((bitField0_ & 0x00001000) != 0);
+    }
+    /**
+     * <code>optional bool optional_bool = 13;</code>
+     * @return The optionalBool.
+     */
+    @java.lang.Override
+    public boolean getOptionalBool() {
+      return optionalBool_;
+    }
+
+    public static final int OPTIONAL_STRING_FIELD_NUMBER = 14;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object optionalString_ = "";
+    /**
+     * <code>optional string optional_string = 14;</code>
+     * @return Whether the optionalString field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalString() {
+      return ((bitField0_ & 0x00002000) != 0);
+    }
+    /**
+     * <code>optional string optional_string = 14;</code>
+     * @return The optionalString.
+     */
+    @java.lang.Override
+    public java.lang.String getOptionalString() {
+      java.lang.Object ref = optionalString_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
+          optionalString_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     * <code>optional string optional_string = 14;</code>
+     * @return The bytes for optionalString.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getOptionalStringBytes() {
+      java.lang.Object ref = optionalString_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        optionalString_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int OPTIONAL_BYTES_FIELD_NUMBER = 15;
+    private com.google.protobuf.ByteString optionalBytes_ = com.google.protobuf.ByteString.EMPTY;
+    /**
+     * <code>optional bytes optional_bytes = 15;</code>
+     * @return Whether the optionalBytes field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalBytes() {
+      return ((bitField0_ & 0x00004000) != 0);
+    }
+    /**
+     * <code>optional bytes optional_bytes = 15;</code>
+     * @return The optionalBytes.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString getOptionalBytes() {
+      return optionalBytes_;
+    }
+
+    public static final int OPTIONAL_NESTED_MESSAGE_FIELD_NUMBER = 18;
+    private legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage optionalNestedMessage_;
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+     * @return Whether the optionalNestedMessage field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalNestedMessage() {
+      return ((bitField0_ & 0x00008000) != 0);
+    }
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+     * @return The optionalNestedMessage.
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getOptionalNestedMessage() {
+      return optionalNestedMessage_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance() : optionalNestedMessage_;
+    }
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder getOptionalNestedMessageOrBuilder() {
+      return optionalNestedMessage_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance() : optionalNestedMessage_;
+    }
+
+    public static final int OPTIONAL_FOREIGN_MESSAGE_FIELD_NUMBER = 19;
+    private legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage optionalForeignMessage_;
+    /**
+     * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+     * @return Whether the optionalForeignMessage field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalForeignMessage() {
+      return ((bitField0_ & 0x00010000) != 0);
+    }
+    /**
+     * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+     * @return The optionalForeignMessage.
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getOptionalForeignMessage() {
+      return optionalForeignMessage_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.getDefaultInstance() : optionalForeignMessage_;
+    }
+    /**
+     * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder getOptionalForeignMessageOrBuilder() {
+      return optionalForeignMessage_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.getDefaultInstance() : optionalForeignMessage_;
+    }
+
+    public static final int OPTIONAL_NESTED_ENUM_FIELD_NUMBER = 21;
+    private int optionalNestedEnum_ = 0;
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum optional_nested_enum = 21;</code>
+     * @return Whether the optionalNestedEnum field is set.
+     */
+    @java.lang.Override public boolean hasOptionalNestedEnum() {
+      return ((bitField0_ & 0x00020000) != 0);
+    }
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum optional_nested_enum = 21;</code>
+     * @return The optionalNestedEnum.
+     */
+    @java.lang.Override public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getOptionalNestedEnum() {
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(optionalNestedEnum_);
+      return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.FOO : result;
+    }
+
+    public static final int OPTIONAL_FOREIGN_ENUM_FIELD_NUMBER = 22;
+    private int optionalForeignEnum_ = 0;
+    /**
+     * <code>optional .legacy_gencode_test.proto2.ForeignEnum optional_foreign_enum = 22;</code>
+     * @return Whether the optionalForeignEnum field is set.
+     */
+    @java.lang.Override public boolean hasOptionalForeignEnum() {
+      return ((bitField0_ & 0x00040000) != 0);
+    }
+    /**
+     * <code>optional .legacy_gencode_test.proto2.ForeignEnum optional_foreign_enum = 22;</code>
+     * @return The optionalForeignEnum.
+     */
+    @java.lang.Override public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getOptionalForeignEnum() {
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.forNumber(optionalForeignEnum_);
+      return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.FOREIGN_FOO : result;
+    }
+
+    public static final int OPTIONAL_ALIASED_ENUM_FIELD_NUMBER = 23;
+    private int optionalAliasedEnum_ = 0;
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.AliasedEnum optional_aliased_enum = 23;</code>
+     * @return Whether the optionalAliasedEnum field is set.
+     */
+    @java.lang.Override public boolean hasOptionalAliasedEnum() {
+      return ((bitField0_ & 0x00080000) != 0);
+    }
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.AliasedEnum optional_aliased_enum = 23;</code>
+     * @return The optionalAliasedEnum.
+     */
+    @java.lang.Override public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum getOptionalAliasedEnum() {
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum.forNumber(optionalAliasedEnum_);
+      return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum.ALIAS_FOO : result;
+    }
+
+    public static final int RECURSIVE_MESSAGE_FIELD_NUMBER = 27;
+    private legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 recursiveMessage_;
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+     * @return Whether the recursiveMessage field is set.
+     */
+    @java.lang.Override
+    public boolean hasRecursiveMessage() {
+      return ((bitField0_ & 0x00100000) != 0);
+    }
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+     * @return The recursiveMessage.
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 getRecursiveMessage() {
+      return recursiveMessage_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance() : recursiveMessage_;
+    }
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder getRecursiveMessageOrBuilder() {
+      return recursiveMessage_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance() : recursiveMessage_;
+    }
+
+    public static final int REPEATED_INT32_FIELD_NUMBER = 31;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList repeatedInt32_ =
+        emptyIntList();
+    /**
+     * <pre>
+     * Repeated
+     * </pre>
+     *
+     * <code>repeated int32 repeated_int32 = 31;</code>
+     * @return A list containing the repeatedInt32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getRepeatedInt32List() {
+      return repeatedInt32_;
+    }
+    /**
+     * <pre>
+     * Repeated
+     * </pre>
+     *
+     * <code>repeated int32 repeated_int32 = 31;</code>
+     * @return The count of repeatedInt32.
+     */
+    public int getRepeatedInt32Count() {
+      return repeatedInt32_.size();
+    }
+    /**
+     * <pre>
+     * Repeated
+     * </pre>
+     *
+     * <code>repeated int32 repeated_int32 = 31;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedInt32 at the given index.
+     */
+    public int getRepeatedInt32(int index) {
+      return repeatedInt32_.getInt(index);
+    }
+
+    public static final int REPEATED_INT64_FIELD_NUMBER = 32;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList repeatedInt64_ =
+        emptyLongList();
+    /**
+     * <code>repeated int64 repeated_int64 = 32;</code>
+     * @return A list containing the repeatedInt64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getRepeatedInt64List() {
+      return repeatedInt64_;
+    }
+    /**
+     * <code>repeated int64 repeated_int64 = 32;</code>
+     * @return The count of repeatedInt64.
+     */
+    public int getRepeatedInt64Count() {
+      return repeatedInt64_.size();
+    }
+    /**
+     * <code>repeated int64 repeated_int64 = 32;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedInt64 at the given index.
+     */
+    public long getRepeatedInt64(int index) {
+      return repeatedInt64_.getLong(index);
+    }
+
+    public static final int REPEATED_UINT32_FIELD_NUMBER = 33;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList repeatedUint32_ =
+        emptyIntList();
+    /**
+     * <code>repeated uint32 repeated_uint32 = 33;</code>
+     * @return A list containing the repeatedUint32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getRepeatedUint32List() {
+      return repeatedUint32_;
+    }
+    /**
+     * <code>repeated uint32 repeated_uint32 = 33;</code>
+     * @return The count of repeatedUint32.
+     */
+    public int getRepeatedUint32Count() {
+      return repeatedUint32_.size();
+    }
+    /**
+     * <code>repeated uint32 repeated_uint32 = 33;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedUint32 at the given index.
+     */
+    public int getRepeatedUint32(int index) {
+      return repeatedUint32_.getInt(index);
+    }
+
+    public static final int REPEATED_UINT64_FIELD_NUMBER = 34;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList repeatedUint64_ =
+        emptyLongList();
+    /**
+     * <code>repeated uint64 repeated_uint64 = 34;</code>
+     * @return A list containing the repeatedUint64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getRepeatedUint64List() {
+      return repeatedUint64_;
+    }
+    /**
+     * <code>repeated uint64 repeated_uint64 = 34;</code>
+     * @return The count of repeatedUint64.
+     */
+    public int getRepeatedUint64Count() {
+      return repeatedUint64_.size();
+    }
+    /**
+     * <code>repeated uint64 repeated_uint64 = 34;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedUint64 at the given index.
+     */
+    public long getRepeatedUint64(int index) {
+      return repeatedUint64_.getLong(index);
+    }
+
+    public static final int REPEATED_SINT32_FIELD_NUMBER = 35;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList repeatedSint32_ =
+        emptyIntList();
+    /**
+     * <code>repeated sint32 repeated_sint32 = 35;</code>
+     * @return A list containing the repeatedSint32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getRepeatedSint32List() {
+      return repeatedSint32_;
+    }
+    /**
+     * <code>repeated sint32 repeated_sint32 = 35;</code>
+     * @return The count of repeatedSint32.
+     */
+    public int getRepeatedSint32Count() {
+      return repeatedSint32_.size();
+    }
+    /**
+     * <code>repeated sint32 repeated_sint32 = 35;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedSint32 at the given index.
+     */
+    public int getRepeatedSint32(int index) {
+      return repeatedSint32_.getInt(index);
+    }
+
+    public static final int REPEATED_SINT64_FIELD_NUMBER = 36;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList repeatedSint64_ =
+        emptyLongList();
+    /**
+     * <code>repeated sint64 repeated_sint64 = 36;</code>
+     * @return A list containing the repeatedSint64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getRepeatedSint64List() {
+      return repeatedSint64_;
+    }
+    /**
+     * <code>repeated sint64 repeated_sint64 = 36;</code>
+     * @return The count of repeatedSint64.
+     */
+    public int getRepeatedSint64Count() {
+      return repeatedSint64_.size();
+    }
+    /**
+     * <code>repeated sint64 repeated_sint64 = 36;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedSint64 at the given index.
+     */
+    public long getRepeatedSint64(int index) {
+      return repeatedSint64_.getLong(index);
+    }
+
+    public static final int REPEATED_FIXED32_FIELD_NUMBER = 37;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList repeatedFixed32_ =
+        emptyIntList();
+    /**
+     * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+     * @return A list containing the repeatedFixed32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getRepeatedFixed32List() {
+      return repeatedFixed32_;
+    }
+    /**
+     * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+     * @return The count of repeatedFixed32.
+     */
+    public int getRepeatedFixed32Count() {
+      return repeatedFixed32_.size();
+    }
+    /**
+     * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedFixed32 at the given index.
+     */
+    public int getRepeatedFixed32(int index) {
+      return repeatedFixed32_.getInt(index);
+    }
+
+    public static final int REPEATED_FIXED64_FIELD_NUMBER = 38;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList repeatedFixed64_ =
+        emptyLongList();
+    /**
+     * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+     * @return A list containing the repeatedFixed64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getRepeatedFixed64List() {
+      return repeatedFixed64_;
+    }
+    /**
+     * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+     * @return The count of repeatedFixed64.
+     */
+    public int getRepeatedFixed64Count() {
+      return repeatedFixed64_.size();
+    }
+    /**
+     * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedFixed64 at the given index.
+     */
+    public long getRepeatedFixed64(int index) {
+      return repeatedFixed64_.getLong(index);
+    }
+
+    public static final int REPEATED_SFIXED32_FIELD_NUMBER = 39;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList repeatedSfixed32_ =
+        emptyIntList();
+    /**
+     * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+     * @return A list containing the repeatedSfixed32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getRepeatedSfixed32List() {
+      return repeatedSfixed32_;
+    }
+    /**
+     * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+     * @return The count of repeatedSfixed32.
+     */
+    public int getRepeatedSfixed32Count() {
+      return repeatedSfixed32_.size();
+    }
+    /**
+     * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedSfixed32 at the given index.
+     */
+    public int getRepeatedSfixed32(int index) {
+      return repeatedSfixed32_.getInt(index);
+    }
+
+    public static final int REPEATED_SFIXED64_FIELD_NUMBER = 40;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList repeatedSfixed64_ =
+        emptyLongList();
+    /**
+     * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+     * @return A list containing the repeatedSfixed64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getRepeatedSfixed64List() {
+      return repeatedSfixed64_;
+    }
+    /**
+     * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+     * @return The count of repeatedSfixed64.
+     */
+    public int getRepeatedSfixed64Count() {
+      return repeatedSfixed64_.size();
+    }
+    /**
+     * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedSfixed64 at the given index.
+     */
+    public long getRepeatedSfixed64(int index) {
+      return repeatedSfixed64_.getLong(index);
+    }
+
+    public static final int REPEATED_FLOAT_FIELD_NUMBER = 41;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.FloatList repeatedFloat_ =
+        emptyFloatList();
+    /**
+     * <code>repeated float repeated_float = 41;</code>
+     * @return A list containing the repeatedFloat.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Float>
+        getRepeatedFloatList() {
+      return repeatedFloat_;
+    }
+    /**
+     * <code>repeated float repeated_float = 41;</code>
+     * @return The count of repeatedFloat.
+     */
+    public int getRepeatedFloatCount() {
+      return repeatedFloat_.size();
+    }
+    /**
+     * <code>repeated float repeated_float = 41;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedFloat at the given index.
+     */
+    public float getRepeatedFloat(int index) {
+      return repeatedFloat_.getFloat(index);
+    }
+
+    public static final int REPEATED_DOUBLE_FIELD_NUMBER = 42;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.DoubleList repeatedDouble_ =
+        emptyDoubleList();
+    /**
+     * <code>repeated double repeated_double = 42;</code>
+     * @return A list containing the repeatedDouble.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Double>
+        getRepeatedDoubleList() {
+      return repeatedDouble_;
+    }
+    /**
+     * <code>repeated double repeated_double = 42;</code>
+     * @return The count of repeatedDouble.
+     */
+    public int getRepeatedDoubleCount() {
+      return repeatedDouble_.size();
+    }
+    /**
+     * <code>repeated double repeated_double = 42;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedDouble at the given index.
+     */
+    public double getRepeatedDouble(int index) {
+      return repeatedDouble_.getDouble(index);
+    }
+
+    public static final int REPEATED_BOOL_FIELD_NUMBER = 43;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.BooleanList repeatedBool_ =
+        emptyBooleanList();
+    /**
+     * <code>repeated bool repeated_bool = 43;</code>
+     * @return A list containing the repeatedBool.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Boolean>
+        getRepeatedBoolList() {
+      return repeatedBool_;
+    }
+    /**
+     * <code>repeated bool repeated_bool = 43;</code>
+     * @return The count of repeatedBool.
+     */
+    public int getRepeatedBoolCount() {
+      return repeatedBool_.size();
+    }
+    /**
+     * <code>repeated bool repeated_bool = 43;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedBool at the given index.
+     */
+    public boolean getRepeatedBool(int index) {
+      return repeatedBool_.getBoolean(index);
+    }
+
+    public static final int REPEATED_STRING_FIELD_NUMBER = 44;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.LazyStringArrayList repeatedString_ =
+        com.google.protobuf.LazyStringArrayList.emptyList();
+    /**
+     * <code>repeated string repeated_string = 44;</code>
+     * @return A list containing the repeatedString.
+     */
+    public com.google.protobuf.ProtocolStringList
+        getRepeatedStringList() {
+      return repeatedString_;
+    }
+    /**
+     * <code>repeated string repeated_string = 44;</code>
+     * @return The count of repeatedString.
+     */
+    public int getRepeatedStringCount() {
+      return repeatedString_.size();
+    }
+    /**
+     * <code>repeated string repeated_string = 44;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedString at the given index.
+     */
+    public java.lang.String getRepeatedString(int index) {
+      return repeatedString_.get(index);
+    }
+    /**
+     * <code>repeated string repeated_string = 44;</code>
+     * @param index The index of the value to return.
+     * @return The bytes of the repeatedString at the given index.
+     */
+    public com.google.protobuf.ByteString
+        getRepeatedStringBytes(int index) {
+      return repeatedString_.getByteString(index);
+    }
+
+    public static final int REPEATED_BYTES_FIELD_NUMBER = 45;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.ProtobufList<com.google.protobuf.ByteString> repeatedBytes_ =
+        emptyList(com.google.protobuf.ByteString.class);
+    /**
+     * <code>repeated bytes repeated_bytes = 45;</code>
+     * @return A list containing the repeatedBytes.
+     */
+    @java.lang.Override
+    public java.util.List<com.google.protobuf.ByteString>
+        getRepeatedBytesList() {
+      return repeatedBytes_;
+    }
+    /**
+     * <code>repeated bytes repeated_bytes = 45;</code>
+     * @return The count of repeatedBytes.
+     */
+    public int getRepeatedBytesCount() {
+      return repeatedBytes_.size();
+    }
+    /**
+     * <code>repeated bytes repeated_bytes = 45;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedBytes at the given index.
+     */
+    public com.google.protobuf.ByteString getRepeatedBytes(int index) {
+      return repeatedBytes_.get(index);
+    }
+
+    public static final int REPEATED_NESTED_MESSAGE_FIELD_NUMBER = 48;
+    @SuppressWarnings("serial")
+    private java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> repeatedNestedMessage_;
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+     */
+    @java.lang.Override
+    public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> getRepeatedNestedMessageList() {
+      return repeatedNestedMessage_;
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> 
+        getRepeatedNestedMessageOrBuilderList() {
+      return repeatedNestedMessage_;
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+     */
+    @java.lang.Override
+    public int getRepeatedNestedMessageCount() {
+      return repeatedNestedMessage_.size();
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getRepeatedNestedMessage(int index) {
+      return repeatedNestedMessage_.get(index);
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder getRepeatedNestedMessageOrBuilder(
+        int index) {
+      return repeatedNestedMessage_.get(index);
+    }
+
+    public static final int REPEATED_FOREIGN_MESSAGE_FIELD_NUMBER = 49;
+    @SuppressWarnings("serial")
+    private java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> repeatedForeignMessage_;
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+     */
+    @java.lang.Override
+    public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> getRepeatedForeignMessageList() {
+      return repeatedForeignMessage_;
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder> 
+        getRepeatedForeignMessageOrBuilderList() {
+      return repeatedForeignMessage_;
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+     */
+    @java.lang.Override
+    public int getRepeatedForeignMessageCount() {
+      return repeatedForeignMessage_.size();
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getRepeatedForeignMessage(int index) {
+      return repeatedForeignMessage_.get(index);
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder getRepeatedForeignMessageOrBuilder(
+        int index) {
+      return repeatedForeignMessage_.get(index);
+    }
+
+    public static final int REPEATED_NESTED_ENUM_FIELD_NUMBER = 51;
+    @SuppressWarnings("serial")
+    private java.util.List<java.lang.Integer> repeatedNestedEnum_;
+    private static final com.google.protobuf.Internal.ListAdapter.Converter<
+        java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> repeatedNestedEnum_converter_ =
+            new com.google.protobuf.Internal.ListAdapter.Converter<
+                java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>() {
+              public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum convert(java.lang.Integer from) {
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(from);
+                return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.FOO : result;
+              }
+            };
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+     * @return A list containing the repeatedNestedEnum.
+     */
+    @java.lang.Override
+    public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> getRepeatedNestedEnumList() {
+      return new com.google.protobuf.Internal.ListAdapter<
+          java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>(repeatedNestedEnum_, repeatedNestedEnum_converter_);
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+     * @return The count of repeatedNestedEnum.
+     */
+    @java.lang.Override
+    public int getRepeatedNestedEnumCount() {
+      return repeatedNestedEnum_.size();
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedNestedEnum at the given index.
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getRepeatedNestedEnum(int index) {
+      return repeatedNestedEnum_converter_.convert(repeatedNestedEnum_.get(index));
+    }
+
+    public static final int REPEATED_FOREIGN_ENUM_FIELD_NUMBER = 52;
+    @SuppressWarnings("serial")
+    private java.util.List<java.lang.Integer> repeatedForeignEnum_;
+    private static final com.google.protobuf.Internal.ListAdapter.Converter<
+        java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum> repeatedForeignEnum_converter_ =
+            new com.google.protobuf.Internal.ListAdapter.Converter<
+                java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum>() {
+              public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum convert(java.lang.Integer from) {
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.forNumber(from);
+                return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.FOREIGN_FOO : result;
+              }
+            };
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+     * @return A list containing the repeatedForeignEnum.
+     */
+    @java.lang.Override
+    public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum> getRepeatedForeignEnumList() {
+      return new com.google.protobuf.Internal.ListAdapter<
+          java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum>(repeatedForeignEnum_, repeatedForeignEnum_converter_);
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+     * @return The count of repeatedForeignEnum.
+     */
+    @java.lang.Override
+    public int getRepeatedForeignEnumCount() {
+      return repeatedForeignEnum_.size();
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedForeignEnum at the given index.
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getRepeatedForeignEnum(int index) {
+      return repeatedForeignEnum_converter_.convert(repeatedForeignEnum_.get(index));
+    }
+
+    public static final int PACKED_INT32_FIELD_NUMBER = 75;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList packedInt32_ =
+        emptyIntList();
+    /**
+     * <pre>
+     * Packed
+     * </pre>
+     *
+     * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+     * @return A list containing the packedInt32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getPackedInt32List() {
+      return packedInt32_;
+    }
+    /**
+     * <pre>
+     * Packed
+     * </pre>
+     *
+     * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+     * @return The count of packedInt32.
+     */
+    public int getPackedInt32Count() {
+      return packedInt32_.size();
+    }
+    /**
+     * <pre>
+     * Packed
+     * </pre>
+     *
+     * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedInt32 at the given index.
+     */
+    public int getPackedInt32(int index) {
+      return packedInt32_.getInt(index);
+    }
+    private int packedInt32MemoizedSerializedSize = -1;
+
+    public static final int PACKED_INT64_FIELD_NUMBER = 76;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList packedInt64_ =
+        emptyLongList();
+    /**
+     * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+     * @return A list containing the packedInt64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getPackedInt64List() {
+      return packedInt64_;
+    }
+    /**
+     * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+     * @return The count of packedInt64.
+     */
+    public int getPackedInt64Count() {
+      return packedInt64_.size();
+    }
+    /**
+     * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedInt64 at the given index.
+     */
+    public long getPackedInt64(int index) {
+      return packedInt64_.getLong(index);
+    }
+    private int packedInt64MemoizedSerializedSize = -1;
+
+    public static final int PACKED_UINT32_FIELD_NUMBER = 77;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList packedUint32_ =
+        emptyIntList();
+    /**
+     * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+     * @return A list containing the packedUint32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getPackedUint32List() {
+      return packedUint32_;
+    }
+    /**
+     * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+     * @return The count of packedUint32.
+     */
+    public int getPackedUint32Count() {
+      return packedUint32_.size();
+    }
+    /**
+     * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedUint32 at the given index.
+     */
+    public int getPackedUint32(int index) {
+      return packedUint32_.getInt(index);
+    }
+    private int packedUint32MemoizedSerializedSize = -1;
+
+    public static final int PACKED_UINT64_FIELD_NUMBER = 78;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList packedUint64_ =
+        emptyLongList();
+    /**
+     * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+     * @return A list containing the packedUint64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getPackedUint64List() {
+      return packedUint64_;
+    }
+    /**
+     * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+     * @return The count of packedUint64.
+     */
+    public int getPackedUint64Count() {
+      return packedUint64_.size();
+    }
+    /**
+     * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedUint64 at the given index.
+     */
+    public long getPackedUint64(int index) {
+      return packedUint64_.getLong(index);
+    }
+    private int packedUint64MemoizedSerializedSize = -1;
+
+    public static final int PACKED_SINT32_FIELD_NUMBER = 79;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList packedSint32_ =
+        emptyIntList();
+    /**
+     * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+     * @return A list containing the packedSint32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getPackedSint32List() {
+      return packedSint32_;
+    }
+    /**
+     * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+     * @return The count of packedSint32.
+     */
+    public int getPackedSint32Count() {
+      return packedSint32_.size();
+    }
+    /**
+     * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedSint32 at the given index.
+     */
+    public int getPackedSint32(int index) {
+      return packedSint32_.getInt(index);
+    }
+    private int packedSint32MemoizedSerializedSize = -1;
+
+    public static final int PACKED_SINT64_FIELD_NUMBER = 80;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList packedSint64_ =
+        emptyLongList();
+    /**
+     * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+     * @return A list containing the packedSint64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getPackedSint64List() {
+      return packedSint64_;
+    }
+    /**
+     * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+     * @return The count of packedSint64.
+     */
+    public int getPackedSint64Count() {
+      return packedSint64_.size();
+    }
+    /**
+     * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedSint64 at the given index.
+     */
+    public long getPackedSint64(int index) {
+      return packedSint64_.getLong(index);
+    }
+    private int packedSint64MemoizedSerializedSize = -1;
+
+    public static final int PACKED_FIXED32_FIELD_NUMBER = 81;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList packedFixed32_ =
+        emptyIntList();
+    /**
+     * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+     * @return A list containing the packedFixed32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getPackedFixed32List() {
+      return packedFixed32_;
+    }
+    /**
+     * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+     * @return The count of packedFixed32.
+     */
+    public int getPackedFixed32Count() {
+      return packedFixed32_.size();
+    }
+    /**
+     * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedFixed32 at the given index.
+     */
+    public int getPackedFixed32(int index) {
+      return packedFixed32_.getInt(index);
+    }
+    private int packedFixed32MemoizedSerializedSize = -1;
+
+    public static final int PACKED_FIXED64_FIELD_NUMBER = 82;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList packedFixed64_ =
+        emptyLongList();
+    /**
+     * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+     * @return A list containing the packedFixed64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getPackedFixed64List() {
+      return packedFixed64_;
+    }
+    /**
+     * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+     * @return The count of packedFixed64.
+     */
+    public int getPackedFixed64Count() {
+      return packedFixed64_.size();
+    }
+    /**
+     * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedFixed64 at the given index.
+     */
+    public long getPackedFixed64(int index) {
+      return packedFixed64_.getLong(index);
+    }
+    private int packedFixed64MemoizedSerializedSize = -1;
+
+    public static final int PACKED_SFIXED32_FIELD_NUMBER = 83;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList packedSfixed32_ =
+        emptyIntList();
+    /**
+     * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+     * @return A list containing the packedSfixed32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getPackedSfixed32List() {
+      return packedSfixed32_;
+    }
+    /**
+     * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+     * @return The count of packedSfixed32.
+     */
+    public int getPackedSfixed32Count() {
+      return packedSfixed32_.size();
+    }
+    /**
+     * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedSfixed32 at the given index.
+     */
+    public int getPackedSfixed32(int index) {
+      return packedSfixed32_.getInt(index);
+    }
+    private int packedSfixed32MemoizedSerializedSize = -1;
+
+    public static final int PACKED_SFIXED64_FIELD_NUMBER = 84;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList packedSfixed64_ =
+        emptyLongList();
+    /**
+     * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+     * @return A list containing the packedSfixed64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getPackedSfixed64List() {
+      return packedSfixed64_;
+    }
+    /**
+     * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+     * @return The count of packedSfixed64.
+     */
+    public int getPackedSfixed64Count() {
+      return packedSfixed64_.size();
+    }
+    /**
+     * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedSfixed64 at the given index.
+     */
+    public long getPackedSfixed64(int index) {
+      return packedSfixed64_.getLong(index);
+    }
+    private int packedSfixed64MemoizedSerializedSize = -1;
+
+    public static final int PACKED_FLOAT_FIELD_NUMBER = 85;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.FloatList packedFloat_ =
+        emptyFloatList();
+    /**
+     * <code>repeated float packed_float = 85 [packed = true];</code>
+     * @return A list containing the packedFloat.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Float>
+        getPackedFloatList() {
+      return packedFloat_;
+    }
+    /**
+     * <code>repeated float packed_float = 85 [packed = true];</code>
+     * @return The count of packedFloat.
+     */
+    public int getPackedFloatCount() {
+      return packedFloat_.size();
+    }
+    /**
+     * <code>repeated float packed_float = 85 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedFloat at the given index.
+     */
+    public float getPackedFloat(int index) {
+      return packedFloat_.getFloat(index);
+    }
+    private int packedFloatMemoizedSerializedSize = -1;
+
+    public static final int PACKED_DOUBLE_FIELD_NUMBER = 86;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.DoubleList packedDouble_ =
+        emptyDoubleList();
+    /**
+     * <code>repeated double packed_double = 86 [packed = true];</code>
+     * @return A list containing the packedDouble.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Double>
+        getPackedDoubleList() {
+      return packedDouble_;
+    }
+    /**
+     * <code>repeated double packed_double = 86 [packed = true];</code>
+     * @return The count of packedDouble.
+     */
+    public int getPackedDoubleCount() {
+      return packedDouble_.size();
+    }
+    /**
+     * <code>repeated double packed_double = 86 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedDouble at the given index.
+     */
+    public double getPackedDouble(int index) {
+      return packedDouble_.getDouble(index);
+    }
+    private int packedDoubleMemoizedSerializedSize = -1;
+
+    public static final int PACKED_BOOL_FIELD_NUMBER = 87;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.BooleanList packedBool_ =
+        emptyBooleanList();
+    /**
+     * <code>repeated bool packed_bool = 87 [packed = true];</code>
+     * @return A list containing the packedBool.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Boolean>
+        getPackedBoolList() {
+      return packedBool_;
+    }
+    /**
+     * <code>repeated bool packed_bool = 87 [packed = true];</code>
+     * @return The count of packedBool.
+     */
+    public int getPackedBoolCount() {
+      return packedBool_.size();
+    }
+    /**
+     * <code>repeated bool packed_bool = 87 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedBool at the given index.
+     */
+    public boolean getPackedBool(int index) {
+      return packedBool_.getBoolean(index);
+    }
+    private int packedBoolMemoizedSerializedSize = -1;
+
+    public static final int PACKED_NESTED_ENUM_FIELD_NUMBER = 88;
+    @SuppressWarnings("serial")
+    private java.util.List<java.lang.Integer> packedNestedEnum_;
+    private static final com.google.protobuf.Internal.ListAdapter.Converter<
+        java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> packedNestedEnum_converter_ =
+            new com.google.protobuf.Internal.ListAdapter.Converter<
+                java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>() {
+              public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum convert(java.lang.Integer from) {
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(from);
+                return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.FOO : result;
+              }
+            };
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+     * @return A list containing the packedNestedEnum.
+     */
+    @java.lang.Override
+    public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> getPackedNestedEnumList() {
+      return new com.google.protobuf.Internal.ListAdapter<
+          java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>(packedNestedEnum_, packedNestedEnum_converter_);
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+     * @return The count of packedNestedEnum.
+     */
+    @java.lang.Override
+    public int getPackedNestedEnumCount() {
+      return packedNestedEnum_.size();
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedNestedEnum at the given index.
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getPackedNestedEnum(int index) {
+      return packedNestedEnum_converter_.convert(packedNestedEnum_.get(index));
+    }
+    private int packedNestedEnumMemoizedSerializedSize;
+
+    public static final int UNPACKED_INT32_FIELD_NUMBER = 89;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList unpackedInt32_ =
+        emptyIntList();
+    /**
+     * <pre>
+     * Unpacked
+     * </pre>
+     *
+     * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+     * @return A list containing the unpackedInt32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getUnpackedInt32List() {
+      return unpackedInt32_;
+    }
+    /**
+     * <pre>
+     * Unpacked
+     * </pre>
+     *
+     * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+     * @return The count of unpackedInt32.
+     */
+    public int getUnpackedInt32Count() {
+      return unpackedInt32_.size();
+    }
+    /**
+     * <pre>
+     * Unpacked
+     * </pre>
+     *
+     * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedInt32 at the given index.
+     */
+    public int getUnpackedInt32(int index) {
+      return unpackedInt32_.getInt(index);
+    }
+
+    public static final int UNPACKED_INT64_FIELD_NUMBER = 90;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList unpackedInt64_ =
+        emptyLongList();
+    /**
+     * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+     * @return A list containing the unpackedInt64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getUnpackedInt64List() {
+      return unpackedInt64_;
+    }
+    /**
+     * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+     * @return The count of unpackedInt64.
+     */
+    public int getUnpackedInt64Count() {
+      return unpackedInt64_.size();
+    }
+    /**
+     * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedInt64 at the given index.
+     */
+    public long getUnpackedInt64(int index) {
+      return unpackedInt64_.getLong(index);
+    }
+
+    public static final int UNPACKED_UINT32_FIELD_NUMBER = 91;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList unpackedUint32_ =
+        emptyIntList();
+    /**
+     * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+     * @return A list containing the unpackedUint32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getUnpackedUint32List() {
+      return unpackedUint32_;
+    }
+    /**
+     * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+     * @return The count of unpackedUint32.
+     */
+    public int getUnpackedUint32Count() {
+      return unpackedUint32_.size();
+    }
+    /**
+     * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedUint32 at the given index.
+     */
+    public int getUnpackedUint32(int index) {
+      return unpackedUint32_.getInt(index);
+    }
+
+    public static final int UNPACKED_UINT64_FIELD_NUMBER = 92;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList unpackedUint64_ =
+        emptyLongList();
+    /**
+     * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+     * @return A list containing the unpackedUint64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getUnpackedUint64List() {
+      return unpackedUint64_;
+    }
+    /**
+     * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+     * @return The count of unpackedUint64.
+     */
+    public int getUnpackedUint64Count() {
+      return unpackedUint64_.size();
+    }
+    /**
+     * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedUint64 at the given index.
+     */
+    public long getUnpackedUint64(int index) {
+      return unpackedUint64_.getLong(index);
+    }
+
+    public static final int UNPACKED_SINT32_FIELD_NUMBER = 93;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList unpackedSint32_ =
+        emptyIntList();
+    /**
+     * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+     * @return A list containing the unpackedSint32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getUnpackedSint32List() {
+      return unpackedSint32_;
+    }
+    /**
+     * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+     * @return The count of unpackedSint32.
+     */
+    public int getUnpackedSint32Count() {
+      return unpackedSint32_.size();
+    }
+    /**
+     * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedSint32 at the given index.
+     */
+    public int getUnpackedSint32(int index) {
+      return unpackedSint32_.getInt(index);
+    }
+
+    public static final int UNPACKED_SINT64_FIELD_NUMBER = 94;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList unpackedSint64_ =
+        emptyLongList();
+    /**
+     * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+     * @return A list containing the unpackedSint64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getUnpackedSint64List() {
+      return unpackedSint64_;
+    }
+    /**
+     * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+     * @return The count of unpackedSint64.
+     */
+    public int getUnpackedSint64Count() {
+      return unpackedSint64_.size();
+    }
+    /**
+     * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedSint64 at the given index.
+     */
+    public long getUnpackedSint64(int index) {
+      return unpackedSint64_.getLong(index);
+    }
+
+    public static final int UNPACKED_FIXED32_FIELD_NUMBER = 95;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList unpackedFixed32_ =
+        emptyIntList();
+    /**
+     * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+     * @return A list containing the unpackedFixed32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getUnpackedFixed32List() {
+      return unpackedFixed32_;
+    }
+    /**
+     * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+     * @return The count of unpackedFixed32.
+     */
+    public int getUnpackedFixed32Count() {
+      return unpackedFixed32_.size();
+    }
+    /**
+     * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedFixed32 at the given index.
+     */
+    public int getUnpackedFixed32(int index) {
+      return unpackedFixed32_.getInt(index);
+    }
+
+    public static final int UNPACKED_FIXED64_FIELD_NUMBER = 96;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList unpackedFixed64_ =
+        emptyLongList();
+    /**
+     * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+     * @return A list containing the unpackedFixed64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getUnpackedFixed64List() {
+      return unpackedFixed64_;
+    }
+    /**
+     * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+     * @return The count of unpackedFixed64.
+     */
+    public int getUnpackedFixed64Count() {
+      return unpackedFixed64_.size();
+    }
+    /**
+     * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedFixed64 at the given index.
+     */
+    public long getUnpackedFixed64(int index) {
+      return unpackedFixed64_.getLong(index);
+    }
+
+    public static final int UNPACKED_SFIXED32_FIELD_NUMBER = 97;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList unpackedSfixed32_ =
+        emptyIntList();
+    /**
+     * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+     * @return A list containing the unpackedSfixed32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getUnpackedSfixed32List() {
+      return unpackedSfixed32_;
+    }
+    /**
+     * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+     * @return The count of unpackedSfixed32.
+     */
+    public int getUnpackedSfixed32Count() {
+      return unpackedSfixed32_.size();
+    }
+    /**
+     * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedSfixed32 at the given index.
+     */
+    public int getUnpackedSfixed32(int index) {
+      return unpackedSfixed32_.getInt(index);
+    }
+
+    public static final int UNPACKED_SFIXED64_FIELD_NUMBER = 98;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList unpackedSfixed64_ =
+        emptyLongList();
+    /**
+     * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+     * @return A list containing the unpackedSfixed64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getUnpackedSfixed64List() {
+      return unpackedSfixed64_;
+    }
+    /**
+     * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+     * @return The count of unpackedSfixed64.
+     */
+    public int getUnpackedSfixed64Count() {
+      return unpackedSfixed64_.size();
+    }
+    /**
+     * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedSfixed64 at the given index.
+     */
+    public long getUnpackedSfixed64(int index) {
+      return unpackedSfixed64_.getLong(index);
+    }
+
+    public static final int UNPACKED_FLOAT_FIELD_NUMBER = 99;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.FloatList unpackedFloat_ =
+        emptyFloatList();
+    /**
+     * <code>repeated float unpacked_float = 99 [packed = false];</code>
+     * @return A list containing the unpackedFloat.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Float>
+        getUnpackedFloatList() {
+      return unpackedFloat_;
+    }
+    /**
+     * <code>repeated float unpacked_float = 99 [packed = false];</code>
+     * @return The count of unpackedFloat.
+     */
+    public int getUnpackedFloatCount() {
+      return unpackedFloat_.size();
+    }
+    /**
+     * <code>repeated float unpacked_float = 99 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedFloat at the given index.
+     */
+    public float getUnpackedFloat(int index) {
+      return unpackedFloat_.getFloat(index);
+    }
+
+    public static final int UNPACKED_DOUBLE_FIELD_NUMBER = 100;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.DoubleList unpackedDouble_ =
+        emptyDoubleList();
+    /**
+     * <code>repeated double unpacked_double = 100 [packed = false];</code>
+     * @return A list containing the unpackedDouble.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Double>
+        getUnpackedDoubleList() {
+      return unpackedDouble_;
+    }
+    /**
+     * <code>repeated double unpacked_double = 100 [packed = false];</code>
+     * @return The count of unpackedDouble.
+     */
+    public int getUnpackedDoubleCount() {
+      return unpackedDouble_.size();
+    }
+    /**
+     * <code>repeated double unpacked_double = 100 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedDouble at the given index.
+     */
+    public double getUnpackedDouble(int index) {
+      return unpackedDouble_.getDouble(index);
+    }
+
+    public static final int UNPACKED_BOOL_FIELD_NUMBER = 101;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.BooleanList unpackedBool_ =
+        emptyBooleanList();
+    /**
+     * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+     * @return A list containing the unpackedBool.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Boolean>
+        getUnpackedBoolList() {
+      return unpackedBool_;
+    }
+    /**
+     * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+     * @return The count of unpackedBool.
+     */
+    public int getUnpackedBoolCount() {
+      return unpackedBool_.size();
+    }
+    /**
+     * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedBool at the given index.
+     */
+    public boolean getUnpackedBool(int index) {
+      return unpackedBool_.getBoolean(index);
+    }
+
+    public static final int UNPACKED_NESTED_ENUM_FIELD_NUMBER = 102;
+    @SuppressWarnings("serial")
+    private java.util.List<java.lang.Integer> unpackedNestedEnum_;
+    private static final com.google.protobuf.Internal.ListAdapter.Converter<
+        java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> unpackedNestedEnum_converter_ =
+            new com.google.protobuf.Internal.ListAdapter.Converter<
+                java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>() {
+              public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum convert(java.lang.Integer from) {
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(from);
+                return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.FOO : result;
+              }
+            };
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+     * @return A list containing the unpackedNestedEnum.
+     */
+    @java.lang.Override
+    public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> getUnpackedNestedEnumList() {
+      return new com.google.protobuf.Internal.ListAdapter<
+          java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>(unpackedNestedEnum_, unpackedNestedEnum_converter_);
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+     * @return The count of unpackedNestedEnum.
+     */
+    @java.lang.Override
+    public int getUnpackedNestedEnumCount() {
+      return unpackedNestedEnum_.size();
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedNestedEnum at the given index.
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getUnpackedNestedEnum(int index) {
+      return unpackedNestedEnum_converter_.convert(unpackedNestedEnum_.get(index));
+    }
+
+    public static final int MAP_INT32_INT32_FIELD_NUMBER = 56;
+    private static final class MapInt32Int32DefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32Int32Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.INT32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.INT32,
+                  0);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Integer> mapInt32Int32_;
+    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+    internalGetMapInt32Int32() {
+      if (mapInt32Int32_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapInt32Int32DefaultEntryHolder.defaultEntry);
+      }
+      return mapInt32Int32_;
+    }
+    public int getMapInt32Int32Count() {
+      return internalGetMapInt32Int32().getMap().size();
+    }
+    /**
+     * <pre>
+     * Map
+     * </pre>
+     *
+     * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapInt32Int32(
+        int key) {
+
+      return internalGetMapInt32Int32().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapInt32Int32Map()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32() {
+      return getMapInt32Int32Map();
+    }
+    /**
+     * <pre>
+     * Map
+     * </pre>
+     *
+     * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32Map() {
+      return internalGetMapInt32Int32().getMap();
+    }
+    /**
+     * <pre>
+     * Map
+     * </pre>
+     *
+     * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+     */
+    @java.lang.Override
+    public int getMapInt32Int32OrDefault(
+        int key,
+        int defaultValue) {
+
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapInt32Int32().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <pre>
+     * Map
+     * </pre>
+     *
+     * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+     */
+    @java.lang.Override
+    public int getMapInt32Int32OrThrow(
+        int key) {
+
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapInt32Int32().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_INT64_INT64_FIELD_NUMBER = 57;
+    private static final class MapInt64Int64DefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Long, java.lang.Long> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Long, java.lang.Long>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt64Int64Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.INT64,
+                  0L,
+                  com.google.protobuf.WireFormat.FieldType.INT64,
+                  0L);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Long, java.lang.Long> mapInt64Int64_;
+    private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+    internalGetMapInt64Int64() {
+      if (mapInt64Int64_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapInt64Int64DefaultEntryHolder.defaultEntry);
+      }
+      return mapInt64Int64_;
+    }
+    public int getMapInt64Int64Count() {
+      return internalGetMapInt64Int64().getMap().size();
+    }
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapInt64Int64(
+        long key) {
+
+      return internalGetMapInt64Int64().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapInt64Int64Map()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Long, java.lang.Long> getMapInt64Int64() {
+      return getMapInt64Int64Map();
+    }
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Long, java.lang.Long> getMapInt64Int64Map() {
+      return internalGetMapInt64Int64().getMap();
+    }
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
+    @java.lang.Override
+    public long getMapInt64Int64OrDefault(
+        long key,
+        long defaultValue) {
+
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapInt64Int64().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
+    @java.lang.Override
+    public long getMapInt64Int64OrThrow(
+        long key) {
+
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapInt64Int64().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_UINT32_UINT32_FIELD_NUMBER = 58;
+    private static final class MapUint32Uint32DefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint32Uint32Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.UINT32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.UINT32,
+                  0);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Integer> mapUint32Uint32_;
+    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+    internalGetMapUint32Uint32() {
+      if (mapUint32Uint32_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapUint32Uint32DefaultEntryHolder.defaultEntry);
+      }
+      return mapUint32Uint32_;
+    }
+    public int getMapUint32Uint32Count() {
+      return internalGetMapUint32Uint32().getMap().size();
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapUint32Uint32(
+        int key) {
+
+      return internalGetMapUint32Uint32().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapUint32Uint32Map()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getMapUint32Uint32() {
+      return getMapUint32Uint32Map();
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getMapUint32Uint32Map() {
+      return internalGetMapUint32Uint32().getMap();
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
+    @java.lang.Override
+    public int getMapUint32Uint32OrDefault(
+        int key,
+        int defaultValue) {
+
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapUint32Uint32().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
+    @java.lang.Override
+    public int getMapUint32Uint32OrThrow(
+        int key) {
+
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapUint32Uint32().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_UINT64_UINT64_FIELD_NUMBER = 59;
+    private static final class MapUint64Uint64DefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Long, java.lang.Long> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Long, java.lang.Long>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint64Uint64Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.UINT64,
+                  0L,
+                  com.google.protobuf.WireFormat.FieldType.UINT64,
+                  0L);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Long, java.lang.Long> mapUint64Uint64_;
+    private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+    internalGetMapUint64Uint64() {
+      if (mapUint64Uint64_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapUint64Uint64DefaultEntryHolder.defaultEntry);
+      }
+      return mapUint64Uint64_;
+    }
+    public int getMapUint64Uint64Count() {
+      return internalGetMapUint64Uint64().getMap().size();
+    }
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapUint64Uint64(
+        long key) {
+
+      return internalGetMapUint64Uint64().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapUint64Uint64Map()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Long, java.lang.Long> getMapUint64Uint64() {
+      return getMapUint64Uint64Map();
+    }
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Long, java.lang.Long> getMapUint64Uint64Map() {
+      return internalGetMapUint64Uint64().getMap();
+    }
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
+    @java.lang.Override
+    public long getMapUint64Uint64OrDefault(
+        long key,
+        long defaultValue) {
+
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapUint64Uint64().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
+    @java.lang.Override
+    public long getMapUint64Uint64OrThrow(
+        long key) {
+
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapUint64Uint64().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_SINT32_SINT32_FIELD_NUMBER = 60;
+    private static final class MapSint32Sint32DefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint32Sint32Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.SINT32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.SINT32,
+                  0);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Integer> mapSint32Sint32_;
+    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+    internalGetMapSint32Sint32() {
+      if (mapSint32Sint32_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapSint32Sint32DefaultEntryHolder.defaultEntry);
+      }
+      return mapSint32Sint32_;
+    }
+    public int getMapSint32Sint32Count() {
+      return internalGetMapSint32Sint32().getMap().size();
+    }
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapSint32Sint32(
+        int key) {
+
+      return internalGetMapSint32Sint32().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapSint32Sint32Map()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSint32Sint32() {
+      return getMapSint32Sint32Map();
+    }
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSint32Sint32Map() {
+      return internalGetMapSint32Sint32().getMap();
+    }
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
+    @java.lang.Override
+    public int getMapSint32Sint32OrDefault(
+        int key,
+        int defaultValue) {
+
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapSint32Sint32().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
+    @java.lang.Override
+    public int getMapSint32Sint32OrThrow(
+        int key) {
+
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapSint32Sint32().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_SINT64_SINT64_FIELD_NUMBER = 61;
+    private static final class MapSint64Sint64DefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Long, java.lang.Long> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Long, java.lang.Long>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint64Sint64Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.SINT64,
+                  0L,
+                  com.google.protobuf.WireFormat.FieldType.SINT64,
+                  0L);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Long, java.lang.Long> mapSint64Sint64_;
+    private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+    internalGetMapSint64Sint64() {
+      if (mapSint64Sint64_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapSint64Sint64DefaultEntryHolder.defaultEntry);
+      }
+      return mapSint64Sint64_;
+    }
+    public int getMapSint64Sint64Count() {
+      return internalGetMapSint64Sint64().getMap().size();
+    }
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapSint64Sint64(
+        long key) {
+
+      return internalGetMapSint64Sint64().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapSint64Sint64Map()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Long, java.lang.Long> getMapSint64Sint64() {
+      return getMapSint64Sint64Map();
+    }
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Long, java.lang.Long> getMapSint64Sint64Map() {
+      return internalGetMapSint64Sint64().getMap();
+    }
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
+    @java.lang.Override
+    public long getMapSint64Sint64OrDefault(
+        long key,
+        long defaultValue) {
+
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapSint64Sint64().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
+    @java.lang.Override
+    public long getMapSint64Sint64OrThrow(
+        long key) {
+
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapSint64Sint64().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_FIXED32_FIXED32_FIELD_NUMBER = 62;
+    private static final class MapFixed32Fixed32DefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed32Fixed32Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.FIXED32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.FIXED32,
+                  0);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Integer> mapFixed32Fixed32_;
+    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+    internalGetMapFixed32Fixed32() {
+      if (mapFixed32Fixed32_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapFixed32Fixed32DefaultEntryHolder.defaultEntry);
+      }
+      return mapFixed32Fixed32_;
+    }
+    public int getMapFixed32Fixed32Count() {
+      return internalGetMapFixed32Fixed32().getMap().size();
+    }
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapFixed32Fixed32(
+        int key) {
+
+      return internalGetMapFixed32Fixed32().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapFixed32Fixed32Map()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getMapFixed32Fixed32() {
+      return getMapFixed32Fixed32Map();
+    }
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getMapFixed32Fixed32Map() {
+      return internalGetMapFixed32Fixed32().getMap();
+    }
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
+    @java.lang.Override
+    public int getMapFixed32Fixed32OrDefault(
+        int key,
+        int defaultValue) {
+
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapFixed32Fixed32().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
+    @java.lang.Override
+    public int getMapFixed32Fixed32OrThrow(
+        int key) {
+
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapFixed32Fixed32().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_FIXED64_FIXED64_FIELD_NUMBER = 63;
+    private static final class MapFixed64Fixed64DefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Long, java.lang.Long> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Long, java.lang.Long>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed64Fixed64Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.FIXED64,
+                  0L,
+                  com.google.protobuf.WireFormat.FieldType.FIXED64,
+                  0L);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Long, java.lang.Long> mapFixed64Fixed64_;
+    private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+    internalGetMapFixed64Fixed64() {
+      if (mapFixed64Fixed64_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapFixed64Fixed64DefaultEntryHolder.defaultEntry);
+      }
+      return mapFixed64Fixed64_;
+    }
+    public int getMapFixed64Fixed64Count() {
+      return internalGetMapFixed64Fixed64().getMap().size();
+    }
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapFixed64Fixed64(
+        long key) {
+
+      return internalGetMapFixed64Fixed64().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapFixed64Fixed64Map()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Long, java.lang.Long> getMapFixed64Fixed64() {
+      return getMapFixed64Fixed64Map();
+    }
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Long, java.lang.Long> getMapFixed64Fixed64Map() {
+      return internalGetMapFixed64Fixed64().getMap();
+    }
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
+    @java.lang.Override
+    public long getMapFixed64Fixed64OrDefault(
+        long key,
+        long defaultValue) {
+
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapFixed64Fixed64().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
+    @java.lang.Override
+    public long getMapFixed64Fixed64OrThrow(
+        long key) {
+
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapFixed64Fixed64().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_SFIXED32_SFIXED32_FIELD_NUMBER = 64;
+    private static final class MapSfixed32Sfixed32DefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed32Sfixed32Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.SFIXED32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.SFIXED32,
+                  0);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Integer> mapSfixed32Sfixed32_;
+    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+    internalGetMapSfixed32Sfixed32() {
+      if (mapSfixed32Sfixed32_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry);
+      }
+      return mapSfixed32Sfixed32_;
+    }
+    public int getMapSfixed32Sfixed32Count() {
+      return internalGetMapSfixed32Sfixed32().getMap().size();
+    }
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapSfixed32Sfixed32(
+        int key) {
+
+      return internalGetMapSfixed32Sfixed32().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapSfixed32Sfixed32Map()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSfixed32Sfixed32() {
+      return getMapSfixed32Sfixed32Map();
+    }
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSfixed32Sfixed32Map() {
+      return internalGetMapSfixed32Sfixed32().getMap();
+    }
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    @java.lang.Override
+    public int getMapSfixed32Sfixed32OrDefault(
+        int key,
+        int defaultValue) {
+
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapSfixed32Sfixed32().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    @java.lang.Override
+    public int getMapSfixed32Sfixed32OrThrow(
+        int key) {
+
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapSfixed32Sfixed32().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_SFIXED64_SFIXED64_FIELD_NUMBER = 65;
+    private static final class MapSfixed64Sfixed64DefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Long, java.lang.Long> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Long, java.lang.Long>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed64Sfixed64Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.SFIXED64,
+                  0L,
+                  com.google.protobuf.WireFormat.FieldType.SFIXED64,
+                  0L);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Long, java.lang.Long> mapSfixed64Sfixed64_;
+    private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+    internalGetMapSfixed64Sfixed64() {
+      if (mapSfixed64Sfixed64_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry);
+      }
+      return mapSfixed64Sfixed64_;
+    }
+    public int getMapSfixed64Sfixed64Count() {
+      return internalGetMapSfixed64Sfixed64().getMap().size();
+    }
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapSfixed64Sfixed64(
+        long key) {
+
+      return internalGetMapSfixed64Sfixed64().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapSfixed64Sfixed64Map()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Long, java.lang.Long> getMapSfixed64Sfixed64() {
+      return getMapSfixed64Sfixed64Map();
+    }
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Long, java.lang.Long> getMapSfixed64Sfixed64Map() {
+      return internalGetMapSfixed64Sfixed64().getMap();
+    }
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    @java.lang.Override
+    public long getMapSfixed64Sfixed64OrDefault(
+        long key,
+        long defaultValue) {
+
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapSfixed64Sfixed64().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    @java.lang.Override
+    public long getMapSfixed64Sfixed64OrThrow(
+        long key) {
+
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapSfixed64Sfixed64().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_INT32_FLOAT_FIELD_NUMBER = 66;
+    private static final class MapInt32FloatDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Float> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Float>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32FloatEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.INT32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.FLOAT,
+                  0F);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Float> mapInt32Float_;
+    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float>
+    internalGetMapInt32Float() {
+      if (mapInt32Float_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapInt32FloatDefaultEntryHolder.defaultEntry);
+      }
+      return mapInt32Float_;
+    }
+    public int getMapInt32FloatCount() {
+      return internalGetMapInt32Float().getMap().size();
+    }
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapInt32Float(
+        int key) {
+
+      return internalGetMapInt32Float().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapInt32FloatMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Integer, java.lang.Float> getMapInt32Float() {
+      return getMapInt32FloatMap();
+    }
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Integer, java.lang.Float> getMapInt32FloatMap() {
+      return internalGetMapInt32Float().getMap();
+    }
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    @java.lang.Override
+    public float getMapInt32FloatOrDefault(
+        int key,
+        float defaultValue) {
+
+      java.util.Map<java.lang.Integer, java.lang.Float> map =
+          internalGetMapInt32Float().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    @java.lang.Override
+    public float getMapInt32FloatOrThrow(
+        int key) {
+
+      java.util.Map<java.lang.Integer, java.lang.Float> map =
+          internalGetMapInt32Float().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_INT32_DOUBLE_FIELD_NUMBER = 67;
+    private static final class MapInt32DoubleDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Double> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Double>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32DoubleEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.INT32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.DOUBLE,
+                  0D);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Double> mapInt32Double_;
+    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Double>
+    internalGetMapInt32Double() {
+      if (mapInt32Double_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapInt32DoubleDefaultEntryHolder.defaultEntry);
+      }
+      return mapInt32Double_;
+    }
+    public int getMapInt32DoubleCount() {
+      return internalGetMapInt32Double().getMap().size();
+    }
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapInt32Double(
+        int key) {
+
+      return internalGetMapInt32Double().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapInt32DoubleMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Integer, java.lang.Double> getMapInt32Double() {
+      return getMapInt32DoubleMap();
+    }
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Integer, java.lang.Double> getMapInt32DoubleMap() {
+      return internalGetMapInt32Double().getMap();
+    }
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    @java.lang.Override
+    public double getMapInt32DoubleOrDefault(
+        int key,
+        double defaultValue) {
+
+      java.util.Map<java.lang.Integer, java.lang.Double> map =
+          internalGetMapInt32Double().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    @java.lang.Override
+    public double getMapInt32DoubleOrThrow(
+        int key) {
+
+      java.util.Map<java.lang.Integer, java.lang.Double> map =
+          internalGetMapInt32Double().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_BOOL_BOOL_FIELD_NUMBER = 68;
+    private static final class MapBoolBoolDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Boolean, java.lang.Boolean> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Boolean, java.lang.Boolean>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapBoolBoolEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.BOOL,
+                  false,
+                  com.google.protobuf.WireFormat.FieldType.BOOL,
+                  false);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Boolean, java.lang.Boolean> mapBoolBool_;
+    private com.google.protobuf.MapField<java.lang.Boolean, java.lang.Boolean>
+    internalGetMapBoolBool() {
+      if (mapBoolBool_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapBoolBoolDefaultEntryHolder.defaultEntry);
+      }
+      return mapBoolBool_;
+    }
+    public int getMapBoolBoolCount() {
+      return internalGetMapBoolBool().getMap().size();
+    }
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapBoolBool(
+        boolean key) {
+
+      return internalGetMapBoolBool().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapBoolBoolMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Boolean, java.lang.Boolean> getMapBoolBool() {
+      return getMapBoolBoolMap();
+    }
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Boolean, java.lang.Boolean> getMapBoolBoolMap() {
+      return internalGetMapBoolBool().getMap();
+    }
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    @java.lang.Override
+    public boolean getMapBoolBoolOrDefault(
+        boolean key,
+        boolean defaultValue) {
+
+      java.util.Map<java.lang.Boolean, java.lang.Boolean> map =
+          internalGetMapBoolBool().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    @java.lang.Override
+    public boolean getMapBoolBoolOrThrow(
+        boolean key) {
+
+      java.util.Map<java.lang.Boolean, java.lang.Boolean> map =
+          internalGetMapBoolBool().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_STRING_STRING_FIELD_NUMBER = 69;
+    private static final class MapStringStringDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.String, java.lang.String> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.String, java.lang.String>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringStringEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "");
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.String, java.lang.String> mapStringString_;
+    private com.google.protobuf.MapField<java.lang.String, java.lang.String>
+    internalGetMapStringString() {
+      if (mapStringString_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapStringStringDefaultEntryHolder.defaultEntry);
+      }
+      return mapStringString_;
+    }
+    public int getMapStringStringCount() {
+      return internalGetMapStringString().getMap().size();
+    }
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapStringString(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      return internalGetMapStringString().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapStringStringMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.String, java.lang.String> getMapStringString() {
+      return getMapStringStringMap();
+    }
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.String, java.lang.String> getMapStringStringMap() {
+      return internalGetMapStringString().getMap();
+    }
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    @java.lang.Override
+    public /* nullable */
+java.lang.String getMapStringStringOrDefault(
+        java.lang.String key,
+        /* nullable */
+java.lang.String defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, java.lang.String> map =
+          internalGetMapStringString().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    @java.lang.Override
+    public java.lang.String getMapStringStringOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, java.lang.String> map =
+          internalGetMapStringString().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_STRING_BYTES_FIELD_NUMBER = 70;
+    private static final class MapStringBytesDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.String, com.google.protobuf.ByteString> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.String, com.google.protobuf.ByteString>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringBytesEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.BYTES,
+                  com.google.protobuf.ByteString.EMPTY);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.String, com.google.protobuf.ByteString> mapStringBytes_;
+    private com.google.protobuf.MapField<java.lang.String, com.google.protobuf.ByteString>
+    internalGetMapStringBytes() {
+      if (mapStringBytes_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapStringBytesDefaultEntryHolder.defaultEntry);
+      }
+      return mapStringBytes_;
+    }
+    public int getMapStringBytesCount() {
+      return internalGetMapStringBytes().getMap().size();
+    }
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapStringBytes(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      return internalGetMapStringBytes().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapStringBytesMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.String, com.google.protobuf.ByteString> getMapStringBytes() {
+      return getMapStringBytesMap();
+    }
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.String, com.google.protobuf.ByteString> getMapStringBytesMap() {
+      return internalGetMapStringBytes().getMap();
+    }
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    @java.lang.Override
+    public /* nullable */
+com.google.protobuf.ByteString getMapStringBytesOrDefault(
+        java.lang.String key,
+        /* nullable */
+com.google.protobuf.ByteString defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, com.google.protobuf.ByteString> map =
+          internalGetMapStringBytes().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString getMapStringBytesOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, com.google.protobuf.ByteString> map =
+          internalGetMapStringBytes().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_STRING_NESTED_MESSAGE_FIELD_NUMBER = 71;
+    private static final class MapStringNestedMessageDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedMessageEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.MESSAGE,
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance());
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> mapStringNestedMessage_;
+    private com.google.protobuf.MapField<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage>
+    internalGetMapStringNestedMessage() {
+      if (mapStringNestedMessage_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapStringNestedMessageDefaultEntryHolder.defaultEntry);
+      }
+      return mapStringNestedMessage_;
+    }
+    public int getMapStringNestedMessageCount() {
+      return internalGetMapStringNestedMessage().getMap().size();
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapStringNestedMessage(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      return internalGetMapStringNestedMessage().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapStringNestedMessageMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> getMapStringNestedMessage() {
+      return getMapStringNestedMessageMap();
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> getMapStringNestedMessageMap() {
+      return internalGetMapStringNestedMessage().getMap();
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    @java.lang.Override
+    public /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getMapStringNestedMessageOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> map =
+          internalGetMapStringNestedMessage().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getMapStringNestedMessageOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> map =
+          internalGetMapStringNestedMessage().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_STRING_FOREIGN_MESSAGE_FIELD_NUMBER = 72;
+    private static final class MapStringForeignMessageDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignMessageEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.MESSAGE,
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.getDefaultInstance());
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> mapStringForeignMessage_;
+    private com.google.protobuf.MapField<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage>
+    internalGetMapStringForeignMessage() {
+      if (mapStringForeignMessage_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapStringForeignMessageDefaultEntryHolder.defaultEntry);
+      }
+      return mapStringForeignMessage_;
+    }
+    public int getMapStringForeignMessageCount() {
+      return internalGetMapStringForeignMessage().getMap().size();
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapStringForeignMessage(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      return internalGetMapStringForeignMessage().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapStringForeignMessageMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> getMapStringForeignMessage() {
+      return getMapStringForeignMessageMap();
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> getMapStringForeignMessageMap() {
+      return internalGetMapStringForeignMessage().getMap();
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    @java.lang.Override
+    public /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getMapStringForeignMessageOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> map =
+          internalGetMapStringForeignMessage().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getMapStringForeignMessageOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> map =
+          internalGetMapStringForeignMessage().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_STRING_NESTED_ENUM_FIELD_NUMBER = 73;
+    private static final class MapStringNestedEnumDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.String, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.String, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedEnumEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.ENUM,
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.FOO.getNumber());
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.String, java.lang.Integer> mapStringNestedEnum_;
+    private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
+    internalGetMapStringNestedEnum() {
+      if (mapStringNestedEnum_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapStringNestedEnumDefaultEntryHolder.defaultEntry);
+      }
+      return mapStringNestedEnum_;
+    }
+    private static final
+    com.google.protobuf.Internal.MapAdapter.Converter<
+        java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> mapStringNestedEnumValueConverter =
+            com.google.protobuf.Internal.MapAdapter.newEnumConverter(
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.internalGetValueMap(),
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.FOO);
+    private static final java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>
+    internalGetAdaptedMapStringNestedEnumMap(
+        java.util.Map<java.lang.String, java.lang.Integer> map) {
+      return new com.google.protobuf.Internal.MapAdapter<
+          java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum, java.lang.Integer>(
+              map, mapStringNestedEnumValueConverter);
+    }
+    public int getMapStringNestedEnumCount() {
+      return internalGetMapStringNestedEnum().getMap().size();
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapStringNestedEnum(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      return internalGetMapStringNestedEnum().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapStringNestedEnumMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>
+    getMapStringNestedEnum() {
+      return getMapStringNestedEnumMap();
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>
+    getMapStringNestedEnumMap() {
+      return internalGetAdaptedMapStringNestedEnumMap(
+          internalGetMapStringNestedEnum().getMap());}
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    @java.lang.Override
+    public /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getMapStringNestedEnumOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, java.lang.Integer> map =
+          internalGetMapStringNestedEnum().getMap();
+      return map.containsKey(key)
+             ? mapStringNestedEnumValueConverter.doForward(map.get(key))
+             : defaultValue;
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getMapStringNestedEnumOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, java.lang.Integer> map =
+          internalGetMapStringNestedEnum().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return mapStringNestedEnumValueConverter.doForward(map.get(key));
+    }
+
+    public static final int MAP_STRING_FOREIGN_ENUM_FIELD_NUMBER = 74;
+    private static final class MapStringForeignEnumDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.String, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.String, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignEnumEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.ENUM,
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.FOREIGN_FOO.getNumber());
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.String, java.lang.Integer> mapStringForeignEnum_;
+    private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
+    internalGetMapStringForeignEnum() {
+      if (mapStringForeignEnum_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapStringForeignEnumDefaultEntryHolder.defaultEntry);
+      }
+      return mapStringForeignEnum_;
+    }
+    private static final
+    com.google.protobuf.Internal.MapAdapter.Converter<
+        java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum> mapStringForeignEnumValueConverter =
+            com.google.protobuf.Internal.MapAdapter.newEnumConverter(
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.internalGetValueMap(),
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.FOREIGN_FOO);
+    private static final java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum>
+    internalGetAdaptedMapStringForeignEnumMap(
+        java.util.Map<java.lang.String, java.lang.Integer> map) {
+      return new com.google.protobuf.Internal.MapAdapter<
+          java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum, java.lang.Integer>(
+              map, mapStringForeignEnumValueConverter);
+    }
+    public int getMapStringForeignEnumCount() {
+      return internalGetMapStringForeignEnum().getMap().size();
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapStringForeignEnum(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      return internalGetMapStringForeignEnum().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapStringForeignEnumMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum>
+    getMapStringForeignEnum() {
+      return getMapStringForeignEnumMap();
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum>
+    getMapStringForeignEnumMap() {
+      return internalGetAdaptedMapStringForeignEnumMap(
+          internalGetMapStringForeignEnum().getMap());}
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    @java.lang.Override
+    public /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getMapStringForeignEnumOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, java.lang.Integer> map =
+          internalGetMapStringForeignEnum().getMap();
+      return map.containsKey(key)
+             ? mapStringForeignEnumValueConverter.doForward(map.get(key))
+             : defaultValue;
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getMapStringForeignEnumOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, java.lang.Integer> map =
+          internalGetMapStringForeignEnum().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return mapStringForeignEnumValueConverter.doForward(map.get(key));
+    }
+
+    public static final int ONEOF_UINT32_FIELD_NUMBER = 111;
+    /**
+     * <code>uint32 oneof_uint32 = 111;</code>
+     * @return Whether the oneofUint32 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOneofUint32() {
+      return oneofFieldCase_ == 111;
+    }
+    /**
+     * <code>uint32 oneof_uint32 = 111;</code>
+     * @return The oneofUint32.
+     */
+    @java.lang.Override
+    public int getOneofUint32() {
+      if (oneofFieldCase_ == 111) {
+        return (java.lang.Integer) oneofField_;
+      }
+      return 0;
+    }
+
+    public static final int ONEOF_NESTED_MESSAGE_FIELD_NUMBER = 112;
+    /**
+     * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+     * @return Whether the oneofNestedMessage field is set.
+     */
+    @java.lang.Override
+    public boolean hasOneofNestedMessage() {
+      return oneofFieldCase_ == 112;
+    }
+    /**
+     * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+     * @return The oneofNestedMessage.
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getOneofNestedMessage() {
+      if (oneofFieldCase_ == 112) {
+         return (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) oneofField_;
+      }
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance();
+    }
+    /**
+     * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder getOneofNestedMessageOrBuilder() {
+      if (oneofFieldCase_ == 112) {
+         return (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) oneofField_;
+      }
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance();
+    }
+
+    public static final int ONEOF_STRING_FIELD_NUMBER = 113;
+    /**
+     * <code>string oneof_string = 113;</code>
+     * @return Whether the oneofString field is set.
+     */
+    public boolean hasOneofString() {
+      return oneofFieldCase_ == 113;
+    }
+    /**
+     * <code>string oneof_string = 113;</code>
+     * @return The oneofString.
+     */
+    public java.lang.String getOneofString() {
+      java.lang.Object ref = "";
+      if (oneofFieldCase_ == 113) {
+        ref = oneofField_;
+      }
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8() && (oneofFieldCase_ == 113)) {
+          oneofField_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     * <code>string oneof_string = 113;</code>
+     * @return The bytes for oneofString.
+     */
+    public com.google.protobuf.ByteString
+        getOneofStringBytes() {
+      java.lang.Object ref = "";
+      if (oneofFieldCase_ == 113) {
+        ref = oneofField_;
+      }
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        if (oneofFieldCase_ == 113) {
+          oneofField_ = b;
+        }
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int ONEOF_BYTES_FIELD_NUMBER = 114;
+    /**
+     * <code>bytes oneof_bytes = 114;</code>
+     * @return Whether the oneofBytes field is set.
+     */
+    @java.lang.Override
+    public boolean hasOneofBytes() {
+      return oneofFieldCase_ == 114;
+    }
+    /**
+     * <code>bytes oneof_bytes = 114;</code>
+     * @return The oneofBytes.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString getOneofBytes() {
+      if (oneofFieldCase_ == 114) {
+        return (com.google.protobuf.ByteString) oneofField_;
+      }
+      return com.google.protobuf.ByteString.EMPTY;
+    }
+
+    public static final int ONEOF_BOOL_FIELD_NUMBER = 115;
+    /**
+     * <code>bool oneof_bool = 115;</code>
+     * @return Whether the oneofBool field is set.
+     */
+    @java.lang.Override
+    public boolean hasOneofBool() {
+      return oneofFieldCase_ == 115;
+    }
+    /**
+     * <code>bool oneof_bool = 115;</code>
+     * @return The oneofBool.
+     */
+    @java.lang.Override
+    public boolean getOneofBool() {
+      if (oneofFieldCase_ == 115) {
+        return (java.lang.Boolean) oneofField_;
+      }
+      return false;
+    }
+
+    public static final int ONEOF_UINT64_FIELD_NUMBER = 116;
+    /**
+     * <code>uint64 oneof_uint64 = 116;</code>
+     * @return Whether the oneofUint64 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOneofUint64() {
+      return oneofFieldCase_ == 116;
+    }
+    /**
+     * <code>uint64 oneof_uint64 = 116;</code>
+     * @return The oneofUint64.
+     */
+    @java.lang.Override
+    public long getOneofUint64() {
+      if (oneofFieldCase_ == 116) {
+        return (java.lang.Long) oneofField_;
+      }
+      return 0L;
+    }
+
+    public static final int ONEOF_FLOAT_FIELD_NUMBER = 117;
+    /**
+     * <code>float oneof_float = 117;</code>
+     * @return Whether the oneofFloat field is set.
+     */
+    @java.lang.Override
+    public boolean hasOneofFloat() {
+      return oneofFieldCase_ == 117;
+    }
+    /**
+     * <code>float oneof_float = 117;</code>
+     * @return The oneofFloat.
+     */
+    @java.lang.Override
+    public float getOneofFloat() {
+      if (oneofFieldCase_ == 117) {
+        return (java.lang.Float) oneofField_;
+      }
+      return 0F;
+    }
+
+    public static final int ONEOF_DOUBLE_FIELD_NUMBER = 118;
+    /**
+     * <code>double oneof_double = 118;</code>
+     * @return Whether the oneofDouble field is set.
+     */
+    @java.lang.Override
+    public boolean hasOneofDouble() {
+      return oneofFieldCase_ == 118;
+    }
+    /**
+     * <code>double oneof_double = 118;</code>
+     * @return The oneofDouble.
+     */
+    @java.lang.Override
+    public double getOneofDouble() {
+      if (oneofFieldCase_ == 118) {
+        return (java.lang.Double) oneofField_;
+      }
+      return 0D;
+    }
+
+    public static final int ONEOF_ENUM_FIELD_NUMBER = 119;
+    /**
+     * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum oneof_enum = 119;</code>
+     * @return Whether the oneofEnum field is set.
+     */
+    public boolean hasOneofEnum() {
+      return oneofFieldCase_ == 119;
+    }
+    /**
+     * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum oneof_enum = 119;</code>
+     * @return The oneofEnum.
+     */
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getOneofEnum() {
+      if (oneofFieldCase_ == 119) {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(
+            (java.lang.Integer) oneofField_);
+        return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.FOO : result;
+      }
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.FOO;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      if (hasOptionalNestedMessage()) {
+        if (!getOptionalNestedMessage().isInitialized()) {
+          memoizedIsInitialized = 0;
+          return false;
+        }
+      }
+      if (hasRecursiveMessage()) {
+        if (!getRecursiveMessage().isInitialized()) {
+          memoizedIsInitialized = 0;
+          return false;
+        }
+      }
+      for (int i = 0; i < getRepeatedNestedMessageCount(); i++) {
+        if (!getRepeatedNestedMessage(i).isInitialized()) {
+          memoizedIsInitialized = 0;
+          return false;
+        }
+      }
+      for (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage item : getMapStringNestedMessageMap().values()) {
+        if (!item.isInitialized()) {
+          memoizedIsInitialized = 0;
+          return false;
+        }
+      }
+      if (hasOneofNestedMessage()) {
+        if (!getOneofNestedMessage().isInitialized()) {
+          memoizedIsInitialized = 0;
+          return false;
+        }
+      }
+      if (!extensionsAreInitialized()) {
+        memoizedIsInitialized = 0;
+        return false;
+      }
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      getSerializedSize();
+      com.google.protobuf.GeneratedMessage
+        .ExtendableMessage<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2>.ExtensionWriter
+          extensionWriter = newExtensionWriter();
+      if (((bitField0_ & 0x00000001) != 0)) {
+        output.writeInt32(1, optionalInt32_);
+      }
+      if (((bitField0_ & 0x00000002) != 0)) {
+        output.writeInt64(2, optionalInt64_);
+      }
+      if (((bitField0_ & 0x00000004) != 0)) {
+        output.writeUInt32(3, optionalUint32_);
+      }
+      if (((bitField0_ & 0x00000008) != 0)) {
+        output.writeUInt64(4, optionalUint64_);
+      }
+      if (((bitField0_ & 0x00000010) != 0)) {
+        output.writeSInt32(5, optionalSint32_);
+      }
+      if (((bitField0_ & 0x00000020) != 0)) {
+        output.writeSInt64(6, optionalSint64_);
+      }
+      if (((bitField0_ & 0x00000040) != 0)) {
+        output.writeFixed32(7, optionalFixed32_);
+      }
+      if (((bitField0_ & 0x00000080) != 0)) {
+        output.writeFixed64(8, optionalFixed64_);
+      }
+      if (((bitField0_ & 0x00000100) != 0)) {
+        output.writeSFixed32(9, optionalSfixed32_);
+      }
+      if (((bitField0_ & 0x00000200) != 0)) {
+        output.writeSFixed64(10, optionalSfixed64_);
+      }
+      if (((bitField0_ & 0x00000400) != 0)) {
+        output.writeFloat(11, optionalFloat_);
+      }
+      if (((bitField0_ & 0x00000800) != 0)) {
+        output.writeDouble(12, optionalDouble_);
+      }
+      if (((bitField0_ & 0x00001000) != 0)) {
+        output.writeBool(13, optionalBool_);
+      }
+      if (((bitField0_ & 0x00002000) != 0)) {
+        com.google.protobuf.GeneratedMessage.writeString(output, 14, optionalString_);
+      }
+      if (((bitField0_ & 0x00004000) != 0)) {
+        output.writeBytes(15, optionalBytes_);
+      }
+      if (((bitField0_ & 0x00008000) != 0)) {
+        output.writeMessage(18, getOptionalNestedMessage());
+      }
+      if (((bitField0_ & 0x00010000) != 0)) {
+        output.writeMessage(19, getOptionalForeignMessage());
+      }
+      if (((bitField0_ & 0x00020000) != 0)) {
+        output.writeEnum(21, optionalNestedEnum_);
+      }
+      if (((bitField0_ & 0x00040000) != 0)) {
+        output.writeEnum(22, optionalForeignEnum_);
+      }
+      if (((bitField0_ & 0x00080000) != 0)) {
+        output.writeEnum(23, optionalAliasedEnum_);
+      }
+      if (((bitField0_ & 0x00100000) != 0)) {
+        output.writeMessage(27, getRecursiveMessage());
+      }
+      for (int i = 0; i < repeatedInt32_.size(); i++) {
+        output.writeInt32(31, repeatedInt32_.getInt(i));
+      }
+      for (int i = 0; i < repeatedInt64_.size(); i++) {
+        output.writeInt64(32, repeatedInt64_.getLong(i));
+      }
+      for (int i = 0; i < repeatedUint32_.size(); i++) {
+        output.writeUInt32(33, repeatedUint32_.getInt(i));
+      }
+      for (int i = 0; i < repeatedUint64_.size(); i++) {
+        output.writeUInt64(34, repeatedUint64_.getLong(i));
+      }
+      for (int i = 0; i < repeatedSint32_.size(); i++) {
+        output.writeSInt32(35, repeatedSint32_.getInt(i));
+      }
+      for (int i = 0; i < repeatedSint64_.size(); i++) {
+        output.writeSInt64(36, repeatedSint64_.getLong(i));
+      }
+      for (int i = 0; i < repeatedFixed32_.size(); i++) {
+        output.writeFixed32(37, repeatedFixed32_.getInt(i));
+      }
+      for (int i = 0; i < repeatedFixed64_.size(); i++) {
+        output.writeFixed64(38, repeatedFixed64_.getLong(i));
+      }
+      for (int i = 0; i < repeatedSfixed32_.size(); i++) {
+        output.writeSFixed32(39, repeatedSfixed32_.getInt(i));
+      }
+      for (int i = 0; i < repeatedSfixed64_.size(); i++) {
+        output.writeSFixed64(40, repeatedSfixed64_.getLong(i));
+      }
+      for (int i = 0; i < repeatedFloat_.size(); i++) {
+        output.writeFloat(41, repeatedFloat_.getFloat(i));
+      }
+      for (int i = 0; i < repeatedDouble_.size(); i++) {
+        output.writeDouble(42, repeatedDouble_.getDouble(i));
+      }
+      for (int i = 0; i < repeatedBool_.size(); i++) {
+        output.writeBool(43, repeatedBool_.getBoolean(i));
+      }
+      for (int i = 0; i < repeatedString_.size(); i++) {
+        com.google.protobuf.GeneratedMessage.writeString(output, 44, repeatedString_.getRaw(i));
+      }
+      for (int i = 0; i < repeatedBytes_.size(); i++) {
+        output.writeBytes(45, repeatedBytes_.get(i));
+      }
+      for (int i = 0; i < repeatedNestedMessage_.size(); i++) {
+        output.writeMessage(48, repeatedNestedMessage_.get(i));
+      }
+      for (int i = 0; i < repeatedForeignMessage_.size(); i++) {
+        output.writeMessage(49, repeatedForeignMessage_.get(i));
+      }
+      for (int i = 0; i < repeatedNestedEnum_.size(); i++) {
+        output.writeEnum(51, repeatedNestedEnum_.get(i));
+      }
+      for (int i = 0; i < repeatedForeignEnum_.size(); i++) {
+        output.writeEnum(52, repeatedForeignEnum_.get(i));
+      }
+      com.google.protobuf.GeneratedMessage
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapInt32Int32(),
+          MapInt32Int32DefaultEntryHolder.defaultEntry,
+          56);
+      com.google.protobuf.GeneratedMessage
+        .serializeLongMapTo(
+          output,
+          internalGetMapInt64Int64(),
+          MapInt64Int64DefaultEntryHolder.defaultEntry,
+          57);
+      com.google.protobuf.GeneratedMessage
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapUint32Uint32(),
+          MapUint32Uint32DefaultEntryHolder.defaultEntry,
+          58);
+      com.google.protobuf.GeneratedMessage
+        .serializeLongMapTo(
+          output,
+          internalGetMapUint64Uint64(),
+          MapUint64Uint64DefaultEntryHolder.defaultEntry,
+          59);
+      com.google.protobuf.GeneratedMessage
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapSint32Sint32(),
+          MapSint32Sint32DefaultEntryHolder.defaultEntry,
+          60);
+      com.google.protobuf.GeneratedMessage
+        .serializeLongMapTo(
+          output,
+          internalGetMapSint64Sint64(),
+          MapSint64Sint64DefaultEntryHolder.defaultEntry,
+          61);
+      com.google.protobuf.GeneratedMessage
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapFixed32Fixed32(),
+          MapFixed32Fixed32DefaultEntryHolder.defaultEntry,
+          62);
+      com.google.protobuf.GeneratedMessage
+        .serializeLongMapTo(
+          output,
+          internalGetMapFixed64Fixed64(),
+          MapFixed64Fixed64DefaultEntryHolder.defaultEntry,
+          63);
+      com.google.protobuf.GeneratedMessage
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapSfixed32Sfixed32(),
+          MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry,
+          64);
+      com.google.protobuf.GeneratedMessage
+        .serializeLongMapTo(
+          output,
+          internalGetMapSfixed64Sfixed64(),
+          MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry,
+          65);
+      com.google.protobuf.GeneratedMessage
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapInt32Float(),
+          MapInt32FloatDefaultEntryHolder.defaultEntry,
+          66);
+      com.google.protobuf.GeneratedMessage
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapInt32Double(),
+          MapInt32DoubleDefaultEntryHolder.defaultEntry,
+          67);
+      com.google.protobuf.GeneratedMessage
+        .serializeBooleanMapTo(
+          output,
+          internalGetMapBoolBool(),
+          MapBoolBoolDefaultEntryHolder.defaultEntry,
+          68);
+      com.google.protobuf.GeneratedMessage
+        .serializeStringMapTo(
+          output,
+          internalGetMapStringString(),
+          MapStringStringDefaultEntryHolder.defaultEntry,
+          69);
+      com.google.protobuf.GeneratedMessage
+        .serializeStringMapTo(
+          output,
+          internalGetMapStringBytes(),
+          MapStringBytesDefaultEntryHolder.defaultEntry,
+          70);
+      com.google.protobuf.GeneratedMessage
+        .serializeStringMapTo(
+          output,
+          internalGetMapStringNestedMessage(),
+          MapStringNestedMessageDefaultEntryHolder.defaultEntry,
+          71);
+      com.google.protobuf.GeneratedMessage
+        .serializeStringMapTo(
+          output,
+          internalGetMapStringForeignMessage(),
+          MapStringForeignMessageDefaultEntryHolder.defaultEntry,
+          72);
+      com.google.protobuf.GeneratedMessage
+        .serializeStringMapTo(
+          output,
+          internalGetMapStringNestedEnum(),
+          MapStringNestedEnumDefaultEntryHolder.defaultEntry,
+          73);
+      com.google.protobuf.GeneratedMessage
+        .serializeStringMapTo(
+          output,
+          internalGetMapStringForeignEnum(),
+          MapStringForeignEnumDefaultEntryHolder.defaultEntry,
+          74);
+      if (getPackedInt32List().size() > 0) {
+        output.writeUInt32NoTag(602);
+        output.writeUInt32NoTag(packedInt32MemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedInt32_.size(); i++) {
+        output.writeInt32NoTag(packedInt32_.getInt(i));
+      }
+      if (getPackedInt64List().size() > 0) {
+        output.writeUInt32NoTag(610);
+        output.writeUInt32NoTag(packedInt64MemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedInt64_.size(); i++) {
+        output.writeInt64NoTag(packedInt64_.getLong(i));
+      }
+      if (getPackedUint32List().size() > 0) {
+        output.writeUInt32NoTag(618);
+        output.writeUInt32NoTag(packedUint32MemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedUint32_.size(); i++) {
+        output.writeUInt32NoTag(packedUint32_.getInt(i));
+      }
+      if (getPackedUint64List().size() > 0) {
+        output.writeUInt32NoTag(626);
+        output.writeUInt32NoTag(packedUint64MemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedUint64_.size(); i++) {
+        output.writeUInt64NoTag(packedUint64_.getLong(i));
+      }
+      if (getPackedSint32List().size() > 0) {
+        output.writeUInt32NoTag(634);
+        output.writeUInt32NoTag(packedSint32MemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedSint32_.size(); i++) {
+        output.writeSInt32NoTag(packedSint32_.getInt(i));
+      }
+      if (getPackedSint64List().size() > 0) {
+        output.writeUInt32NoTag(642);
+        output.writeUInt32NoTag(packedSint64MemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedSint64_.size(); i++) {
+        output.writeSInt64NoTag(packedSint64_.getLong(i));
+      }
+      if (getPackedFixed32List().size() > 0) {
+        output.writeUInt32NoTag(650);
+        output.writeUInt32NoTag(packedFixed32MemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedFixed32_.size(); i++) {
+        output.writeFixed32NoTag(packedFixed32_.getInt(i));
+      }
+      if (getPackedFixed64List().size() > 0) {
+        output.writeUInt32NoTag(658);
+        output.writeUInt32NoTag(packedFixed64MemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedFixed64_.size(); i++) {
+        output.writeFixed64NoTag(packedFixed64_.getLong(i));
+      }
+      if (getPackedSfixed32List().size() > 0) {
+        output.writeUInt32NoTag(666);
+        output.writeUInt32NoTag(packedSfixed32MemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedSfixed32_.size(); i++) {
+        output.writeSFixed32NoTag(packedSfixed32_.getInt(i));
+      }
+      if (getPackedSfixed64List().size() > 0) {
+        output.writeUInt32NoTag(674);
+        output.writeUInt32NoTag(packedSfixed64MemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedSfixed64_.size(); i++) {
+        output.writeSFixed64NoTag(packedSfixed64_.getLong(i));
+      }
+      if (getPackedFloatList().size() > 0) {
+        output.writeUInt32NoTag(682);
+        output.writeUInt32NoTag(packedFloatMemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedFloat_.size(); i++) {
+        output.writeFloatNoTag(packedFloat_.getFloat(i));
+      }
+      if (getPackedDoubleList().size() > 0) {
+        output.writeUInt32NoTag(690);
+        output.writeUInt32NoTag(packedDoubleMemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedDouble_.size(); i++) {
+        output.writeDoubleNoTag(packedDouble_.getDouble(i));
+      }
+      if (getPackedBoolList().size() > 0) {
+        output.writeUInt32NoTag(698);
+        output.writeUInt32NoTag(packedBoolMemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedBool_.size(); i++) {
+        output.writeBoolNoTag(packedBool_.getBoolean(i));
+      }
+      if (getPackedNestedEnumList().size() > 0) {
+        output.writeUInt32NoTag(706);
+        output.writeUInt32NoTag(packedNestedEnumMemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedNestedEnum_.size(); i++) {
+        output.writeEnumNoTag(packedNestedEnum_.get(i));
+      }
+      for (int i = 0; i < unpackedInt32_.size(); i++) {
+        output.writeInt32(89, unpackedInt32_.getInt(i));
+      }
+      for (int i = 0; i < unpackedInt64_.size(); i++) {
+        output.writeInt64(90, unpackedInt64_.getLong(i));
+      }
+      for (int i = 0; i < unpackedUint32_.size(); i++) {
+        output.writeUInt32(91, unpackedUint32_.getInt(i));
+      }
+      for (int i = 0; i < unpackedUint64_.size(); i++) {
+        output.writeUInt64(92, unpackedUint64_.getLong(i));
+      }
+      for (int i = 0; i < unpackedSint32_.size(); i++) {
+        output.writeSInt32(93, unpackedSint32_.getInt(i));
+      }
+      for (int i = 0; i < unpackedSint64_.size(); i++) {
+        output.writeSInt64(94, unpackedSint64_.getLong(i));
+      }
+      for (int i = 0; i < unpackedFixed32_.size(); i++) {
+        output.writeFixed32(95, unpackedFixed32_.getInt(i));
+      }
+      for (int i = 0; i < unpackedFixed64_.size(); i++) {
+        output.writeFixed64(96, unpackedFixed64_.getLong(i));
+      }
+      for (int i = 0; i < unpackedSfixed32_.size(); i++) {
+        output.writeSFixed32(97, unpackedSfixed32_.getInt(i));
+      }
+      for (int i = 0; i < unpackedSfixed64_.size(); i++) {
+        output.writeSFixed64(98, unpackedSfixed64_.getLong(i));
+      }
+      for (int i = 0; i < unpackedFloat_.size(); i++) {
+        output.writeFloat(99, unpackedFloat_.getFloat(i));
+      }
+      for (int i = 0; i < unpackedDouble_.size(); i++) {
+        output.writeDouble(100, unpackedDouble_.getDouble(i));
+      }
+      for (int i = 0; i < unpackedBool_.size(); i++) {
+        output.writeBool(101, unpackedBool_.getBoolean(i));
+      }
+      for (int i = 0; i < unpackedNestedEnum_.size(); i++) {
+        output.writeEnum(102, unpackedNestedEnum_.get(i));
+      }
+      if (oneofFieldCase_ == 111) {
+        output.writeUInt32(
+            111, (int)((java.lang.Integer) oneofField_));
+      }
+      if (oneofFieldCase_ == 112) {
+        output.writeMessage(112, (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) oneofField_);
+      }
+      if (oneofFieldCase_ == 113) {
+        com.google.protobuf.GeneratedMessage.writeString(output, 113, oneofField_);
+      }
+      if (oneofFieldCase_ == 114) {
+        output.writeBytes(
+            114, (com.google.protobuf.ByteString) oneofField_);
+      }
+      if (oneofFieldCase_ == 115) {
+        output.writeBool(
+            115, (boolean)((java.lang.Boolean) oneofField_));
+      }
+      if (oneofFieldCase_ == 116) {
+        output.writeUInt64(
+            116, (long)((java.lang.Long) oneofField_));
+      }
+      if (oneofFieldCase_ == 117) {
+        output.writeFloat(
+            117, (float)((java.lang.Float) oneofField_));
+      }
+      if (oneofFieldCase_ == 118) {
+        output.writeDouble(
+            118, (double)((java.lang.Double) oneofField_));
+      }
+      if (oneofFieldCase_ == 119) {
+        output.writeEnum(119, ((java.lang.Integer) oneofField_));
+      }
+      extensionWriter.writeUntil(536870912, output);
+      getUnknownFields().writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(1, optionalInt32_);
+      }
+      if (((bitField0_ & 0x00000002) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt64Size(2, optionalInt64_);
+      }
+      if (((bitField0_ & 0x00000004) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(3, optionalUint32_);
+      }
+      if (((bitField0_ & 0x00000008) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(4, optionalUint64_);
+      }
+      if (((bitField0_ & 0x00000010) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeSInt32Size(5, optionalSint32_);
+      }
+      if (((bitField0_ & 0x00000020) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeSInt64Size(6, optionalSint64_);
+      }
+      if (((bitField0_ & 0x00000040) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeFixed32Size(7, optionalFixed32_);
+      }
+      if (((bitField0_ & 0x00000080) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeFixed64Size(8, optionalFixed64_);
+      }
+      if (((bitField0_ & 0x00000100) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeSFixed32Size(9, optionalSfixed32_);
+      }
+      if (((bitField0_ & 0x00000200) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeSFixed64Size(10, optionalSfixed64_);
+      }
+      if (((bitField0_ & 0x00000400) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeFloatSize(11, optionalFloat_);
+      }
+      if (((bitField0_ & 0x00000800) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeDoubleSize(12, optionalDouble_);
+      }
+      if (((bitField0_ & 0x00001000) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(13, optionalBool_);
+      }
+      if (((bitField0_ & 0x00002000) != 0)) {
+        size += com.google.protobuf.GeneratedMessage.computeStringSize(14, optionalString_);
+      }
+      if (((bitField0_ & 0x00004000) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(15, optionalBytes_);
+      }
+      if (((bitField0_ & 0x00008000) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(18, getOptionalNestedMessage());
+      }
+      if (((bitField0_ & 0x00010000) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(19, getOptionalForeignMessage());
+      }
+      if (((bitField0_ & 0x00020000) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(21, optionalNestedEnum_);
+      }
+      if (((bitField0_ & 0x00040000) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(22, optionalForeignEnum_);
+      }
+      if (((bitField0_ & 0x00080000) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(23, optionalAliasedEnum_);
+      }
+      if (((bitField0_ & 0x00100000) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(27, getRecursiveMessage());
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < repeatedInt32_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt32SizeNoTag(repeatedInt32_.getInt(i));
+        }
+        size += dataSize;
+        size += 2 * getRepeatedInt32List().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < repeatedInt64_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt64SizeNoTag(repeatedInt64_.getLong(i));
+        }
+        size += dataSize;
+        size += 2 * getRepeatedInt64List().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < repeatedUint32_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(repeatedUint32_.getInt(i));
+        }
+        size += dataSize;
+        size += 2 * getRepeatedUint32List().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < repeatedUint64_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt64SizeNoTag(repeatedUint64_.getLong(i));
+        }
+        size += dataSize;
+        size += 2 * getRepeatedUint64List().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < repeatedSint32_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt32SizeNoTag(repeatedSint32_.getInt(i));
+        }
+        size += dataSize;
+        size += 2 * getRepeatedSint32List().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < repeatedSint64_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt64SizeNoTag(repeatedSint64_.getLong(i));
+        }
+        size += dataSize;
+        size += 2 * getRepeatedSint64List().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 4 * getRepeatedFixed32List().size();
+        size += dataSize;
+        size += 2 * getRepeatedFixed32List().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 8 * getRepeatedFixed64List().size();
+        size += dataSize;
+        size += 2 * getRepeatedFixed64List().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 4 * getRepeatedSfixed32List().size();
+        size += dataSize;
+        size += 2 * getRepeatedSfixed32List().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 8 * getRepeatedSfixed64List().size();
+        size += dataSize;
+        size += 2 * getRepeatedSfixed64List().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 4 * getRepeatedFloatList().size();
+        size += dataSize;
+        size += 2 * getRepeatedFloatList().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 8 * getRepeatedDoubleList().size();
+        size += dataSize;
+        size += 2 * getRepeatedDoubleList().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 1 * getRepeatedBoolList().size();
+        size += dataSize;
+        size += 2 * getRepeatedBoolList().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < repeatedString_.size(); i++) {
+          dataSize += computeStringSizeNoTag(repeatedString_.getRaw(i));
+        }
+        size += dataSize;
+        size += 2 * getRepeatedStringList().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < repeatedBytes_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeBytesSizeNoTag(repeatedBytes_.get(i));
+        }
+        size += dataSize;
+        size += 2 * getRepeatedBytesList().size();
+      }
+      for (int i = 0; i < repeatedNestedMessage_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(48, repeatedNestedMessage_.get(i));
+      }
+      for (int i = 0; i < repeatedForeignMessage_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(49, repeatedForeignMessage_.get(i));
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < repeatedNestedEnum_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeEnumSizeNoTag(repeatedNestedEnum_.get(i));
+        }
+        size += dataSize;
+        size += 2 * repeatedNestedEnum_.size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < repeatedForeignEnum_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeEnumSizeNoTag(repeatedForeignEnum_.get(i));
+        }
+        size += dataSize;
+        size += 2 * repeatedForeignEnum_.size();
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetMapInt32Int32().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        mapInt32Int32__ = MapInt32Int32DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(56, mapInt32Int32__);
+      }
+      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry
+           : internalGetMapInt64Int64().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+        mapInt64Int64__ = MapInt64Int64DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(57, mapInt64Int64__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetMapUint32Uint32().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        mapUint32Uint32__ = MapUint32Uint32DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(58, mapUint32Uint32__);
+      }
+      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry
+           : internalGetMapUint64Uint64().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+        mapUint64Uint64__ = MapUint64Uint64DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(59, mapUint64Uint64__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetMapSint32Sint32().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        mapSint32Sint32__ = MapSint32Sint32DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(60, mapSint32Sint32__);
+      }
+      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry
+           : internalGetMapSint64Sint64().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+        mapSint64Sint64__ = MapSint64Sint64DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(61, mapSint64Sint64__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetMapFixed32Fixed32().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        mapFixed32Fixed32__ = MapFixed32Fixed32DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(62, mapFixed32Fixed32__);
+      }
+      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry
+           : internalGetMapFixed64Fixed64().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+        mapFixed64Fixed64__ = MapFixed64Fixed64DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(63, mapFixed64Fixed64__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetMapSfixed32Sfixed32().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        mapSfixed32Sfixed32__ = MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(64, mapSfixed32Sfixed32__);
+      }
+      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry
+           : internalGetMapSfixed64Sfixed64().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+        mapSfixed64Sfixed64__ = MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(65, mapSfixed64Sfixed64__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Float> entry
+           : internalGetMapInt32Float().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float>
+        mapInt32Float__ = MapInt32FloatDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(66, mapInt32Float__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Double> entry
+           : internalGetMapInt32Double().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Double>
+        mapInt32Double__ = MapInt32DoubleDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(67, mapInt32Double__);
+      }
+      for (java.util.Map.Entry<java.lang.Boolean, java.lang.Boolean> entry
+           : internalGetMapBoolBool().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Boolean, java.lang.Boolean>
+        mapBoolBool__ = MapBoolBoolDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(68, mapBoolBool__);
+      }
+      for (java.util.Map.Entry<java.lang.String, java.lang.String> entry
+           : internalGetMapStringString().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, java.lang.String>
+        mapStringString__ = MapStringStringDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(69, mapStringString__);
+      }
+      for (java.util.Map.Entry<java.lang.String, com.google.protobuf.ByteString> entry
+           : internalGetMapStringBytes().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, com.google.protobuf.ByteString>
+        mapStringBytes__ = MapStringBytesDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(70, mapStringBytes__);
+      }
+      for (java.util.Map.Entry<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> entry
+           : internalGetMapStringNestedMessage().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage>
+        mapStringNestedMessage__ = MapStringNestedMessageDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(71, mapStringNestedMessage__);
+      }
+      for (java.util.Map.Entry<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> entry
+           : internalGetMapStringForeignMessage().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage>
+        mapStringForeignMessage__ = MapStringForeignMessageDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(72, mapStringForeignMessage__);
+      }
+      for (java.util.Map.Entry<java.lang.String, java.lang.Integer> entry
+           : internalGetMapStringNestedEnum().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer>
+        mapStringNestedEnum__ = MapStringNestedEnumDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(73, mapStringNestedEnum__);
+      }
+      for (java.util.Map.Entry<java.lang.String, java.lang.Integer> entry
+           : internalGetMapStringForeignEnum().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer>
+        mapStringForeignEnum__ = MapStringForeignEnumDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(74, mapStringForeignEnum__);
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < packedInt32_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt32SizeNoTag(packedInt32_.getInt(i));
+        }
+        size += dataSize;
+        if (!getPackedInt32List().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedInt32MemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < packedInt64_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt64SizeNoTag(packedInt64_.getLong(i));
+        }
+        size += dataSize;
+        if (!getPackedInt64List().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedInt64MemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < packedUint32_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(packedUint32_.getInt(i));
+        }
+        size += dataSize;
+        if (!getPackedUint32List().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedUint32MemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < packedUint64_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt64SizeNoTag(packedUint64_.getLong(i));
+        }
+        size += dataSize;
+        if (!getPackedUint64List().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedUint64MemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < packedSint32_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt32SizeNoTag(packedSint32_.getInt(i));
+        }
+        size += dataSize;
+        if (!getPackedSint32List().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedSint32MemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < packedSint64_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt64SizeNoTag(packedSint64_.getLong(i));
+        }
+        size += dataSize;
+        if (!getPackedSint64List().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedSint64MemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        dataSize = 4 * getPackedFixed32List().size();
+        size += dataSize;
+        if (!getPackedFixed32List().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedFixed32MemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        dataSize = 8 * getPackedFixed64List().size();
+        size += dataSize;
+        if (!getPackedFixed64List().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedFixed64MemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        dataSize = 4 * getPackedSfixed32List().size();
+        size += dataSize;
+        if (!getPackedSfixed32List().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedSfixed32MemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        dataSize = 8 * getPackedSfixed64List().size();
+        size += dataSize;
+        if (!getPackedSfixed64List().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedSfixed64MemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        dataSize = 4 * getPackedFloatList().size();
+        size += dataSize;
+        if (!getPackedFloatList().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedFloatMemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        dataSize = 8 * getPackedDoubleList().size();
+        size += dataSize;
+        if (!getPackedDoubleList().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedDoubleMemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        dataSize = 1 * getPackedBoolList().size();
+        size += dataSize;
+        if (!getPackedBoolList().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedBoolMemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < packedNestedEnum_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeEnumSizeNoTag(packedNestedEnum_.get(i));
+        }
+        size += dataSize;
+        if (!getPackedNestedEnumList().isEmpty()) {  size += 2;
+          size += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(dataSize);
+        }packedNestedEnumMemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < unpackedInt32_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt32SizeNoTag(unpackedInt32_.getInt(i));
+        }
+        size += dataSize;
+        size += 2 * getUnpackedInt32List().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < unpackedInt64_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt64SizeNoTag(unpackedInt64_.getLong(i));
+        }
+        size += dataSize;
+        size += 2 * getUnpackedInt64List().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < unpackedUint32_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(unpackedUint32_.getInt(i));
+        }
+        size += dataSize;
+        size += 2 * getUnpackedUint32List().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < unpackedUint64_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt64SizeNoTag(unpackedUint64_.getLong(i));
+        }
+        size += dataSize;
+        size += 2 * getUnpackedUint64List().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < unpackedSint32_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt32SizeNoTag(unpackedSint32_.getInt(i));
+        }
+        size += dataSize;
+        size += 2 * getUnpackedSint32List().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < unpackedSint64_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt64SizeNoTag(unpackedSint64_.getLong(i));
+        }
+        size += dataSize;
+        size += 2 * getUnpackedSint64List().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 4 * getUnpackedFixed32List().size();
+        size += dataSize;
+        size += 2 * getUnpackedFixed32List().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 8 * getUnpackedFixed64List().size();
+        size += dataSize;
+        size += 2 * getUnpackedFixed64List().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 4 * getUnpackedSfixed32List().size();
+        size += dataSize;
+        size += 2 * getUnpackedSfixed32List().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 8 * getUnpackedSfixed64List().size();
+        size += dataSize;
+        size += 2 * getUnpackedSfixed64List().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 4 * getUnpackedFloatList().size();
+        size += dataSize;
+        size += 2 * getUnpackedFloatList().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 8 * getUnpackedDoubleList().size();
+        size += dataSize;
+        size += 2 * getUnpackedDoubleList().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 1 * getUnpackedBoolList().size();
+        size += dataSize;
+        size += 2 * getUnpackedBoolList().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < unpackedNestedEnum_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeEnumSizeNoTag(unpackedNestedEnum_.get(i));
+        }
+        size += dataSize;
+        size += 2 * unpackedNestedEnum_.size();
+      }
+      if (oneofFieldCase_ == 111) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(
+              111, (int)((java.lang.Integer) oneofField_));
+      }
+      if (oneofFieldCase_ == 112) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(112, (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) oneofField_);
+      }
+      if (oneofFieldCase_ == 113) {
+        size += com.google.protobuf.GeneratedMessage.computeStringSize(113, oneofField_);
+      }
+      if (oneofFieldCase_ == 114) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(
+              114, (com.google.protobuf.ByteString) oneofField_);
+      }
+      if (oneofFieldCase_ == 115) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(
+              115, (boolean)((java.lang.Boolean) oneofField_));
+      }
+      if (oneofFieldCase_ == 116) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(
+              116, (long)((java.lang.Long) oneofField_));
+      }
+      if (oneofFieldCase_ == 117) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeFloatSize(
+              117, (float)((java.lang.Float) oneofField_));
+      }
+      if (oneofFieldCase_ == 118) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeDoubleSize(
+              118, (double)((java.lang.Double) oneofField_));
+      }
+      if (oneofFieldCase_ == 119) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(119, ((java.lang.Integer) oneofField_));
+      }
+      size += extensionsSerializedSize();
+      size += getUnknownFields().getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2)) {
+        return super.equals(obj);
+      }
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 other = (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2) obj;
+
+      if (hasOptionalInt32() != other.hasOptionalInt32()) return false;
+      if (hasOptionalInt32()) {
+        if (getOptionalInt32()
+            != other.getOptionalInt32()) return false;
+      }
+      if (hasOptionalInt64() != other.hasOptionalInt64()) return false;
+      if (hasOptionalInt64()) {
+        if (getOptionalInt64()
+            != other.getOptionalInt64()) return false;
+      }
+      if (hasOptionalUint32() != other.hasOptionalUint32()) return false;
+      if (hasOptionalUint32()) {
+        if (getOptionalUint32()
+            != other.getOptionalUint32()) return false;
+      }
+      if (hasOptionalUint64() != other.hasOptionalUint64()) return false;
+      if (hasOptionalUint64()) {
+        if (getOptionalUint64()
+            != other.getOptionalUint64()) return false;
+      }
+      if (hasOptionalSint32() != other.hasOptionalSint32()) return false;
+      if (hasOptionalSint32()) {
+        if (getOptionalSint32()
+            != other.getOptionalSint32()) return false;
+      }
+      if (hasOptionalSint64() != other.hasOptionalSint64()) return false;
+      if (hasOptionalSint64()) {
+        if (getOptionalSint64()
+            != other.getOptionalSint64()) return false;
+      }
+      if (hasOptionalFixed32() != other.hasOptionalFixed32()) return false;
+      if (hasOptionalFixed32()) {
+        if (getOptionalFixed32()
+            != other.getOptionalFixed32()) return false;
+      }
+      if (hasOptionalFixed64() != other.hasOptionalFixed64()) return false;
+      if (hasOptionalFixed64()) {
+        if (getOptionalFixed64()
+            != other.getOptionalFixed64()) return false;
+      }
+      if (hasOptionalSfixed32() != other.hasOptionalSfixed32()) return false;
+      if (hasOptionalSfixed32()) {
+        if (getOptionalSfixed32()
+            != other.getOptionalSfixed32()) return false;
+      }
+      if (hasOptionalSfixed64() != other.hasOptionalSfixed64()) return false;
+      if (hasOptionalSfixed64()) {
+        if (getOptionalSfixed64()
+            != other.getOptionalSfixed64()) return false;
+      }
+      if (hasOptionalFloat() != other.hasOptionalFloat()) return false;
+      if (hasOptionalFloat()) {
+        if (java.lang.Float.floatToIntBits(getOptionalFloat())
+            != java.lang.Float.floatToIntBits(
+                other.getOptionalFloat())) return false;
+      }
+      if (hasOptionalDouble() != other.hasOptionalDouble()) return false;
+      if (hasOptionalDouble()) {
+        if (java.lang.Double.doubleToLongBits(getOptionalDouble())
+            != java.lang.Double.doubleToLongBits(
+                other.getOptionalDouble())) return false;
+      }
+      if (hasOptionalBool() != other.hasOptionalBool()) return false;
+      if (hasOptionalBool()) {
+        if (getOptionalBool()
+            != other.getOptionalBool()) return false;
+      }
+      if (hasOptionalString() != other.hasOptionalString()) return false;
+      if (hasOptionalString()) {
+        if (!getOptionalString()
+            .equals(other.getOptionalString())) return false;
+      }
+      if (hasOptionalBytes() != other.hasOptionalBytes()) return false;
+      if (hasOptionalBytes()) {
+        if (!getOptionalBytes()
+            .equals(other.getOptionalBytes())) return false;
+      }
+      if (hasOptionalNestedMessage() != other.hasOptionalNestedMessage()) return false;
+      if (hasOptionalNestedMessage()) {
+        if (!getOptionalNestedMessage()
+            .equals(other.getOptionalNestedMessage())) return false;
+      }
+      if (hasOptionalForeignMessage() != other.hasOptionalForeignMessage()) return false;
+      if (hasOptionalForeignMessage()) {
+        if (!getOptionalForeignMessage()
+            .equals(other.getOptionalForeignMessage())) return false;
+      }
+      if (hasOptionalNestedEnum() != other.hasOptionalNestedEnum()) return false;
+      if (hasOptionalNestedEnum()) {
+        if (optionalNestedEnum_ != other.optionalNestedEnum_) return false;
+      }
+      if (hasOptionalForeignEnum() != other.hasOptionalForeignEnum()) return false;
+      if (hasOptionalForeignEnum()) {
+        if (optionalForeignEnum_ != other.optionalForeignEnum_) return false;
+      }
+      if (hasOptionalAliasedEnum() != other.hasOptionalAliasedEnum()) return false;
+      if (hasOptionalAliasedEnum()) {
+        if (optionalAliasedEnum_ != other.optionalAliasedEnum_) return false;
+      }
+      if (hasRecursiveMessage() != other.hasRecursiveMessage()) return false;
+      if (hasRecursiveMessage()) {
+        if (!getRecursiveMessage()
+            .equals(other.getRecursiveMessage())) return false;
+      }
+      if (!getRepeatedInt32List()
+          .equals(other.getRepeatedInt32List())) return false;
+      if (!getRepeatedInt64List()
+          .equals(other.getRepeatedInt64List())) return false;
+      if (!getRepeatedUint32List()
+          .equals(other.getRepeatedUint32List())) return false;
+      if (!getRepeatedUint64List()
+          .equals(other.getRepeatedUint64List())) return false;
+      if (!getRepeatedSint32List()
+          .equals(other.getRepeatedSint32List())) return false;
+      if (!getRepeatedSint64List()
+          .equals(other.getRepeatedSint64List())) return false;
+      if (!getRepeatedFixed32List()
+          .equals(other.getRepeatedFixed32List())) return false;
+      if (!getRepeatedFixed64List()
+          .equals(other.getRepeatedFixed64List())) return false;
+      if (!getRepeatedSfixed32List()
+          .equals(other.getRepeatedSfixed32List())) return false;
+      if (!getRepeatedSfixed64List()
+          .equals(other.getRepeatedSfixed64List())) return false;
+      if (!getRepeatedFloatList()
+          .equals(other.getRepeatedFloatList())) return false;
+      if (!getRepeatedDoubleList()
+          .equals(other.getRepeatedDoubleList())) return false;
+      if (!getRepeatedBoolList()
+          .equals(other.getRepeatedBoolList())) return false;
+      if (!getRepeatedStringList()
+          .equals(other.getRepeatedStringList())) return false;
+      if (!getRepeatedBytesList()
+          .equals(other.getRepeatedBytesList())) return false;
+      if (!getRepeatedNestedMessageList()
+          .equals(other.getRepeatedNestedMessageList())) return false;
+      if (!getRepeatedForeignMessageList()
+          .equals(other.getRepeatedForeignMessageList())) return false;
+      if (!repeatedNestedEnum_.equals(other.repeatedNestedEnum_)) return false;
+      if (!repeatedForeignEnum_.equals(other.repeatedForeignEnum_)) return false;
+      if (!getPackedInt32List()
+          .equals(other.getPackedInt32List())) return false;
+      if (!getPackedInt64List()
+          .equals(other.getPackedInt64List())) return false;
+      if (!getPackedUint32List()
+          .equals(other.getPackedUint32List())) return false;
+      if (!getPackedUint64List()
+          .equals(other.getPackedUint64List())) return false;
+      if (!getPackedSint32List()
+          .equals(other.getPackedSint32List())) return false;
+      if (!getPackedSint64List()
+          .equals(other.getPackedSint64List())) return false;
+      if (!getPackedFixed32List()
+          .equals(other.getPackedFixed32List())) return false;
+      if (!getPackedFixed64List()
+          .equals(other.getPackedFixed64List())) return false;
+      if (!getPackedSfixed32List()
+          .equals(other.getPackedSfixed32List())) return false;
+      if (!getPackedSfixed64List()
+          .equals(other.getPackedSfixed64List())) return false;
+      if (!getPackedFloatList()
+          .equals(other.getPackedFloatList())) return false;
+      if (!getPackedDoubleList()
+          .equals(other.getPackedDoubleList())) return false;
+      if (!getPackedBoolList()
+          .equals(other.getPackedBoolList())) return false;
+      if (!packedNestedEnum_.equals(other.packedNestedEnum_)) return false;
+      if (!getUnpackedInt32List()
+          .equals(other.getUnpackedInt32List())) return false;
+      if (!getUnpackedInt64List()
+          .equals(other.getUnpackedInt64List())) return false;
+      if (!getUnpackedUint32List()
+          .equals(other.getUnpackedUint32List())) return false;
+      if (!getUnpackedUint64List()
+          .equals(other.getUnpackedUint64List())) return false;
+      if (!getUnpackedSint32List()
+          .equals(other.getUnpackedSint32List())) return false;
+      if (!getUnpackedSint64List()
+          .equals(other.getUnpackedSint64List())) return false;
+      if (!getUnpackedFixed32List()
+          .equals(other.getUnpackedFixed32List())) return false;
+      if (!getUnpackedFixed64List()
+          .equals(other.getUnpackedFixed64List())) return false;
+      if (!getUnpackedSfixed32List()
+          .equals(other.getUnpackedSfixed32List())) return false;
+      if (!getUnpackedSfixed64List()
+          .equals(other.getUnpackedSfixed64List())) return false;
+      if (!getUnpackedFloatList()
+          .equals(other.getUnpackedFloatList())) return false;
+      if (!getUnpackedDoubleList()
+          .equals(other.getUnpackedDoubleList())) return false;
+      if (!getUnpackedBoolList()
+          .equals(other.getUnpackedBoolList())) return false;
+      if (!unpackedNestedEnum_.equals(other.unpackedNestedEnum_)) return false;
+      if (!internalGetMapInt32Int32().equals(
+          other.internalGetMapInt32Int32())) return false;
+      if (!internalGetMapInt64Int64().equals(
+          other.internalGetMapInt64Int64())) return false;
+      if (!internalGetMapUint32Uint32().equals(
+          other.internalGetMapUint32Uint32())) return false;
+      if (!internalGetMapUint64Uint64().equals(
+          other.internalGetMapUint64Uint64())) return false;
+      if (!internalGetMapSint32Sint32().equals(
+          other.internalGetMapSint32Sint32())) return false;
+      if (!internalGetMapSint64Sint64().equals(
+          other.internalGetMapSint64Sint64())) return false;
+      if (!internalGetMapFixed32Fixed32().equals(
+          other.internalGetMapFixed32Fixed32())) return false;
+      if (!internalGetMapFixed64Fixed64().equals(
+          other.internalGetMapFixed64Fixed64())) return false;
+      if (!internalGetMapSfixed32Sfixed32().equals(
+          other.internalGetMapSfixed32Sfixed32())) return false;
+      if (!internalGetMapSfixed64Sfixed64().equals(
+          other.internalGetMapSfixed64Sfixed64())) return false;
+      if (!internalGetMapInt32Float().equals(
+          other.internalGetMapInt32Float())) return false;
+      if (!internalGetMapInt32Double().equals(
+          other.internalGetMapInt32Double())) return false;
+      if (!internalGetMapBoolBool().equals(
+          other.internalGetMapBoolBool())) return false;
+      if (!internalGetMapStringString().equals(
+          other.internalGetMapStringString())) return false;
+      if (!internalGetMapStringBytes().equals(
+          other.internalGetMapStringBytes())) return false;
+      if (!internalGetMapStringNestedMessage().equals(
+          other.internalGetMapStringNestedMessage())) return false;
+      if (!internalGetMapStringForeignMessage().equals(
+          other.internalGetMapStringForeignMessage())) return false;
+      if (!internalGetMapStringNestedEnum().equals(
+          other.internalGetMapStringNestedEnum())) return false;
+      if (!internalGetMapStringForeignEnum().equals(
+          other.internalGetMapStringForeignEnum())) return false;
+      if (!getOneofFieldCase().equals(other.getOneofFieldCase())) return false;
+      switch (oneofFieldCase_) {
+        case 111:
+          if (getOneofUint32()
+              != other.getOneofUint32()) return false;
+          break;
+        case 112:
+          if (!getOneofNestedMessage()
+              .equals(other.getOneofNestedMessage())) return false;
+          break;
+        case 113:
+          if (!getOneofString()
+              .equals(other.getOneofString())) return false;
+          break;
+        case 114:
+          if (!getOneofBytes()
+              .equals(other.getOneofBytes())) return false;
+          break;
+        case 115:
+          if (getOneofBool()
+              != other.getOneofBool()) return false;
+          break;
+        case 116:
+          if (getOneofUint64()
+              != other.getOneofUint64()) return false;
+          break;
+        case 117:
+          if (java.lang.Float.floatToIntBits(getOneofFloat())
+              != java.lang.Float.floatToIntBits(
+                  other.getOneofFloat())) return false;
+          break;
+        case 118:
+          if (java.lang.Double.doubleToLongBits(getOneofDouble())
+              != java.lang.Double.doubleToLongBits(
+                  other.getOneofDouble())) return false;
+          break;
+        case 119:
+          if (!getOneofEnum()
+              .equals(other.getOneofEnum())) return false;
+          break;
+        case 0:
+        default:
+      }
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!getExtensionFields().equals(other.getExtensionFields()))
+        return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasOptionalInt32()) {
+        hash = (37 * hash) + OPTIONAL_INT32_FIELD_NUMBER;
+        hash = (53 * hash) + getOptionalInt32();
+      }
+      if (hasOptionalInt64()) {
+        hash = (37 * hash) + OPTIONAL_INT64_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getOptionalInt64());
+      }
+      if (hasOptionalUint32()) {
+        hash = (37 * hash) + OPTIONAL_UINT32_FIELD_NUMBER;
+        hash = (53 * hash) + getOptionalUint32();
+      }
+      if (hasOptionalUint64()) {
+        hash = (37 * hash) + OPTIONAL_UINT64_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getOptionalUint64());
+      }
+      if (hasOptionalSint32()) {
+        hash = (37 * hash) + OPTIONAL_SINT32_FIELD_NUMBER;
+        hash = (53 * hash) + getOptionalSint32();
+      }
+      if (hasOptionalSint64()) {
+        hash = (37 * hash) + OPTIONAL_SINT64_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getOptionalSint64());
+      }
+      if (hasOptionalFixed32()) {
+        hash = (37 * hash) + OPTIONAL_FIXED32_FIELD_NUMBER;
+        hash = (53 * hash) + getOptionalFixed32();
+      }
+      if (hasOptionalFixed64()) {
+        hash = (37 * hash) + OPTIONAL_FIXED64_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getOptionalFixed64());
+      }
+      if (hasOptionalSfixed32()) {
+        hash = (37 * hash) + OPTIONAL_SFIXED32_FIELD_NUMBER;
+        hash = (53 * hash) + getOptionalSfixed32();
+      }
+      if (hasOptionalSfixed64()) {
+        hash = (37 * hash) + OPTIONAL_SFIXED64_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getOptionalSfixed64());
+      }
+      if (hasOptionalFloat()) {
+        hash = (37 * hash) + OPTIONAL_FLOAT_FIELD_NUMBER;
+        hash = (53 * hash) + java.lang.Float.floatToIntBits(
+            getOptionalFloat());
+      }
+      if (hasOptionalDouble()) {
+        hash = (37 * hash) + OPTIONAL_DOUBLE_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            java.lang.Double.doubleToLongBits(getOptionalDouble()));
+      }
+      if (hasOptionalBool()) {
+        hash = (37 * hash) + OPTIONAL_BOOL_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+            getOptionalBool());
+      }
+      if (hasOptionalString()) {
+        hash = (37 * hash) + OPTIONAL_STRING_FIELD_NUMBER;
+        hash = (53 * hash) + getOptionalString().hashCode();
+      }
+      if (hasOptionalBytes()) {
+        hash = (37 * hash) + OPTIONAL_BYTES_FIELD_NUMBER;
+        hash = (53 * hash) + getOptionalBytes().hashCode();
+      }
+      if (hasOptionalNestedMessage()) {
+        hash = (37 * hash) + OPTIONAL_NESTED_MESSAGE_FIELD_NUMBER;
+        hash = (53 * hash) + getOptionalNestedMessage().hashCode();
+      }
+      if (hasOptionalForeignMessage()) {
+        hash = (37 * hash) + OPTIONAL_FOREIGN_MESSAGE_FIELD_NUMBER;
+        hash = (53 * hash) + getOptionalForeignMessage().hashCode();
+      }
+      if (hasOptionalNestedEnum()) {
+        hash = (37 * hash) + OPTIONAL_NESTED_ENUM_FIELD_NUMBER;
+        hash = (53 * hash) + optionalNestedEnum_;
+      }
+      if (hasOptionalForeignEnum()) {
+        hash = (37 * hash) + OPTIONAL_FOREIGN_ENUM_FIELD_NUMBER;
+        hash = (53 * hash) + optionalForeignEnum_;
+      }
+      if (hasOptionalAliasedEnum()) {
+        hash = (37 * hash) + OPTIONAL_ALIASED_ENUM_FIELD_NUMBER;
+        hash = (53 * hash) + optionalAliasedEnum_;
+      }
+      if (hasRecursiveMessage()) {
+        hash = (37 * hash) + RECURSIVE_MESSAGE_FIELD_NUMBER;
+        hash = (53 * hash) + getRecursiveMessage().hashCode();
+      }
+      if (getRepeatedInt32Count() > 0) {
+        hash = (37 * hash) + REPEATED_INT32_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedInt32List().hashCode();
+      }
+      if (getRepeatedInt64Count() > 0) {
+        hash = (37 * hash) + REPEATED_INT64_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedInt64List().hashCode();
+      }
+      if (getRepeatedUint32Count() > 0) {
+        hash = (37 * hash) + REPEATED_UINT32_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedUint32List().hashCode();
+      }
+      if (getRepeatedUint64Count() > 0) {
+        hash = (37 * hash) + REPEATED_UINT64_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedUint64List().hashCode();
+      }
+      if (getRepeatedSint32Count() > 0) {
+        hash = (37 * hash) + REPEATED_SINT32_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedSint32List().hashCode();
+      }
+      if (getRepeatedSint64Count() > 0) {
+        hash = (37 * hash) + REPEATED_SINT64_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedSint64List().hashCode();
+      }
+      if (getRepeatedFixed32Count() > 0) {
+        hash = (37 * hash) + REPEATED_FIXED32_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedFixed32List().hashCode();
+      }
+      if (getRepeatedFixed64Count() > 0) {
+        hash = (37 * hash) + REPEATED_FIXED64_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedFixed64List().hashCode();
+      }
+      if (getRepeatedSfixed32Count() > 0) {
+        hash = (37 * hash) + REPEATED_SFIXED32_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedSfixed32List().hashCode();
+      }
+      if (getRepeatedSfixed64Count() > 0) {
+        hash = (37 * hash) + REPEATED_SFIXED64_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedSfixed64List().hashCode();
+      }
+      if (getRepeatedFloatCount() > 0) {
+        hash = (37 * hash) + REPEATED_FLOAT_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedFloatList().hashCode();
+      }
+      if (getRepeatedDoubleCount() > 0) {
+        hash = (37 * hash) + REPEATED_DOUBLE_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedDoubleList().hashCode();
+      }
+      if (getRepeatedBoolCount() > 0) {
+        hash = (37 * hash) + REPEATED_BOOL_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedBoolList().hashCode();
+      }
+      if (getRepeatedStringCount() > 0) {
+        hash = (37 * hash) + REPEATED_STRING_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedStringList().hashCode();
+      }
+      if (getRepeatedBytesCount() > 0) {
+        hash = (37 * hash) + REPEATED_BYTES_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedBytesList().hashCode();
+      }
+      if (getRepeatedNestedMessageCount() > 0) {
+        hash = (37 * hash) + REPEATED_NESTED_MESSAGE_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedNestedMessageList().hashCode();
+      }
+      if (getRepeatedForeignMessageCount() > 0) {
+        hash = (37 * hash) + REPEATED_FOREIGN_MESSAGE_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedForeignMessageList().hashCode();
+      }
+      if (getRepeatedNestedEnumCount() > 0) {
+        hash = (37 * hash) + REPEATED_NESTED_ENUM_FIELD_NUMBER;
+        hash = (53 * hash) + repeatedNestedEnum_.hashCode();
+      }
+      if (getRepeatedForeignEnumCount() > 0) {
+        hash = (37 * hash) + REPEATED_FOREIGN_ENUM_FIELD_NUMBER;
+        hash = (53 * hash) + repeatedForeignEnum_.hashCode();
+      }
+      if (getPackedInt32Count() > 0) {
+        hash = (37 * hash) + PACKED_INT32_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedInt32List().hashCode();
+      }
+      if (getPackedInt64Count() > 0) {
+        hash = (37 * hash) + PACKED_INT64_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedInt64List().hashCode();
+      }
+      if (getPackedUint32Count() > 0) {
+        hash = (37 * hash) + PACKED_UINT32_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedUint32List().hashCode();
+      }
+      if (getPackedUint64Count() > 0) {
+        hash = (37 * hash) + PACKED_UINT64_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedUint64List().hashCode();
+      }
+      if (getPackedSint32Count() > 0) {
+        hash = (37 * hash) + PACKED_SINT32_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedSint32List().hashCode();
+      }
+      if (getPackedSint64Count() > 0) {
+        hash = (37 * hash) + PACKED_SINT64_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedSint64List().hashCode();
+      }
+      if (getPackedFixed32Count() > 0) {
+        hash = (37 * hash) + PACKED_FIXED32_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedFixed32List().hashCode();
+      }
+      if (getPackedFixed64Count() > 0) {
+        hash = (37 * hash) + PACKED_FIXED64_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedFixed64List().hashCode();
+      }
+      if (getPackedSfixed32Count() > 0) {
+        hash = (37 * hash) + PACKED_SFIXED32_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedSfixed32List().hashCode();
+      }
+      if (getPackedSfixed64Count() > 0) {
+        hash = (37 * hash) + PACKED_SFIXED64_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedSfixed64List().hashCode();
+      }
+      if (getPackedFloatCount() > 0) {
+        hash = (37 * hash) + PACKED_FLOAT_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedFloatList().hashCode();
+      }
+      if (getPackedDoubleCount() > 0) {
+        hash = (37 * hash) + PACKED_DOUBLE_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedDoubleList().hashCode();
+      }
+      if (getPackedBoolCount() > 0) {
+        hash = (37 * hash) + PACKED_BOOL_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedBoolList().hashCode();
+      }
+      if (getPackedNestedEnumCount() > 0) {
+        hash = (37 * hash) + PACKED_NESTED_ENUM_FIELD_NUMBER;
+        hash = (53 * hash) + packedNestedEnum_.hashCode();
+      }
+      if (getUnpackedInt32Count() > 0) {
+        hash = (37 * hash) + UNPACKED_INT32_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedInt32List().hashCode();
+      }
+      if (getUnpackedInt64Count() > 0) {
+        hash = (37 * hash) + UNPACKED_INT64_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedInt64List().hashCode();
+      }
+      if (getUnpackedUint32Count() > 0) {
+        hash = (37 * hash) + UNPACKED_UINT32_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedUint32List().hashCode();
+      }
+      if (getUnpackedUint64Count() > 0) {
+        hash = (37 * hash) + UNPACKED_UINT64_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedUint64List().hashCode();
+      }
+      if (getUnpackedSint32Count() > 0) {
+        hash = (37 * hash) + UNPACKED_SINT32_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedSint32List().hashCode();
+      }
+      if (getUnpackedSint64Count() > 0) {
+        hash = (37 * hash) + UNPACKED_SINT64_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedSint64List().hashCode();
+      }
+      if (getUnpackedFixed32Count() > 0) {
+        hash = (37 * hash) + UNPACKED_FIXED32_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedFixed32List().hashCode();
+      }
+      if (getUnpackedFixed64Count() > 0) {
+        hash = (37 * hash) + UNPACKED_FIXED64_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedFixed64List().hashCode();
+      }
+      if (getUnpackedSfixed32Count() > 0) {
+        hash = (37 * hash) + UNPACKED_SFIXED32_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedSfixed32List().hashCode();
+      }
+      if (getUnpackedSfixed64Count() > 0) {
+        hash = (37 * hash) + UNPACKED_SFIXED64_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedSfixed64List().hashCode();
+      }
+      if (getUnpackedFloatCount() > 0) {
+        hash = (37 * hash) + UNPACKED_FLOAT_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedFloatList().hashCode();
+      }
+      if (getUnpackedDoubleCount() > 0) {
+        hash = (37 * hash) + UNPACKED_DOUBLE_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedDoubleList().hashCode();
+      }
+      if (getUnpackedBoolCount() > 0) {
+        hash = (37 * hash) + UNPACKED_BOOL_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedBoolList().hashCode();
+      }
+      if (getUnpackedNestedEnumCount() > 0) {
+        hash = (37 * hash) + UNPACKED_NESTED_ENUM_FIELD_NUMBER;
+        hash = (53 * hash) + unpackedNestedEnum_.hashCode();
+      }
+      if (!internalGetMapInt32Int32().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_INT32_INT32_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapInt32Int32().hashCode();
+      }
+      if (!internalGetMapInt64Int64().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_INT64_INT64_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapInt64Int64().hashCode();
+      }
+      if (!internalGetMapUint32Uint32().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_UINT32_UINT32_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapUint32Uint32().hashCode();
+      }
+      if (!internalGetMapUint64Uint64().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_UINT64_UINT64_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapUint64Uint64().hashCode();
+      }
+      if (!internalGetMapSint32Sint32().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_SINT32_SINT32_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapSint32Sint32().hashCode();
+      }
+      if (!internalGetMapSint64Sint64().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_SINT64_SINT64_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapSint64Sint64().hashCode();
+      }
+      if (!internalGetMapFixed32Fixed32().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_FIXED32_FIXED32_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapFixed32Fixed32().hashCode();
+      }
+      if (!internalGetMapFixed64Fixed64().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_FIXED64_FIXED64_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapFixed64Fixed64().hashCode();
+      }
+      if (!internalGetMapSfixed32Sfixed32().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_SFIXED32_SFIXED32_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapSfixed32Sfixed32().hashCode();
+      }
+      if (!internalGetMapSfixed64Sfixed64().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_SFIXED64_SFIXED64_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapSfixed64Sfixed64().hashCode();
+      }
+      if (!internalGetMapInt32Float().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_INT32_FLOAT_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapInt32Float().hashCode();
+      }
+      if (!internalGetMapInt32Double().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_INT32_DOUBLE_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapInt32Double().hashCode();
+      }
+      if (!internalGetMapBoolBool().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_BOOL_BOOL_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapBoolBool().hashCode();
+      }
+      if (!internalGetMapStringString().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_STRING_STRING_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapStringString().hashCode();
+      }
+      if (!internalGetMapStringBytes().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_STRING_BYTES_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapStringBytes().hashCode();
+      }
+      if (!internalGetMapStringNestedMessage().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_STRING_NESTED_MESSAGE_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapStringNestedMessage().hashCode();
+      }
+      if (!internalGetMapStringForeignMessage().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_STRING_FOREIGN_MESSAGE_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapStringForeignMessage().hashCode();
+      }
+      if (!internalGetMapStringNestedEnum().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_STRING_NESTED_ENUM_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapStringNestedEnum().hashCode();
+      }
+      if (!internalGetMapStringForeignEnum().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_STRING_FOREIGN_ENUM_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapStringForeignEnum().hashCode();
+      }
+      switch (oneofFieldCase_) {
+        case 111:
+          hash = (37 * hash) + ONEOF_UINT32_FIELD_NUMBER;
+          hash = (53 * hash) + getOneofUint32();
+          break;
+        case 112:
+          hash = (37 * hash) + ONEOF_NESTED_MESSAGE_FIELD_NUMBER;
+          hash = (53 * hash) + getOneofNestedMessage().hashCode();
+          break;
+        case 113:
+          hash = (37 * hash) + ONEOF_STRING_FIELD_NUMBER;
+          hash = (53 * hash) + getOneofString().hashCode();
+          break;
+        case 114:
+          hash = (37 * hash) + ONEOF_BYTES_FIELD_NUMBER;
+          hash = (53 * hash) + getOneofBytes().hashCode();
+          break;
+        case 115:
+          hash = (37 * hash) + ONEOF_BOOL_FIELD_NUMBER;
+          hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+              getOneofBool());
+          break;
+        case 116:
+          hash = (37 * hash) + ONEOF_UINT64_FIELD_NUMBER;
+          hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+              getOneofUint64());
+          break;
+        case 117:
+          hash = (37 * hash) + ONEOF_FLOAT_FIELD_NUMBER;
+          hash = (53 * hash) + java.lang.Float.floatToIntBits(
+              getOneofFloat());
+          break;
+        case 118:
+          hash = (37 * hash) + ONEOF_DOUBLE_FIELD_NUMBER;
+          hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+              java.lang.Double.doubleToLongBits(getOneofDouble()));
+          break;
+        case 119:
+          hash = (37 * hash) + ONEOF_ENUM_FIELD_NUMBER;
+          hash = (53 * hash) + getOneofEnum().getNumber();
+          break;
+        case 0:
+        default:
+      }
+      hash = hashFields(hash, getExtensionFields());
+      hash = (29 * hash) + getUnknownFields().hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * <pre>
+     * Proto2 version of TestMostTypesProto3
+     * </pre>
+     *
+     * Protobuf type {@code legacy_gencode_test.proto2.TestMostTypesProto2}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.ExtendableBuilder<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2, Builder> implements
+        // @@protoc_insertion_point(builder_implements:legacy_gencode_test.proto2.TestMostTypesProto2)
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor;
+      }
+
+      @SuppressWarnings({"rawtypes"})
+      protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
+          int number) {
+        switch (number) {
+          case 56:
+            return internalGetMapInt32Int32();
+          case 57:
+            return internalGetMapInt64Int64();
+          case 58:
+            return internalGetMapUint32Uint32();
+          case 59:
+            return internalGetMapUint64Uint64();
+          case 60:
+            return internalGetMapSint32Sint32();
+          case 61:
+            return internalGetMapSint64Sint64();
+          case 62:
+            return internalGetMapFixed32Fixed32();
+          case 63:
+            return internalGetMapFixed64Fixed64();
+          case 64:
+            return internalGetMapSfixed32Sfixed32();
+          case 65:
+            return internalGetMapSfixed64Sfixed64();
+          case 66:
+            return internalGetMapInt32Float();
+          case 67:
+            return internalGetMapInt32Double();
+          case 68:
+            return internalGetMapBoolBool();
+          case 69:
+            return internalGetMapStringString();
+          case 70:
+            return internalGetMapStringBytes();
+          case 71:
+            return internalGetMapStringNestedMessage();
+          case 72:
+            return internalGetMapStringForeignMessage();
+          case 73:
+            return internalGetMapStringNestedEnum();
+          case 74:
+            return internalGetMapStringForeignEnum();
+          default:
+            throw new RuntimeException(
+                "Invalid map field number: " + number);
+        }
+      }
+      @SuppressWarnings({"rawtypes"})
+      protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
+          int number) {
+        switch (number) {
+          case 56:
+            return internalGetMutableMapInt32Int32();
+          case 57:
+            return internalGetMutableMapInt64Int64();
+          case 58:
+            return internalGetMutableMapUint32Uint32();
+          case 59:
+            return internalGetMutableMapUint64Uint64();
+          case 60:
+            return internalGetMutableMapSint32Sint32();
+          case 61:
+            return internalGetMutableMapSint64Sint64();
+          case 62:
+            return internalGetMutableMapFixed32Fixed32();
+          case 63:
+            return internalGetMutableMapFixed64Fixed64();
+          case 64:
+            return internalGetMutableMapSfixed32Sfixed32();
+          case 65:
+            return internalGetMutableMapSfixed64Sfixed64();
+          case 66:
+            return internalGetMutableMapInt32Float();
+          case 67:
+            return internalGetMutableMapInt32Double();
+          case 68:
+            return internalGetMutableMapBoolBool();
+          case 69:
+            return internalGetMutableMapStringString();
+          case 70:
+            return internalGetMutableMapStringBytes();
+          case 71:
+            return internalGetMutableMapStringNestedMessage();
+          case 72:
+            return internalGetMutableMapStringForeignMessage();
+          case 73:
+            return internalGetMutableMapStringNestedEnum();
+          case 74:
+            return internalGetMutableMapStringForeignEnum();
+          default:
+            throw new RuntimeException(
+                "Invalid map field number: " + number);
+        }
+      }
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.class, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder.class);
+      }
+
+      // Construct using legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessage
+                .alwaysUseFieldBuilders) {
+          getOptionalNestedMessageFieldBuilder();
+          getOptionalForeignMessageFieldBuilder();
+          getRecursiveMessageFieldBuilder();
+          getRepeatedNestedMessageFieldBuilder();
+          getRepeatedForeignMessageFieldBuilder();
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        bitField0_ = 0;
+        bitField1_ = 0;
+        bitField2_ = 0;
+        optionalInt32_ = 0;
+        optionalInt64_ = 0L;
+        optionalUint32_ = 0;
+        optionalUint64_ = 0L;
+        optionalSint32_ = 0;
+        optionalSint64_ = 0L;
+        optionalFixed32_ = 0;
+        optionalFixed64_ = 0L;
+        optionalSfixed32_ = 0;
+        optionalSfixed64_ = 0L;
+        optionalFloat_ = 0F;
+        optionalDouble_ = 0D;
+        optionalBool_ = false;
+        optionalString_ = "";
+        optionalBytes_ = com.google.protobuf.ByteString.EMPTY;
+        optionalNestedMessage_ = null;
+        if (optionalNestedMessageBuilder_ != null) {
+          optionalNestedMessageBuilder_.dispose();
+          optionalNestedMessageBuilder_ = null;
+        }
+        optionalForeignMessage_ = null;
+        if (optionalForeignMessageBuilder_ != null) {
+          optionalForeignMessageBuilder_.dispose();
+          optionalForeignMessageBuilder_ = null;
+        }
+        optionalNestedEnum_ = 0;
+        optionalForeignEnum_ = 0;
+        optionalAliasedEnum_ = 0;
+        recursiveMessage_ = null;
+        if (recursiveMessageBuilder_ != null) {
+          recursiveMessageBuilder_.dispose();
+          recursiveMessageBuilder_ = null;
+        }
+        repeatedInt32_ = emptyIntList();
+        repeatedInt64_ = emptyLongList();
+        repeatedUint32_ = emptyIntList();
+        repeatedUint64_ = emptyLongList();
+        repeatedSint32_ = emptyIntList();
+        repeatedSint64_ = emptyLongList();
+        repeatedFixed32_ = emptyIntList();
+        repeatedFixed64_ = emptyLongList();
+        repeatedSfixed32_ = emptyIntList();
+        repeatedSfixed64_ = emptyLongList();
+        repeatedFloat_ = emptyFloatList();
+        repeatedDouble_ = emptyDoubleList();
+        repeatedBool_ = emptyBooleanList();
+        repeatedString_ =
+            com.google.protobuf.LazyStringArrayList.emptyList();
+        repeatedBytes_ = emptyList(com.google.protobuf.ByteString.class);
+        if (repeatedNestedMessageBuilder_ == null) {
+          repeatedNestedMessage_ = java.util.Collections.emptyList();
+        } else {
+          repeatedNestedMessage_ = null;
+          repeatedNestedMessageBuilder_.clear();
+        }
+        bitField1_ = (bitField1_ & ~0x00000010);
+        if (repeatedForeignMessageBuilder_ == null) {
+          repeatedForeignMessage_ = java.util.Collections.emptyList();
+        } else {
+          repeatedForeignMessage_ = null;
+          repeatedForeignMessageBuilder_.clear();
+        }
+        bitField1_ = (bitField1_ & ~0x00000020);
+        repeatedNestedEnum_ = java.util.Collections.emptyList();
+        bitField1_ = (bitField1_ & ~0x00000040);
+        repeatedForeignEnum_ = java.util.Collections.emptyList();
+        bitField1_ = (bitField1_ & ~0x00000080);
+        packedInt32_ = emptyIntList();
+        packedInt64_ = emptyLongList();
+        packedUint32_ = emptyIntList();
+        packedUint64_ = emptyLongList();
+        packedSint32_ = emptyIntList();
+        packedSint64_ = emptyLongList();
+        packedFixed32_ = emptyIntList();
+        packedFixed64_ = emptyLongList();
+        packedSfixed32_ = emptyIntList();
+        packedSfixed64_ = emptyLongList();
+        packedFloat_ = emptyFloatList();
+        packedDouble_ = emptyDoubleList();
+        packedBool_ = emptyBooleanList();
+        packedNestedEnum_ = java.util.Collections.emptyList();
+        bitField1_ = (bitField1_ & ~0x00200000);
+        unpackedInt32_ = emptyIntList();
+        unpackedInt64_ = emptyLongList();
+        unpackedUint32_ = emptyIntList();
+        unpackedUint64_ = emptyLongList();
+        unpackedSint32_ = emptyIntList();
+        unpackedSint64_ = emptyLongList();
+        unpackedFixed32_ = emptyIntList();
+        unpackedFixed64_ = emptyLongList();
+        unpackedSfixed32_ = emptyIntList();
+        unpackedSfixed64_ = emptyLongList();
+        unpackedFloat_ = emptyFloatList();
+        unpackedDouble_ = emptyDoubleList();
+        unpackedBool_ = emptyBooleanList();
+        unpackedNestedEnum_ = java.util.Collections.emptyList();
+        bitField2_ = (bitField2_ & ~0x00000008);
+        internalGetMutableMapInt32Int32().clear();
+        internalGetMutableMapInt64Int64().clear();
+        internalGetMutableMapUint32Uint32().clear();
+        internalGetMutableMapUint64Uint64().clear();
+        internalGetMutableMapSint32Sint32().clear();
+        internalGetMutableMapSint64Sint64().clear();
+        internalGetMutableMapFixed32Fixed32().clear();
+        internalGetMutableMapFixed64Fixed64().clear();
+        internalGetMutableMapSfixed32Sfixed32().clear();
+        internalGetMutableMapSfixed64Sfixed64().clear();
+        internalGetMutableMapInt32Float().clear();
+        internalGetMutableMapInt32Double().clear();
+        internalGetMutableMapBoolBool().clear();
+        internalGetMutableMapStringString().clear();
+        internalGetMutableMapStringBytes().clear();
+        internalGetMutableMapStringNestedMessage().clear();
+        internalGetMutableMapStringForeignMessage().clear();
+        internalGetMutableMapStringNestedEnum().clear();
+        internalGetMutableMapStringForeignEnum().clear();
+        if (oneofNestedMessageBuilder_ != null) {
+          oneofNestedMessageBuilder_.clear();
+        }
+        oneofFieldCase_ = 0;
+        oneofField_ = null;
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor;
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 getDefaultInstanceForType() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 build() {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 buildPartial() {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 result = new legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2(this);
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        if (bitField1_ != 0) { buildPartial1(result); }
+        if (bitField2_ != 0) { buildPartial2(result); }
+        buildPartialOneofs(result);
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 result) {
+        if (repeatedNestedMessageBuilder_ == null) {
+          if (((bitField1_ & 0x00000010) != 0)) {
+            repeatedNestedMessage_ = java.util.Collections.unmodifiableList(repeatedNestedMessage_);
+            bitField1_ = (bitField1_ & ~0x00000010);
+          }
+          result.repeatedNestedMessage_ = repeatedNestedMessage_;
+        } else {
+          result.repeatedNestedMessage_ = repeatedNestedMessageBuilder_.build();
+        }
+        if (repeatedForeignMessageBuilder_ == null) {
+          if (((bitField1_ & 0x00000020) != 0)) {
+            repeatedForeignMessage_ = java.util.Collections.unmodifiableList(repeatedForeignMessage_);
+            bitField1_ = (bitField1_ & ~0x00000020);
+          }
+          result.repeatedForeignMessage_ = repeatedForeignMessage_;
+        } else {
+          result.repeatedForeignMessage_ = repeatedForeignMessageBuilder_.build();
+        }
+        if (((bitField1_ & 0x00000040) != 0)) {
+          repeatedNestedEnum_ = java.util.Collections.unmodifiableList(repeatedNestedEnum_);
+          bitField1_ = (bitField1_ & ~0x00000040);
+        }
+        result.repeatedNestedEnum_ = repeatedNestedEnum_;
+        if (((bitField1_ & 0x00000080) != 0)) {
+          repeatedForeignEnum_ = java.util.Collections.unmodifiableList(repeatedForeignEnum_);
+          bitField1_ = (bitField1_ & ~0x00000080);
+        }
+        result.repeatedForeignEnum_ = repeatedForeignEnum_;
+        if (((bitField1_ & 0x00200000) != 0)) {
+          packedNestedEnum_ = java.util.Collections.unmodifiableList(packedNestedEnum_);
+          bitField1_ = (bitField1_ & ~0x00200000);
+        }
+        result.packedNestedEnum_ = packedNestedEnum_;
+        if (((bitField2_ & 0x00000008) != 0)) {
+          unpackedNestedEnum_ = java.util.Collections.unmodifiableList(unpackedNestedEnum_);
+          bitField2_ = (bitField2_ & ~0x00000008);
+        }
+        result.unpackedNestedEnum_ = unpackedNestedEnum_;
+      }
+
+      private void buildPartial0(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 result) {
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.optionalInt32_ = optionalInt32_;
+          to_bitField0_ |= 0x00000001;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.optionalInt64_ = optionalInt64_;
+          to_bitField0_ |= 0x00000002;
+        }
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.optionalUint32_ = optionalUint32_;
+          to_bitField0_ |= 0x00000004;
+        }
+        if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.optionalUint64_ = optionalUint64_;
+          to_bitField0_ |= 0x00000008;
+        }
+        if (((from_bitField0_ & 0x00000010) != 0)) {
+          result.optionalSint32_ = optionalSint32_;
+          to_bitField0_ |= 0x00000010;
+        }
+        if (((from_bitField0_ & 0x00000020) != 0)) {
+          result.optionalSint64_ = optionalSint64_;
+          to_bitField0_ |= 0x00000020;
+        }
+        if (((from_bitField0_ & 0x00000040) != 0)) {
+          result.optionalFixed32_ = optionalFixed32_;
+          to_bitField0_ |= 0x00000040;
+        }
+        if (((from_bitField0_ & 0x00000080) != 0)) {
+          result.optionalFixed64_ = optionalFixed64_;
+          to_bitField0_ |= 0x00000080;
+        }
+        if (((from_bitField0_ & 0x00000100) != 0)) {
+          result.optionalSfixed32_ = optionalSfixed32_;
+          to_bitField0_ |= 0x00000100;
+        }
+        if (((from_bitField0_ & 0x00000200) != 0)) {
+          result.optionalSfixed64_ = optionalSfixed64_;
+          to_bitField0_ |= 0x00000200;
+        }
+        if (((from_bitField0_ & 0x00000400) != 0)) {
+          result.optionalFloat_ = optionalFloat_;
+          to_bitField0_ |= 0x00000400;
+        }
+        if (((from_bitField0_ & 0x00000800) != 0)) {
+          result.optionalDouble_ = optionalDouble_;
+          to_bitField0_ |= 0x00000800;
+        }
+        if (((from_bitField0_ & 0x00001000) != 0)) {
+          result.optionalBool_ = optionalBool_;
+          to_bitField0_ |= 0x00001000;
+        }
+        if (((from_bitField0_ & 0x00002000) != 0)) {
+          result.optionalString_ = optionalString_;
+          to_bitField0_ |= 0x00002000;
+        }
+        if (((from_bitField0_ & 0x00004000) != 0)) {
+          result.optionalBytes_ = optionalBytes_;
+          to_bitField0_ |= 0x00004000;
+        }
+        if (((from_bitField0_ & 0x00008000) != 0)) {
+          result.optionalNestedMessage_ = optionalNestedMessageBuilder_ == null
+              ? optionalNestedMessage_
+              : optionalNestedMessageBuilder_.build();
+          to_bitField0_ |= 0x00008000;
+        }
+        if (((from_bitField0_ & 0x00010000) != 0)) {
+          result.optionalForeignMessage_ = optionalForeignMessageBuilder_ == null
+              ? optionalForeignMessage_
+              : optionalForeignMessageBuilder_.build();
+          to_bitField0_ |= 0x00010000;
+        }
+        if (((from_bitField0_ & 0x00020000) != 0)) {
+          result.optionalNestedEnum_ = optionalNestedEnum_;
+          to_bitField0_ |= 0x00020000;
+        }
+        if (((from_bitField0_ & 0x00040000) != 0)) {
+          result.optionalForeignEnum_ = optionalForeignEnum_;
+          to_bitField0_ |= 0x00040000;
+        }
+        if (((from_bitField0_ & 0x00080000) != 0)) {
+          result.optionalAliasedEnum_ = optionalAliasedEnum_;
+          to_bitField0_ |= 0x00080000;
+        }
+        if (((from_bitField0_ & 0x00100000) != 0)) {
+          result.recursiveMessage_ = recursiveMessageBuilder_ == null
+              ? recursiveMessage_
+              : recursiveMessageBuilder_.build();
+          to_bitField0_ |= 0x00100000;
+        }
+        if (((from_bitField0_ & 0x00200000) != 0)) {
+          repeatedInt32_.makeImmutable();
+          result.repeatedInt32_ = repeatedInt32_;
+        }
+        if (((from_bitField0_ & 0x00400000) != 0)) {
+          repeatedInt64_.makeImmutable();
+          result.repeatedInt64_ = repeatedInt64_;
+        }
+        if (((from_bitField0_ & 0x00800000) != 0)) {
+          repeatedUint32_.makeImmutable();
+          result.repeatedUint32_ = repeatedUint32_;
+        }
+        if (((from_bitField0_ & 0x01000000) != 0)) {
+          repeatedUint64_.makeImmutable();
+          result.repeatedUint64_ = repeatedUint64_;
+        }
+        if (((from_bitField0_ & 0x02000000) != 0)) {
+          repeatedSint32_.makeImmutable();
+          result.repeatedSint32_ = repeatedSint32_;
+        }
+        if (((from_bitField0_ & 0x04000000) != 0)) {
+          repeatedSint64_.makeImmutable();
+          result.repeatedSint64_ = repeatedSint64_;
+        }
+        if (((from_bitField0_ & 0x08000000) != 0)) {
+          repeatedFixed32_.makeImmutable();
+          result.repeatedFixed32_ = repeatedFixed32_;
+        }
+        if (((from_bitField0_ & 0x10000000) != 0)) {
+          repeatedFixed64_.makeImmutable();
+          result.repeatedFixed64_ = repeatedFixed64_;
+        }
+        if (((from_bitField0_ & 0x20000000) != 0)) {
+          repeatedSfixed32_.makeImmutable();
+          result.repeatedSfixed32_ = repeatedSfixed32_;
+        }
+        if (((from_bitField0_ & 0x40000000) != 0)) {
+          repeatedSfixed64_.makeImmutable();
+          result.repeatedSfixed64_ = repeatedSfixed64_;
+        }
+        if (((from_bitField0_ & 0x80000000) != 0)) {
+          repeatedFloat_.makeImmutable();
+          result.repeatedFloat_ = repeatedFloat_;
+        }
+        result.bitField0_ |= to_bitField0_;
+      }
+
+      private void buildPartial1(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 result) {
+        int from_bitField1_ = bitField1_;
+        if (((from_bitField1_ & 0x00000001) != 0)) {
+          repeatedDouble_.makeImmutable();
+          result.repeatedDouble_ = repeatedDouble_;
+        }
+        if (((from_bitField1_ & 0x00000002) != 0)) {
+          repeatedBool_.makeImmutable();
+          result.repeatedBool_ = repeatedBool_;
+        }
+        if (((from_bitField1_ & 0x00000004) != 0)) {
+          repeatedString_.makeImmutable();
+          result.repeatedString_ = repeatedString_;
+        }
+        if (((from_bitField1_ & 0x00000008) != 0)) {
+          repeatedBytes_.makeImmutable();
+          result.repeatedBytes_ = repeatedBytes_;
+        }
+        if (((from_bitField1_ & 0x00000100) != 0)) {
+          packedInt32_.makeImmutable();
+          result.packedInt32_ = packedInt32_;
+        }
+        if (((from_bitField1_ & 0x00000200) != 0)) {
+          packedInt64_.makeImmutable();
+          result.packedInt64_ = packedInt64_;
+        }
+        if (((from_bitField1_ & 0x00000400) != 0)) {
+          packedUint32_.makeImmutable();
+          result.packedUint32_ = packedUint32_;
+        }
+        if (((from_bitField1_ & 0x00000800) != 0)) {
+          packedUint64_.makeImmutable();
+          result.packedUint64_ = packedUint64_;
+        }
+        if (((from_bitField1_ & 0x00001000) != 0)) {
+          packedSint32_.makeImmutable();
+          result.packedSint32_ = packedSint32_;
+        }
+        if (((from_bitField1_ & 0x00002000) != 0)) {
+          packedSint64_.makeImmutable();
+          result.packedSint64_ = packedSint64_;
+        }
+        if (((from_bitField1_ & 0x00004000) != 0)) {
+          packedFixed32_.makeImmutable();
+          result.packedFixed32_ = packedFixed32_;
+        }
+        if (((from_bitField1_ & 0x00008000) != 0)) {
+          packedFixed64_.makeImmutable();
+          result.packedFixed64_ = packedFixed64_;
+        }
+        if (((from_bitField1_ & 0x00010000) != 0)) {
+          packedSfixed32_.makeImmutable();
+          result.packedSfixed32_ = packedSfixed32_;
+        }
+        if (((from_bitField1_ & 0x00020000) != 0)) {
+          packedSfixed64_.makeImmutable();
+          result.packedSfixed64_ = packedSfixed64_;
+        }
+        if (((from_bitField1_ & 0x00040000) != 0)) {
+          packedFloat_.makeImmutable();
+          result.packedFloat_ = packedFloat_;
+        }
+        if (((from_bitField1_ & 0x00080000) != 0)) {
+          packedDouble_.makeImmutable();
+          result.packedDouble_ = packedDouble_;
+        }
+        if (((from_bitField1_ & 0x00100000) != 0)) {
+          packedBool_.makeImmutable();
+          result.packedBool_ = packedBool_;
+        }
+        if (((from_bitField1_ & 0x00400000) != 0)) {
+          unpackedInt32_.makeImmutable();
+          result.unpackedInt32_ = unpackedInt32_;
+        }
+        if (((from_bitField1_ & 0x00800000) != 0)) {
+          unpackedInt64_.makeImmutable();
+          result.unpackedInt64_ = unpackedInt64_;
+        }
+        if (((from_bitField1_ & 0x01000000) != 0)) {
+          unpackedUint32_.makeImmutable();
+          result.unpackedUint32_ = unpackedUint32_;
+        }
+        if (((from_bitField1_ & 0x02000000) != 0)) {
+          unpackedUint64_.makeImmutable();
+          result.unpackedUint64_ = unpackedUint64_;
+        }
+        if (((from_bitField1_ & 0x04000000) != 0)) {
+          unpackedSint32_.makeImmutable();
+          result.unpackedSint32_ = unpackedSint32_;
+        }
+        if (((from_bitField1_ & 0x08000000) != 0)) {
+          unpackedSint64_.makeImmutable();
+          result.unpackedSint64_ = unpackedSint64_;
+        }
+        if (((from_bitField1_ & 0x10000000) != 0)) {
+          unpackedFixed32_.makeImmutable();
+          result.unpackedFixed32_ = unpackedFixed32_;
+        }
+        if (((from_bitField1_ & 0x20000000) != 0)) {
+          unpackedFixed64_.makeImmutable();
+          result.unpackedFixed64_ = unpackedFixed64_;
+        }
+        if (((from_bitField1_ & 0x40000000) != 0)) {
+          unpackedSfixed32_.makeImmutable();
+          result.unpackedSfixed32_ = unpackedSfixed32_;
+        }
+        if (((from_bitField1_ & 0x80000000) != 0)) {
+          unpackedSfixed64_.makeImmutable();
+          result.unpackedSfixed64_ = unpackedSfixed64_;
+        }
+      }
+
+      private void buildPartial2(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 result) {
+        int from_bitField2_ = bitField2_;
+        if (((from_bitField2_ & 0x00000001) != 0)) {
+          unpackedFloat_.makeImmutable();
+          result.unpackedFloat_ = unpackedFloat_;
+        }
+        if (((from_bitField2_ & 0x00000002) != 0)) {
+          unpackedDouble_.makeImmutable();
+          result.unpackedDouble_ = unpackedDouble_;
+        }
+        if (((from_bitField2_ & 0x00000004) != 0)) {
+          unpackedBool_.makeImmutable();
+          result.unpackedBool_ = unpackedBool_;
+        }
+        if (((from_bitField2_ & 0x00000010) != 0)) {
+          result.mapInt32Int32_ = internalGetMapInt32Int32();
+          result.mapInt32Int32_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00000020) != 0)) {
+          result.mapInt64Int64_ = internalGetMapInt64Int64();
+          result.mapInt64Int64_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00000040) != 0)) {
+          result.mapUint32Uint32_ = internalGetMapUint32Uint32();
+          result.mapUint32Uint32_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00000080) != 0)) {
+          result.mapUint64Uint64_ = internalGetMapUint64Uint64();
+          result.mapUint64Uint64_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00000100) != 0)) {
+          result.mapSint32Sint32_ = internalGetMapSint32Sint32();
+          result.mapSint32Sint32_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00000200) != 0)) {
+          result.mapSint64Sint64_ = internalGetMapSint64Sint64();
+          result.mapSint64Sint64_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00000400) != 0)) {
+          result.mapFixed32Fixed32_ = internalGetMapFixed32Fixed32();
+          result.mapFixed32Fixed32_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00000800) != 0)) {
+          result.mapFixed64Fixed64_ = internalGetMapFixed64Fixed64();
+          result.mapFixed64Fixed64_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00001000) != 0)) {
+          result.mapSfixed32Sfixed32_ = internalGetMapSfixed32Sfixed32();
+          result.mapSfixed32Sfixed32_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00002000) != 0)) {
+          result.mapSfixed64Sfixed64_ = internalGetMapSfixed64Sfixed64();
+          result.mapSfixed64Sfixed64_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00004000) != 0)) {
+          result.mapInt32Float_ = internalGetMapInt32Float();
+          result.mapInt32Float_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00008000) != 0)) {
+          result.mapInt32Double_ = internalGetMapInt32Double();
+          result.mapInt32Double_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00010000) != 0)) {
+          result.mapBoolBool_ = internalGetMapBoolBool();
+          result.mapBoolBool_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00020000) != 0)) {
+          result.mapStringString_ = internalGetMapStringString();
+          result.mapStringString_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00040000) != 0)) {
+          result.mapStringBytes_ = internalGetMapStringBytes();
+          result.mapStringBytes_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00080000) != 0)) {
+          result.mapStringNestedMessage_ = internalGetMapStringNestedMessage().build(MapStringNestedMessageDefaultEntryHolder.defaultEntry);
+        }
+        if (((from_bitField2_ & 0x00100000) != 0)) {
+          result.mapStringForeignMessage_ = internalGetMapStringForeignMessage().build(MapStringForeignMessageDefaultEntryHolder.defaultEntry);
+        }
+        if (((from_bitField2_ & 0x00200000) != 0)) {
+          result.mapStringNestedEnum_ = internalGetMapStringNestedEnum();
+          result.mapStringNestedEnum_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00400000) != 0)) {
+          result.mapStringForeignEnum_ = internalGetMapStringForeignEnum();
+          result.mapStringForeignEnum_.makeImmutable();
+        }
+      }
+
+      private void buildPartialOneofs(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 result) {
+        result.oneofFieldCase_ = oneofFieldCase_;
+        result.oneofField_ = this.oneofField_;
+        if (oneofFieldCase_ == 112 &&
+            oneofNestedMessageBuilder_ != null) {
+          result.oneofField_ = oneofNestedMessageBuilder_.build();
+        }
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2) {
+          return mergeFrom((legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 other) {
+        if (other == legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance()) return this;
+        if (other.hasOptionalInt32()) {
+          setOptionalInt32(other.getOptionalInt32());
+        }
+        if (other.hasOptionalInt64()) {
+          setOptionalInt64(other.getOptionalInt64());
+        }
+        if (other.hasOptionalUint32()) {
+          setOptionalUint32(other.getOptionalUint32());
+        }
+        if (other.hasOptionalUint64()) {
+          setOptionalUint64(other.getOptionalUint64());
+        }
+        if (other.hasOptionalSint32()) {
+          setOptionalSint32(other.getOptionalSint32());
+        }
+        if (other.hasOptionalSint64()) {
+          setOptionalSint64(other.getOptionalSint64());
+        }
+        if (other.hasOptionalFixed32()) {
+          setOptionalFixed32(other.getOptionalFixed32());
+        }
+        if (other.hasOptionalFixed64()) {
+          setOptionalFixed64(other.getOptionalFixed64());
+        }
+        if (other.hasOptionalSfixed32()) {
+          setOptionalSfixed32(other.getOptionalSfixed32());
+        }
+        if (other.hasOptionalSfixed64()) {
+          setOptionalSfixed64(other.getOptionalSfixed64());
+        }
+        if (other.hasOptionalFloat()) {
+          setOptionalFloat(other.getOptionalFloat());
+        }
+        if (other.hasOptionalDouble()) {
+          setOptionalDouble(other.getOptionalDouble());
+        }
+        if (other.hasOptionalBool()) {
+          setOptionalBool(other.getOptionalBool());
+        }
+        if (other.hasOptionalString()) {
+          optionalString_ = other.optionalString_;
+          bitField0_ |= 0x00002000;
+          onChanged();
+        }
+        if (other.hasOptionalBytes()) {
+          setOptionalBytes(other.getOptionalBytes());
+        }
+        if (other.hasOptionalNestedMessage()) {
+          mergeOptionalNestedMessage(other.getOptionalNestedMessage());
+        }
+        if (other.hasOptionalForeignMessage()) {
+          mergeOptionalForeignMessage(other.getOptionalForeignMessage());
+        }
+        if (other.hasOptionalNestedEnum()) {
+          setOptionalNestedEnum(other.getOptionalNestedEnum());
+        }
+        if (other.hasOptionalForeignEnum()) {
+          setOptionalForeignEnum(other.getOptionalForeignEnum());
+        }
+        if (other.hasOptionalAliasedEnum()) {
+          setOptionalAliasedEnum(other.getOptionalAliasedEnum());
+        }
+        if (other.hasRecursiveMessage()) {
+          mergeRecursiveMessage(other.getRecursiveMessage());
+        }
+        if (!other.repeatedInt32_.isEmpty()) {
+          if (repeatedInt32_.isEmpty()) {
+            repeatedInt32_ = other.repeatedInt32_;
+            repeatedInt32_.makeImmutable();
+            bitField0_ |= 0x00200000;
+          } else {
+            ensureRepeatedInt32IsMutable();
+            repeatedInt32_.addAll(other.repeatedInt32_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedInt64_.isEmpty()) {
+          if (repeatedInt64_.isEmpty()) {
+            repeatedInt64_ = other.repeatedInt64_;
+            repeatedInt64_.makeImmutable();
+            bitField0_ |= 0x00400000;
+          } else {
+            ensureRepeatedInt64IsMutable();
+            repeatedInt64_.addAll(other.repeatedInt64_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedUint32_.isEmpty()) {
+          if (repeatedUint32_.isEmpty()) {
+            repeatedUint32_ = other.repeatedUint32_;
+            repeatedUint32_.makeImmutable();
+            bitField0_ |= 0x00800000;
+          } else {
+            ensureRepeatedUint32IsMutable();
+            repeatedUint32_.addAll(other.repeatedUint32_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedUint64_.isEmpty()) {
+          if (repeatedUint64_.isEmpty()) {
+            repeatedUint64_ = other.repeatedUint64_;
+            repeatedUint64_.makeImmutable();
+            bitField0_ |= 0x01000000;
+          } else {
+            ensureRepeatedUint64IsMutable();
+            repeatedUint64_.addAll(other.repeatedUint64_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedSint32_.isEmpty()) {
+          if (repeatedSint32_.isEmpty()) {
+            repeatedSint32_ = other.repeatedSint32_;
+            repeatedSint32_.makeImmutable();
+            bitField0_ |= 0x02000000;
+          } else {
+            ensureRepeatedSint32IsMutable();
+            repeatedSint32_.addAll(other.repeatedSint32_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedSint64_.isEmpty()) {
+          if (repeatedSint64_.isEmpty()) {
+            repeatedSint64_ = other.repeatedSint64_;
+            repeatedSint64_.makeImmutable();
+            bitField0_ |= 0x04000000;
+          } else {
+            ensureRepeatedSint64IsMutable();
+            repeatedSint64_.addAll(other.repeatedSint64_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedFixed32_.isEmpty()) {
+          if (repeatedFixed32_.isEmpty()) {
+            repeatedFixed32_ = other.repeatedFixed32_;
+            repeatedFixed32_.makeImmutable();
+            bitField0_ |= 0x08000000;
+          } else {
+            ensureRepeatedFixed32IsMutable();
+            repeatedFixed32_.addAll(other.repeatedFixed32_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedFixed64_.isEmpty()) {
+          if (repeatedFixed64_.isEmpty()) {
+            repeatedFixed64_ = other.repeatedFixed64_;
+            repeatedFixed64_.makeImmutable();
+            bitField0_ |= 0x10000000;
+          } else {
+            ensureRepeatedFixed64IsMutable();
+            repeatedFixed64_.addAll(other.repeatedFixed64_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedSfixed32_.isEmpty()) {
+          if (repeatedSfixed32_.isEmpty()) {
+            repeatedSfixed32_ = other.repeatedSfixed32_;
+            repeatedSfixed32_.makeImmutable();
+            bitField0_ |= 0x20000000;
+          } else {
+            ensureRepeatedSfixed32IsMutable();
+            repeatedSfixed32_.addAll(other.repeatedSfixed32_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedSfixed64_.isEmpty()) {
+          if (repeatedSfixed64_.isEmpty()) {
+            repeatedSfixed64_ = other.repeatedSfixed64_;
+            repeatedSfixed64_.makeImmutable();
+            bitField0_ |= 0x40000000;
+          } else {
+            ensureRepeatedSfixed64IsMutable();
+            repeatedSfixed64_.addAll(other.repeatedSfixed64_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedFloat_.isEmpty()) {
+          if (repeatedFloat_.isEmpty()) {
+            repeatedFloat_ = other.repeatedFloat_;
+            repeatedFloat_.makeImmutable();
+            bitField0_ |= 0x80000000;
+          } else {
+            ensureRepeatedFloatIsMutable();
+            repeatedFloat_.addAll(other.repeatedFloat_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedDouble_.isEmpty()) {
+          if (repeatedDouble_.isEmpty()) {
+            repeatedDouble_ = other.repeatedDouble_;
+            repeatedDouble_.makeImmutable();
+            bitField1_ |= 0x00000001;
+          } else {
+            ensureRepeatedDoubleIsMutable();
+            repeatedDouble_.addAll(other.repeatedDouble_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedBool_.isEmpty()) {
+          if (repeatedBool_.isEmpty()) {
+            repeatedBool_ = other.repeatedBool_;
+            repeatedBool_.makeImmutable();
+            bitField1_ |= 0x00000002;
+          } else {
+            ensureRepeatedBoolIsMutable();
+            repeatedBool_.addAll(other.repeatedBool_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedString_.isEmpty()) {
+          if (repeatedString_.isEmpty()) {
+            repeatedString_ = other.repeatedString_;
+            bitField1_ |= 0x00000004;
+          } else {
+            ensureRepeatedStringIsMutable();
+            repeatedString_.addAll(other.repeatedString_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedBytes_.isEmpty()) {
+          if (repeatedBytes_.isEmpty()) {
+            repeatedBytes_ = other.repeatedBytes_;
+            repeatedBytes_.makeImmutable();
+            bitField1_ |= 0x00000008;
+          } else {
+            ensureRepeatedBytesIsMutable();
+            repeatedBytes_.addAll(other.repeatedBytes_);
+          }
+          onChanged();
+        }
+        if (repeatedNestedMessageBuilder_ == null) {
+          if (!other.repeatedNestedMessage_.isEmpty()) {
+            if (repeatedNestedMessage_.isEmpty()) {
+              repeatedNestedMessage_ = other.repeatedNestedMessage_;
+              bitField1_ = (bitField1_ & ~0x00000010);
+            } else {
+              ensureRepeatedNestedMessageIsMutable();
+              repeatedNestedMessage_.addAll(other.repeatedNestedMessage_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.repeatedNestedMessage_.isEmpty()) {
+            if (repeatedNestedMessageBuilder_.isEmpty()) {
+              repeatedNestedMessageBuilder_.dispose();
+              repeatedNestedMessageBuilder_ = null;
+              repeatedNestedMessage_ = other.repeatedNestedMessage_;
+              bitField1_ = (bitField1_ & ~0x00000010);
+              repeatedNestedMessageBuilder_ = 
+                com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                   getRepeatedNestedMessageFieldBuilder() : null;
+            } else {
+              repeatedNestedMessageBuilder_.addAllMessages(other.repeatedNestedMessage_);
+            }
+          }
+        }
+        if (repeatedForeignMessageBuilder_ == null) {
+          if (!other.repeatedForeignMessage_.isEmpty()) {
+            if (repeatedForeignMessage_.isEmpty()) {
+              repeatedForeignMessage_ = other.repeatedForeignMessage_;
+              bitField1_ = (bitField1_ & ~0x00000020);
+            } else {
+              ensureRepeatedForeignMessageIsMutable();
+              repeatedForeignMessage_.addAll(other.repeatedForeignMessage_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.repeatedForeignMessage_.isEmpty()) {
+            if (repeatedForeignMessageBuilder_.isEmpty()) {
+              repeatedForeignMessageBuilder_.dispose();
+              repeatedForeignMessageBuilder_ = null;
+              repeatedForeignMessage_ = other.repeatedForeignMessage_;
+              bitField1_ = (bitField1_ & ~0x00000020);
+              repeatedForeignMessageBuilder_ = 
+                com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                   getRepeatedForeignMessageFieldBuilder() : null;
+            } else {
+              repeatedForeignMessageBuilder_.addAllMessages(other.repeatedForeignMessage_);
+            }
+          }
+        }
+        if (!other.repeatedNestedEnum_.isEmpty()) {
+          if (repeatedNestedEnum_.isEmpty()) {
+            repeatedNestedEnum_ = other.repeatedNestedEnum_;
+            bitField1_ = (bitField1_ & ~0x00000040);
+          } else {
+            ensureRepeatedNestedEnumIsMutable();
+            repeatedNestedEnum_.addAll(other.repeatedNestedEnum_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedForeignEnum_.isEmpty()) {
+          if (repeatedForeignEnum_.isEmpty()) {
+            repeatedForeignEnum_ = other.repeatedForeignEnum_;
+            bitField1_ = (bitField1_ & ~0x00000080);
+          } else {
+            ensureRepeatedForeignEnumIsMutable();
+            repeatedForeignEnum_.addAll(other.repeatedForeignEnum_);
+          }
+          onChanged();
+        }
+        if (!other.packedInt32_.isEmpty()) {
+          if (packedInt32_.isEmpty()) {
+            packedInt32_ = other.packedInt32_;
+            packedInt32_.makeImmutable();
+            bitField1_ |= 0x00000100;
+          } else {
+            ensurePackedInt32IsMutable();
+            packedInt32_.addAll(other.packedInt32_);
+          }
+          onChanged();
+        }
+        if (!other.packedInt64_.isEmpty()) {
+          if (packedInt64_.isEmpty()) {
+            packedInt64_ = other.packedInt64_;
+            packedInt64_.makeImmutable();
+            bitField1_ |= 0x00000200;
+          } else {
+            ensurePackedInt64IsMutable();
+            packedInt64_.addAll(other.packedInt64_);
+          }
+          onChanged();
+        }
+        if (!other.packedUint32_.isEmpty()) {
+          if (packedUint32_.isEmpty()) {
+            packedUint32_ = other.packedUint32_;
+            packedUint32_.makeImmutable();
+            bitField1_ |= 0x00000400;
+          } else {
+            ensurePackedUint32IsMutable();
+            packedUint32_.addAll(other.packedUint32_);
+          }
+          onChanged();
+        }
+        if (!other.packedUint64_.isEmpty()) {
+          if (packedUint64_.isEmpty()) {
+            packedUint64_ = other.packedUint64_;
+            packedUint64_.makeImmutable();
+            bitField1_ |= 0x00000800;
+          } else {
+            ensurePackedUint64IsMutable();
+            packedUint64_.addAll(other.packedUint64_);
+          }
+          onChanged();
+        }
+        if (!other.packedSint32_.isEmpty()) {
+          if (packedSint32_.isEmpty()) {
+            packedSint32_ = other.packedSint32_;
+            packedSint32_.makeImmutable();
+            bitField1_ |= 0x00001000;
+          } else {
+            ensurePackedSint32IsMutable();
+            packedSint32_.addAll(other.packedSint32_);
+          }
+          onChanged();
+        }
+        if (!other.packedSint64_.isEmpty()) {
+          if (packedSint64_.isEmpty()) {
+            packedSint64_ = other.packedSint64_;
+            packedSint64_.makeImmutable();
+            bitField1_ |= 0x00002000;
+          } else {
+            ensurePackedSint64IsMutable();
+            packedSint64_.addAll(other.packedSint64_);
+          }
+          onChanged();
+        }
+        if (!other.packedFixed32_.isEmpty()) {
+          if (packedFixed32_.isEmpty()) {
+            packedFixed32_ = other.packedFixed32_;
+            packedFixed32_.makeImmutable();
+            bitField1_ |= 0x00004000;
+          } else {
+            ensurePackedFixed32IsMutable();
+            packedFixed32_.addAll(other.packedFixed32_);
+          }
+          onChanged();
+        }
+        if (!other.packedFixed64_.isEmpty()) {
+          if (packedFixed64_.isEmpty()) {
+            packedFixed64_ = other.packedFixed64_;
+            packedFixed64_.makeImmutable();
+            bitField1_ |= 0x00008000;
+          } else {
+            ensurePackedFixed64IsMutable();
+            packedFixed64_.addAll(other.packedFixed64_);
+          }
+          onChanged();
+        }
+        if (!other.packedSfixed32_.isEmpty()) {
+          if (packedSfixed32_.isEmpty()) {
+            packedSfixed32_ = other.packedSfixed32_;
+            packedSfixed32_.makeImmutable();
+            bitField1_ |= 0x00010000;
+          } else {
+            ensurePackedSfixed32IsMutable();
+            packedSfixed32_.addAll(other.packedSfixed32_);
+          }
+          onChanged();
+        }
+        if (!other.packedSfixed64_.isEmpty()) {
+          if (packedSfixed64_.isEmpty()) {
+            packedSfixed64_ = other.packedSfixed64_;
+            packedSfixed64_.makeImmutable();
+            bitField1_ |= 0x00020000;
+          } else {
+            ensurePackedSfixed64IsMutable();
+            packedSfixed64_.addAll(other.packedSfixed64_);
+          }
+          onChanged();
+        }
+        if (!other.packedFloat_.isEmpty()) {
+          if (packedFloat_.isEmpty()) {
+            packedFloat_ = other.packedFloat_;
+            packedFloat_.makeImmutable();
+            bitField1_ |= 0x00040000;
+          } else {
+            ensurePackedFloatIsMutable();
+            packedFloat_.addAll(other.packedFloat_);
+          }
+          onChanged();
+        }
+        if (!other.packedDouble_.isEmpty()) {
+          if (packedDouble_.isEmpty()) {
+            packedDouble_ = other.packedDouble_;
+            packedDouble_.makeImmutable();
+            bitField1_ |= 0x00080000;
+          } else {
+            ensurePackedDoubleIsMutable();
+            packedDouble_.addAll(other.packedDouble_);
+          }
+          onChanged();
+        }
+        if (!other.packedBool_.isEmpty()) {
+          if (packedBool_.isEmpty()) {
+            packedBool_ = other.packedBool_;
+            packedBool_.makeImmutable();
+            bitField1_ |= 0x00100000;
+          } else {
+            ensurePackedBoolIsMutable();
+            packedBool_.addAll(other.packedBool_);
+          }
+          onChanged();
+        }
+        if (!other.packedNestedEnum_.isEmpty()) {
+          if (packedNestedEnum_.isEmpty()) {
+            packedNestedEnum_ = other.packedNestedEnum_;
+            bitField1_ = (bitField1_ & ~0x00200000);
+          } else {
+            ensurePackedNestedEnumIsMutable();
+            packedNestedEnum_.addAll(other.packedNestedEnum_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedInt32_.isEmpty()) {
+          if (unpackedInt32_.isEmpty()) {
+            unpackedInt32_ = other.unpackedInt32_;
+            unpackedInt32_.makeImmutable();
+            bitField1_ |= 0x00400000;
+          } else {
+            ensureUnpackedInt32IsMutable();
+            unpackedInt32_.addAll(other.unpackedInt32_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedInt64_.isEmpty()) {
+          if (unpackedInt64_.isEmpty()) {
+            unpackedInt64_ = other.unpackedInt64_;
+            unpackedInt64_.makeImmutable();
+            bitField1_ |= 0x00800000;
+          } else {
+            ensureUnpackedInt64IsMutable();
+            unpackedInt64_.addAll(other.unpackedInt64_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedUint32_.isEmpty()) {
+          if (unpackedUint32_.isEmpty()) {
+            unpackedUint32_ = other.unpackedUint32_;
+            unpackedUint32_.makeImmutable();
+            bitField1_ |= 0x01000000;
+          } else {
+            ensureUnpackedUint32IsMutable();
+            unpackedUint32_.addAll(other.unpackedUint32_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedUint64_.isEmpty()) {
+          if (unpackedUint64_.isEmpty()) {
+            unpackedUint64_ = other.unpackedUint64_;
+            unpackedUint64_.makeImmutable();
+            bitField1_ |= 0x02000000;
+          } else {
+            ensureUnpackedUint64IsMutable();
+            unpackedUint64_.addAll(other.unpackedUint64_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedSint32_.isEmpty()) {
+          if (unpackedSint32_.isEmpty()) {
+            unpackedSint32_ = other.unpackedSint32_;
+            unpackedSint32_.makeImmutable();
+            bitField1_ |= 0x04000000;
+          } else {
+            ensureUnpackedSint32IsMutable();
+            unpackedSint32_.addAll(other.unpackedSint32_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedSint64_.isEmpty()) {
+          if (unpackedSint64_.isEmpty()) {
+            unpackedSint64_ = other.unpackedSint64_;
+            unpackedSint64_.makeImmutable();
+            bitField1_ |= 0x08000000;
+          } else {
+            ensureUnpackedSint64IsMutable();
+            unpackedSint64_.addAll(other.unpackedSint64_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedFixed32_.isEmpty()) {
+          if (unpackedFixed32_.isEmpty()) {
+            unpackedFixed32_ = other.unpackedFixed32_;
+            unpackedFixed32_.makeImmutable();
+            bitField1_ |= 0x10000000;
+          } else {
+            ensureUnpackedFixed32IsMutable();
+            unpackedFixed32_.addAll(other.unpackedFixed32_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedFixed64_.isEmpty()) {
+          if (unpackedFixed64_.isEmpty()) {
+            unpackedFixed64_ = other.unpackedFixed64_;
+            unpackedFixed64_.makeImmutable();
+            bitField1_ |= 0x20000000;
+          } else {
+            ensureUnpackedFixed64IsMutable();
+            unpackedFixed64_.addAll(other.unpackedFixed64_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedSfixed32_.isEmpty()) {
+          if (unpackedSfixed32_.isEmpty()) {
+            unpackedSfixed32_ = other.unpackedSfixed32_;
+            unpackedSfixed32_.makeImmutable();
+            bitField1_ |= 0x40000000;
+          } else {
+            ensureUnpackedSfixed32IsMutable();
+            unpackedSfixed32_.addAll(other.unpackedSfixed32_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedSfixed64_.isEmpty()) {
+          if (unpackedSfixed64_.isEmpty()) {
+            unpackedSfixed64_ = other.unpackedSfixed64_;
+            unpackedSfixed64_.makeImmutable();
+            bitField1_ |= 0x80000000;
+          } else {
+            ensureUnpackedSfixed64IsMutable();
+            unpackedSfixed64_.addAll(other.unpackedSfixed64_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedFloat_.isEmpty()) {
+          if (unpackedFloat_.isEmpty()) {
+            unpackedFloat_ = other.unpackedFloat_;
+            unpackedFloat_.makeImmutable();
+            bitField2_ |= 0x00000001;
+          } else {
+            ensureUnpackedFloatIsMutable();
+            unpackedFloat_.addAll(other.unpackedFloat_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedDouble_.isEmpty()) {
+          if (unpackedDouble_.isEmpty()) {
+            unpackedDouble_ = other.unpackedDouble_;
+            unpackedDouble_.makeImmutable();
+            bitField2_ |= 0x00000002;
+          } else {
+            ensureUnpackedDoubleIsMutable();
+            unpackedDouble_.addAll(other.unpackedDouble_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedBool_.isEmpty()) {
+          if (unpackedBool_.isEmpty()) {
+            unpackedBool_ = other.unpackedBool_;
+            unpackedBool_.makeImmutable();
+            bitField2_ |= 0x00000004;
+          } else {
+            ensureUnpackedBoolIsMutable();
+            unpackedBool_.addAll(other.unpackedBool_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedNestedEnum_.isEmpty()) {
+          if (unpackedNestedEnum_.isEmpty()) {
+            unpackedNestedEnum_ = other.unpackedNestedEnum_;
+            bitField2_ = (bitField2_ & ~0x00000008);
+          } else {
+            ensureUnpackedNestedEnumIsMutable();
+            unpackedNestedEnum_.addAll(other.unpackedNestedEnum_);
+          }
+          onChanged();
+        }
+        internalGetMutableMapInt32Int32().mergeFrom(
+            other.internalGetMapInt32Int32());
+        bitField2_ |= 0x00000010;
+        internalGetMutableMapInt64Int64().mergeFrom(
+            other.internalGetMapInt64Int64());
+        bitField2_ |= 0x00000020;
+        internalGetMutableMapUint32Uint32().mergeFrom(
+            other.internalGetMapUint32Uint32());
+        bitField2_ |= 0x00000040;
+        internalGetMutableMapUint64Uint64().mergeFrom(
+            other.internalGetMapUint64Uint64());
+        bitField2_ |= 0x00000080;
+        internalGetMutableMapSint32Sint32().mergeFrom(
+            other.internalGetMapSint32Sint32());
+        bitField2_ |= 0x00000100;
+        internalGetMutableMapSint64Sint64().mergeFrom(
+            other.internalGetMapSint64Sint64());
+        bitField2_ |= 0x00000200;
+        internalGetMutableMapFixed32Fixed32().mergeFrom(
+            other.internalGetMapFixed32Fixed32());
+        bitField2_ |= 0x00000400;
+        internalGetMutableMapFixed64Fixed64().mergeFrom(
+            other.internalGetMapFixed64Fixed64());
+        bitField2_ |= 0x00000800;
+        internalGetMutableMapSfixed32Sfixed32().mergeFrom(
+            other.internalGetMapSfixed32Sfixed32());
+        bitField2_ |= 0x00001000;
+        internalGetMutableMapSfixed64Sfixed64().mergeFrom(
+            other.internalGetMapSfixed64Sfixed64());
+        bitField2_ |= 0x00002000;
+        internalGetMutableMapInt32Float().mergeFrom(
+            other.internalGetMapInt32Float());
+        bitField2_ |= 0x00004000;
+        internalGetMutableMapInt32Double().mergeFrom(
+            other.internalGetMapInt32Double());
+        bitField2_ |= 0x00008000;
+        internalGetMutableMapBoolBool().mergeFrom(
+            other.internalGetMapBoolBool());
+        bitField2_ |= 0x00010000;
+        internalGetMutableMapStringString().mergeFrom(
+            other.internalGetMapStringString());
+        bitField2_ |= 0x00020000;
+        internalGetMutableMapStringBytes().mergeFrom(
+            other.internalGetMapStringBytes());
+        bitField2_ |= 0x00040000;
+        internalGetMutableMapStringNestedMessage().mergeFrom(
+            other.internalGetMapStringNestedMessage());
+        bitField2_ |= 0x00080000;
+        internalGetMutableMapStringForeignMessage().mergeFrom(
+            other.internalGetMapStringForeignMessage());
+        bitField2_ |= 0x00100000;
+        internalGetMutableMapStringNestedEnum().mergeFrom(
+            other.internalGetMapStringNestedEnum());
+        bitField2_ |= 0x00200000;
+        internalGetMutableMapStringForeignEnum().mergeFrom(
+            other.internalGetMapStringForeignEnum());
+        bitField2_ |= 0x00400000;
+        switch (other.getOneofFieldCase()) {
+          case ONEOF_UINT32: {
+            setOneofUint32(other.getOneofUint32());
+            break;
+          }
+          case ONEOF_NESTED_MESSAGE: {
+            mergeOneofNestedMessage(other.getOneofNestedMessage());
+            break;
+          }
+          case ONEOF_STRING: {
+            oneofFieldCase_ = 113;
+            oneofField_ = other.oneofField_;
+            onChanged();
+            break;
+          }
+          case ONEOF_BYTES: {
+            setOneofBytes(other.getOneofBytes());
+            break;
+          }
+          case ONEOF_BOOL: {
+            setOneofBool(other.getOneofBool());
+            break;
+          }
+          case ONEOF_UINT64: {
+            setOneofUint64(other.getOneofUint64());
+            break;
+          }
+          case ONEOF_FLOAT: {
+            setOneofFloat(other.getOneofFloat());
+            break;
+          }
+          case ONEOF_DOUBLE: {
+            setOneofDouble(other.getOneofDouble());
+            break;
+          }
+          case ONEOF_ENUM: {
+            setOneofEnum(other.getOneofEnum());
+            break;
+          }
+          case ONEOFFIELD_NOT_SET: {
+            break;
+          }
+        }
+        this.mergeExtensionFields(other);
+        this.mergeUnknownFields(other.getUnknownFields());
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        if (hasOptionalNestedMessage()) {
+          if (!getOptionalNestedMessage().isInitialized()) {
+            return false;
+          }
+        }
+        if (hasRecursiveMessage()) {
+          if (!getRecursiveMessage().isInitialized()) {
+            return false;
+          }
+        }
+        for (int i = 0; i < getRepeatedNestedMessageCount(); i++) {
+          if (!getRepeatedNestedMessage(i).isInitialized()) {
+            return false;
+          }
+        }
+        for (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage item : getMapStringNestedMessageMap().values()) {
+          if (!item.isInitialized()) {
+            return false;
+          }
+        }
+        if (hasOneofNestedMessage()) {
+          if (!getOneofNestedMessage().isInitialized()) {
+            return false;
+          }
+        }
+        if (!extensionsAreInitialized()) {
+          return false;
+        }
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
+        try {
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                optionalInt32_ = input.readInt32();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 16: {
+                optionalInt64_ = input.readInt64();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 24: {
+                optionalUint32_ = input.readUInt32();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              case 32: {
+                optionalUint64_ = input.readUInt64();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 32
+              case 40: {
+                optionalSint32_ = input.readSInt32();
+                bitField0_ |= 0x00000010;
+                break;
+              } // case 40
+              case 48: {
+                optionalSint64_ = input.readSInt64();
+                bitField0_ |= 0x00000020;
+                break;
+              } // case 48
+              case 61: {
+                optionalFixed32_ = input.readFixed32();
+                bitField0_ |= 0x00000040;
+                break;
+              } // case 61
+              case 65: {
+                optionalFixed64_ = input.readFixed64();
+                bitField0_ |= 0x00000080;
+                break;
+              } // case 65
+              case 77: {
+                optionalSfixed32_ = input.readSFixed32();
+                bitField0_ |= 0x00000100;
+                break;
+              } // case 77
+              case 81: {
+                optionalSfixed64_ = input.readSFixed64();
+                bitField0_ |= 0x00000200;
+                break;
+              } // case 81
+              case 93: {
+                optionalFloat_ = input.readFloat();
+                bitField0_ |= 0x00000400;
+                break;
+              } // case 93
+              case 97: {
+                optionalDouble_ = input.readDouble();
+                bitField0_ |= 0x00000800;
+                break;
+              } // case 97
+              case 104: {
+                optionalBool_ = input.readBool();
+                bitField0_ |= 0x00001000;
+                break;
+              } // case 104
+              case 114: {
+                optionalString_ = input.readBytes();
+                bitField0_ |= 0x00002000;
+                break;
+              } // case 114
+              case 122: {
+                optionalBytes_ = input.readBytes();
+                bitField0_ |= 0x00004000;
+                break;
+              } // case 122
+              case 146: {
+                input.readMessage(
+                    getOptionalNestedMessageFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00008000;
+                break;
+              } // case 146
+              case 154: {
+                input.readMessage(
+                    getOptionalForeignMessageFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00010000;
+                break;
+              } // case 154
+              case 168: {
+                int tmpRaw = input.readEnum();
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum tmpValue =
+                    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(tmpRaw);
+                if (tmpValue == null) {
+                  mergeUnknownVarintField(21, tmpRaw);
+                } else {
+                  optionalNestedEnum_ = tmpRaw;
+                  bitField0_ |= 0x00020000;
+                }
+                break;
+              } // case 168
+              case 176: {
+                int tmpRaw = input.readEnum();
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum tmpValue =
+                    legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.forNumber(tmpRaw);
+                if (tmpValue == null) {
+                  mergeUnknownVarintField(22, tmpRaw);
+                } else {
+                  optionalForeignEnum_ = tmpRaw;
+                  bitField0_ |= 0x00040000;
+                }
+                break;
+              } // case 176
+              case 184: {
+                int tmpRaw = input.readEnum();
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum tmpValue =
+                    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum.forNumber(tmpRaw);
+                if (tmpValue == null) {
+                  mergeUnknownVarintField(23, tmpRaw);
+                } else {
+                  optionalAliasedEnum_ = tmpRaw;
+                  bitField0_ |= 0x00080000;
+                }
+                break;
+              } // case 184
+              case 218: {
+                input.readMessage(
+                    getRecursiveMessageFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00100000;
+                break;
+              } // case 218
+              case 248: {
+                int v = input.readInt32();
+                ensureRepeatedInt32IsMutable();
+                repeatedInt32_.addInt(v);
+                break;
+              } // case 248
+              case 250: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedInt32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedInt32_.addInt(input.readInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 250
+              case 256: {
+                long v = input.readInt64();
+                ensureRepeatedInt64IsMutable();
+                repeatedInt64_.addLong(v);
+                break;
+              } // case 256
+              case 258: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedInt64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedInt64_.addLong(input.readInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 258
+              case 264: {
+                int v = input.readUInt32();
+                ensureRepeatedUint32IsMutable();
+                repeatedUint32_.addInt(v);
+                break;
+              } // case 264
+              case 266: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedUint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedUint32_.addInt(input.readUInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 266
+              case 272: {
+                long v = input.readUInt64();
+                ensureRepeatedUint64IsMutable();
+                repeatedUint64_.addLong(v);
+                break;
+              } // case 272
+              case 274: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedUint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedUint64_.addLong(input.readUInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 274
+              case 280: {
+                int v = input.readSInt32();
+                ensureRepeatedSint32IsMutable();
+                repeatedSint32_.addInt(v);
+                break;
+              } // case 280
+              case 282: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedSint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedSint32_.addInt(input.readSInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 282
+              case 288: {
+                long v = input.readSInt64();
+                ensureRepeatedSint64IsMutable();
+                repeatedSint64_.addLong(v);
+                break;
+              } // case 288
+              case 290: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedSint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedSint64_.addLong(input.readSInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 290
+              case 301: {
+                int v = input.readFixed32();
+                ensureRepeatedFixed32IsMutable();
+                repeatedFixed32_.addInt(v);
+                break;
+              } // case 301
+              case 298: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedFixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedFixed32_.addInt(input.readFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 298
+              case 305: {
+                long v = input.readFixed64();
+                ensureRepeatedFixed64IsMutable();
+                repeatedFixed64_.addLong(v);
+                break;
+              } // case 305
+              case 306: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedFixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedFixed64_.addLong(input.readFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 306
+              case 317: {
+                int v = input.readSFixed32();
+                ensureRepeatedSfixed32IsMutable();
+                repeatedSfixed32_.addInt(v);
+                break;
+              } // case 317
+              case 314: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedSfixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedSfixed32_.addInt(input.readSFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 314
+              case 321: {
+                long v = input.readSFixed64();
+                ensureRepeatedSfixed64IsMutable();
+                repeatedSfixed64_.addLong(v);
+                break;
+              } // case 321
+              case 322: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedSfixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedSfixed64_.addLong(input.readSFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 322
+              case 333: {
+                float v = input.readFloat();
+                ensureRepeatedFloatIsMutable();
+                repeatedFloat_.addFloat(v);
+                break;
+              } // case 333
+              case 330: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedFloatIsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedFloat_.addFloat(input.readFloat());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 330
+              case 337: {
+                double v = input.readDouble();
+                ensureRepeatedDoubleIsMutable();
+                repeatedDouble_.addDouble(v);
+                break;
+              } // case 337
+              case 338: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedDoubleIsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedDouble_.addDouble(input.readDouble());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 338
+              case 344: {
+                boolean v = input.readBool();
+                ensureRepeatedBoolIsMutable();
+                repeatedBool_.addBoolean(v);
+                break;
+              } // case 344
+              case 346: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedBoolIsMutable(alloc / 1);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedBool_.addBoolean(input.readBool());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 346
+              case 354: {
+                com.google.protobuf.ByteString bs = input.readBytes();
+                ensureRepeatedStringIsMutable();
+                repeatedString_.add(bs);
+                break;
+              } // case 354
+              case 362: {
+                com.google.protobuf.ByteString v = input.readBytes();
+                ensureRepeatedBytesIsMutable();
+                repeatedBytes_.add(v);
+                break;
+              } // case 362
+              case 386: {
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage m =
+                    input.readMessage(
+                        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.parser(),
+                        extensionRegistry);
+                if (repeatedNestedMessageBuilder_ == null) {
+                  ensureRepeatedNestedMessageIsMutable();
+                  repeatedNestedMessage_.add(m);
+                } else {
+                  repeatedNestedMessageBuilder_.addMessage(m);
+                }
+                break;
+              } // case 386
+              case 394: {
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage m =
+                    input.readMessage(
+                        legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.parser(),
+                        extensionRegistry);
+                if (repeatedForeignMessageBuilder_ == null) {
+                  ensureRepeatedForeignMessageIsMutable();
+                  repeatedForeignMessage_.add(m);
+                } else {
+                  repeatedForeignMessageBuilder_.addMessage(m);
+                }
+                break;
+              } // case 394
+              case 408: {
+                int tmpRaw = input.readEnum();
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum tmpValue =
+                    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(tmpRaw);
+                if (tmpValue == null) {
+                  mergeUnknownVarintField(51, tmpRaw);
+                } else {
+                  ensureRepeatedNestedEnumIsMutable();
+                  repeatedNestedEnum_.add(tmpRaw);
+                }
+                break;
+              } // case 408
+              case 410: {
+                int length = input.readRawVarint32();
+                int oldLimit = input.pushLimit(length);
+                while(input.getBytesUntilLimit() > 0) {
+                  int tmpRaw = input.readEnum();
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum tmpValue =
+                      legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(tmpRaw);
+                  if (tmpValue == null) {
+                    mergeUnknownVarintField(51, tmpRaw);
+                  } else {
+                    ensureRepeatedNestedEnumIsMutable();
+                    repeatedNestedEnum_.add(tmpRaw);
+                  }
+                }
+                input.popLimit(oldLimit);
+                break;
+              } // case 410
+              case 416: {
+                int tmpRaw = input.readEnum();
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum tmpValue =
+                    legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.forNumber(tmpRaw);
+                if (tmpValue == null) {
+                  mergeUnknownVarintField(52, tmpRaw);
+                } else {
+                  ensureRepeatedForeignEnumIsMutable();
+                  repeatedForeignEnum_.add(tmpRaw);
+                }
+                break;
+              } // case 416
+              case 418: {
+                int length = input.readRawVarint32();
+                int oldLimit = input.pushLimit(length);
+                while(input.getBytesUntilLimit() > 0) {
+                  int tmpRaw = input.readEnum();
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum tmpValue =
+                      legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.forNumber(tmpRaw);
+                  if (tmpValue == null) {
+                    mergeUnknownVarintField(52, tmpRaw);
+                  } else {
+                    ensureRepeatedForeignEnumIsMutable();
+                    repeatedForeignEnum_.add(tmpRaw);
+                  }
+                }
+                input.popLimit(oldLimit);
+                break;
+              } // case 418
+              case 450: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+                mapInt32Int32__ = input.readMessage(
+                    MapInt32Int32DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapInt32Int32().getMutableMap().put(
+                    mapInt32Int32__.getKey(), mapInt32Int32__.getValue());
+                bitField2_ |= 0x00000010;
+                break;
+              } // case 450
+              case 458: {
+                com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+                mapInt64Int64__ = input.readMessage(
+                    MapInt64Int64DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapInt64Int64().getMutableMap().put(
+                    mapInt64Int64__.getKey(), mapInt64Int64__.getValue());
+                bitField2_ |= 0x00000020;
+                break;
+              } // case 458
+              case 466: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+                mapUint32Uint32__ = input.readMessage(
+                    MapUint32Uint32DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapUint32Uint32().getMutableMap().put(
+                    mapUint32Uint32__.getKey(), mapUint32Uint32__.getValue());
+                bitField2_ |= 0x00000040;
+                break;
+              } // case 466
+              case 474: {
+                com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+                mapUint64Uint64__ = input.readMessage(
+                    MapUint64Uint64DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapUint64Uint64().getMutableMap().put(
+                    mapUint64Uint64__.getKey(), mapUint64Uint64__.getValue());
+                bitField2_ |= 0x00000080;
+                break;
+              } // case 474
+              case 482: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+                mapSint32Sint32__ = input.readMessage(
+                    MapSint32Sint32DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapSint32Sint32().getMutableMap().put(
+                    mapSint32Sint32__.getKey(), mapSint32Sint32__.getValue());
+                bitField2_ |= 0x00000100;
+                break;
+              } // case 482
+              case 490: {
+                com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+                mapSint64Sint64__ = input.readMessage(
+                    MapSint64Sint64DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapSint64Sint64().getMutableMap().put(
+                    mapSint64Sint64__.getKey(), mapSint64Sint64__.getValue());
+                bitField2_ |= 0x00000200;
+                break;
+              } // case 490
+              case 498: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+                mapFixed32Fixed32__ = input.readMessage(
+                    MapFixed32Fixed32DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapFixed32Fixed32().getMutableMap().put(
+                    mapFixed32Fixed32__.getKey(), mapFixed32Fixed32__.getValue());
+                bitField2_ |= 0x00000400;
+                break;
+              } // case 498
+              case 506: {
+                com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+                mapFixed64Fixed64__ = input.readMessage(
+                    MapFixed64Fixed64DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapFixed64Fixed64().getMutableMap().put(
+                    mapFixed64Fixed64__.getKey(), mapFixed64Fixed64__.getValue());
+                bitField2_ |= 0x00000800;
+                break;
+              } // case 506
+              case 514: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+                mapSfixed32Sfixed32__ = input.readMessage(
+                    MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapSfixed32Sfixed32().getMutableMap().put(
+                    mapSfixed32Sfixed32__.getKey(), mapSfixed32Sfixed32__.getValue());
+                bitField2_ |= 0x00001000;
+                break;
+              } // case 514
+              case 522: {
+                com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+                mapSfixed64Sfixed64__ = input.readMessage(
+                    MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapSfixed64Sfixed64().getMutableMap().put(
+                    mapSfixed64Sfixed64__.getKey(), mapSfixed64Sfixed64__.getValue());
+                bitField2_ |= 0x00002000;
+                break;
+              } // case 522
+              case 530: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float>
+                mapInt32Float__ = input.readMessage(
+                    MapInt32FloatDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapInt32Float().getMutableMap().put(
+                    mapInt32Float__.getKey(), mapInt32Float__.getValue());
+                bitField2_ |= 0x00004000;
+                break;
+              } // case 530
+              case 538: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Double>
+                mapInt32Double__ = input.readMessage(
+                    MapInt32DoubleDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapInt32Double().getMutableMap().put(
+                    mapInt32Double__.getKey(), mapInt32Double__.getValue());
+                bitField2_ |= 0x00008000;
+                break;
+              } // case 538
+              case 546: {
+                com.google.protobuf.MapEntry<java.lang.Boolean, java.lang.Boolean>
+                mapBoolBool__ = input.readMessage(
+                    MapBoolBoolDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapBoolBool().getMutableMap().put(
+                    mapBoolBool__.getKey(), mapBoolBool__.getValue());
+                bitField2_ |= 0x00010000;
+                break;
+              } // case 546
+              case 554: {
+                com.google.protobuf.MapEntry<java.lang.String, java.lang.String>
+                mapStringString__ = input.readMessage(
+                    MapStringStringDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapStringString().getMutableMap().put(
+                    mapStringString__.getKey(), mapStringString__.getValue());
+                bitField2_ |= 0x00020000;
+                break;
+              } // case 554
+              case 562: {
+                com.google.protobuf.MapEntry<java.lang.String, com.google.protobuf.ByteString>
+                mapStringBytes__ = input.readMessage(
+                    MapStringBytesDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapStringBytes().getMutableMap().put(
+                    mapStringBytes__.getKey(), mapStringBytes__.getValue());
+                bitField2_ |= 0x00040000;
+                break;
+              } // case 562
+              case 570: {
+                com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage>
+                mapStringNestedMessage__ = input.readMessage(
+                    MapStringNestedMessageDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapStringNestedMessage().ensureBuilderMap().put(
+                    mapStringNestedMessage__.getKey(), mapStringNestedMessage__.getValue());
+                bitField2_ |= 0x00080000;
+                break;
+              } // case 570
+              case 578: {
+                com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage>
+                mapStringForeignMessage__ = input.readMessage(
+                    MapStringForeignMessageDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapStringForeignMessage().ensureBuilderMap().put(
+                    mapStringForeignMessage__.getKey(), mapStringForeignMessage__.getValue());
+                bitField2_ |= 0x00100000;
+                break;
+              } // case 578
+              case 586: {
+                com.google.protobuf.ByteString bytes = input.readBytes();
+                com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer>
+                mapStringNestedEnum__ = MapStringNestedEnumDefaultEntryHolder.defaultEntry.getParserForType().parseFrom(bytes);
+                if (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(mapStringNestedEnum__.getValue()) == null) {
+                  mergeUnknownLengthDelimitedField(73, bytes);
+                } else {
+                  internalGetMutableMapStringNestedEnum().getMutableMap().put(
+                      mapStringNestedEnum__.getKey(), mapStringNestedEnum__.getValue());
+                  bitField2_ |= 0x00200000;
+                }
+                break;
+              } // case 586
+              case 594: {
+                com.google.protobuf.ByteString bytes = input.readBytes();
+                com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer>
+                mapStringForeignEnum__ = MapStringForeignEnumDefaultEntryHolder.defaultEntry.getParserForType().parseFrom(bytes);
+                if (legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.forNumber(mapStringForeignEnum__.getValue()) == null) {
+                  mergeUnknownLengthDelimitedField(74, bytes);
+                } else {
+                  internalGetMutableMapStringForeignEnum().getMutableMap().put(
+                      mapStringForeignEnum__.getKey(), mapStringForeignEnum__.getValue());
+                  bitField2_ |= 0x00400000;
+                }
+                break;
+              } // case 594
+              case 600: {
+                int v = input.readInt32();
+                ensurePackedInt32IsMutable();
+                packedInt32_.addInt(v);
+                break;
+              } // case 600
+              case 602: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedInt32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedInt32_.addInt(input.readInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 602
+              case 608: {
+                long v = input.readInt64();
+                ensurePackedInt64IsMutable();
+                packedInt64_.addLong(v);
+                break;
+              } // case 608
+              case 610: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedInt64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedInt64_.addLong(input.readInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 610
+              case 616: {
+                int v = input.readUInt32();
+                ensurePackedUint32IsMutable();
+                packedUint32_.addInt(v);
+                break;
+              } // case 616
+              case 618: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedUint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedUint32_.addInt(input.readUInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 618
+              case 624: {
+                long v = input.readUInt64();
+                ensurePackedUint64IsMutable();
+                packedUint64_.addLong(v);
+                break;
+              } // case 624
+              case 626: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedUint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedUint64_.addLong(input.readUInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 626
+              case 632: {
+                int v = input.readSInt32();
+                ensurePackedSint32IsMutable();
+                packedSint32_.addInt(v);
+                break;
+              } // case 632
+              case 634: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedSint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedSint32_.addInt(input.readSInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 634
+              case 640: {
+                long v = input.readSInt64();
+                ensurePackedSint64IsMutable();
+                packedSint64_.addLong(v);
+                break;
+              } // case 640
+              case 642: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedSint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedSint64_.addLong(input.readSInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 642
+              case 653: {
+                int v = input.readFixed32();
+                ensurePackedFixed32IsMutable();
+                packedFixed32_.addInt(v);
+                break;
+              } // case 653
+              case 650: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedFixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedFixed32_.addInt(input.readFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 650
+              case 657: {
+                long v = input.readFixed64();
+                ensurePackedFixed64IsMutable();
+                packedFixed64_.addLong(v);
+                break;
+              } // case 657
+              case 658: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedFixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedFixed64_.addLong(input.readFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 658
+              case 669: {
+                int v = input.readSFixed32();
+                ensurePackedSfixed32IsMutable();
+                packedSfixed32_.addInt(v);
+                break;
+              } // case 669
+              case 666: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedSfixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedSfixed32_.addInt(input.readSFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 666
+              case 673: {
+                long v = input.readSFixed64();
+                ensurePackedSfixed64IsMutable();
+                packedSfixed64_.addLong(v);
+                break;
+              } // case 673
+              case 674: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedSfixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedSfixed64_.addLong(input.readSFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 674
+              case 685: {
+                float v = input.readFloat();
+                ensurePackedFloatIsMutable();
+                packedFloat_.addFloat(v);
+                break;
+              } // case 685
+              case 682: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedFloatIsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedFloat_.addFloat(input.readFloat());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 682
+              case 689: {
+                double v = input.readDouble();
+                ensurePackedDoubleIsMutable();
+                packedDouble_.addDouble(v);
+                break;
+              } // case 689
+              case 690: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedDoubleIsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedDouble_.addDouble(input.readDouble());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 690
+              case 696: {
+                boolean v = input.readBool();
+                ensurePackedBoolIsMutable();
+                packedBool_.addBoolean(v);
+                break;
+              } // case 696
+              case 698: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedBoolIsMutable(alloc / 1);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedBool_.addBoolean(input.readBool());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 698
+              case 704: {
+                int tmpRaw = input.readEnum();
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum tmpValue =
+                    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(tmpRaw);
+                if (tmpValue == null) {
+                  mergeUnknownVarintField(88, tmpRaw);
+                } else {
+                  ensurePackedNestedEnumIsMutable();
+                  packedNestedEnum_.add(tmpRaw);
+                }
+                break;
+              } // case 704
+              case 706: {
+                int length = input.readRawVarint32();
+                int oldLimit = input.pushLimit(length);
+                while(input.getBytesUntilLimit() > 0) {
+                  int tmpRaw = input.readEnum();
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum tmpValue =
+                      legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(tmpRaw);
+                  if (tmpValue == null) {
+                    mergeUnknownVarintField(88, tmpRaw);
+                  } else {
+                    ensurePackedNestedEnumIsMutable();
+                    packedNestedEnum_.add(tmpRaw);
+                  }
+                }
+                input.popLimit(oldLimit);
+                break;
+              } // case 706
+              case 712: {
+                int v = input.readInt32();
+                ensureUnpackedInt32IsMutable();
+                unpackedInt32_.addInt(v);
+                break;
+              } // case 712
+              case 714: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedInt32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedInt32_.addInt(input.readInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 714
+              case 720: {
+                long v = input.readInt64();
+                ensureUnpackedInt64IsMutable();
+                unpackedInt64_.addLong(v);
+                break;
+              } // case 720
+              case 722: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedInt64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedInt64_.addLong(input.readInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 722
+              case 728: {
+                int v = input.readUInt32();
+                ensureUnpackedUint32IsMutable();
+                unpackedUint32_.addInt(v);
+                break;
+              } // case 728
+              case 730: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedUint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedUint32_.addInt(input.readUInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 730
+              case 736: {
+                long v = input.readUInt64();
+                ensureUnpackedUint64IsMutable();
+                unpackedUint64_.addLong(v);
+                break;
+              } // case 736
+              case 738: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedUint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedUint64_.addLong(input.readUInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 738
+              case 744: {
+                int v = input.readSInt32();
+                ensureUnpackedSint32IsMutable();
+                unpackedSint32_.addInt(v);
+                break;
+              } // case 744
+              case 746: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedSint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedSint32_.addInt(input.readSInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 746
+              case 752: {
+                long v = input.readSInt64();
+                ensureUnpackedSint64IsMutable();
+                unpackedSint64_.addLong(v);
+                break;
+              } // case 752
+              case 754: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedSint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedSint64_.addLong(input.readSInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 754
+              case 765: {
+                int v = input.readFixed32();
+                ensureUnpackedFixed32IsMutable();
+                unpackedFixed32_.addInt(v);
+                break;
+              } // case 765
+              case 762: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedFixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedFixed32_.addInt(input.readFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 762
+              case 769: {
+                long v = input.readFixed64();
+                ensureUnpackedFixed64IsMutable();
+                unpackedFixed64_.addLong(v);
+                break;
+              } // case 769
+              case 770: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedFixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedFixed64_.addLong(input.readFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 770
+              case 781: {
+                int v = input.readSFixed32();
+                ensureUnpackedSfixed32IsMutable();
+                unpackedSfixed32_.addInt(v);
+                break;
+              } // case 781
+              case 778: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedSfixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedSfixed32_.addInt(input.readSFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 778
+              case 785: {
+                long v = input.readSFixed64();
+                ensureUnpackedSfixed64IsMutable();
+                unpackedSfixed64_.addLong(v);
+                break;
+              } // case 785
+              case 786: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedSfixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedSfixed64_.addLong(input.readSFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 786
+              case 797: {
+                float v = input.readFloat();
+                ensureUnpackedFloatIsMutable();
+                unpackedFloat_.addFloat(v);
+                break;
+              } // case 797
+              case 794: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedFloatIsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedFloat_.addFloat(input.readFloat());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 794
+              case 801: {
+                double v = input.readDouble();
+                ensureUnpackedDoubleIsMutable();
+                unpackedDouble_.addDouble(v);
+                break;
+              } // case 801
+              case 802: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedDoubleIsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedDouble_.addDouble(input.readDouble());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 802
+              case 808: {
+                boolean v = input.readBool();
+                ensureUnpackedBoolIsMutable();
+                unpackedBool_.addBoolean(v);
+                break;
+              } // case 808
+              case 810: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedBoolIsMutable(alloc / 1);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedBool_.addBoolean(input.readBool());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 810
+              case 816: {
+                int tmpRaw = input.readEnum();
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum tmpValue =
+                    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(tmpRaw);
+                if (tmpValue == null) {
+                  mergeUnknownVarintField(102, tmpRaw);
+                } else {
+                  ensureUnpackedNestedEnumIsMutable();
+                  unpackedNestedEnum_.add(tmpRaw);
+                }
+                break;
+              } // case 816
+              case 818: {
+                int length = input.readRawVarint32();
+                int oldLimit = input.pushLimit(length);
+                while(input.getBytesUntilLimit() > 0) {
+                  int tmpRaw = input.readEnum();
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum tmpValue =
+                      legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(tmpRaw);
+                  if (tmpValue == null) {
+                    mergeUnknownVarintField(102, tmpRaw);
+                  } else {
+                    ensureUnpackedNestedEnumIsMutable();
+                    unpackedNestedEnum_.add(tmpRaw);
+                  }
+                }
+                input.popLimit(oldLimit);
+                break;
+              } // case 818
+              case 888: {
+                oneofField_ = input.readUInt32();
+                oneofFieldCase_ = 111;
+                break;
+              } // case 888
+              case 898: {
+                input.readMessage(
+                    getOneofNestedMessageFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                oneofFieldCase_ = 112;
+                break;
+              } // case 898
+              case 906: {
+                com.google.protobuf.ByteString bs = input.readBytes();
+                oneofFieldCase_ = 113;
+                oneofField_ = bs;
+                break;
+              } // case 906
+              case 914: {
+                oneofField_ = input.readBytes();
+                oneofFieldCase_ = 114;
+                break;
+              } // case 914
+              case 920: {
+                oneofField_ = input.readBool();
+                oneofFieldCase_ = 115;
+                break;
+              } // case 920
+              case 928: {
+                oneofField_ = input.readUInt64();
+                oneofFieldCase_ = 116;
+                break;
+              } // case 928
+              case 941: {
+                oneofField_ = input.readFloat();
+                oneofFieldCase_ = 117;
+                break;
+              } // case 941
+              case 945: {
+                oneofField_ = input.readDouble();
+                oneofFieldCase_ = 118;
+                break;
+              } // case 945
+              case 952: {
+                int rawValue = input.readEnum();
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value =
+                    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(rawValue);
+                if (value == null) {
+                  mergeUnknownVarintField(119, rawValue);
+                } else {
+                  oneofFieldCase_ = 119;
+                  oneofField_ = rawValue;
+                }
+                break;
+              } // case 952
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.unwrapIOException();
+        } finally {
+          onChanged();
+        } // finally
+        return this;
+      }
+      private int oneofFieldCase_ = 0;
+      private java.lang.Object oneofField_;
+      public OneofFieldCase
+          getOneofFieldCase() {
+        return OneofFieldCase.forNumber(
+            oneofFieldCase_);
+      }
+
+      public Builder clearOneofField() {
+        oneofFieldCase_ = 0;
+        oneofField_ = null;
+        onChanged();
+        return this;
+      }
+
+      private int bitField0_;
+      private int bitField1_;
+      private int bitField2_;
+
+      private int optionalInt32_ ;
+      /**
+       * <code>optional int32 optional_int32 = 1;</code>
+       * @return Whether the optionalInt32 field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalInt32() {
+        return ((bitField0_ & 0x00000001) != 0);
+      }
+      /**
+       * <code>optional int32 optional_int32 = 1;</code>
+       * @return The optionalInt32.
+       */
+      @java.lang.Override
+      public int getOptionalInt32() {
+        return optionalInt32_;
+      }
+      /**
+       * <code>optional int32 optional_int32 = 1;</code>
+       * @param value The optionalInt32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalInt32(int value) {
+
+        optionalInt32_ = value;
+        bitField0_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional int32 optional_int32 = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalInt32() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        optionalInt32_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private long optionalInt64_ ;
+      /**
+       * <code>optional int64 optional_int64 = 2;</code>
+       * @return Whether the optionalInt64 field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalInt64() {
+        return ((bitField0_ & 0x00000002) != 0);
+      }
+      /**
+       * <code>optional int64 optional_int64 = 2;</code>
+       * @return The optionalInt64.
+       */
+      @java.lang.Override
+      public long getOptionalInt64() {
+        return optionalInt64_;
+      }
+      /**
+       * <code>optional int64 optional_int64 = 2;</code>
+       * @param value The optionalInt64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalInt64(long value) {
+
+        optionalInt64_ = value;
+        bitField0_ |= 0x00000002;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional int64 optional_int64 = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalInt64() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        optionalInt64_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private int optionalUint32_ ;
+      /**
+       * <code>optional uint32 optional_uint32 = 3;</code>
+       * @return Whether the optionalUint32 field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalUint32() {
+        return ((bitField0_ & 0x00000004) != 0);
+      }
+      /**
+       * <code>optional uint32 optional_uint32 = 3;</code>
+       * @return The optionalUint32.
+       */
+      @java.lang.Override
+      public int getOptionalUint32() {
+        return optionalUint32_;
+      }
+      /**
+       * <code>optional uint32 optional_uint32 = 3;</code>
+       * @param value The optionalUint32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalUint32(int value) {
+
+        optionalUint32_ = value;
+        bitField0_ |= 0x00000004;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional uint32 optional_uint32 = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalUint32() {
+        bitField0_ = (bitField0_ & ~0x00000004);
+        optionalUint32_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private long optionalUint64_ ;
+      /**
+       * <code>optional uint64 optional_uint64 = 4;</code>
+       * @return Whether the optionalUint64 field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalUint64() {
+        return ((bitField0_ & 0x00000008) != 0);
+      }
+      /**
+       * <code>optional uint64 optional_uint64 = 4;</code>
+       * @return The optionalUint64.
+       */
+      @java.lang.Override
+      public long getOptionalUint64() {
+        return optionalUint64_;
+      }
+      /**
+       * <code>optional uint64 optional_uint64 = 4;</code>
+       * @param value The optionalUint64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalUint64(long value) {
+
+        optionalUint64_ = value;
+        bitField0_ |= 0x00000008;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional uint64 optional_uint64 = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalUint64() {
+        bitField0_ = (bitField0_ & ~0x00000008);
+        optionalUint64_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private int optionalSint32_ ;
+      /**
+       * <code>optional sint32 optional_sint32 = 5;</code>
+       * @return Whether the optionalSint32 field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalSint32() {
+        return ((bitField0_ & 0x00000010) != 0);
+      }
+      /**
+       * <code>optional sint32 optional_sint32 = 5;</code>
+       * @return The optionalSint32.
+       */
+      @java.lang.Override
+      public int getOptionalSint32() {
+        return optionalSint32_;
+      }
+      /**
+       * <code>optional sint32 optional_sint32 = 5;</code>
+       * @param value The optionalSint32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalSint32(int value) {
+
+        optionalSint32_ = value;
+        bitField0_ |= 0x00000010;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional sint32 optional_sint32 = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalSint32() {
+        bitField0_ = (bitField0_ & ~0x00000010);
+        optionalSint32_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private long optionalSint64_ ;
+      /**
+       * <code>optional sint64 optional_sint64 = 6;</code>
+       * @return Whether the optionalSint64 field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalSint64() {
+        return ((bitField0_ & 0x00000020) != 0);
+      }
+      /**
+       * <code>optional sint64 optional_sint64 = 6;</code>
+       * @return The optionalSint64.
+       */
+      @java.lang.Override
+      public long getOptionalSint64() {
+        return optionalSint64_;
+      }
+      /**
+       * <code>optional sint64 optional_sint64 = 6;</code>
+       * @param value The optionalSint64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalSint64(long value) {
+
+        optionalSint64_ = value;
+        bitField0_ |= 0x00000020;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional sint64 optional_sint64 = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalSint64() {
+        bitField0_ = (bitField0_ & ~0x00000020);
+        optionalSint64_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private int optionalFixed32_ ;
+      /**
+       * <code>optional fixed32 optional_fixed32 = 7;</code>
+       * @return Whether the optionalFixed32 field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalFixed32() {
+        return ((bitField0_ & 0x00000040) != 0);
+      }
+      /**
+       * <code>optional fixed32 optional_fixed32 = 7;</code>
+       * @return The optionalFixed32.
+       */
+      @java.lang.Override
+      public int getOptionalFixed32() {
+        return optionalFixed32_;
+      }
+      /**
+       * <code>optional fixed32 optional_fixed32 = 7;</code>
+       * @param value The optionalFixed32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalFixed32(int value) {
+
+        optionalFixed32_ = value;
+        bitField0_ |= 0x00000040;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional fixed32 optional_fixed32 = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalFixed32() {
+        bitField0_ = (bitField0_ & ~0x00000040);
+        optionalFixed32_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private long optionalFixed64_ ;
+      /**
+       * <code>optional fixed64 optional_fixed64 = 8;</code>
+       * @return Whether the optionalFixed64 field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalFixed64() {
+        return ((bitField0_ & 0x00000080) != 0);
+      }
+      /**
+       * <code>optional fixed64 optional_fixed64 = 8;</code>
+       * @return The optionalFixed64.
+       */
+      @java.lang.Override
+      public long getOptionalFixed64() {
+        return optionalFixed64_;
+      }
+      /**
+       * <code>optional fixed64 optional_fixed64 = 8;</code>
+       * @param value The optionalFixed64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalFixed64(long value) {
+
+        optionalFixed64_ = value;
+        bitField0_ |= 0x00000080;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional fixed64 optional_fixed64 = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalFixed64() {
+        bitField0_ = (bitField0_ & ~0x00000080);
+        optionalFixed64_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private int optionalSfixed32_ ;
+      /**
+       * <code>optional sfixed32 optional_sfixed32 = 9;</code>
+       * @return Whether the optionalSfixed32 field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalSfixed32() {
+        return ((bitField0_ & 0x00000100) != 0);
+      }
+      /**
+       * <code>optional sfixed32 optional_sfixed32 = 9;</code>
+       * @return The optionalSfixed32.
+       */
+      @java.lang.Override
+      public int getOptionalSfixed32() {
+        return optionalSfixed32_;
+      }
+      /**
+       * <code>optional sfixed32 optional_sfixed32 = 9;</code>
+       * @param value The optionalSfixed32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalSfixed32(int value) {
+
+        optionalSfixed32_ = value;
+        bitField0_ |= 0x00000100;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional sfixed32 optional_sfixed32 = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalSfixed32() {
+        bitField0_ = (bitField0_ & ~0x00000100);
+        optionalSfixed32_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private long optionalSfixed64_ ;
+      /**
+       * <code>optional sfixed64 optional_sfixed64 = 10;</code>
+       * @return Whether the optionalSfixed64 field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalSfixed64() {
+        return ((bitField0_ & 0x00000200) != 0);
+      }
+      /**
+       * <code>optional sfixed64 optional_sfixed64 = 10;</code>
+       * @return The optionalSfixed64.
+       */
+      @java.lang.Override
+      public long getOptionalSfixed64() {
+        return optionalSfixed64_;
+      }
+      /**
+       * <code>optional sfixed64 optional_sfixed64 = 10;</code>
+       * @param value The optionalSfixed64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalSfixed64(long value) {
+
+        optionalSfixed64_ = value;
+        bitField0_ |= 0x00000200;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional sfixed64 optional_sfixed64 = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalSfixed64() {
+        bitField0_ = (bitField0_ & ~0x00000200);
+        optionalSfixed64_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private float optionalFloat_ ;
+      /**
+       * <code>optional float optional_float = 11;</code>
+       * @return Whether the optionalFloat field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalFloat() {
+        return ((bitField0_ & 0x00000400) != 0);
+      }
+      /**
+       * <code>optional float optional_float = 11;</code>
+       * @return The optionalFloat.
+       */
+      @java.lang.Override
+      public float getOptionalFloat() {
+        return optionalFloat_;
+      }
+      /**
+       * <code>optional float optional_float = 11;</code>
+       * @param value The optionalFloat to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalFloat(float value) {
+
+        optionalFloat_ = value;
+        bitField0_ |= 0x00000400;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional float optional_float = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalFloat() {
+        bitField0_ = (bitField0_ & ~0x00000400);
+        optionalFloat_ = 0F;
+        onChanged();
+        return this;
+      }
+
+      private double optionalDouble_ ;
+      /**
+       * <code>optional double optional_double = 12;</code>
+       * @return Whether the optionalDouble field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalDouble() {
+        return ((bitField0_ & 0x00000800) != 0);
+      }
+      /**
+       * <code>optional double optional_double = 12;</code>
+       * @return The optionalDouble.
+       */
+      @java.lang.Override
+      public double getOptionalDouble() {
+        return optionalDouble_;
+      }
+      /**
+       * <code>optional double optional_double = 12;</code>
+       * @param value The optionalDouble to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalDouble(double value) {
+
+        optionalDouble_ = value;
+        bitField0_ |= 0x00000800;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional double optional_double = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalDouble() {
+        bitField0_ = (bitField0_ & ~0x00000800);
+        optionalDouble_ = 0D;
+        onChanged();
+        return this;
+      }
+
+      private boolean optionalBool_ ;
+      /**
+       * <code>optional bool optional_bool = 13;</code>
+       * @return Whether the optionalBool field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalBool() {
+        return ((bitField0_ & 0x00001000) != 0);
+      }
+      /**
+       * <code>optional bool optional_bool = 13;</code>
+       * @return The optionalBool.
+       */
+      @java.lang.Override
+      public boolean getOptionalBool() {
+        return optionalBool_;
+      }
+      /**
+       * <code>optional bool optional_bool = 13;</code>
+       * @param value The optionalBool to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalBool(boolean value) {
+
+        optionalBool_ = value;
+        bitField0_ |= 0x00001000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional bool optional_bool = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalBool() {
+        bitField0_ = (bitField0_ & ~0x00001000);
+        optionalBool_ = false;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object optionalString_ = "";
+      /**
+       * <code>optional string optional_string = 14;</code>
+       * @return Whether the optionalString field is set.
+       */
+      public boolean hasOptionalString() {
+        return ((bitField0_ & 0x00002000) != 0);
+      }
+      /**
+       * <code>optional string optional_string = 14;</code>
+       * @return The optionalString.
+       */
+      public java.lang.String getOptionalString() {
+        java.lang.Object ref = optionalString_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          if (bs.isValidUtf8()) {
+            optionalString_ = s;
+          }
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>optional string optional_string = 14;</code>
+       * @return The bytes for optionalString.
+       */
+      public com.google.protobuf.ByteString
+          getOptionalStringBytes() {
+        java.lang.Object ref = optionalString_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          optionalString_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>optional string optional_string = 14;</code>
+       * @param value The optionalString to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalString(
+          java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
+        optionalString_ = value;
+        bitField0_ |= 0x00002000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string optional_string = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalString() {
+        optionalString_ = getDefaultInstance().getOptionalString();
+        bitField0_ = (bitField0_ & ~0x00002000);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string optional_string = 14;</code>
+       * @param value The bytes for optionalString to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalStringBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
+        optionalString_ = value;
+        bitField0_ |= 0x00002000;
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.ByteString optionalBytes_ = com.google.protobuf.ByteString.EMPTY;
+      /**
+       * <code>optional bytes optional_bytes = 15;</code>
+       * @return Whether the optionalBytes field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalBytes() {
+        return ((bitField0_ & 0x00004000) != 0);
+      }
+      /**
+       * <code>optional bytes optional_bytes = 15;</code>
+       * @return The optionalBytes.
+       */
+      @java.lang.Override
+      public com.google.protobuf.ByteString getOptionalBytes() {
+        return optionalBytes_;
+      }
+      /**
+       * <code>optional bytes optional_bytes = 15;</code>
+       * @param value The optionalBytes to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalBytes(com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
+        optionalBytes_ = value;
+        bitField0_ |= 0x00004000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional bytes optional_bytes = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalBytes() {
+        bitField0_ = (bitField0_ & ~0x00004000);
+        optionalBytes_ = getDefaultInstance().getOptionalBytes();
+        onChanged();
+        return this;
+      }
+
+      private legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage optionalNestedMessage_;
+      private com.google.protobuf.SingleFieldBuilder<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> optionalNestedMessageBuilder_;
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+       * @return Whether the optionalNestedMessage field is set.
+       */
+      public boolean hasOptionalNestedMessage() {
+        return ((bitField0_ & 0x00008000) != 0);
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+       * @return The optionalNestedMessage.
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getOptionalNestedMessage() {
+        if (optionalNestedMessageBuilder_ == null) {
+          return optionalNestedMessage_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance() : optionalNestedMessage_;
+        } else {
+          return optionalNestedMessageBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+       */
+      public Builder setOptionalNestedMessage(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage value) {
+        if (optionalNestedMessageBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          optionalNestedMessage_ = value;
+        } else {
+          optionalNestedMessageBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00008000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+       */
+      public Builder setOptionalNestedMessage(
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder builderForValue) {
+        if (optionalNestedMessageBuilder_ == null) {
+          optionalNestedMessage_ = builderForValue.build();
+        } else {
+          optionalNestedMessageBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00008000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+       */
+      public Builder mergeOptionalNestedMessage(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage value) {
+        if (optionalNestedMessageBuilder_ == null) {
+          if (((bitField0_ & 0x00008000) != 0) &&
+            optionalNestedMessage_ != null &&
+            optionalNestedMessage_ != legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance()) {
+            getOptionalNestedMessageBuilder().mergeFrom(value);
+          } else {
+            optionalNestedMessage_ = value;
+          }
+        } else {
+          optionalNestedMessageBuilder_.mergeFrom(value);
+        }
+        if (optionalNestedMessage_ != null) {
+          bitField0_ |= 0x00008000;
+          onChanged();
+        }
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+       */
+      public Builder clearOptionalNestedMessage() {
+        bitField0_ = (bitField0_ & ~0x00008000);
+        optionalNestedMessage_ = null;
+        if (optionalNestedMessageBuilder_ != null) {
+          optionalNestedMessageBuilder_.dispose();
+          optionalNestedMessageBuilder_ = null;
+        }
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder getOptionalNestedMessageBuilder() {
+        bitField0_ |= 0x00008000;
+        onChanged();
+        return getOptionalNestedMessageFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder getOptionalNestedMessageOrBuilder() {
+        if (optionalNestedMessageBuilder_ != null) {
+          return optionalNestedMessageBuilder_.getMessageOrBuilder();
+        } else {
+          return optionalNestedMessage_ == null ?
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance() : optionalNestedMessage_;
+        }
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilder<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> 
+          getOptionalNestedMessageFieldBuilder() {
+        if (optionalNestedMessageBuilder_ == null) {
+          optionalNestedMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder>(
+                  getOptionalNestedMessage(),
+                  getParentForChildren(),
+                  isClean());
+          optionalNestedMessage_ = null;
+        }
+        return optionalNestedMessageBuilder_;
+      }
+
+      private legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage optionalForeignMessage_;
+      private com.google.protobuf.SingleFieldBuilder<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder> optionalForeignMessageBuilder_;
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+       * @return Whether the optionalForeignMessage field is set.
+       */
+      public boolean hasOptionalForeignMessage() {
+        return ((bitField0_ & 0x00010000) != 0);
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+       * @return The optionalForeignMessage.
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getOptionalForeignMessage() {
+        if (optionalForeignMessageBuilder_ == null) {
+          return optionalForeignMessage_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.getDefaultInstance() : optionalForeignMessage_;
+        } else {
+          return optionalForeignMessageBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+       */
+      public Builder setOptionalForeignMessage(legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage value) {
+        if (optionalForeignMessageBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          optionalForeignMessage_ = value;
+        } else {
+          optionalForeignMessageBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00010000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+       */
+      public Builder setOptionalForeignMessage(
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder builderForValue) {
+        if (optionalForeignMessageBuilder_ == null) {
+          optionalForeignMessage_ = builderForValue.build();
+        } else {
+          optionalForeignMessageBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00010000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+       */
+      public Builder mergeOptionalForeignMessage(legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage value) {
+        if (optionalForeignMessageBuilder_ == null) {
+          if (((bitField0_ & 0x00010000) != 0) &&
+            optionalForeignMessage_ != null &&
+            optionalForeignMessage_ != legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.getDefaultInstance()) {
+            getOptionalForeignMessageBuilder().mergeFrom(value);
+          } else {
+            optionalForeignMessage_ = value;
+          }
+        } else {
+          optionalForeignMessageBuilder_.mergeFrom(value);
+        }
+        if (optionalForeignMessage_ != null) {
+          bitField0_ |= 0x00010000;
+          onChanged();
+        }
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+       */
+      public Builder clearOptionalForeignMessage() {
+        bitField0_ = (bitField0_ & ~0x00010000);
+        optionalForeignMessage_ = null;
+        if (optionalForeignMessageBuilder_ != null) {
+          optionalForeignMessageBuilder_.dispose();
+          optionalForeignMessageBuilder_ = null;
+        }
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder getOptionalForeignMessageBuilder() {
+        bitField0_ |= 0x00010000;
+        onChanged();
+        return getOptionalForeignMessageFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder getOptionalForeignMessageOrBuilder() {
+        if (optionalForeignMessageBuilder_ != null) {
+          return optionalForeignMessageBuilder_.getMessageOrBuilder();
+        } else {
+          return optionalForeignMessage_ == null ?
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.getDefaultInstance() : optionalForeignMessage_;
+        }
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilder<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder> 
+          getOptionalForeignMessageFieldBuilder() {
+        if (optionalForeignMessageBuilder_ == null) {
+          optionalForeignMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder>(
+                  getOptionalForeignMessage(),
+                  getParentForChildren(),
+                  isClean());
+          optionalForeignMessage_ = null;
+        }
+        return optionalForeignMessageBuilder_;
+      }
+
+      private int optionalNestedEnum_ = 0;
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum optional_nested_enum = 21;</code>
+       * @return Whether the optionalNestedEnum field is set.
+       */
+      @java.lang.Override public boolean hasOptionalNestedEnum() {
+        return ((bitField0_ & 0x00020000) != 0);
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum optional_nested_enum = 21;</code>
+       * @return The optionalNestedEnum.
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getOptionalNestedEnum() {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(optionalNestedEnum_);
+        return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.FOO : result;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum optional_nested_enum = 21;</code>
+       * @param value The optionalNestedEnum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalNestedEnum(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        bitField0_ |= 0x00020000;
+        optionalNestedEnum_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum optional_nested_enum = 21;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalNestedEnum() {
+        bitField0_ = (bitField0_ & ~0x00020000);
+        optionalNestedEnum_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int optionalForeignEnum_ = 0;
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignEnum optional_foreign_enum = 22;</code>
+       * @return Whether the optionalForeignEnum field is set.
+       */
+      @java.lang.Override public boolean hasOptionalForeignEnum() {
+        return ((bitField0_ & 0x00040000) != 0);
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignEnum optional_foreign_enum = 22;</code>
+       * @return The optionalForeignEnum.
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getOptionalForeignEnum() {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.forNumber(optionalForeignEnum_);
+        return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.FOREIGN_FOO : result;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignEnum optional_foreign_enum = 22;</code>
+       * @param value The optionalForeignEnum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalForeignEnum(legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        bitField0_ |= 0x00040000;
+        optionalForeignEnum_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignEnum optional_foreign_enum = 22;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalForeignEnum() {
+        bitField0_ = (bitField0_ & ~0x00040000);
+        optionalForeignEnum_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int optionalAliasedEnum_ = 0;
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.AliasedEnum optional_aliased_enum = 23;</code>
+       * @return Whether the optionalAliasedEnum field is set.
+       */
+      @java.lang.Override public boolean hasOptionalAliasedEnum() {
+        return ((bitField0_ & 0x00080000) != 0);
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.AliasedEnum optional_aliased_enum = 23;</code>
+       * @return The optionalAliasedEnum.
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum getOptionalAliasedEnum() {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum.forNumber(optionalAliasedEnum_);
+        return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum.ALIAS_FOO : result;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.AliasedEnum optional_aliased_enum = 23;</code>
+       * @param value The optionalAliasedEnum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalAliasedEnum(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        bitField0_ |= 0x00080000;
+        optionalAliasedEnum_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.AliasedEnum optional_aliased_enum = 23;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalAliasedEnum() {
+        bitField0_ = (bitField0_ & ~0x00080000);
+        optionalAliasedEnum_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 recursiveMessage_;
+      private com.google.protobuf.SingleFieldBuilder<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder> recursiveMessageBuilder_;
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+       * @return Whether the recursiveMessage field is set.
+       */
+      public boolean hasRecursiveMessage() {
+        return ((bitField0_ & 0x00100000) != 0);
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+       * @return The recursiveMessage.
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 getRecursiveMessage() {
+        if (recursiveMessageBuilder_ == null) {
+          return recursiveMessage_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance() : recursiveMessage_;
+        } else {
+          return recursiveMessageBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+       */
+      public Builder setRecursiveMessage(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 value) {
+        if (recursiveMessageBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          recursiveMessage_ = value;
+        } else {
+          recursiveMessageBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00100000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+       */
+      public Builder setRecursiveMessage(
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder builderForValue) {
+        if (recursiveMessageBuilder_ == null) {
+          recursiveMessage_ = builderForValue.build();
+        } else {
+          recursiveMessageBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00100000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+       */
+      public Builder mergeRecursiveMessage(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 value) {
+        if (recursiveMessageBuilder_ == null) {
+          if (((bitField0_ & 0x00100000) != 0) &&
+            recursiveMessage_ != null &&
+            recursiveMessage_ != legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance()) {
+            getRecursiveMessageBuilder().mergeFrom(value);
+          } else {
+            recursiveMessage_ = value;
+          }
+        } else {
+          recursiveMessageBuilder_.mergeFrom(value);
+        }
+        if (recursiveMessage_ != null) {
+          bitField0_ |= 0x00100000;
+          onChanged();
+        }
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+       */
+      public Builder clearRecursiveMessage() {
+        bitField0_ = (bitField0_ & ~0x00100000);
+        recursiveMessage_ = null;
+        if (recursiveMessageBuilder_ != null) {
+          recursiveMessageBuilder_.dispose();
+          recursiveMessageBuilder_ = null;
+        }
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder getRecursiveMessageBuilder() {
+        bitField0_ |= 0x00100000;
+        onChanged();
+        return getRecursiveMessageFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder getRecursiveMessageOrBuilder() {
+        if (recursiveMessageBuilder_ != null) {
+          return recursiveMessageBuilder_.getMessageOrBuilder();
+        } else {
+          return recursiveMessage_ == null ?
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance() : recursiveMessage_;
+        }
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilder<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder> 
+          getRecursiveMessageFieldBuilder() {
+        if (recursiveMessageBuilder_ == null) {
+          recursiveMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder>(
+                  getRecursiveMessage(),
+                  getParentForChildren(),
+                  isClean());
+          recursiveMessage_ = null;
+        }
+        return recursiveMessageBuilder_;
+      }
+
+      private com.google.protobuf.Internal.IntList repeatedInt32_ = emptyIntList();
+      private void ensureRepeatedInt32IsMutable() {
+        if (!repeatedInt32_.isModifiable()) {
+          repeatedInt32_ = makeMutableCopy(repeatedInt32_);
+        }
+        bitField0_ |= 0x00200000;
+      }
+      /**
+       * <pre>
+       * Repeated
+       * </pre>
+       *
+       * <code>repeated int32 repeated_int32 = 31;</code>
+       * @return A list containing the repeatedInt32.
+       */
+      public java.util.List<java.lang.Integer>
+          getRepeatedInt32List() {
+        repeatedInt32_.makeImmutable();
+        return repeatedInt32_;
+      }
+      /**
+       * <pre>
+       * Repeated
+       * </pre>
+       *
+       * <code>repeated int32 repeated_int32 = 31;</code>
+       * @return The count of repeatedInt32.
+       */
+      public int getRepeatedInt32Count() {
+        return repeatedInt32_.size();
+      }
+      /**
+       * <pre>
+       * Repeated
+       * </pre>
+       *
+       * <code>repeated int32 repeated_int32 = 31;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedInt32 at the given index.
+       */
+      public int getRepeatedInt32(int index) {
+        return repeatedInt32_.getInt(index);
+      }
+      /**
+       * <pre>
+       * Repeated
+       * </pre>
+       *
+       * <code>repeated int32 repeated_int32 = 31;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedInt32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedInt32(
+          int index, int value) {
+
+        ensureRepeatedInt32IsMutable();
+        repeatedInt32_.setInt(index, value);
+        bitField0_ |= 0x00200000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Repeated
+       * </pre>
+       *
+       * <code>repeated int32 repeated_int32 = 31;</code>
+       * @param value The repeatedInt32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedInt32(int value) {
+
+        ensureRepeatedInt32IsMutable();
+        repeatedInt32_.addInt(value);
+        bitField0_ |= 0x00200000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Repeated
+       * </pre>
+       *
+       * <code>repeated int32 repeated_int32 = 31;</code>
+       * @param values The repeatedInt32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedInt32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureRepeatedInt32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedInt32_);
+        bitField0_ |= 0x00200000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Repeated
+       * </pre>
+       *
+       * <code>repeated int32 repeated_int32 = 31;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedInt32() {
+        repeatedInt32_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00200000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList repeatedInt64_ = emptyLongList();
+      private void ensureRepeatedInt64IsMutable() {
+        if (!repeatedInt64_.isModifiable()) {
+          repeatedInt64_ = makeMutableCopy(repeatedInt64_);
+        }
+        bitField0_ |= 0x00400000;
+      }
+      /**
+       * <code>repeated int64 repeated_int64 = 32;</code>
+       * @return A list containing the repeatedInt64.
+       */
+      public java.util.List<java.lang.Long>
+          getRepeatedInt64List() {
+        repeatedInt64_.makeImmutable();
+        return repeatedInt64_;
+      }
+      /**
+       * <code>repeated int64 repeated_int64 = 32;</code>
+       * @return The count of repeatedInt64.
+       */
+      public int getRepeatedInt64Count() {
+        return repeatedInt64_.size();
+      }
+      /**
+       * <code>repeated int64 repeated_int64 = 32;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedInt64 at the given index.
+       */
+      public long getRepeatedInt64(int index) {
+        return repeatedInt64_.getLong(index);
+      }
+      /**
+       * <code>repeated int64 repeated_int64 = 32;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedInt64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedInt64(
+          int index, long value) {
+
+        ensureRepeatedInt64IsMutable();
+        repeatedInt64_.setLong(index, value);
+        bitField0_ |= 0x00400000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int64 repeated_int64 = 32;</code>
+       * @param value The repeatedInt64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedInt64(long value) {
+
+        ensureRepeatedInt64IsMutable();
+        repeatedInt64_.addLong(value);
+        bitField0_ |= 0x00400000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int64 repeated_int64 = 32;</code>
+       * @param values The repeatedInt64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedInt64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureRepeatedInt64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedInt64_);
+        bitField0_ |= 0x00400000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int64 repeated_int64 = 32;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedInt64() {
+        repeatedInt64_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x00400000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList repeatedUint32_ = emptyIntList();
+      private void ensureRepeatedUint32IsMutable() {
+        if (!repeatedUint32_.isModifiable()) {
+          repeatedUint32_ = makeMutableCopy(repeatedUint32_);
+        }
+        bitField0_ |= 0x00800000;
+      }
+      /**
+       * <code>repeated uint32 repeated_uint32 = 33;</code>
+       * @return A list containing the repeatedUint32.
+       */
+      public java.util.List<java.lang.Integer>
+          getRepeatedUint32List() {
+        repeatedUint32_.makeImmutable();
+        return repeatedUint32_;
+      }
+      /**
+       * <code>repeated uint32 repeated_uint32 = 33;</code>
+       * @return The count of repeatedUint32.
+       */
+      public int getRepeatedUint32Count() {
+        return repeatedUint32_.size();
+      }
+      /**
+       * <code>repeated uint32 repeated_uint32 = 33;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedUint32 at the given index.
+       */
+      public int getRepeatedUint32(int index) {
+        return repeatedUint32_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 repeated_uint32 = 33;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedUint32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedUint32(
+          int index, int value) {
+
+        ensureRepeatedUint32IsMutable();
+        repeatedUint32_.setInt(index, value);
+        bitField0_ |= 0x00800000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 repeated_uint32 = 33;</code>
+       * @param value The repeatedUint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedUint32(int value) {
+
+        ensureRepeatedUint32IsMutable();
+        repeatedUint32_.addInt(value);
+        bitField0_ |= 0x00800000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 repeated_uint32 = 33;</code>
+       * @param values The repeatedUint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedUint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureRepeatedUint32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedUint32_);
+        bitField0_ |= 0x00800000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 repeated_uint32 = 33;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedUint32() {
+        repeatedUint32_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00800000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList repeatedUint64_ = emptyLongList();
+      private void ensureRepeatedUint64IsMutable() {
+        if (!repeatedUint64_.isModifiable()) {
+          repeatedUint64_ = makeMutableCopy(repeatedUint64_);
+        }
+        bitField0_ |= 0x01000000;
+      }
+      /**
+       * <code>repeated uint64 repeated_uint64 = 34;</code>
+       * @return A list containing the repeatedUint64.
+       */
+      public java.util.List<java.lang.Long>
+          getRepeatedUint64List() {
+        repeatedUint64_.makeImmutable();
+        return repeatedUint64_;
+      }
+      /**
+       * <code>repeated uint64 repeated_uint64 = 34;</code>
+       * @return The count of repeatedUint64.
+       */
+      public int getRepeatedUint64Count() {
+        return repeatedUint64_.size();
+      }
+      /**
+       * <code>repeated uint64 repeated_uint64 = 34;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedUint64 at the given index.
+       */
+      public long getRepeatedUint64(int index) {
+        return repeatedUint64_.getLong(index);
+      }
+      /**
+       * <code>repeated uint64 repeated_uint64 = 34;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedUint64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedUint64(
+          int index, long value) {
+
+        ensureRepeatedUint64IsMutable();
+        repeatedUint64_.setLong(index, value);
+        bitField0_ |= 0x01000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 repeated_uint64 = 34;</code>
+       * @param value The repeatedUint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedUint64(long value) {
+
+        ensureRepeatedUint64IsMutable();
+        repeatedUint64_.addLong(value);
+        bitField0_ |= 0x01000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 repeated_uint64 = 34;</code>
+       * @param values The repeatedUint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedUint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureRepeatedUint64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedUint64_);
+        bitField0_ |= 0x01000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 repeated_uint64 = 34;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedUint64() {
+        repeatedUint64_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x01000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList repeatedSint32_ = emptyIntList();
+      private void ensureRepeatedSint32IsMutable() {
+        if (!repeatedSint32_.isModifiable()) {
+          repeatedSint32_ = makeMutableCopy(repeatedSint32_);
+        }
+        bitField0_ |= 0x02000000;
+      }
+      /**
+       * <code>repeated sint32 repeated_sint32 = 35;</code>
+       * @return A list containing the repeatedSint32.
+       */
+      public java.util.List<java.lang.Integer>
+          getRepeatedSint32List() {
+        repeatedSint32_.makeImmutable();
+        return repeatedSint32_;
+      }
+      /**
+       * <code>repeated sint32 repeated_sint32 = 35;</code>
+       * @return The count of repeatedSint32.
+       */
+      public int getRepeatedSint32Count() {
+        return repeatedSint32_.size();
+      }
+      /**
+       * <code>repeated sint32 repeated_sint32 = 35;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedSint32 at the given index.
+       */
+      public int getRepeatedSint32(int index) {
+        return repeatedSint32_.getInt(index);
+      }
+      /**
+       * <code>repeated sint32 repeated_sint32 = 35;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedSint32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedSint32(
+          int index, int value) {
+
+        ensureRepeatedSint32IsMutable();
+        repeatedSint32_.setInt(index, value);
+        bitField0_ |= 0x02000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint32 repeated_sint32 = 35;</code>
+       * @param value The repeatedSint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedSint32(int value) {
+
+        ensureRepeatedSint32IsMutable();
+        repeatedSint32_.addInt(value);
+        bitField0_ |= 0x02000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint32 repeated_sint32 = 35;</code>
+       * @param values The repeatedSint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedSint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureRepeatedSint32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedSint32_);
+        bitField0_ |= 0x02000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint32 repeated_sint32 = 35;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedSint32() {
+        repeatedSint32_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x02000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList repeatedSint64_ = emptyLongList();
+      private void ensureRepeatedSint64IsMutable() {
+        if (!repeatedSint64_.isModifiable()) {
+          repeatedSint64_ = makeMutableCopy(repeatedSint64_);
+        }
+        bitField0_ |= 0x04000000;
+      }
+      /**
+       * <code>repeated sint64 repeated_sint64 = 36;</code>
+       * @return A list containing the repeatedSint64.
+       */
+      public java.util.List<java.lang.Long>
+          getRepeatedSint64List() {
+        repeatedSint64_.makeImmutable();
+        return repeatedSint64_;
+      }
+      /**
+       * <code>repeated sint64 repeated_sint64 = 36;</code>
+       * @return The count of repeatedSint64.
+       */
+      public int getRepeatedSint64Count() {
+        return repeatedSint64_.size();
+      }
+      /**
+       * <code>repeated sint64 repeated_sint64 = 36;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedSint64 at the given index.
+       */
+      public long getRepeatedSint64(int index) {
+        return repeatedSint64_.getLong(index);
+      }
+      /**
+       * <code>repeated sint64 repeated_sint64 = 36;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedSint64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedSint64(
+          int index, long value) {
+
+        ensureRepeatedSint64IsMutable();
+        repeatedSint64_.setLong(index, value);
+        bitField0_ |= 0x04000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint64 repeated_sint64 = 36;</code>
+       * @param value The repeatedSint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedSint64(long value) {
+
+        ensureRepeatedSint64IsMutable();
+        repeatedSint64_.addLong(value);
+        bitField0_ |= 0x04000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint64 repeated_sint64 = 36;</code>
+       * @param values The repeatedSint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedSint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureRepeatedSint64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedSint64_);
+        bitField0_ |= 0x04000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint64 repeated_sint64 = 36;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedSint64() {
+        repeatedSint64_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x04000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList repeatedFixed32_ = emptyIntList();
+      private void ensureRepeatedFixed32IsMutable() {
+        if (!repeatedFixed32_.isModifiable()) {
+          repeatedFixed32_ = makeMutableCopy(repeatedFixed32_);
+        }
+        bitField0_ |= 0x08000000;
+      }
+      private void ensureRepeatedFixed32IsMutable(int capacity) {
+        if (!repeatedFixed32_.isModifiable()) {
+          repeatedFixed32_ = makeMutableCopy(repeatedFixed32_, capacity);
+        }
+        bitField0_ |= 0x08000000;
+      }
+      /**
+       * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+       * @return A list containing the repeatedFixed32.
+       */
+      public java.util.List<java.lang.Integer>
+          getRepeatedFixed32List() {
+        repeatedFixed32_.makeImmutable();
+        return repeatedFixed32_;
+      }
+      /**
+       * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+       * @return The count of repeatedFixed32.
+       */
+      public int getRepeatedFixed32Count() {
+        return repeatedFixed32_.size();
+      }
+      /**
+       * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedFixed32 at the given index.
+       */
+      public int getRepeatedFixed32(int index) {
+        return repeatedFixed32_.getInt(index);
+      }
+      /**
+       * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedFixed32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedFixed32(
+          int index, int value) {
+
+        ensureRepeatedFixed32IsMutable();
+        repeatedFixed32_.setInt(index, value);
+        bitField0_ |= 0x08000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+       * @param value The repeatedFixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedFixed32(int value) {
+
+        ensureRepeatedFixed32IsMutable();
+        repeatedFixed32_.addInt(value);
+        bitField0_ |= 0x08000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+       * @param values The repeatedFixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedFixed32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureRepeatedFixed32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedFixed32_);
+        bitField0_ |= 0x08000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedFixed32() {
+        repeatedFixed32_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x08000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList repeatedFixed64_ = emptyLongList();
+      private void ensureRepeatedFixed64IsMutable() {
+        if (!repeatedFixed64_.isModifiable()) {
+          repeatedFixed64_ = makeMutableCopy(repeatedFixed64_);
+        }
+        bitField0_ |= 0x10000000;
+      }
+      private void ensureRepeatedFixed64IsMutable(int capacity) {
+        if (!repeatedFixed64_.isModifiable()) {
+          repeatedFixed64_ = makeMutableCopy(repeatedFixed64_, capacity);
+        }
+        bitField0_ |= 0x10000000;
+      }
+      /**
+       * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+       * @return A list containing the repeatedFixed64.
+       */
+      public java.util.List<java.lang.Long>
+          getRepeatedFixed64List() {
+        repeatedFixed64_.makeImmutable();
+        return repeatedFixed64_;
+      }
+      /**
+       * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+       * @return The count of repeatedFixed64.
+       */
+      public int getRepeatedFixed64Count() {
+        return repeatedFixed64_.size();
+      }
+      /**
+       * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedFixed64 at the given index.
+       */
+      public long getRepeatedFixed64(int index) {
+        return repeatedFixed64_.getLong(index);
+      }
+      /**
+       * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedFixed64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedFixed64(
+          int index, long value) {
+
+        ensureRepeatedFixed64IsMutable();
+        repeatedFixed64_.setLong(index, value);
+        bitField0_ |= 0x10000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+       * @param value The repeatedFixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedFixed64(long value) {
+
+        ensureRepeatedFixed64IsMutable();
+        repeatedFixed64_.addLong(value);
+        bitField0_ |= 0x10000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+       * @param values The repeatedFixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedFixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureRepeatedFixed64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedFixed64_);
+        bitField0_ |= 0x10000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedFixed64() {
+        repeatedFixed64_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x10000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList repeatedSfixed32_ = emptyIntList();
+      private void ensureRepeatedSfixed32IsMutable() {
+        if (!repeatedSfixed32_.isModifiable()) {
+          repeatedSfixed32_ = makeMutableCopy(repeatedSfixed32_);
+        }
+        bitField0_ |= 0x20000000;
+      }
+      private void ensureRepeatedSfixed32IsMutable(int capacity) {
+        if (!repeatedSfixed32_.isModifiable()) {
+          repeatedSfixed32_ = makeMutableCopy(repeatedSfixed32_, capacity);
+        }
+        bitField0_ |= 0x20000000;
+      }
+      /**
+       * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+       * @return A list containing the repeatedSfixed32.
+       */
+      public java.util.List<java.lang.Integer>
+          getRepeatedSfixed32List() {
+        repeatedSfixed32_.makeImmutable();
+        return repeatedSfixed32_;
+      }
+      /**
+       * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+       * @return The count of repeatedSfixed32.
+       */
+      public int getRepeatedSfixed32Count() {
+        return repeatedSfixed32_.size();
+      }
+      /**
+       * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedSfixed32 at the given index.
+       */
+      public int getRepeatedSfixed32(int index) {
+        return repeatedSfixed32_.getInt(index);
+      }
+      /**
+       * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedSfixed32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedSfixed32(
+          int index, int value) {
+
+        ensureRepeatedSfixed32IsMutable();
+        repeatedSfixed32_.setInt(index, value);
+        bitField0_ |= 0x20000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+       * @param value The repeatedSfixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedSfixed32(int value) {
+
+        ensureRepeatedSfixed32IsMutable();
+        repeatedSfixed32_.addInt(value);
+        bitField0_ |= 0x20000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+       * @param values The repeatedSfixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedSfixed32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureRepeatedSfixed32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedSfixed32_);
+        bitField0_ |= 0x20000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedSfixed32() {
+        repeatedSfixed32_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x20000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList repeatedSfixed64_ = emptyLongList();
+      private void ensureRepeatedSfixed64IsMutable() {
+        if (!repeatedSfixed64_.isModifiable()) {
+          repeatedSfixed64_ = makeMutableCopy(repeatedSfixed64_);
+        }
+        bitField0_ |= 0x40000000;
+      }
+      private void ensureRepeatedSfixed64IsMutable(int capacity) {
+        if (!repeatedSfixed64_.isModifiable()) {
+          repeatedSfixed64_ = makeMutableCopy(repeatedSfixed64_, capacity);
+        }
+        bitField0_ |= 0x40000000;
+      }
+      /**
+       * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+       * @return A list containing the repeatedSfixed64.
+       */
+      public java.util.List<java.lang.Long>
+          getRepeatedSfixed64List() {
+        repeatedSfixed64_.makeImmutable();
+        return repeatedSfixed64_;
+      }
+      /**
+       * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+       * @return The count of repeatedSfixed64.
+       */
+      public int getRepeatedSfixed64Count() {
+        return repeatedSfixed64_.size();
+      }
+      /**
+       * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedSfixed64 at the given index.
+       */
+      public long getRepeatedSfixed64(int index) {
+        return repeatedSfixed64_.getLong(index);
+      }
+      /**
+       * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedSfixed64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedSfixed64(
+          int index, long value) {
+
+        ensureRepeatedSfixed64IsMutable();
+        repeatedSfixed64_.setLong(index, value);
+        bitField0_ |= 0x40000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+       * @param value The repeatedSfixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedSfixed64(long value) {
+
+        ensureRepeatedSfixed64IsMutable();
+        repeatedSfixed64_.addLong(value);
+        bitField0_ |= 0x40000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+       * @param values The repeatedSfixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedSfixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureRepeatedSfixed64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedSfixed64_);
+        bitField0_ |= 0x40000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedSfixed64() {
+        repeatedSfixed64_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x40000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.FloatList repeatedFloat_ = emptyFloatList();
+      private void ensureRepeatedFloatIsMutable() {
+        if (!repeatedFloat_.isModifiable()) {
+          repeatedFloat_ = makeMutableCopy(repeatedFloat_);
+        }
+        bitField0_ |= 0x80000000;
+      }
+      private void ensureRepeatedFloatIsMutable(int capacity) {
+        if (!repeatedFloat_.isModifiable()) {
+          repeatedFloat_ = makeMutableCopy(repeatedFloat_, capacity);
+        }
+        bitField0_ |= 0x80000000;
+      }
+      /**
+       * <code>repeated float repeated_float = 41;</code>
+       * @return A list containing the repeatedFloat.
+       */
+      public java.util.List<java.lang.Float>
+          getRepeatedFloatList() {
+        repeatedFloat_.makeImmutable();
+        return repeatedFloat_;
+      }
+      /**
+       * <code>repeated float repeated_float = 41;</code>
+       * @return The count of repeatedFloat.
+       */
+      public int getRepeatedFloatCount() {
+        return repeatedFloat_.size();
+      }
+      /**
+       * <code>repeated float repeated_float = 41;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedFloat at the given index.
+       */
+      public float getRepeatedFloat(int index) {
+        return repeatedFloat_.getFloat(index);
+      }
+      /**
+       * <code>repeated float repeated_float = 41;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedFloat to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedFloat(
+          int index, float value) {
+
+        ensureRepeatedFloatIsMutable();
+        repeatedFloat_.setFloat(index, value);
+        bitField0_ |= 0x80000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated float repeated_float = 41;</code>
+       * @param value The repeatedFloat to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedFloat(float value) {
+
+        ensureRepeatedFloatIsMutable();
+        repeatedFloat_.addFloat(value);
+        bitField0_ |= 0x80000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated float repeated_float = 41;</code>
+       * @param values The repeatedFloat to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedFloat(
+          java.lang.Iterable<? extends java.lang.Float> values) {
+        ensureRepeatedFloatIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedFloat_);
+        bitField0_ |= 0x80000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated float repeated_float = 41;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedFloat() {
+        repeatedFloat_ = emptyFloatList();
+        bitField0_ = (bitField0_ & ~0x80000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.DoubleList repeatedDouble_ = emptyDoubleList();
+      private void ensureRepeatedDoubleIsMutable() {
+        if (!repeatedDouble_.isModifiable()) {
+          repeatedDouble_ = makeMutableCopy(repeatedDouble_);
+        }
+        bitField1_ |= 0x00000001;
+      }
+      private void ensureRepeatedDoubleIsMutable(int capacity) {
+        if (!repeatedDouble_.isModifiable()) {
+          repeatedDouble_ = makeMutableCopy(repeatedDouble_, capacity);
+        }
+        bitField1_ |= 0x00000001;
+      }
+      /**
+       * <code>repeated double repeated_double = 42;</code>
+       * @return A list containing the repeatedDouble.
+       */
+      public java.util.List<java.lang.Double>
+          getRepeatedDoubleList() {
+        repeatedDouble_.makeImmutable();
+        return repeatedDouble_;
+      }
+      /**
+       * <code>repeated double repeated_double = 42;</code>
+       * @return The count of repeatedDouble.
+       */
+      public int getRepeatedDoubleCount() {
+        return repeatedDouble_.size();
+      }
+      /**
+       * <code>repeated double repeated_double = 42;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedDouble at the given index.
+       */
+      public double getRepeatedDouble(int index) {
+        return repeatedDouble_.getDouble(index);
+      }
+      /**
+       * <code>repeated double repeated_double = 42;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedDouble to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedDouble(
+          int index, double value) {
+
+        ensureRepeatedDoubleIsMutable();
+        repeatedDouble_.setDouble(index, value);
+        bitField1_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated double repeated_double = 42;</code>
+       * @param value The repeatedDouble to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedDouble(double value) {
+
+        ensureRepeatedDoubleIsMutable();
+        repeatedDouble_.addDouble(value);
+        bitField1_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated double repeated_double = 42;</code>
+       * @param values The repeatedDouble to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedDouble(
+          java.lang.Iterable<? extends java.lang.Double> values) {
+        ensureRepeatedDoubleIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedDouble_);
+        bitField1_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated double repeated_double = 42;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedDouble() {
+        repeatedDouble_ = emptyDoubleList();
+        bitField1_ = (bitField1_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.BooleanList repeatedBool_ = emptyBooleanList();
+      private void ensureRepeatedBoolIsMutable() {
+        if (!repeatedBool_.isModifiable()) {
+          repeatedBool_ = makeMutableCopy(repeatedBool_);
+        }
+        bitField1_ |= 0x00000002;
+      }
+      private void ensureRepeatedBoolIsMutable(int capacity) {
+        if (!repeatedBool_.isModifiable()) {
+          repeatedBool_ = makeMutableCopy(repeatedBool_, capacity);
+        }
+        bitField1_ |= 0x00000002;
+      }
+      /**
+       * <code>repeated bool repeated_bool = 43;</code>
+       * @return A list containing the repeatedBool.
+       */
+      public java.util.List<java.lang.Boolean>
+          getRepeatedBoolList() {
+        repeatedBool_.makeImmutable();
+        return repeatedBool_;
+      }
+      /**
+       * <code>repeated bool repeated_bool = 43;</code>
+       * @return The count of repeatedBool.
+       */
+      public int getRepeatedBoolCount() {
+        return repeatedBool_.size();
+      }
+      /**
+       * <code>repeated bool repeated_bool = 43;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedBool at the given index.
+       */
+      public boolean getRepeatedBool(int index) {
+        return repeatedBool_.getBoolean(index);
+      }
+      /**
+       * <code>repeated bool repeated_bool = 43;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedBool to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedBool(
+          int index, boolean value) {
+
+        ensureRepeatedBoolIsMutable();
+        repeatedBool_.setBoolean(index, value);
+        bitField1_ |= 0x00000002;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bool repeated_bool = 43;</code>
+       * @param value The repeatedBool to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedBool(boolean value) {
+
+        ensureRepeatedBoolIsMutable();
+        repeatedBool_.addBoolean(value);
+        bitField1_ |= 0x00000002;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bool repeated_bool = 43;</code>
+       * @param values The repeatedBool to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedBool(
+          java.lang.Iterable<? extends java.lang.Boolean> values) {
+        ensureRepeatedBoolIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedBool_);
+        bitField1_ |= 0x00000002;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bool repeated_bool = 43;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedBool() {
+        repeatedBool_ = emptyBooleanList();
+        bitField1_ = (bitField1_ & ~0x00000002);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.LazyStringArrayList repeatedString_ =
+          com.google.protobuf.LazyStringArrayList.emptyList();
+      private void ensureRepeatedStringIsMutable() {
+        if (!repeatedString_.isModifiable()) {
+          repeatedString_ = new com.google.protobuf.LazyStringArrayList(repeatedString_);
+        }
+        bitField1_ |= 0x00000004;
+      }
+      /**
+       * <code>repeated string repeated_string = 44;</code>
+       * @return A list containing the repeatedString.
+       */
+      public com.google.protobuf.ProtocolStringList
+          getRepeatedStringList() {
+        repeatedString_.makeImmutable();
+        return repeatedString_;
+      }
+      /**
+       * <code>repeated string repeated_string = 44;</code>
+       * @return The count of repeatedString.
+       */
+      public int getRepeatedStringCount() {
+        return repeatedString_.size();
+      }
+      /**
+       * <code>repeated string repeated_string = 44;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedString at the given index.
+       */
+      public java.lang.String getRepeatedString(int index) {
+        return repeatedString_.get(index);
+      }
+      /**
+       * <code>repeated string repeated_string = 44;</code>
+       * @param index The index of the value to return.
+       * @return The bytes of the repeatedString at the given index.
+       */
+      public com.google.protobuf.ByteString
+          getRepeatedStringBytes(int index) {
+        return repeatedString_.getByteString(index);
+      }
+      /**
+       * <code>repeated string repeated_string = 44;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedString to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedString(
+          int index, java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
+        ensureRepeatedStringIsMutable();
+        repeatedString_.set(index, value);
+        bitField1_ |= 0x00000004;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated string repeated_string = 44;</code>
+       * @param value The repeatedString to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedString(
+          java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
+        ensureRepeatedStringIsMutable();
+        repeatedString_.add(value);
+        bitField1_ |= 0x00000004;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated string repeated_string = 44;</code>
+       * @param values The repeatedString to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedString(
+          java.lang.Iterable<java.lang.String> values) {
+        ensureRepeatedStringIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedString_);
+        bitField1_ |= 0x00000004;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated string repeated_string = 44;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedString() {
+        repeatedString_ =
+          com.google.protobuf.LazyStringArrayList.emptyList();
+        bitField1_ = (bitField1_ & ~0x00000004);;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated string repeated_string = 44;</code>
+       * @param value The bytes of the repeatedString to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedStringBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
+        ensureRepeatedStringIsMutable();
+        repeatedString_.add(value);
+        bitField1_ |= 0x00000004;
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.ProtobufList<com.google.protobuf.ByteString> repeatedBytes_ = emptyList(com.google.protobuf.ByteString.class);
+      private void ensureRepeatedBytesIsMutable() {
+        if (!repeatedBytes_.isModifiable()) {
+          repeatedBytes_ = makeMutableCopy(repeatedBytes_);
+        }
+        bitField1_ |= 0x00000008;
+      }
+      /**
+       * <code>repeated bytes repeated_bytes = 45;</code>
+       * @return A list containing the repeatedBytes.
+       */
+      public java.util.List<com.google.protobuf.ByteString>
+          getRepeatedBytesList() {
+        repeatedBytes_.makeImmutable();
+        return repeatedBytes_;
+      }
+      /**
+       * <code>repeated bytes repeated_bytes = 45;</code>
+       * @return The count of repeatedBytes.
+       */
+      public int getRepeatedBytesCount() {
+        return repeatedBytes_.size();
+      }
+      /**
+       * <code>repeated bytes repeated_bytes = 45;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedBytes at the given index.
+       */
+      public com.google.protobuf.ByteString getRepeatedBytes(int index) {
+        return repeatedBytes_.get(index);
+      }
+      /**
+       * <code>repeated bytes repeated_bytes = 45;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedBytes to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedBytes(
+          int index, com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
+        ensureRepeatedBytesIsMutable();
+        repeatedBytes_.set(index, value);
+        bitField1_ |= 0x00000008;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bytes repeated_bytes = 45;</code>
+       * @param value The repeatedBytes to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedBytes(com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
+        ensureRepeatedBytesIsMutable();
+        repeatedBytes_.add(value);
+        bitField1_ |= 0x00000008;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bytes repeated_bytes = 45;</code>
+       * @param values The repeatedBytes to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedBytes(
+          java.lang.Iterable<? extends com.google.protobuf.ByteString> values) {
+        ensureRepeatedBytesIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedBytes_);
+        bitField1_ |= 0x00000008;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bytes repeated_bytes = 45;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedBytes() {
+        repeatedBytes_ = emptyList(com.google.protobuf.ByteString.class);
+        bitField1_ = (bitField1_ & ~0x00000008);
+        onChanged();
+        return this;
+      }
+
+      private java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> repeatedNestedMessage_ =
+        java.util.Collections.emptyList();
+      private void ensureRepeatedNestedMessageIsMutable() {
+        if (!((bitField1_ & 0x00000010) != 0)) {
+          repeatedNestedMessage_ = new java.util.ArrayList<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage>(repeatedNestedMessage_);
+          bitField1_ |= 0x00000010;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilder<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> repeatedNestedMessageBuilder_;
+
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> getRepeatedNestedMessageList() {
+        if (repeatedNestedMessageBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(repeatedNestedMessage_);
+        } else {
+          return repeatedNestedMessageBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public int getRepeatedNestedMessageCount() {
+        if (repeatedNestedMessageBuilder_ == null) {
+          return repeatedNestedMessage_.size();
+        } else {
+          return repeatedNestedMessageBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getRepeatedNestedMessage(int index) {
+        if (repeatedNestedMessageBuilder_ == null) {
+          return repeatedNestedMessage_.get(index);
+        } else {
+          return repeatedNestedMessageBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public Builder setRepeatedNestedMessage(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage value) {
+        if (repeatedNestedMessageBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureRepeatedNestedMessageIsMutable();
+          repeatedNestedMessage_.set(index, value);
+          onChanged();
+        } else {
+          repeatedNestedMessageBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public Builder setRepeatedNestedMessage(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder builderForValue) {
+        if (repeatedNestedMessageBuilder_ == null) {
+          ensureRepeatedNestedMessageIsMutable();
+          repeatedNestedMessage_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          repeatedNestedMessageBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public Builder addRepeatedNestedMessage(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage value) {
+        if (repeatedNestedMessageBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureRepeatedNestedMessageIsMutable();
+          repeatedNestedMessage_.add(value);
+          onChanged();
+        } else {
+          repeatedNestedMessageBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public Builder addRepeatedNestedMessage(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage value) {
+        if (repeatedNestedMessageBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureRepeatedNestedMessageIsMutable();
+          repeatedNestedMessage_.add(index, value);
+          onChanged();
+        } else {
+          repeatedNestedMessageBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public Builder addRepeatedNestedMessage(
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder builderForValue) {
+        if (repeatedNestedMessageBuilder_ == null) {
+          ensureRepeatedNestedMessageIsMutable();
+          repeatedNestedMessage_.add(builderForValue.build());
+          onChanged();
+        } else {
+          repeatedNestedMessageBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public Builder addRepeatedNestedMessage(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder builderForValue) {
+        if (repeatedNestedMessageBuilder_ == null) {
+          ensureRepeatedNestedMessageIsMutable();
+          repeatedNestedMessage_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          repeatedNestedMessageBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public Builder addAllRepeatedNestedMessage(
+          java.lang.Iterable<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> values) {
+        if (repeatedNestedMessageBuilder_ == null) {
+          ensureRepeatedNestedMessageIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, repeatedNestedMessage_);
+          onChanged();
+        } else {
+          repeatedNestedMessageBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public Builder clearRepeatedNestedMessage() {
+        if (repeatedNestedMessageBuilder_ == null) {
+          repeatedNestedMessage_ = java.util.Collections.emptyList();
+          bitField1_ = (bitField1_ & ~0x00000010);
+          onChanged();
+        } else {
+          repeatedNestedMessageBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public Builder removeRepeatedNestedMessage(int index) {
+        if (repeatedNestedMessageBuilder_ == null) {
+          ensureRepeatedNestedMessageIsMutable();
+          repeatedNestedMessage_.remove(index);
+          onChanged();
+        } else {
+          repeatedNestedMessageBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder getRepeatedNestedMessageBuilder(
+          int index) {
+        return getRepeatedNestedMessageFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder getRepeatedNestedMessageOrBuilder(
+          int index) {
+        if (repeatedNestedMessageBuilder_ == null) {
+          return repeatedNestedMessage_.get(index);  } else {
+          return repeatedNestedMessageBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public java.util.List<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> 
+           getRepeatedNestedMessageOrBuilderList() {
+        if (repeatedNestedMessageBuilder_ != null) {
+          return repeatedNestedMessageBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(repeatedNestedMessage_);
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder addRepeatedNestedMessageBuilder() {
+        return getRepeatedNestedMessageFieldBuilder().addBuilder(
+            legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder addRepeatedNestedMessageBuilder(
+          int index) {
+        return getRepeatedNestedMessageFieldBuilder().addBuilder(
+            index, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder> 
+           getRepeatedNestedMessageBuilderList() {
+        return getRepeatedNestedMessageFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilder<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> 
+          getRepeatedNestedMessageFieldBuilder() {
+        if (repeatedNestedMessageBuilder_ == null) {
+          repeatedNestedMessageBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder>(
+                  repeatedNestedMessage_,
+                  ((bitField1_ & 0x00000010) != 0),
+                  getParentForChildren(),
+                  isClean());
+          repeatedNestedMessage_ = null;
+        }
+        return repeatedNestedMessageBuilder_;
+      }
+
+      private java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> repeatedForeignMessage_ =
+        java.util.Collections.emptyList();
+      private void ensureRepeatedForeignMessageIsMutable() {
+        if (!((bitField1_ & 0x00000020) != 0)) {
+          repeatedForeignMessage_ = new java.util.ArrayList<legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage>(repeatedForeignMessage_);
+          bitField1_ |= 0x00000020;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilder<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder> repeatedForeignMessageBuilder_;
+
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> getRepeatedForeignMessageList() {
+        if (repeatedForeignMessageBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(repeatedForeignMessage_);
+        } else {
+          return repeatedForeignMessageBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public int getRepeatedForeignMessageCount() {
+        if (repeatedForeignMessageBuilder_ == null) {
+          return repeatedForeignMessage_.size();
+        } else {
+          return repeatedForeignMessageBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getRepeatedForeignMessage(int index) {
+        if (repeatedForeignMessageBuilder_ == null) {
+          return repeatedForeignMessage_.get(index);
+        } else {
+          return repeatedForeignMessageBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public Builder setRepeatedForeignMessage(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage value) {
+        if (repeatedForeignMessageBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureRepeatedForeignMessageIsMutable();
+          repeatedForeignMessage_.set(index, value);
+          onChanged();
+        } else {
+          repeatedForeignMessageBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public Builder setRepeatedForeignMessage(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder builderForValue) {
+        if (repeatedForeignMessageBuilder_ == null) {
+          ensureRepeatedForeignMessageIsMutable();
+          repeatedForeignMessage_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          repeatedForeignMessageBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public Builder addRepeatedForeignMessage(legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage value) {
+        if (repeatedForeignMessageBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureRepeatedForeignMessageIsMutable();
+          repeatedForeignMessage_.add(value);
+          onChanged();
+        } else {
+          repeatedForeignMessageBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public Builder addRepeatedForeignMessage(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage value) {
+        if (repeatedForeignMessageBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureRepeatedForeignMessageIsMutable();
+          repeatedForeignMessage_.add(index, value);
+          onChanged();
+        } else {
+          repeatedForeignMessageBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public Builder addRepeatedForeignMessage(
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder builderForValue) {
+        if (repeatedForeignMessageBuilder_ == null) {
+          ensureRepeatedForeignMessageIsMutable();
+          repeatedForeignMessage_.add(builderForValue.build());
+          onChanged();
+        } else {
+          repeatedForeignMessageBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public Builder addRepeatedForeignMessage(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder builderForValue) {
+        if (repeatedForeignMessageBuilder_ == null) {
+          ensureRepeatedForeignMessageIsMutable();
+          repeatedForeignMessage_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          repeatedForeignMessageBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public Builder addAllRepeatedForeignMessage(
+          java.lang.Iterable<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> values) {
+        if (repeatedForeignMessageBuilder_ == null) {
+          ensureRepeatedForeignMessageIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, repeatedForeignMessage_);
+          onChanged();
+        } else {
+          repeatedForeignMessageBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public Builder clearRepeatedForeignMessage() {
+        if (repeatedForeignMessageBuilder_ == null) {
+          repeatedForeignMessage_ = java.util.Collections.emptyList();
+          bitField1_ = (bitField1_ & ~0x00000020);
+          onChanged();
+        } else {
+          repeatedForeignMessageBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public Builder removeRepeatedForeignMessage(int index) {
+        if (repeatedForeignMessageBuilder_ == null) {
+          ensureRepeatedForeignMessageIsMutable();
+          repeatedForeignMessage_.remove(index);
+          onChanged();
+        } else {
+          repeatedForeignMessageBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder getRepeatedForeignMessageBuilder(
+          int index) {
+        return getRepeatedForeignMessageFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder getRepeatedForeignMessageOrBuilder(
+          int index) {
+        if (repeatedForeignMessageBuilder_ == null) {
+          return repeatedForeignMessage_.get(index);  } else {
+          return repeatedForeignMessageBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public java.util.List<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder> 
+           getRepeatedForeignMessageOrBuilderList() {
+        if (repeatedForeignMessageBuilder_ != null) {
+          return repeatedForeignMessageBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(repeatedForeignMessage_);
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder addRepeatedForeignMessageBuilder() {
+        return getRepeatedForeignMessageFieldBuilder().addBuilder(
+            legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder addRepeatedForeignMessageBuilder(
+          int index) {
+        return getRepeatedForeignMessageFieldBuilder().addBuilder(
+            index, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder> 
+           getRepeatedForeignMessageBuilderList() {
+        return getRepeatedForeignMessageFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilder<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder> 
+          getRepeatedForeignMessageFieldBuilder() {
+        if (repeatedForeignMessageBuilder_ == null) {
+          repeatedForeignMessageBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder>(
+                  repeatedForeignMessage_,
+                  ((bitField1_ & 0x00000020) != 0),
+                  getParentForChildren(),
+                  isClean());
+          repeatedForeignMessage_ = null;
+        }
+        return repeatedForeignMessageBuilder_;
+      }
+
+      private java.util.List<java.lang.Integer> repeatedNestedEnum_ =
+        java.util.Collections.emptyList();
+      private void ensureRepeatedNestedEnumIsMutable() {
+        if (!((bitField1_ & 0x00000040) != 0)) {
+          repeatedNestedEnum_ = new java.util.ArrayList<java.lang.Integer>(repeatedNestedEnum_);
+          bitField1_ |= 0x00000040;
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+       * @return A list containing the repeatedNestedEnum.
+       */
+      public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> getRepeatedNestedEnumList() {
+        return new com.google.protobuf.Internal.ListAdapter<
+            java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>(repeatedNestedEnum_, repeatedNestedEnum_converter_);
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+       * @return The count of repeatedNestedEnum.
+       */
+      public int getRepeatedNestedEnumCount() {
+        return repeatedNestedEnum_.size();
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedNestedEnum at the given index.
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getRepeatedNestedEnum(int index) {
+        return repeatedNestedEnum_converter_.convert(repeatedNestedEnum_.get(index));
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedNestedEnum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedNestedEnum(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureRepeatedNestedEnumIsMutable();
+        repeatedNestedEnum_.set(index, value.getNumber());
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+       * @param value The repeatedNestedEnum to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedNestedEnum(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureRepeatedNestedEnumIsMutable();
+        repeatedNestedEnum_.add(value.getNumber());
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+       * @param values The repeatedNestedEnum to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedNestedEnum(
+          java.lang.Iterable<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> values) {
+        ensureRepeatedNestedEnumIsMutable();
+        for (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value : values) {
+          repeatedNestedEnum_.add(value.getNumber());
+        }
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedNestedEnum() {
+        repeatedNestedEnum_ = java.util.Collections.emptyList();
+        bitField1_ = (bitField1_ & ~0x00000040);
+        onChanged();
+        return this;
+      }
+
+      private java.util.List<java.lang.Integer> repeatedForeignEnum_ =
+        java.util.Collections.emptyList();
+      private void ensureRepeatedForeignEnumIsMutable() {
+        if (!((bitField1_ & 0x00000080) != 0)) {
+          repeatedForeignEnum_ = new java.util.ArrayList<java.lang.Integer>(repeatedForeignEnum_);
+          bitField1_ |= 0x00000080;
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+       * @return A list containing the repeatedForeignEnum.
+       */
+      public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum> getRepeatedForeignEnumList() {
+        return new com.google.protobuf.Internal.ListAdapter<
+            java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum>(repeatedForeignEnum_, repeatedForeignEnum_converter_);
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+       * @return The count of repeatedForeignEnum.
+       */
+      public int getRepeatedForeignEnumCount() {
+        return repeatedForeignEnum_.size();
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedForeignEnum at the given index.
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getRepeatedForeignEnum(int index) {
+        return repeatedForeignEnum_converter_.convert(repeatedForeignEnum_.get(index));
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedForeignEnum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedForeignEnum(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureRepeatedForeignEnumIsMutable();
+        repeatedForeignEnum_.set(index, value.getNumber());
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+       * @param value The repeatedForeignEnum to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedForeignEnum(legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureRepeatedForeignEnumIsMutable();
+        repeatedForeignEnum_.add(value.getNumber());
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+       * @param values The repeatedForeignEnum to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedForeignEnum(
+          java.lang.Iterable<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum> values) {
+        ensureRepeatedForeignEnumIsMutable();
+        for (legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum value : values) {
+          repeatedForeignEnum_.add(value.getNumber());
+        }
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedForeignEnum() {
+        repeatedForeignEnum_ = java.util.Collections.emptyList();
+        bitField1_ = (bitField1_ & ~0x00000080);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList packedInt32_ = emptyIntList();
+      private void ensurePackedInt32IsMutable() {
+        if (!packedInt32_.isModifiable()) {
+          packedInt32_ = makeMutableCopy(packedInt32_);
+        }
+        bitField1_ |= 0x00000100;
+      }
+      /**
+       * <pre>
+       * Packed
+       * </pre>
+       *
+       * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+       * @return A list containing the packedInt32.
+       */
+      public java.util.List<java.lang.Integer>
+          getPackedInt32List() {
+        packedInt32_.makeImmutable();
+        return packedInt32_;
+      }
+      /**
+       * <pre>
+       * Packed
+       * </pre>
+       *
+       * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+       * @return The count of packedInt32.
+       */
+      public int getPackedInt32Count() {
+        return packedInt32_.size();
+      }
+      /**
+       * <pre>
+       * Packed
+       * </pre>
+       *
+       * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedInt32 at the given index.
+       */
+      public int getPackedInt32(int index) {
+        return packedInt32_.getInt(index);
+      }
+      /**
+       * <pre>
+       * Packed
+       * </pre>
+       *
+       * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedInt32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedInt32(
+          int index, int value) {
+
+        ensurePackedInt32IsMutable();
+        packedInt32_.setInt(index, value);
+        bitField1_ |= 0x00000100;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Packed
+       * </pre>
+       *
+       * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+       * @param value The packedInt32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedInt32(int value) {
+
+        ensurePackedInt32IsMutable();
+        packedInt32_.addInt(value);
+        bitField1_ |= 0x00000100;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Packed
+       * </pre>
+       *
+       * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+       * @param values The packedInt32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedInt32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensurePackedInt32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedInt32_);
+        bitField1_ |= 0x00000100;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Packed
+       * </pre>
+       *
+       * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedInt32() {
+        packedInt32_ = emptyIntList();
+        bitField1_ = (bitField1_ & ~0x00000100);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList packedInt64_ = emptyLongList();
+      private void ensurePackedInt64IsMutable() {
+        if (!packedInt64_.isModifiable()) {
+          packedInt64_ = makeMutableCopy(packedInt64_);
+        }
+        bitField1_ |= 0x00000200;
+      }
+      /**
+       * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+       * @return A list containing the packedInt64.
+       */
+      public java.util.List<java.lang.Long>
+          getPackedInt64List() {
+        packedInt64_.makeImmutable();
+        return packedInt64_;
+      }
+      /**
+       * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+       * @return The count of packedInt64.
+       */
+      public int getPackedInt64Count() {
+        return packedInt64_.size();
+      }
+      /**
+       * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedInt64 at the given index.
+       */
+      public long getPackedInt64(int index) {
+        return packedInt64_.getLong(index);
+      }
+      /**
+       * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedInt64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedInt64(
+          int index, long value) {
+
+        ensurePackedInt64IsMutable();
+        packedInt64_.setLong(index, value);
+        bitField1_ |= 0x00000200;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+       * @param value The packedInt64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedInt64(long value) {
+
+        ensurePackedInt64IsMutable();
+        packedInt64_.addLong(value);
+        bitField1_ |= 0x00000200;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+       * @param values The packedInt64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedInt64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensurePackedInt64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedInt64_);
+        bitField1_ |= 0x00000200;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedInt64() {
+        packedInt64_ = emptyLongList();
+        bitField1_ = (bitField1_ & ~0x00000200);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList packedUint32_ = emptyIntList();
+      private void ensurePackedUint32IsMutable() {
+        if (!packedUint32_.isModifiable()) {
+          packedUint32_ = makeMutableCopy(packedUint32_);
+        }
+        bitField1_ |= 0x00000400;
+      }
+      /**
+       * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+       * @return A list containing the packedUint32.
+       */
+      public java.util.List<java.lang.Integer>
+          getPackedUint32List() {
+        packedUint32_.makeImmutable();
+        return packedUint32_;
+      }
+      /**
+       * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+       * @return The count of packedUint32.
+       */
+      public int getPackedUint32Count() {
+        return packedUint32_.size();
+      }
+      /**
+       * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedUint32 at the given index.
+       */
+      public int getPackedUint32(int index) {
+        return packedUint32_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedUint32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedUint32(
+          int index, int value) {
+
+        ensurePackedUint32IsMutable();
+        packedUint32_.setInt(index, value);
+        bitField1_ |= 0x00000400;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+       * @param value The packedUint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedUint32(int value) {
+
+        ensurePackedUint32IsMutable();
+        packedUint32_.addInt(value);
+        bitField1_ |= 0x00000400;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+       * @param values The packedUint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedUint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensurePackedUint32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedUint32_);
+        bitField1_ |= 0x00000400;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedUint32() {
+        packedUint32_ = emptyIntList();
+        bitField1_ = (bitField1_ & ~0x00000400);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList packedUint64_ = emptyLongList();
+      private void ensurePackedUint64IsMutable() {
+        if (!packedUint64_.isModifiable()) {
+          packedUint64_ = makeMutableCopy(packedUint64_);
+        }
+        bitField1_ |= 0x00000800;
+      }
+      /**
+       * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+       * @return A list containing the packedUint64.
+       */
+      public java.util.List<java.lang.Long>
+          getPackedUint64List() {
+        packedUint64_.makeImmutable();
+        return packedUint64_;
+      }
+      /**
+       * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+       * @return The count of packedUint64.
+       */
+      public int getPackedUint64Count() {
+        return packedUint64_.size();
+      }
+      /**
+       * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedUint64 at the given index.
+       */
+      public long getPackedUint64(int index) {
+        return packedUint64_.getLong(index);
+      }
+      /**
+       * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedUint64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedUint64(
+          int index, long value) {
+
+        ensurePackedUint64IsMutable();
+        packedUint64_.setLong(index, value);
+        bitField1_ |= 0x00000800;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+       * @param value The packedUint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedUint64(long value) {
+
+        ensurePackedUint64IsMutable();
+        packedUint64_.addLong(value);
+        bitField1_ |= 0x00000800;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+       * @param values The packedUint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedUint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensurePackedUint64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedUint64_);
+        bitField1_ |= 0x00000800;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedUint64() {
+        packedUint64_ = emptyLongList();
+        bitField1_ = (bitField1_ & ~0x00000800);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList packedSint32_ = emptyIntList();
+      private void ensurePackedSint32IsMutable() {
+        if (!packedSint32_.isModifiable()) {
+          packedSint32_ = makeMutableCopy(packedSint32_);
+        }
+        bitField1_ |= 0x00001000;
+      }
+      /**
+       * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+       * @return A list containing the packedSint32.
+       */
+      public java.util.List<java.lang.Integer>
+          getPackedSint32List() {
+        packedSint32_.makeImmutable();
+        return packedSint32_;
+      }
+      /**
+       * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+       * @return The count of packedSint32.
+       */
+      public int getPackedSint32Count() {
+        return packedSint32_.size();
+      }
+      /**
+       * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedSint32 at the given index.
+       */
+      public int getPackedSint32(int index) {
+        return packedSint32_.getInt(index);
+      }
+      /**
+       * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedSint32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedSint32(
+          int index, int value) {
+
+        ensurePackedSint32IsMutable();
+        packedSint32_.setInt(index, value);
+        bitField1_ |= 0x00001000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+       * @param value The packedSint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedSint32(int value) {
+
+        ensurePackedSint32IsMutable();
+        packedSint32_.addInt(value);
+        bitField1_ |= 0x00001000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+       * @param values The packedSint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedSint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensurePackedSint32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedSint32_);
+        bitField1_ |= 0x00001000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedSint32() {
+        packedSint32_ = emptyIntList();
+        bitField1_ = (bitField1_ & ~0x00001000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList packedSint64_ = emptyLongList();
+      private void ensurePackedSint64IsMutable() {
+        if (!packedSint64_.isModifiable()) {
+          packedSint64_ = makeMutableCopy(packedSint64_);
+        }
+        bitField1_ |= 0x00002000;
+      }
+      /**
+       * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+       * @return A list containing the packedSint64.
+       */
+      public java.util.List<java.lang.Long>
+          getPackedSint64List() {
+        packedSint64_.makeImmutable();
+        return packedSint64_;
+      }
+      /**
+       * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+       * @return The count of packedSint64.
+       */
+      public int getPackedSint64Count() {
+        return packedSint64_.size();
+      }
+      /**
+       * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedSint64 at the given index.
+       */
+      public long getPackedSint64(int index) {
+        return packedSint64_.getLong(index);
+      }
+      /**
+       * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedSint64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedSint64(
+          int index, long value) {
+
+        ensurePackedSint64IsMutable();
+        packedSint64_.setLong(index, value);
+        bitField1_ |= 0x00002000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+       * @param value The packedSint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedSint64(long value) {
+
+        ensurePackedSint64IsMutable();
+        packedSint64_.addLong(value);
+        bitField1_ |= 0x00002000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+       * @param values The packedSint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedSint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensurePackedSint64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedSint64_);
+        bitField1_ |= 0x00002000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedSint64() {
+        packedSint64_ = emptyLongList();
+        bitField1_ = (bitField1_ & ~0x00002000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList packedFixed32_ = emptyIntList();
+      private void ensurePackedFixed32IsMutable() {
+        if (!packedFixed32_.isModifiable()) {
+          packedFixed32_ = makeMutableCopy(packedFixed32_);
+        }
+        bitField1_ |= 0x00004000;
+      }
+      private void ensurePackedFixed32IsMutable(int capacity) {
+        if (!packedFixed32_.isModifiable()) {
+          packedFixed32_ = makeMutableCopy(packedFixed32_, capacity);
+        }
+        bitField1_ |= 0x00004000;
+      }
+      /**
+       * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+       * @return A list containing the packedFixed32.
+       */
+      public java.util.List<java.lang.Integer>
+          getPackedFixed32List() {
+        packedFixed32_.makeImmutable();
+        return packedFixed32_;
+      }
+      /**
+       * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+       * @return The count of packedFixed32.
+       */
+      public int getPackedFixed32Count() {
+        return packedFixed32_.size();
+      }
+      /**
+       * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedFixed32 at the given index.
+       */
+      public int getPackedFixed32(int index) {
+        return packedFixed32_.getInt(index);
+      }
+      /**
+       * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedFixed32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedFixed32(
+          int index, int value) {
+
+        ensurePackedFixed32IsMutable();
+        packedFixed32_.setInt(index, value);
+        bitField1_ |= 0x00004000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+       * @param value The packedFixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedFixed32(int value) {
+
+        ensurePackedFixed32IsMutable();
+        packedFixed32_.addInt(value);
+        bitField1_ |= 0x00004000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+       * @param values The packedFixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedFixed32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensurePackedFixed32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedFixed32_);
+        bitField1_ |= 0x00004000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedFixed32() {
+        packedFixed32_ = emptyIntList();
+        bitField1_ = (bitField1_ & ~0x00004000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList packedFixed64_ = emptyLongList();
+      private void ensurePackedFixed64IsMutable() {
+        if (!packedFixed64_.isModifiable()) {
+          packedFixed64_ = makeMutableCopy(packedFixed64_);
+        }
+        bitField1_ |= 0x00008000;
+      }
+      private void ensurePackedFixed64IsMutable(int capacity) {
+        if (!packedFixed64_.isModifiable()) {
+          packedFixed64_ = makeMutableCopy(packedFixed64_, capacity);
+        }
+        bitField1_ |= 0x00008000;
+      }
+      /**
+       * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+       * @return A list containing the packedFixed64.
+       */
+      public java.util.List<java.lang.Long>
+          getPackedFixed64List() {
+        packedFixed64_.makeImmutable();
+        return packedFixed64_;
+      }
+      /**
+       * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+       * @return The count of packedFixed64.
+       */
+      public int getPackedFixed64Count() {
+        return packedFixed64_.size();
+      }
+      /**
+       * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedFixed64 at the given index.
+       */
+      public long getPackedFixed64(int index) {
+        return packedFixed64_.getLong(index);
+      }
+      /**
+       * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedFixed64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedFixed64(
+          int index, long value) {
+
+        ensurePackedFixed64IsMutable();
+        packedFixed64_.setLong(index, value);
+        bitField1_ |= 0x00008000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+       * @param value The packedFixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedFixed64(long value) {
+
+        ensurePackedFixed64IsMutable();
+        packedFixed64_.addLong(value);
+        bitField1_ |= 0x00008000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+       * @param values The packedFixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedFixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensurePackedFixed64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedFixed64_);
+        bitField1_ |= 0x00008000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedFixed64() {
+        packedFixed64_ = emptyLongList();
+        bitField1_ = (bitField1_ & ~0x00008000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList packedSfixed32_ = emptyIntList();
+      private void ensurePackedSfixed32IsMutable() {
+        if (!packedSfixed32_.isModifiable()) {
+          packedSfixed32_ = makeMutableCopy(packedSfixed32_);
+        }
+        bitField1_ |= 0x00010000;
+      }
+      private void ensurePackedSfixed32IsMutable(int capacity) {
+        if (!packedSfixed32_.isModifiable()) {
+          packedSfixed32_ = makeMutableCopy(packedSfixed32_, capacity);
+        }
+        bitField1_ |= 0x00010000;
+      }
+      /**
+       * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+       * @return A list containing the packedSfixed32.
+       */
+      public java.util.List<java.lang.Integer>
+          getPackedSfixed32List() {
+        packedSfixed32_.makeImmutable();
+        return packedSfixed32_;
+      }
+      /**
+       * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+       * @return The count of packedSfixed32.
+       */
+      public int getPackedSfixed32Count() {
+        return packedSfixed32_.size();
+      }
+      /**
+       * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedSfixed32 at the given index.
+       */
+      public int getPackedSfixed32(int index) {
+        return packedSfixed32_.getInt(index);
+      }
+      /**
+       * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedSfixed32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedSfixed32(
+          int index, int value) {
+
+        ensurePackedSfixed32IsMutable();
+        packedSfixed32_.setInt(index, value);
+        bitField1_ |= 0x00010000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+       * @param value The packedSfixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedSfixed32(int value) {
+
+        ensurePackedSfixed32IsMutable();
+        packedSfixed32_.addInt(value);
+        bitField1_ |= 0x00010000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+       * @param values The packedSfixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedSfixed32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensurePackedSfixed32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedSfixed32_);
+        bitField1_ |= 0x00010000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedSfixed32() {
+        packedSfixed32_ = emptyIntList();
+        bitField1_ = (bitField1_ & ~0x00010000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList packedSfixed64_ = emptyLongList();
+      private void ensurePackedSfixed64IsMutable() {
+        if (!packedSfixed64_.isModifiable()) {
+          packedSfixed64_ = makeMutableCopy(packedSfixed64_);
+        }
+        bitField1_ |= 0x00020000;
+      }
+      private void ensurePackedSfixed64IsMutable(int capacity) {
+        if (!packedSfixed64_.isModifiable()) {
+          packedSfixed64_ = makeMutableCopy(packedSfixed64_, capacity);
+        }
+        bitField1_ |= 0x00020000;
+      }
+      /**
+       * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+       * @return A list containing the packedSfixed64.
+       */
+      public java.util.List<java.lang.Long>
+          getPackedSfixed64List() {
+        packedSfixed64_.makeImmutable();
+        return packedSfixed64_;
+      }
+      /**
+       * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+       * @return The count of packedSfixed64.
+       */
+      public int getPackedSfixed64Count() {
+        return packedSfixed64_.size();
+      }
+      /**
+       * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedSfixed64 at the given index.
+       */
+      public long getPackedSfixed64(int index) {
+        return packedSfixed64_.getLong(index);
+      }
+      /**
+       * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedSfixed64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedSfixed64(
+          int index, long value) {
+
+        ensurePackedSfixed64IsMutable();
+        packedSfixed64_.setLong(index, value);
+        bitField1_ |= 0x00020000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+       * @param value The packedSfixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedSfixed64(long value) {
+
+        ensurePackedSfixed64IsMutable();
+        packedSfixed64_.addLong(value);
+        bitField1_ |= 0x00020000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+       * @param values The packedSfixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedSfixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensurePackedSfixed64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedSfixed64_);
+        bitField1_ |= 0x00020000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedSfixed64() {
+        packedSfixed64_ = emptyLongList();
+        bitField1_ = (bitField1_ & ~0x00020000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.FloatList packedFloat_ = emptyFloatList();
+      private void ensurePackedFloatIsMutable() {
+        if (!packedFloat_.isModifiable()) {
+          packedFloat_ = makeMutableCopy(packedFloat_);
+        }
+        bitField1_ |= 0x00040000;
+      }
+      private void ensurePackedFloatIsMutable(int capacity) {
+        if (!packedFloat_.isModifiable()) {
+          packedFloat_ = makeMutableCopy(packedFloat_, capacity);
+        }
+        bitField1_ |= 0x00040000;
+      }
+      /**
+       * <code>repeated float packed_float = 85 [packed = true];</code>
+       * @return A list containing the packedFloat.
+       */
+      public java.util.List<java.lang.Float>
+          getPackedFloatList() {
+        packedFloat_.makeImmutable();
+        return packedFloat_;
+      }
+      /**
+       * <code>repeated float packed_float = 85 [packed = true];</code>
+       * @return The count of packedFloat.
+       */
+      public int getPackedFloatCount() {
+        return packedFloat_.size();
+      }
+      /**
+       * <code>repeated float packed_float = 85 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedFloat at the given index.
+       */
+      public float getPackedFloat(int index) {
+        return packedFloat_.getFloat(index);
+      }
+      /**
+       * <code>repeated float packed_float = 85 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedFloat to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedFloat(
+          int index, float value) {
+
+        ensurePackedFloatIsMutable();
+        packedFloat_.setFloat(index, value);
+        bitField1_ |= 0x00040000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated float packed_float = 85 [packed = true];</code>
+       * @param value The packedFloat to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedFloat(float value) {
+
+        ensurePackedFloatIsMutable();
+        packedFloat_.addFloat(value);
+        bitField1_ |= 0x00040000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated float packed_float = 85 [packed = true];</code>
+       * @param values The packedFloat to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedFloat(
+          java.lang.Iterable<? extends java.lang.Float> values) {
+        ensurePackedFloatIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedFloat_);
+        bitField1_ |= 0x00040000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated float packed_float = 85 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedFloat() {
+        packedFloat_ = emptyFloatList();
+        bitField1_ = (bitField1_ & ~0x00040000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.DoubleList packedDouble_ = emptyDoubleList();
+      private void ensurePackedDoubleIsMutable() {
+        if (!packedDouble_.isModifiable()) {
+          packedDouble_ = makeMutableCopy(packedDouble_);
+        }
+        bitField1_ |= 0x00080000;
+      }
+      private void ensurePackedDoubleIsMutable(int capacity) {
+        if (!packedDouble_.isModifiable()) {
+          packedDouble_ = makeMutableCopy(packedDouble_, capacity);
+        }
+        bitField1_ |= 0x00080000;
+      }
+      /**
+       * <code>repeated double packed_double = 86 [packed = true];</code>
+       * @return A list containing the packedDouble.
+       */
+      public java.util.List<java.lang.Double>
+          getPackedDoubleList() {
+        packedDouble_.makeImmutable();
+        return packedDouble_;
+      }
+      /**
+       * <code>repeated double packed_double = 86 [packed = true];</code>
+       * @return The count of packedDouble.
+       */
+      public int getPackedDoubleCount() {
+        return packedDouble_.size();
+      }
+      /**
+       * <code>repeated double packed_double = 86 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedDouble at the given index.
+       */
+      public double getPackedDouble(int index) {
+        return packedDouble_.getDouble(index);
+      }
+      /**
+       * <code>repeated double packed_double = 86 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedDouble to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedDouble(
+          int index, double value) {
+
+        ensurePackedDoubleIsMutable();
+        packedDouble_.setDouble(index, value);
+        bitField1_ |= 0x00080000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated double packed_double = 86 [packed = true];</code>
+       * @param value The packedDouble to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedDouble(double value) {
+
+        ensurePackedDoubleIsMutable();
+        packedDouble_.addDouble(value);
+        bitField1_ |= 0x00080000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated double packed_double = 86 [packed = true];</code>
+       * @param values The packedDouble to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedDouble(
+          java.lang.Iterable<? extends java.lang.Double> values) {
+        ensurePackedDoubleIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedDouble_);
+        bitField1_ |= 0x00080000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated double packed_double = 86 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedDouble() {
+        packedDouble_ = emptyDoubleList();
+        bitField1_ = (bitField1_ & ~0x00080000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.BooleanList packedBool_ = emptyBooleanList();
+      private void ensurePackedBoolIsMutable() {
+        if (!packedBool_.isModifiable()) {
+          packedBool_ = makeMutableCopy(packedBool_);
+        }
+        bitField1_ |= 0x00100000;
+      }
+      private void ensurePackedBoolIsMutable(int capacity) {
+        if (!packedBool_.isModifiable()) {
+          packedBool_ = makeMutableCopy(packedBool_, capacity);
+        }
+        bitField1_ |= 0x00100000;
+      }
+      /**
+       * <code>repeated bool packed_bool = 87 [packed = true];</code>
+       * @return A list containing the packedBool.
+       */
+      public java.util.List<java.lang.Boolean>
+          getPackedBoolList() {
+        packedBool_.makeImmutable();
+        return packedBool_;
+      }
+      /**
+       * <code>repeated bool packed_bool = 87 [packed = true];</code>
+       * @return The count of packedBool.
+       */
+      public int getPackedBoolCount() {
+        return packedBool_.size();
+      }
+      /**
+       * <code>repeated bool packed_bool = 87 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedBool at the given index.
+       */
+      public boolean getPackedBool(int index) {
+        return packedBool_.getBoolean(index);
+      }
+      /**
+       * <code>repeated bool packed_bool = 87 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedBool to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedBool(
+          int index, boolean value) {
+
+        ensurePackedBoolIsMutable();
+        packedBool_.setBoolean(index, value);
+        bitField1_ |= 0x00100000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bool packed_bool = 87 [packed = true];</code>
+       * @param value The packedBool to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedBool(boolean value) {
+
+        ensurePackedBoolIsMutable();
+        packedBool_.addBoolean(value);
+        bitField1_ |= 0x00100000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bool packed_bool = 87 [packed = true];</code>
+       * @param values The packedBool to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedBool(
+          java.lang.Iterable<? extends java.lang.Boolean> values) {
+        ensurePackedBoolIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedBool_);
+        bitField1_ |= 0x00100000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bool packed_bool = 87 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedBool() {
+        packedBool_ = emptyBooleanList();
+        bitField1_ = (bitField1_ & ~0x00100000);
+        onChanged();
+        return this;
+      }
+
+      private java.util.List<java.lang.Integer> packedNestedEnum_ =
+        java.util.Collections.emptyList();
+      private void ensurePackedNestedEnumIsMutable() {
+        if (!((bitField1_ & 0x00200000) != 0)) {
+          packedNestedEnum_ = new java.util.ArrayList<java.lang.Integer>(packedNestedEnum_);
+          bitField1_ |= 0x00200000;
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+       * @return A list containing the packedNestedEnum.
+       */
+      public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> getPackedNestedEnumList() {
+        return new com.google.protobuf.Internal.ListAdapter<
+            java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>(packedNestedEnum_, packedNestedEnum_converter_);
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+       * @return The count of packedNestedEnum.
+       */
+      public int getPackedNestedEnumCount() {
+        return packedNestedEnum_.size();
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedNestedEnum at the given index.
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getPackedNestedEnum(int index) {
+        return packedNestedEnum_converter_.convert(packedNestedEnum_.get(index));
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedNestedEnum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedNestedEnum(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensurePackedNestedEnumIsMutable();
+        packedNestedEnum_.set(index, value.getNumber());
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+       * @param value The packedNestedEnum to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedNestedEnum(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensurePackedNestedEnumIsMutable();
+        packedNestedEnum_.add(value.getNumber());
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+       * @param values The packedNestedEnum to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedNestedEnum(
+          java.lang.Iterable<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> values) {
+        ensurePackedNestedEnumIsMutable();
+        for (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value : values) {
+          packedNestedEnum_.add(value.getNumber());
+        }
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedNestedEnum() {
+        packedNestedEnum_ = java.util.Collections.emptyList();
+        bitField1_ = (bitField1_ & ~0x00200000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList unpackedInt32_ = emptyIntList();
+      private void ensureUnpackedInt32IsMutable() {
+        if (!unpackedInt32_.isModifiable()) {
+          unpackedInt32_ = makeMutableCopy(unpackedInt32_);
+        }
+        bitField1_ |= 0x00400000;
+      }
+      /**
+       * <pre>
+       * Unpacked
+       * </pre>
+       *
+       * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+       * @return A list containing the unpackedInt32.
+       */
+      public java.util.List<java.lang.Integer>
+          getUnpackedInt32List() {
+        unpackedInt32_.makeImmutable();
+        return unpackedInt32_;
+      }
+      /**
+       * <pre>
+       * Unpacked
+       * </pre>
+       *
+       * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+       * @return The count of unpackedInt32.
+       */
+      public int getUnpackedInt32Count() {
+        return unpackedInt32_.size();
+      }
+      /**
+       * <pre>
+       * Unpacked
+       * </pre>
+       *
+       * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedInt32 at the given index.
+       */
+      public int getUnpackedInt32(int index) {
+        return unpackedInt32_.getInt(index);
+      }
+      /**
+       * <pre>
+       * Unpacked
+       * </pre>
+       *
+       * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedInt32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedInt32(
+          int index, int value) {
+
+        ensureUnpackedInt32IsMutable();
+        unpackedInt32_.setInt(index, value);
+        bitField1_ |= 0x00400000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Unpacked
+       * </pre>
+       *
+       * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+       * @param value The unpackedInt32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedInt32(int value) {
+
+        ensureUnpackedInt32IsMutable();
+        unpackedInt32_.addInt(value);
+        bitField1_ |= 0x00400000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Unpacked
+       * </pre>
+       *
+       * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+       * @param values The unpackedInt32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedInt32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureUnpackedInt32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedInt32_);
+        bitField1_ |= 0x00400000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Unpacked
+       * </pre>
+       *
+       * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedInt32() {
+        unpackedInt32_ = emptyIntList();
+        bitField1_ = (bitField1_ & ~0x00400000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList unpackedInt64_ = emptyLongList();
+      private void ensureUnpackedInt64IsMutable() {
+        if (!unpackedInt64_.isModifiable()) {
+          unpackedInt64_ = makeMutableCopy(unpackedInt64_);
+        }
+        bitField1_ |= 0x00800000;
+      }
+      /**
+       * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+       * @return A list containing the unpackedInt64.
+       */
+      public java.util.List<java.lang.Long>
+          getUnpackedInt64List() {
+        unpackedInt64_.makeImmutable();
+        return unpackedInt64_;
+      }
+      /**
+       * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+       * @return The count of unpackedInt64.
+       */
+      public int getUnpackedInt64Count() {
+        return unpackedInt64_.size();
+      }
+      /**
+       * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedInt64 at the given index.
+       */
+      public long getUnpackedInt64(int index) {
+        return unpackedInt64_.getLong(index);
+      }
+      /**
+       * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedInt64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedInt64(
+          int index, long value) {
+
+        ensureUnpackedInt64IsMutable();
+        unpackedInt64_.setLong(index, value);
+        bitField1_ |= 0x00800000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+       * @param value The unpackedInt64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedInt64(long value) {
+
+        ensureUnpackedInt64IsMutable();
+        unpackedInt64_.addLong(value);
+        bitField1_ |= 0x00800000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+       * @param values The unpackedInt64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedInt64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureUnpackedInt64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedInt64_);
+        bitField1_ |= 0x00800000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedInt64() {
+        unpackedInt64_ = emptyLongList();
+        bitField1_ = (bitField1_ & ~0x00800000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList unpackedUint32_ = emptyIntList();
+      private void ensureUnpackedUint32IsMutable() {
+        if (!unpackedUint32_.isModifiable()) {
+          unpackedUint32_ = makeMutableCopy(unpackedUint32_);
+        }
+        bitField1_ |= 0x01000000;
+      }
+      /**
+       * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+       * @return A list containing the unpackedUint32.
+       */
+      public java.util.List<java.lang.Integer>
+          getUnpackedUint32List() {
+        unpackedUint32_.makeImmutable();
+        return unpackedUint32_;
+      }
+      /**
+       * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+       * @return The count of unpackedUint32.
+       */
+      public int getUnpackedUint32Count() {
+        return unpackedUint32_.size();
+      }
+      /**
+       * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedUint32 at the given index.
+       */
+      public int getUnpackedUint32(int index) {
+        return unpackedUint32_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedUint32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedUint32(
+          int index, int value) {
+
+        ensureUnpackedUint32IsMutable();
+        unpackedUint32_.setInt(index, value);
+        bitField1_ |= 0x01000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+       * @param value The unpackedUint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedUint32(int value) {
+
+        ensureUnpackedUint32IsMutable();
+        unpackedUint32_.addInt(value);
+        bitField1_ |= 0x01000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+       * @param values The unpackedUint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedUint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureUnpackedUint32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedUint32_);
+        bitField1_ |= 0x01000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedUint32() {
+        unpackedUint32_ = emptyIntList();
+        bitField1_ = (bitField1_ & ~0x01000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList unpackedUint64_ = emptyLongList();
+      private void ensureUnpackedUint64IsMutable() {
+        if (!unpackedUint64_.isModifiable()) {
+          unpackedUint64_ = makeMutableCopy(unpackedUint64_);
+        }
+        bitField1_ |= 0x02000000;
+      }
+      /**
+       * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+       * @return A list containing the unpackedUint64.
+       */
+      public java.util.List<java.lang.Long>
+          getUnpackedUint64List() {
+        unpackedUint64_.makeImmutable();
+        return unpackedUint64_;
+      }
+      /**
+       * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+       * @return The count of unpackedUint64.
+       */
+      public int getUnpackedUint64Count() {
+        return unpackedUint64_.size();
+      }
+      /**
+       * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedUint64 at the given index.
+       */
+      public long getUnpackedUint64(int index) {
+        return unpackedUint64_.getLong(index);
+      }
+      /**
+       * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedUint64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedUint64(
+          int index, long value) {
+
+        ensureUnpackedUint64IsMutable();
+        unpackedUint64_.setLong(index, value);
+        bitField1_ |= 0x02000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+       * @param value The unpackedUint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedUint64(long value) {
+
+        ensureUnpackedUint64IsMutable();
+        unpackedUint64_.addLong(value);
+        bitField1_ |= 0x02000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+       * @param values The unpackedUint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedUint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureUnpackedUint64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedUint64_);
+        bitField1_ |= 0x02000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedUint64() {
+        unpackedUint64_ = emptyLongList();
+        bitField1_ = (bitField1_ & ~0x02000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList unpackedSint32_ = emptyIntList();
+      private void ensureUnpackedSint32IsMutable() {
+        if (!unpackedSint32_.isModifiable()) {
+          unpackedSint32_ = makeMutableCopy(unpackedSint32_);
+        }
+        bitField1_ |= 0x04000000;
+      }
+      /**
+       * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+       * @return A list containing the unpackedSint32.
+       */
+      public java.util.List<java.lang.Integer>
+          getUnpackedSint32List() {
+        unpackedSint32_.makeImmutable();
+        return unpackedSint32_;
+      }
+      /**
+       * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+       * @return The count of unpackedSint32.
+       */
+      public int getUnpackedSint32Count() {
+        return unpackedSint32_.size();
+      }
+      /**
+       * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedSint32 at the given index.
+       */
+      public int getUnpackedSint32(int index) {
+        return unpackedSint32_.getInt(index);
+      }
+      /**
+       * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedSint32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedSint32(
+          int index, int value) {
+
+        ensureUnpackedSint32IsMutable();
+        unpackedSint32_.setInt(index, value);
+        bitField1_ |= 0x04000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+       * @param value The unpackedSint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedSint32(int value) {
+
+        ensureUnpackedSint32IsMutable();
+        unpackedSint32_.addInt(value);
+        bitField1_ |= 0x04000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+       * @param values The unpackedSint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedSint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureUnpackedSint32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedSint32_);
+        bitField1_ |= 0x04000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedSint32() {
+        unpackedSint32_ = emptyIntList();
+        bitField1_ = (bitField1_ & ~0x04000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList unpackedSint64_ = emptyLongList();
+      private void ensureUnpackedSint64IsMutable() {
+        if (!unpackedSint64_.isModifiable()) {
+          unpackedSint64_ = makeMutableCopy(unpackedSint64_);
+        }
+        bitField1_ |= 0x08000000;
+      }
+      /**
+       * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+       * @return A list containing the unpackedSint64.
+       */
+      public java.util.List<java.lang.Long>
+          getUnpackedSint64List() {
+        unpackedSint64_.makeImmutable();
+        return unpackedSint64_;
+      }
+      /**
+       * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+       * @return The count of unpackedSint64.
+       */
+      public int getUnpackedSint64Count() {
+        return unpackedSint64_.size();
+      }
+      /**
+       * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedSint64 at the given index.
+       */
+      public long getUnpackedSint64(int index) {
+        return unpackedSint64_.getLong(index);
+      }
+      /**
+       * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedSint64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedSint64(
+          int index, long value) {
+
+        ensureUnpackedSint64IsMutable();
+        unpackedSint64_.setLong(index, value);
+        bitField1_ |= 0x08000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+       * @param value The unpackedSint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedSint64(long value) {
+
+        ensureUnpackedSint64IsMutable();
+        unpackedSint64_.addLong(value);
+        bitField1_ |= 0x08000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+       * @param values The unpackedSint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedSint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureUnpackedSint64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedSint64_);
+        bitField1_ |= 0x08000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedSint64() {
+        unpackedSint64_ = emptyLongList();
+        bitField1_ = (bitField1_ & ~0x08000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList unpackedFixed32_ = emptyIntList();
+      private void ensureUnpackedFixed32IsMutable() {
+        if (!unpackedFixed32_.isModifiable()) {
+          unpackedFixed32_ = makeMutableCopy(unpackedFixed32_);
+        }
+        bitField1_ |= 0x10000000;
+      }
+      private void ensureUnpackedFixed32IsMutable(int capacity) {
+        if (!unpackedFixed32_.isModifiable()) {
+          unpackedFixed32_ = makeMutableCopy(unpackedFixed32_, capacity);
+        }
+        bitField1_ |= 0x10000000;
+      }
+      /**
+       * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+       * @return A list containing the unpackedFixed32.
+       */
+      public java.util.List<java.lang.Integer>
+          getUnpackedFixed32List() {
+        unpackedFixed32_.makeImmutable();
+        return unpackedFixed32_;
+      }
+      /**
+       * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+       * @return The count of unpackedFixed32.
+       */
+      public int getUnpackedFixed32Count() {
+        return unpackedFixed32_.size();
+      }
+      /**
+       * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedFixed32 at the given index.
+       */
+      public int getUnpackedFixed32(int index) {
+        return unpackedFixed32_.getInt(index);
+      }
+      /**
+       * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedFixed32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedFixed32(
+          int index, int value) {
+
+        ensureUnpackedFixed32IsMutable();
+        unpackedFixed32_.setInt(index, value);
+        bitField1_ |= 0x10000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+       * @param value The unpackedFixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedFixed32(int value) {
+
+        ensureUnpackedFixed32IsMutable();
+        unpackedFixed32_.addInt(value);
+        bitField1_ |= 0x10000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+       * @param values The unpackedFixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedFixed32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureUnpackedFixed32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedFixed32_);
+        bitField1_ |= 0x10000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedFixed32() {
+        unpackedFixed32_ = emptyIntList();
+        bitField1_ = (bitField1_ & ~0x10000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList unpackedFixed64_ = emptyLongList();
+      private void ensureUnpackedFixed64IsMutable() {
+        if (!unpackedFixed64_.isModifiable()) {
+          unpackedFixed64_ = makeMutableCopy(unpackedFixed64_);
+        }
+        bitField1_ |= 0x20000000;
+      }
+      private void ensureUnpackedFixed64IsMutable(int capacity) {
+        if (!unpackedFixed64_.isModifiable()) {
+          unpackedFixed64_ = makeMutableCopy(unpackedFixed64_, capacity);
+        }
+        bitField1_ |= 0x20000000;
+      }
+      /**
+       * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+       * @return A list containing the unpackedFixed64.
+       */
+      public java.util.List<java.lang.Long>
+          getUnpackedFixed64List() {
+        unpackedFixed64_.makeImmutable();
+        return unpackedFixed64_;
+      }
+      /**
+       * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+       * @return The count of unpackedFixed64.
+       */
+      public int getUnpackedFixed64Count() {
+        return unpackedFixed64_.size();
+      }
+      /**
+       * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedFixed64 at the given index.
+       */
+      public long getUnpackedFixed64(int index) {
+        return unpackedFixed64_.getLong(index);
+      }
+      /**
+       * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedFixed64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedFixed64(
+          int index, long value) {
+
+        ensureUnpackedFixed64IsMutable();
+        unpackedFixed64_.setLong(index, value);
+        bitField1_ |= 0x20000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+       * @param value The unpackedFixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedFixed64(long value) {
+
+        ensureUnpackedFixed64IsMutable();
+        unpackedFixed64_.addLong(value);
+        bitField1_ |= 0x20000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+       * @param values The unpackedFixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedFixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureUnpackedFixed64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedFixed64_);
+        bitField1_ |= 0x20000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedFixed64() {
+        unpackedFixed64_ = emptyLongList();
+        bitField1_ = (bitField1_ & ~0x20000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList unpackedSfixed32_ = emptyIntList();
+      private void ensureUnpackedSfixed32IsMutable() {
+        if (!unpackedSfixed32_.isModifiable()) {
+          unpackedSfixed32_ = makeMutableCopy(unpackedSfixed32_);
+        }
+        bitField1_ |= 0x40000000;
+      }
+      private void ensureUnpackedSfixed32IsMutable(int capacity) {
+        if (!unpackedSfixed32_.isModifiable()) {
+          unpackedSfixed32_ = makeMutableCopy(unpackedSfixed32_, capacity);
+        }
+        bitField1_ |= 0x40000000;
+      }
+      /**
+       * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+       * @return A list containing the unpackedSfixed32.
+       */
+      public java.util.List<java.lang.Integer>
+          getUnpackedSfixed32List() {
+        unpackedSfixed32_.makeImmutable();
+        return unpackedSfixed32_;
+      }
+      /**
+       * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+       * @return The count of unpackedSfixed32.
+       */
+      public int getUnpackedSfixed32Count() {
+        return unpackedSfixed32_.size();
+      }
+      /**
+       * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedSfixed32 at the given index.
+       */
+      public int getUnpackedSfixed32(int index) {
+        return unpackedSfixed32_.getInt(index);
+      }
+      /**
+       * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedSfixed32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedSfixed32(
+          int index, int value) {
+
+        ensureUnpackedSfixed32IsMutable();
+        unpackedSfixed32_.setInt(index, value);
+        bitField1_ |= 0x40000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+       * @param value The unpackedSfixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedSfixed32(int value) {
+
+        ensureUnpackedSfixed32IsMutable();
+        unpackedSfixed32_.addInt(value);
+        bitField1_ |= 0x40000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+       * @param values The unpackedSfixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedSfixed32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureUnpackedSfixed32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedSfixed32_);
+        bitField1_ |= 0x40000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedSfixed32() {
+        unpackedSfixed32_ = emptyIntList();
+        bitField1_ = (bitField1_ & ~0x40000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList unpackedSfixed64_ = emptyLongList();
+      private void ensureUnpackedSfixed64IsMutable() {
+        if (!unpackedSfixed64_.isModifiable()) {
+          unpackedSfixed64_ = makeMutableCopy(unpackedSfixed64_);
+        }
+        bitField1_ |= 0x80000000;
+      }
+      private void ensureUnpackedSfixed64IsMutable(int capacity) {
+        if (!unpackedSfixed64_.isModifiable()) {
+          unpackedSfixed64_ = makeMutableCopy(unpackedSfixed64_, capacity);
+        }
+        bitField1_ |= 0x80000000;
+      }
+      /**
+       * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+       * @return A list containing the unpackedSfixed64.
+       */
+      public java.util.List<java.lang.Long>
+          getUnpackedSfixed64List() {
+        unpackedSfixed64_.makeImmutable();
+        return unpackedSfixed64_;
+      }
+      /**
+       * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+       * @return The count of unpackedSfixed64.
+       */
+      public int getUnpackedSfixed64Count() {
+        return unpackedSfixed64_.size();
+      }
+      /**
+       * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedSfixed64 at the given index.
+       */
+      public long getUnpackedSfixed64(int index) {
+        return unpackedSfixed64_.getLong(index);
+      }
+      /**
+       * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedSfixed64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedSfixed64(
+          int index, long value) {
+
+        ensureUnpackedSfixed64IsMutable();
+        unpackedSfixed64_.setLong(index, value);
+        bitField1_ |= 0x80000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+       * @param value The unpackedSfixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedSfixed64(long value) {
+
+        ensureUnpackedSfixed64IsMutable();
+        unpackedSfixed64_.addLong(value);
+        bitField1_ |= 0x80000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+       * @param values The unpackedSfixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedSfixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureUnpackedSfixed64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedSfixed64_);
+        bitField1_ |= 0x80000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedSfixed64() {
+        unpackedSfixed64_ = emptyLongList();
+        bitField1_ = (bitField1_ & ~0x80000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.FloatList unpackedFloat_ = emptyFloatList();
+      private void ensureUnpackedFloatIsMutable() {
+        if (!unpackedFloat_.isModifiable()) {
+          unpackedFloat_ = makeMutableCopy(unpackedFloat_);
+        }
+        bitField2_ |= 0x00000001;
+      }
+      private void ensureUnpackedFloatIsMutable(int capacity) {
+        if (!unpackedFloat_.isModifiable()) {
+          unpackedFloat_ = makeMutableCopy(unpackedFloat_, capacity);
+        }
+        bitField2_ |= 0x00000001;
+      }
+      /**
+       * <code>repeated float unpacked_float = 99 [packed = false];</code>
+       * @return A list containing the unpackedFloat.
+       */
+      public java.util.List<java.lang.Float>
+          getUnpackedFloatList() {
+        unpackedFloat_.makeImmutable();
+        return unpackedFloat_;
+      }
+      /**
+       * <code>repeated float unpacked_float = 99 [packed = false];</code>
+       * @return The count of unpackedFloat.
+       */
+      public int getUnpackedFloatCount() {
+        return unpackedFloat_.size();
+      }
+      /**
+       * <code>repeated float unpacked_float = 99 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedFloat at the given index.
+       */
+      public float getUnpackedFloat(int index) {
+        return unpackedFloat_.getFloat(index);
+      }
+      /**
+       * <code>repeated float unpacked_float = 99 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedFloat to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedFloat(
+          int index, float value) {
+
+        ensureUnpackedFloatIsMutable();
+        unpackedFloat_.setFloat(index, value);
+        bitField2_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated float unpacked_float = 99 [packed = false];</code>
+       * @param value The unpackedFloat to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedFloat(float value) {
+
+        ensureUnpackedFloatIsMutable();
+        unpackedFloat_.addFloat(value);
+        bitField2_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated float unpacked_float = 99 [packed = false];</code>
+       * @param values The unpackedFloat to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedFloat(
+          java.lang.Iterable<? extends java.lang.Float> values) {
+        ensureUnpackedFloatIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedFloat_);
+        bitField2_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated float unpacked_float = 99 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedFloat() {
+        unpackedFloat_ = emptyFloatList();
+        bitField2_ = (bitField2_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.DoubleList unpackedDouble_ = emptyDoubleList();
+      private void ensureUnpackedDoubleIsMutable() {
+        if (!unpackedDouble_.isModifiable()) {
+          unpackedDouble_ = makeMutableCopy(unpackedDouble_);
+        }
+        bitField2_ |= 0x00000002;
+      }
+      private void ensureUnpackedDoubleIsMutable(int capacity) {
+        if (!unpackedDouble_.isModifiable()) {
+          unpackedDouble_ = makeMutableCopy(unpackedDouble_, capacity);
+        }
+        bitField2_ |= 0x00000002;
+      }
+      /**
+       * <code>repeated double unpacked_double = 100 [packed = false];</code>
+       * @return A list containing the unpackedDouble.
+       */
+      public java.util.List<java.lang.Double>
+          getUnpackedDoubleList() {
+        unpackedDouble_.makeImmutable();
+        return unpackedDouble_;
+      }
+      /**
+       * <code>repeated double unpacked_double = 100 [packed = false];</code>
+       * @return The count of unpackedDouble.
+       */
+      public int getUnpackedDoubleCount() {
+        return unpackedDouble_.size();
+      }
+      /**
+       * <code>repeated double unpacked_double = 100 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedDouble at the given index.
+       */
+      public double getUnpackedDouble(int index) {
+        return unpackedDouble_.getDouble(index);
+      }
+      /**
+       * <code>repeated double unpacked_double = 100 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedDouble to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedDouble(
+          int index, double value) {
+
+        ensureUnpackedDoubleIsMutable();
+        unpackedDouble_.setDouble(index, value);
+        bitField2_ |= 0x00000002;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated double unpacked_double = 100 [packed = false];</code>
+       * @param value The unpackedDouble to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedDouble(double value) {
+
+        ensureUnpackedDoubleIsMutable();
+        unpackedDouble_.addDouble(value);
+        bitField2_ |= 0x00000002;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated double unpacked_double = 100 [packed = false];</code>
+       * @param values The unpackedDouble to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedDouble(
+          java.lang.Iterable<? extends java.lang.Double> values) {
+        ensureUnpackedDoubleIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedDouble_);
+        bitField2_ |= 0x00000002;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated double unpacked_double = 100 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedDouble() {
+        unpackedDouble_ = emptyDoubleList();
+        bitField2_ = (bitField2_ & ~0x00000002);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.BooleanList unpackedBool_ = emptyBooleanList();
+      private void ensureUnpackedBoolIsMutable() {
+        if (!unpackedBool_.isModifiable()) {
+          unpackedBool_ = makeMutableCopy(unpackedBool_);
+        }
+        bitField2_ |= 0x00000004;
+      }
+      private void ensureUnpackedBoolIsMutable(int capacity) {
+        if (!unpackedBool_.isModifiable()) {
+          unpackedBool_ = makeMutableCopy(unpackedBool_, capacity);
+        }
+        bitField2_ |= 0x00000004;
+      }
+      /**
+       * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+       * @return A list containing the unpackedBool.
+       */
+      public java.util.List<java.lang.Boolean>
+          getUnpackedBoolList() {
+        unpackedBool_.makeImmutable();
+        return unpackedBool_;
+      }
+      /**
+       * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+       * @return The count of unpackedBool.
+       */
+      public int getUnpackedBoolCount() {
+        return unpackedBool_.size();
+      }
+      /**
+       * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedBool at the given index.
+       */
+      public boolean getUnpackedBool(int index) {
+        return unpackedBool_.getBoolean(index);
+      }
+      /**
+       * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedBool to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedBool(
+          int index, boolean value) {
+
+        ensureUnpackedBoolIsMutable();
+        unpackedBool_.setBoolean(index, value);
+        bitField2_ |= 0x00000004;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+       * @param value The unpackedBool to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedBool(boolean value) {
+
+        ensureUnpackedBoolIsMutable();
+        unpackedBool_.addBoolean(value);
+        bitField2_ |= 0x00000004;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+       * @param values The unpackedBool to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedBool(
+          java.lang.Iterable<? extends java.lang.Boolean> values) {
+        ensureUnpackedBoolIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedBool_);
+        bitField2_ |= 0x00000004;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedBool() {
+        unpackedBool_ = emptyBooleanList();
+        bitField2_ = (bitField2_ & ~0x00000004);
+        onChanged();
+        return this;
+      }
+
+      private java.util.List<java.lang.Integer> unpackedNestedEnum_ =
+        java.util.Collections.emptyList();
+      private void ensureUnpackedNestedEnumIsMutable() {
+        if (!((bitField2_ & 0x00000008) != 0)) {
+          unpackedNestedEnum_ = new java.util.ArrayList<java.lang.Integer>(unpackedNestedEnum_);
+          bitField2_ |= 0x00000008;
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+       * @return A list containing the unpackedNestedEnum.
+       */
+      public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> getUnpackedNestedEnumList() {
+        return new com.google.protobuf.Internal.ListAdapter<
+            java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>(unpackedNestedEnum_, unpackedNestedEnum_converter_);
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+       * @return The count of unpackedNestedEnum.
+       */
+      public int getUnpackedNestedEnumCount() {
+        return unpackedNestedEnum_.size();
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedNestedEnum at the given index.
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getUnpackedNestedEnum(int index) {
+        return unpackedNestedEnum_converter_.convert(unpackedNestedEnum_.get(index));
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedNestedEnum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedNestedEnum(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureUnpackedNestedEnumIsMutable();
+        unpackedNestedEnum_.set(index, value.getNumber());
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+       * @param value The unpackedNestedEnum to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedNestedEnum(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureUnpackedNestedEnumIsMutable();
+        unpackedNestedEnum_.add(value.getNumber());
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+       * @param values The unpackedNestedEnum to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedNestedEnum(
+          java.lang.Iterable<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> values) {
+        ensureUnpackedNestedEnumIsMutable();
+        for (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value : values) {
+          unpackedNestedEnum_.add(value.getNumber());
+        }
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedNestedEnum() {
+        unpackedNestedEnum_ = java.util.Collections.emptyList();
+        bitField2_ = (bitField2_ & ~0x00000008);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> mapInt32Int32_;
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+          internalGetMapInt32Int32() {
+        if (mapInt32Int32_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapInt32Int32DefaultEntryHolder.defaultEntry);
+        }
+        return mapInt32Int32_;
+      }
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+          internalGetMutableMapInt32Int32() {
+        if (mapInt32Int32_ == null) {
+          mapInt32Int32_ = com.google.protobuf.MapField.newMapField(
+              MapInt32Int32DefaultEntryHolder.defaultEntry);
+        }
+        if (!mapInt32Int32_.isMutable()) {
+          mapInt32Int32_ = mapInt32Int32_.copy();
+        }
+        bitField2_ |= 0x00000010;
+        onChanged();
+        return mapInt32Int32_;
+      }
+      public int getMapInt32Int32Count() {
+        return internalGetMapInt32Int32().getMap().size();
+      }
+      /**
+       * <pre>
+       * Map
+       * </pre>
+       *
+       * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapInt32Int32(
+          int key) {
+
+        return internalGetMapInt32Int32().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapInt32Int32Map()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32() {
+        return getMapInt32Int32Map();
+      }
+      /**
+       * <pre>
+       * Map
+       * </pre>
+       *
+       * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32Map() {
+        return internalGetMapInt32Int32().getMap();
+      }
+      /**
+       * <pre>
+       * Map
+       * </pre>
+       *
+       * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+       */
+      @java.lang.Override
+      public int getMapInt32Int32OrDefault(
+          int key,
+          int defaultValue) {
+
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetMapInt32Int32().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <pre>
+       * Map
+       * </pre>
+       *
+       * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+       */
+      @java.lang.Override
+      public int getMapInt32Int32OrThrow(
+          int key) {
+
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetMapInt32Int32().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapInt32Int32() {
+        bitField2_ = (bitField2_ & ~0x00000010);
+        internalGetMutableMapInt32Int32().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <pre>
+       * Map
+       * </pre>
+       *
+       * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+       */
+      public Builder removeMapInt32Int32(
+          int key) {
+
+        internalGetMutableMapInt32Int32().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+          getMutableMapInt32Int32() {
+        bitField2_ |= 0x00000010;
+        return internalGetMutableMapInt32Int32().getMutableMap();
+      }
+      /**
+       * <pre>
+       * Map
+       * </pre>
+       *
+       * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+       */
+      public Builder putMapInt32Int32(
+          int key,
+          int value) {
+
+
+        internalGetMutableMapInt32Int32().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00000010;
+        return this;
+      }
+      /**
+       * <pre>
+       * Map
+       * </pre>
+       *
+       * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+       */
+      public Builder putAllMapInt32Int32(
+          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
+        internalGetMutableMapInt32Int32().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00000010;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Long, java.lang.Long> mapInt64Int64_;
+      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+          internalGetMapInt64Int64() {
+        if (mapInt64Int64_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapInt64Int64DefaultEntryHolder.defaultEntry);
+        }
+        return mapInt64Int64_;
+      }
+      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+          internalGetMutableMapInt64Int64() {
+        if (mapInt64Int64_ == null) {
+          mapInt64Int64_ = com.google.protobuf.MapField.newMapField(
+              MapInt64Int64DefaultEntryHolder.defaultEntry);
+        }
+        if (!mapInt64Int64_.isMutable()) {
+          mapInt64Int64_ = mapInt64Int64_.copy();
+        }
+        bitField2_ |= 0x00000020;
+        onChanged();
+        return mapInt64Int64_;
+      }
+      public int getMapInt64Int64Count() {
+        return internalGetMapInt64Int64().getMap().size();
+      }
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapInt64Int64(
+          long key) {
+
+        return internalGetMapInt64Int64().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapInt64Int64Map()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Long, java.lang.Long> getMapInt64Int64() {
+        return getMapInt64Int64Map();
+      }
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Long, java.lang.Long> getMapInt64Int64Map() {
+        return internalGetMapInt64Int64().getMap();
+      }
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
+      @java.lang.Override
+      public long getMapInt64Int64OrDefault(
+          long key,
+          long defaultValue) {
+
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapInt64Int64().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
+      @java.lang.Override
+      public long getMapInt64Int64OrThrow(
+          long key) {
+
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapInt64Int64().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapInt64Int64() {
+        bitField2_ = (bitField2_ & ~0x00000020);
+        internalGetMutableMapInt64Int64().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
+      public Builder removeMapInt64Int64(
+          long key) {
+
+        internalGetMutableMapInt64Int64().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Long, java.lang.Long>
+          getMutableMapInt64Int64() {
+        bitField2_ |= 0x00000020;
+        return internalGetMutableMapInt64Int64().getMutableMap();
+      }
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
+      public Builder putMapInt64Int64(
+          long key,
+          long value) {
+
+
+        internalGetMutableMapInt64Int64().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00000020;
+        return this;
+      }
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
+      public Builder putAllMapInt64Int64(
+          java.util.Map<java.lang.Long, java.lang.Long> values) {
+        internalGetMutableMapInt64Int64().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00000020;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> mapUint32Uint32_;
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+          internalGetMapUint32Uint32() {
+        if (mapUint32Uint32_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapUint32Uint32DefaultEntryHolder.defaultEntry);
+        }
+        return mapUint32Uint32_;
+      }
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+          internalGetMutableMapUint32Uint32() {
+        if (mapUint32Uint32_ == null) {
+          mapUint32Uint32_ = com.google.protobuf.MapField.newMapField(
+              MapUint32Uint32DefaultEntryHolder.defaultEntry);
+        }
+        if (!mapUint32Uint32_.isMutable()) {
+          mapUint32Uint32_ = mapUint32Uint32_.copy();
+        }
+        bitField2_ |= 0x00000040;
+        onChanged();
+        return mapUint32Uint32_;
+      }
+      public int getMapUint32Uint32Count() {
+        return internalGetMapUint32Uint32().getMap().size();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapUint32Uint32(
+          int key) {
+
+        return internalGetMapUint32Uint32().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapUint32Uint32Map()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getMapUint32Uint32() {
+        return getMapUint32Uint32Map();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getMapUint32Uint32Map() {
+        return internalGetMapUint32Uint32().getMap();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
+      @java.lang.Override
+      public int getMapUint32Uint32OrDefault(
+          int key,
+          int defaultValue) {
+
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetMapUint32Uint32().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
+      @java.lang.Override
+      public int getMapUint32Uint32OrThrow(
+          int key) {
+
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetMapUint32Uint32().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapUint32Uint32() {
+        bitField2_ = (bitField2_ & ~0x00000040);
+        internalGetMutableMapUint32Uint32().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
+      public Builder removeMapUint32Uint32(
+          int key) {
+
+        internalGetMutableMapUint32Uint32().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+          getMutableMapUint32Uint32() {
+        bitField2_ |= 0x00000040;
+        return internalGetMutableMapUint32Uint32().getMutableMap();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
+      public Builder putMapUint32Uint32(
+          int key,
+          int value) {
+
+
+        internalGetMutableMapUint32Uint32().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00000040;
+        return this;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
+      public Builder putAllMapUint32Uint32(
+          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
+        internalGetMutableMapUint32Uint32().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00000040;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Long, java.lang.Long> mapUint64Uint64_;
+      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+          internalGetMapUint64Uint64() {
+        if (mapUint64Uint64_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapUint64Uint64DefaultEntryHolder.defaultEntry);
+        }
+        return mapUint64Uint64_;
+      }
+      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+          internalGetMutableMapUint64Uint64() {
+        if (mapUint64Uint64_ == null) {
+          mapUint64Uint64_ = com.google.protobuf.MapField.newMapField(
+              MapUint64Uint64DefaultEntryHolder.defaultEntry);
+        }
+        if (!mapUint64Uint64_.isMutable()) {
+          mapUint64Uint64_ = mapUint64Uint64_.copy();
+        }
+        bitField2_ |= 0x00000080;
+        onChanged();
+        return mapUint64Uint64_;
+      }
+      public int getMapUint64Uint64Count() {
+        return internalGetMapUint64Uint64().getMap().size();
+      }
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapUint64Uint64(
+          long key) {
+
+        return internalGetMapUint64Uint64().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapUint64Uint64Map()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Long, java.lang.Long> getMapUint64Uint64() {
+        return getMapUint64Uint64Map();
+      }
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Long, java.lang.Long> getMapUint64Uint64Map() {
+        return internalGetMapUint64Uint64().getMap();
+      }
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
+      @java.lang.Override
+      public long getMapUint64Uint64OrDefault(
+          long key,
+          long defaultValue) {
+
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapUint64Uint64().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
+      @java.lang.Override
+      public long getMapUint64Uint64OrThrow(
+          long key) {
+
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapUint64Uint64().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapUint64Uint64() {
+        bitField2_ = (bitField2_ & ~0x00000080);
+        internalGetMutableMapUint64Uint64().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
+      public Builder removeMapUint64Uint64(
+          long key) {
+
+        internalGetMutableMapUint64Uint64().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Long, java.lang.Long>
+          getMutableMapUint64Uint64() {
+        bitField2_ |= 0x00000080;
+        return internalGetMutableMapUint64Uint64().getMutableMap();
+      }
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
+      public Builder putMapUint64Uint64(
+          long key,
+          long value) {
+
+
+        internalGetMutableMapUint64Uint64().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00000080;
+        return this;
+      }
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
+      public Builder putAllMapUint64Uint64(
+          java.util.Map<java.lang.Long, java.lang.Long> values) {
+        internalGetMutableMapUint64Uint64().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00000080;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> mapSint32Sint32_;
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+          internalGetMapSint32Sint32() {
+        if (mapSint32Sint32_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapSint32Sint32DefaultEntryHolder.defaultEntry);
+        }
+        return mapSint32Sint32_;
+      }
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+          internalGetMutableMapSint32Sint32() {
+        if (mapSint32Sint32_ == null) {
+          mapSint32Sint32_ = com.google.protobuf.MapField.newMapField(
+              MapSint32Sint32DefaultEntryHolder.defaultEntry);
+        }
+        if (!mapSint32Sint32_.isMutable()) {
+          mapSint32Sint32_ = mapSint32Sint32_.copy();
+        }
+        bitField2_ |= 0x00000100;
+        onChanged();
+        return mapSint32Sint32_;
+      }
+      public int getMapSint32Sint32Count() {
+        return internalGetMapSint32Sint32().getMap().size();
+      }
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapSint32Sint32(
+          int key) {
+
+        return internalGetMapSint32Sint32().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapSint32Sint32Map()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSint32Sint32() {
+        return getMapSint32Sint32Map();
+      }
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSint32Sint32Map() {
+        return internalGetMapSint32Sint32().getMap();
+      }
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
+      @java.lang.Override
+      public int getMapSint32Sint32OrDefault(
+          int key,
+          int defaultValue) {
+
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetMapSint32Sint32().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
+      @java.lang.Override
+      public int getMapSint32Sint32OrThrow(
+          int key) {
+
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetMapSint32Sint32().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapSint32Sint32() {
+        bitField2_ = (bitField2_ & ~0x00000100);
+        internalGetMutableMapSint32Sint32().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
+      public Builder removeMapSint32Sint32(
+          int key) {
+
+        internalGetMutableMapSint32Sint32().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+          getMutableMapSint32Sint32() {
+        bitField2_ |= 0x00000100;
+        return internalGetMutableMapSint32Sint32().getMutableMap();
+      }
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
+      public Builder putMapSint32Sint32(
+          int key,
+          int value) {
+
+
+        internalGetMutableMapSint32Sint32().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00000100;
+        return this;
+      }
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
+      public Builder putAllMapSint32Sint32(
+          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
+        internalGetMutableMapSint32Sint32().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00000100;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Long, java.lang.Long> mapSint64Sint64_;
+      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+          internalGetMapSint64Sint64() {
+        if (mapSint64Sint64_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapSint64Sint64DefaultEntryHolder.defaultEntry);
+        }
+        return mapSint64Sint64_;
+      }
+      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+          internalGetMutableMapSint64Sint64() {
+        if (mapSint64Sint64_ == null) {
+          mapSint64Sint64_ = com.google.protobuf.MapField.newMapField(
+              MapSint64Sint64DefaultEntryHolder.defaultEntry);
+        }
+        if (!mapSint64Sint64_.isMutable()) {
+          mapSint64Sint64_ = mapSint64Sint64_.copy();
+        }
+        bitField2_ |= 0x00000200;
+        onChanged();
+        return mapSint64Sint64_;
+      }
+      public int getMapSint64Sint64Count() {
+        return internalGetMapSint64Sint64().getMap().size();
+      }
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapSint64Sint64(
+          long key) {
+
+        return internalGetMapSint64Sint64().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapSint64Sint64Map()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Long, java.lang.Long> getMapSint64Sint64() {
+        return getMapSint64Sint64Map();
+      }
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Long, java.lang.Long> getMapSint64Sint64Map() {
+        return internalGetMapSint64Sint64().getMap();
+      }
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
+      @java.lang.Override
+      public long getMapSint64Sint64OrDefault(
+          long key,
+          long defaultValue) {
+
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapSint64Sint64().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
+      @java.lang.Override
+      public long getMapSint64Sint64OrThrow(
+          long key) {
+
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapSint64Sint64().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapSint64Sint64() {
+        bitField2_ = (bitField2_ & ~0x00000200);
+        internalGetMutableMapSint64Sint64().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
+      public Builder removeMapSint64Sint64(
+          long key) {
+
+        internalGetMutableMapSint64Sint64().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Long, java.lang.Long>
+          getMutableMapSint64Sint64() {
+        bitField2_ |= 0x00000200;
+        return internalGetMutableMapSint64Sint64().getMutableMap();
+      }
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
+      public Builder putMapSint64Sint64(
+          long key,
+          long value) {
+
+
+        internalGetMutableMapSint64Sint64().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00000200;
+        return this;
+      }
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
+      public Builder putAllMapSint64Sint64(
+          java.util.Map<java.lang.Long, java.lang.Long> values) {
+        internalGetMutableMapSint64Sint64().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00000200;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> mapFixed32Fixed32_;
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+          internalGetMapFixed32Fixed32() {
+        if (mapFixed32Fixed32_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapFixed32Fixed32DefaultEntryHolder.defaultEntry);
+        }
+        return mapFixed32Fixed32_;
+      }
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+          internalGetMutableMapFixed32Fixed32() {
+        if (mapFixed32Fixed32_ == null) {
+          mapFixed32Fixed32_ = com.google.protobuf.MapField.newMapField(
+              MapFixed32Fixed32DefaultEntryHolder.defaultEntry);
+        }
+        if (!mapFixed32Fixed32_.isMutable()) {
+          mapFixed32Fixed32_ = mapFixed32Fixed32_.copy();
+        }
+        bitField2_ |= 0x00000400;
+        onChanged();
+        return mapFixed32Fixed32_;
+      }
+      public int getMapFixed32Fixed32Count() {
+        return internalGetMapFixed32Fixed32().getMap().size();
+      }
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapFixed32Fixed32(
+          int key) {
+
+        return internalGetMapFixed32Fixed32().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapFixed32Fixed32Map()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getMapFixed32Fixed32() {
+        return getMapFixed32Fixed32Map();
+      }
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getMapFixed32Fixed32Map() {
+        return internalGetMapFixed32Fixed32().getMap();
+      }
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
+      @java.lang.Override
+      public int getMapFixed32Fixed32OrDefault(
+          int key,
+          int defaultValue) {
+
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetMapFixed32Fixed32().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
+      @java.lang.Override
+      public int getMapFixed32Fixed32OrThrow(
+          int key) {
+
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetMapFixed32Fixed32().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapFixed32Fixed32() {
+        bitField2_ = (bitField2_ & ~0x00000400);
+        internalGetMutableMapFixed32Fixed32().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
+      public Builder removeMapFixed32Fixed32(
+          int key) {
+
+        internalGetMutableMapFixed32Fixed32().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+          getMutableMapFixed32Fixed32() {
+        bitField2_ |= 0x00000400;
+        return internalGetMutableMapFixed32Fixed32().getMutableMap();
+      }
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
+      public Builder putMapFixed32Fixed32(
+          int key,
+          int value) {
+
+
+        internalGetMutableMapFixed32Fixed32().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00000400;
+        return this;
+      }
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
+      public Builder putAllMapFixed32Fixed32(
+          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
+        internalGetMutableMapFixed32Fixed32().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00000400;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Long, java.lang.Long> mapFixed64Fixed64_;
+      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+          internalGetMapFixed64Fixed64() {
+        if (mapFixed64Fixed64_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapFixed64Fixed64DefaultEntryHolder.defaultEntry);
+        }
+        return mapFixed64Fixed64_;
+      }
+      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+          internalGetMutableMapFixed64Fixed64() {
+        if (mapFixed64Fixed64_ == null) {
+          mapFixed64Fixed64_ = com.google.protobuf.MapField.newMapField(
+              MapFixed64Fixed64DefaultEntryHolder.defaultEntry);
+        }
+        if (!mapFixed64Fixed64_.isMutable()) {
+          mapFixed64Fixed64_ = mapFixed64Fixed64_.copy();
+        }
+        bitField2_ |= 0x00000800;
+        onChanged();
+        return mapFixed64Fixed64_;
+      }
+      public int getMapFixed64Fixed64Count() {
+        return internalGetMapFixed64Fixed64().getMap().size();
+      }
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapFixed64Fixed64(
+          long key) {
+
+        return internalGetMapFixed64Fixed64().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapFixed64Fixed64Map()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Long, java.lang.Long> getMapFixed64Fixed64() {
+        return getMapFixed64Fixed64Map();
+      }
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Long, java.lang.Long> getMapFixed64Fixed64Map() {
+        return internalGetMapFixed64Fixed64().getMap();
+      }
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
+      @java.lang.Override
+      public long getMapFixed64Fixed64OrDefault(
+          long key,
+          long defaultValue) {
+
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapFixed64Fixed64().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
+      @java.lang.Override
+      public long getMapFixed64Fixed64OrThrow(
+          long key) {
+
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapFixed64Fixed64().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapFixed64Fixed64() {
+        bitField2_ = (bitField2_ & ~0x00000800);
+        internalGetMutableMapFixed64Fixed64().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
+      public Builder removeMapFixed64Fixed64(
+          long key) {
+
+        internalGetMutableMapFixed64Fixed64().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Long, java.lang.Long>
+          getMutableMapFixed64Fixed64() {
+        bitField2_ |= 0x00000800;
+        return internalGetMutableMapFixed64Fixed64().getMutableMap();
+      }
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
+      public Builder putMapFixed64Fixed64(
+          long key,
+          long value) {
+
+
+        internalGetMutableMapFixed64Fixed64().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00000800;
+        return this;
+      }
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
+      public Builder putAllMapFixed64Fixed64(
+          java.util.Map<java.lang.Long, java.lang.Long> values) {
+        internalGetMutableMapFixed64Fixed64().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00000800;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> mapSfixed32Sfixed32_;
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+          internalGetMapSfixed32Sfixed32() {
+        if (mapSfixed32Sfixed32_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry);
+        }
+        return mapSfixed32Sfixed32_;
+      }
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+          internalGetMutableMapSfixed32Sfixed32() {
+        if (mapSfixed32Sfixed32_ == null) {
+          mapSfixed32Sfixed32_ = com.google.protobuf.MapField.newMapField(
+              MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry);
+        }
+        if (!mapSfixed32Sfixed32_.isMutable()) {
+          mapSfixed32Sfixed32_ = mapSfixed32Sfixed32_.copy();
+        }
+        bitField2_ |= 0x00001000;
+        onChanged();
+        return mapSfixed32Sfixed32_;
+      }
+      public int getMapSfixed32Sfixed32Count() {
+        return internalGetMapSfixed32Sfixed32().getMap().size();
+      }
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapSfixed32Sfixed32(
+          int key) {
+
+        return internalGetMapSfixed32Sfixed32().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapSfixed32Sfixed32Map()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSfixed32Sfixed32() {
+        return getMapSfixed32Sfixed32Map();
+      }
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSfixed32Sfixed32Map() {
+        return internalGetMapSfixed32Sfixed32().getMap();
+      }
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
+      @java.lang.Override
+      public int getMapSfixed32Sfixed32OrDefault(
+          int key,
+          int defaultValue) {
+
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetMapSfixed32Sfixed32().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
+      @java.lang.Override
+      public int getMapSfixed32Sfixed32OrThrow(
+          int key) {
+
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetMapSfixed32Sfixed32().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapSfixed32Sfixed32() {
+        bitField2_ = (bitField2_ & ~0x00001000);
+        internalGetMutableMapSfixed32Sfixed32().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
+      public Builder removeMapSfixed32Sfixed32(
+          int key) {
+
+        internalGetMutableMapSfixed32Sfixed32().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+          getMutableMapSfixed32Sfixed32() {
+        bitField2_ |= 0x00001000;
+        return internalGetMutableMapSfixed32Sfixed32().getMutableMap();
+      }
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
+      public Builder putMapSfixed32Sfixed32(
+          int key,
+          int value) {
+
+
+        internalGetMutableMapSfixed32Sfixed32().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00001000;
+        return this;
+      }
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
+      public Builder putAllMapSfixed32Sfixed32(
+          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
+        internalGetMutableMapSfixed32Sfixed32().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00001000;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Long, java.lang.Long> mapSfixed64Sfixed64_;
+      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+          internalGetMapSfixed64Sfixed64() {
+        if (mapSfixed64Sfixed64_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry);
+        }
+        return mapSfixed64Sfixed64_;
+      }
+      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+          internalGetMutableMapSfixed64Sfixed64() {
+        if (mapSfixed64Sfixed64_ == null) {
+          mapSfixed64Sfixed64_ = com.google.protobuf.MapField.newMapField(
+              MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry);
+        }
+        if (!mapSfixed64Sfixed64_.isMutable()) {
+          mapSfixed64Sfixed64_ = mapSfixed64Sfixed64_.copy();
+        }
+        bitField2_ |= 0x00002000;
+        onChanged();
+        return mapSfixed64Sfixed64_;
+      }
+      public int getMapSfixed64Sfixed64Count() {
+        return internalGetMapSfixed64Sfixed64().getMap().size();
+      }
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapSfixed64Sfixed64(
+          long key) {
+
+        return internalGetMapSfixed64Sfixed64().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapSfixed64Sfixed64Map()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Long, java.lang.Long> getMapSfixed64Sfixed64() {
+        return getMapSfixed64Sfixed64Map();
+      }
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Long, java.lang.Long> getMapSfixed64Sfixed64Map() {
+        return internalGetMapSfixed64Sfixed64().getMap();
+      }
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
+      @java.lang.Override
+      public long getMapSfixed64Sfixed64OrDefault(
+          long key,
+          long defaultValue) {
+
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapSfixed64Sfixed64().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
+      @java.lang.Override
+      public long getMapSfixed64Sfixed64OrThrow(
+          long key) {
+
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapSfixed64Sfixed64().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapSfixed64Sfixed64() {
+        bitField2_ = (bitField2_ & ~0x00002000);
+        internalGetMutableMapSfixed64Sfixed64().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
+      public Builder removeMapSfixed64Sfixed64(
+          long key) {
+
+        internalGetMutableMapSfixed64Sfixed64().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Long, java.lang.Long>
+          getMutableMapSfixed64Sfixed64() {
+        bitField2_ |= 0x00002000;
+        return internalGetMutableMapSfixed64Sfixed64().getMutableMap();
+      }
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
+      public Builder putMapSfixed64Sfixed64(
+          long key,
+          long value) {
+
+
+        internalGetMutableMapSfixed64Sfixed64().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00002000;
+        return this;
+      }
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
+      public Builder putAllMapSfixed64Sfixed64(
+          java.util.Map<java.lang.Long, java.lang.Long> values) {
+        internalGetMutableMapSfixed64Sfixed64().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00002000;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Float> mapInt32Float_;
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float>
+          internalGetMapInt32Float() {
+        if (mapInt32Float_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapInt32FloatDefaultEntryHolder.defaultEntry);
+        }
+        return mapInt32Float_;
+      }
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float>
+          internalGetMutableMapInt32Float() {
+        if (mapInt32Float_ == null) {
+          mapInt32Float_ = com.google.protobuf.MapField.newMapField(
+              MapInt32FloatDefaultEntryHolder.defaultEntry);
+        }
+        if (!mapInt32Float_.isMutable()) {
+          mapInt32Float_ = mapInt32Float_.copy();
+        }
+        bitField2_ |= 0x00004000;
+        onChanged();
+        return mapInt32Float_;
+      }
+      public int getMapInt32FloatCount() {
+        return internalGetMapInt32Float().getMap().size();
+      }
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapInt32Float(
+          int key) {
+
+        return internalGetMapInt32Float().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapInt32FloatMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Float> getMapInt32Float() {
+        return getMapInt32FloatMap();
+      }
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Integer, java.lang.Float> getMapInt32FloatMap() {
+        return internalGetMapInt32Float().getMap();
+      }
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
+      @java.lang.Override
+      public float getMapInt32FloatOrDefault(
+          int key,
+          float defaultValue) {
+
+        java.util.Map<java.lang.Integer, java.lang.Float> map =
+            internalGetMapInt32Float().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
+      @java.lang.Override
+      public float getMapInt32FloatOrThrow(
+          int key) {
+
+        java.util.Map<java.lang.Integer, java.lang.Float> map =
+            internalGetMapInt32Float().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapInt32Float() {
+        bitField2_ = (bitField2_ & ~0x00004000);
+        internalGetMutableMapInt32Float().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
+      public Builder removeMapInt32Float(
+          int key) {
+
+        internalGetMutableMapInt32Float().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Float>
+          getMutableMapInt32Float() {
+        bitField2_ |= 0x00004000;
+        return internalGetMutableMapInt32Float().getMutableMap();
+      }
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
+      public Builder putMapInt32Float(
+          int key,
+          float value) {
+
+
+        internalGetMutableMapInt32Float().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00004000;
+        return this;
+      }
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
+      public Builder putAllMapInt32Float(
+          java.util.Map<java.lang.Integer, java.lang.Float> values) {
+        internalGetMutableMapInt32Float().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00004000;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Double> mapInt32Double_;
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Double>
+          internalGetMapInt32Double() {
+        if (mapInt32Double_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapInt32DoubleDefaultEntryHolder.defaultEntry);
+        }
+        return mapInt32Double_;
+      }
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Double>
+          internalGetMutableMapInt32Double() {
+        if (mapInt32Double_ == null) {
+          mapInt32Double_ = com.google.protobuf.MapField.newMapField(
+              MapInt32DoubleDefaultEntryHolder.defaultEntry);
+        }
+        if (!mapInt32Double_.isMutable()) {
+          mapInt32Double_ = mapInt32Double_.copy();
+        }
+        bitField2_ |= 0x00008000;
+        onChanged();
+        return mapInt32Double_;
+      }
+      public int getMapInt32DoubleCount() {
+        return internalGetMapInt32Double().getMap().size();
+      }
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapInt32Double(
+          int key) {
+
+        return internalGetMapInt32Double().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapInt32DoubleMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Double> getMapInt32Double() {
+        return getMapInt32DoubleMap();
+      }
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Integer, java.lang.Double> getMapInt32DoubleMap() {
+        return internalGetMapInt32Double().getMap();
+      }
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
+      @java.lang.Override
+      public double getMapInt32DoubleOrDefault(
+          int key,
+          double defaultValue) {
+
+        java.util.Map<java.lang.Integer, java.lang.Double> map =
+            internalGetMapInt32Double().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
+      @java.lang.Override
+      public double getMapInt32DoubleOrThrow(
+          int key) {
+
+        java.util.Map<java.lang.Integer, java.lang.Double> map =
+            internalGetMapInt32Double().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapInt32Double() {
+        bitField2_ = (bitField2_ & ~0x00008000);
+        internalGetMutableMapInt32Double().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
+      public Builder removeMapInt32Double(
+          int key) {
+
+        internalGetMutableMapInt32Double().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Double>
+          getMutableMapInt32Double() {
+        bitField2_ |= 0x00008000;
+        return internalGetMutableMapInt32Double().getMutableMap();
+      }
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
+      public Builder putMapInt32Double(
+          int key,
+          double value) {
+
+
+        internalGetMutableMapInt32Double().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00008000;
+        return this;
+      }
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
+      public Builder putAllMapInt32Double(
+          java.util.Map<java.lang.Integer, java.lang.Double> values) {
+        internalGetMutableMapInt32Double().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00008000;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Boolean, java.lang.Boolean> mapBoolBool_;
+      private com.google.protobuf.MapField<java.lang.Boolean, java.lang.Boolean>
+          internalGetMapBoolBool() {
+        if (mapBoolBool_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapBoolBoolDefaultEntryHolder.defaultEntry);
+        }
+        return mapBoolBool_;
+      }
+      private com.google.protobuf.MapField<java.lang.Boolean, java.lang.Boolean>
+          internalGetMutableMapBoolBool() {
+        if (mapBoolBool_ == null) {
+          mapBoolBool_ = com.google.protobuf.MapField.newMapField(
+              MapBoolBoolDefaultEntryHolder.defaultEntry);
+        }
+        if (!mapBoolBool_.isMutable()) {
+          mapBoolBool_ = mapBoolBool_.copy();
+        }
+        bitField2_ |= 0x00010000;
+        onChanged();
+        return mapBoolBool_;
+      }
+      public int getMapBoolBoolCount() {
+        return internalGetMapBoolBool().getMap().size();
+      }
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapBoolBool(
+          boolean key) {
+
+        return internalGetMapBoolBool().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapBoolBoolMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Boolean, java.lang.Boolean> getMapBoolBool() {
+        return getMapBoolBoolMap();
+      }
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Boolean, java.lang.Boolean> getMapBoolBoolMap() {
+        return internalGetMapBoolBool().getMap();
+      }
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
+      @java.lang.Override
+      public boolean getMapBoolBoolOrDefault(
+          boolean key,
+          boolean defaultValue) {
+
+        java.util.Map<java.lang.Boolean, java.lang.Boolean> map =
+            internalGetMapBoolBool().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
+      @java.lang.Override
+      public boolean getMapBoolBoolOrThrow(
+          boolean key) {
+
+        java.util.Map<java.lang.Boolean, java.lang.Boolean> map =
+            internalGetMapBoolBool().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapBoolBool() {
+        bitField2_ = (bitField2_ & ~0x00010000);
+        internalGetMutableMapBoolBool().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
+      public Builder removeMapBoolBool(
+          boolean key) {
+
+        internalGetMutableMapBoolBool().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Boolean, java.lang.Boolean>
+          getMutableMapBoolBool() {
+        bitField2_ |= 0x00010000;
+        return internalGetMutableMapBoolBool().getMutableMap();
+      }
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
+      public Builder putMapBoolBool(
+          boolean key,
+          boolean value) {
+
+
+        internalGetMutableMapBoolBool().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00010000;
+        return this;
+      }
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
+      public Builder putAllMapBoolBool(
+          java.util.Map<java.lang.Boolean, java.lang.Boolean> values) {
+        internalGetMutableMapBoolBool().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00010000;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.String, java.lang.String> mapStringString_;
+      private com.google.protobuf.MapField<java.lang.String, java.lang.String>
+          internalGetMapStringString() {
+        if (mapStringString_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapStringStringDefaultEntryHolder.defaultEntry);
+        }
+        return mapStringString_;
+      }
+      private com.google.protobuf.MapField<java.lang.String, java.lang.String>
+          internalGetMutableMapStringString() {
+        if (mapStringString_ == null) {
+          mapStringString_ = com.google.protobuf.MapField.newMapField(
+              MapStringStringDefaultEntryHolder.defaultEntry);
+        }
+        if (!mapStringString_.isMutable()) {
+          mapStringString_ = mapStringString_.copy();
+        }
+        bitField2_ |= 0x00020000;
+        onChanged();
+        return mapStringString_;
+      }
+      public int getMapStringStringCount() {
+        return internalGetMapStringString().getMap().size();
+      }
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapStringString(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        return internalGetMapStringString().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapStringStringMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, java.lang.String> getMapStringString() {
+        return getMapStringStringMap();
+      }
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.String, java.lang.String> getMapStringStringMap() {
+        return internalGetMapStringString().getMap();
+      }
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
+      @java.lang.Override
+      public /* nullable */
+java.lang.String getMapStringStringOrDefault(
+          java.lang.String key,
+          /* nullable */
+java.lang.String defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, java.lang.String> map =
+            internalGetMapStringString().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
+      @java.lang.Override
+      public java.lang.String getMapStringStringOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, java.lang.String> map =
+            internalGetMapStringString().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapStringString() {
+        bitField2_ = (bitField2_ & ~0x00020000);
+        internalGetMutableMapStringString().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
+      public Builder removeMapStringString(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringString().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, java.lang.String>
+          getMutableMapStringString() {
+        bitField2_ |= 0x00020000;
+        return internalGetMutableMapStringString().getMutableMap();
+      }
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
+      public Builder putMapStringString(
+          java.lang.String key,
+          java.lang.String value) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        if (value == null) { throw new NullPointerException("map value"); }
+        internalGetMutableMapStringString().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00020000;
+        return this;
+      }
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
+      public Builder putAllMapStringString(
+          java.util.Map<java.lang.String, java.lang.String> values) {
+        internalGetMutableMapStringString().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00020000;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.String, com.google.protobuf.ByteString> mapStringBytes_;
+      private com.google.protobuf.MapField<java.lang.String, com.google.protobuf.ByteString>
+          internalGetMapStringBytes() {
+        if (mapStringBytes_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapStringBytesDefaultEntryHolder.defaultEntry);
+        }
+        return mapStringBytes_;
+      }
+      private com.google.protobuf.MapField<java.lang.String, com.google.protobuf.ByteString>
+          internalGetMutableMapStringBytes() {
+        if (mapStringBytes_ == null) {
+          mapStringBytes_ = com.google.protobuf.MapField.newMapField(
+              MapStringBytesDefaultEntryHolder.defaultEntry);
+        }
+        if (!mapStringBytes_.isMutable()) {
+          mapStringBytes_ = mapStringBytes_.copy();
+        }
+        bitField2_ |= 0x00040000;
+        onChanged();
+        return mapStringBytes_;
+      }
+      public int getMapStringBytesCount() {
+        return internalGetMapStringBytes().getMap().size();
+      }
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapStringBytes(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        return internalGetMapStringBytes().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapStringBytesMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, com.google.protobuf.ByteString> getMapStringBytes() {
+        return getMapStringBytesMap();
+      }
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.String, com.google.protobuf.ByteString> getMapStringBytesMap() {
+        return internalGetMapStringBytes().getMap();
+      }
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
+      @java.lang.Override
+      public /* nullable */
+com.google.protobuf.ByteString getMapStringBytesOrDefault(
+          java.lang.String key,
+          /* nullable */
+com.google.protobuf.ByteString defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, com.google.protobuf.ByteString> map =
+            internalGetMapStringBytes().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
+      @java.lang.Override
+      public com.google.protobuf.ByteString getMapStringBytesOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, com.google.protobuf.ByteString> map =
+            internalGetMapStringBytes().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapStringBytes() {
+        bitField2_ = (bitField2_ & ~0x00040000);
+        internalGetMutableMapStringBytes().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
+      public Builder removeMapStringBytes(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringBytes().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, com.google.protobuf.ByteString>
+          getMutableMapStringBytes() {
+        bitField2_ |= 0x00040000;
+        return internalGetMutableMapStringBytes().getMutableMap();
+      }
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
+      public Builder putMapStringBytes(
+          java.lang.String key,
+          com.google.protobuf.ByteString value) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        if (value == null) { throw new NullPointerException("map value"); }
+        internalGetMutableMapStringBytes().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00040000;
+        return this;
+      }
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
+      public Builder putAllMapStringBytes(
+          java.util.Map<java.lang.String, com.google.protobuf.ByteString> values) {
+        internalGetMutableMapStringBytes().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00040000;
+        return this;
+      }
+
+      private static final class MapStringNestedMessageConverter implements com.google.protobuf.MapFieldBuilder.Converter<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> {
+        @java.lang.Override
+        public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage build(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder val) {
+          if (val instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) { return (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) val; }
+          return ((legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder) val).build();
+        }
+
+        @java.lang.Override
+        public com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> defaultEntry() {
+          return MapStringNestedMessageDefaultEntryHolder.defaultEntry;
+        }
+      };
+      private static final MapStringNestedMessageConverter mapStringNestedMessageConverter = new MapStringNestedMessageConverter();
+
+      private com.google.protobuf.MapFieldBuilder<
+          java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder> mapStringNestedMessage_;
+      private com.google.protobuf.MapFieldBuilder<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder>
+          internalGetMapStringNestedMessage() {
+        if (mapStringNestedMessage_ == null) {
+          return new com.google.protobuf.MapFieldBuilder<>(mapStringNestedMessageConverter);
+        }
+        return mapStringNestedMessage_;
+      }
+      private com.google.protobuf.MapFieldBuilder<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder>
+          internalGetMutableMapStringNestedMessage() {
+        if (mapStringNestedMessage_ == null) {
+          mapStringNestedMessage_ = new com.google.protobuf.MapFieldBuilder<>(mapStringNestedMessageConverter);
+        }
+        bitField2_ |= 0x00080000;
+        onChanged();
+        return mapStringNestedMessage_;
+      }
+      public int getMapStringNestedMessageCount() {
+        return internalGetMapStringNestedMessage().ensureBuilderMap().size();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapStringNestedMessage(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        return internalGetMapStringNestedMessage().ensureBuilderMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapStringNestedMessageMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> getMapStringNestedMessage() {
+        return getMapStringNestedMessageMap();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> getMapStringNestedMessageMap() {
+        return internalGetMapStringNestedMessage().getImmutableMap();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+       */
+      @java.lang.Override
+      public /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getMapStringNestedMessageOrDefault(
+          java.lang.String key,
+          /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> map = internalGetMutableMapStringNestedMessage().ensureBuilderMap();
+        return map.containsKey(key) ? mapStringNestedMessageConverter.build(map.get(key)) : defaultValue;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getMapStringNestedMessageOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> map = internalGetMutableMapStringNestedMessage().ensureBuilderMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return mapStringNestedMessageConverter.build(map.get(key));
+      }
+      public Builder clearMapStringNestedMessage() {
+        bitField2_ = (bitField2_ & ~0x00080000);
+        internalGetMutableMapStringNestedMessage().clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+       */
+      public Builder removeMapStringNestedMessage(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringNestedMessage().ensureBuilderMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage>
+          getMutableMapStringNestedMessage() {
+        bitField2_ |= 0x00080000;
+        return internalGetMutableMapStringNestedMessage().ensureMessageMap();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+       */
+      public Builder putMapStringNestedMessage(
+          java.lang.String key,
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage value) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        if (value == null) { throw new NullPointerException("map value"); }
+        internalGetMutableMapStringNestedMessage().ensureBuilderMap()
+            .put(key, value);
+        bitField2_ |= 0x00080000;
+        return this;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+       */
+      public Builder putAllMapStringNestedMessage(
+          java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> values) {
+        for (java.util.Map.Entry<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> e : values.entrySet()) {
+          if (e.getKey() == null || e.getValue() == null) {
+            throw new NullPointerException();
+          }
+        }
+        internalGetMutableMapStringNestedMessage().ensureBuilderMap()
+            .putAll(values);
+        bitField2_ |= 0x00080000;
+        return this;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder putMapStringNestedMessageBuilderIfAbsent(
+          java.lang.String key) {
+        java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> builderMap = internalGetMutableMapStringNestedMessage().ensureBuilderMap();
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder entry = builderMap.get(key);
+        if (entry == null) {
+          entry = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.newBuilder();
+          builderMap.put(key, entry);
+        }
+        if (entry instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) {
+          entry = ((legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) entry).toBuilder();
+          builderMap.put(key, entry);
+        }
+        return (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder) entry;
+      }
+
+      private static final class MapStringForeignMessageConverter implements com.google.protobuf.MapFieldBuilder.Converter<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> {
+        @java.lang.Override
+        public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage build(legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder val) {
+          if (val instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage) { return (legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage) val; }
+          return ((legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder) val).build();
+        }
+
+        @java.lang.Override
+        public com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> defaultEntry() {
+          return MapStringForeignMessageDefaultEntryHolder.defaultEntry;
+        }
+      };
+      private static final MapStringForeignMessageConverter mapStringForeignMessageConverter = new MapStringForeignMessageConverter();
+
+      private com.google.protobuf.MapFieldBuilder<
+          java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder> mapStringForeignMessage_;
+      private com.google.protobuf.MapFieldBuilder<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder>
+          internalGetMapStringForeignMessage() {
+        if (mapStringForeignMessage_ == null) {
+          return new com.google.protobuf.MapFieldBuilder<>(mapStringForeignMessageConverter);
+        }
+        return mapStringForeignMessage_;
+      }
+      private com.google.protobuf.MapFieldBuilder<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder>
+          internalGetMutableMapStringForeignMessage() {
+        if (mapStringForeignMessage_ == null) {
+          mapStringForeignMessage_ = new com.google.protobuf.MapFieldBuilder<>(mapStringForeignMessageConverter);
+        }
+        bitField2_ |= 0x00100000;
+        onChanged();
+        return mapStringForeignMessage_;
+      }
+      public int getMapStringForeignMessageCount() {
+        return internalGetMapStringForeignMessage().ensureBuilderMap().size();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapStringForeignMessage(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        return internalGetMapStringForeignMessage().ensureBuilderMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapStringForeignMessageMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> getMapStringForeignMessage() {
+        return getMapStringForeignMessageMap();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> getMapStringForeignMessageMap() {
+        return internalGetMapStringForeignMessage().getImmutableMap();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+       */
+      @java.lang.Override
+      public /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getMapStringForeignMessageOrDefault(
+          java.lang.String key,
+          /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder> map = internalGetMutableMapStringForeignMessage().ensureBuilderMap();
+        return map.containsKey(key) ? mapStringForeignMessageConverter.build(map.get(key)) : defaultValue;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getMapStringForeignMessageOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder> map = internalGetMutableMapStringForeignMessage().ensureBuilderMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return mapStringForeignMessageConverter.build(map.get(key));
+      }
+      public Builder clearMapStringForeignMessage() {
+        bitField2_ = (bitField2_ & ~0x00100000);
+        internalGetMutableMapStringForeignMessage().clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+       */
+      public Builder removeMapStringForeignMessage(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringForeignMessage().ensureBuilderMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage>
+          getMutableMapStringForeignMessage() {
+        bitField2_ |= 0x00100000;
+        return internalGetMutableMapStringForeignMessage().ensureMessageMap();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+       */
+      public Builder putMapStringForeignMessage(
+          java.lang.String key,
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage value) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        if (value == null) { throw new NullPointerException("map value"); }
+        internalGetMutableMapStringForeignMessage().ensureBuilderMap()
+            .put(key, value);
+        bitField2_ |= 0x00100000;
+        return this;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+       */
+      public Builder putAllMapStringForeignMessage(
+          java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> values) {
+        for (java.util.Map.Entry<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> e : values.entrySet()) {
+          if (e.getKey() == null || e.getValue() == null) {
+            throw new NullPointerException();
+          }
+        }
+        internalGetMutableMapStringForeignMessage().ensureBuilderMap()
+            .putAll(values);
+        bitField2_ |= 0x00100000;
+        return this;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder putMapStringForeignMessageBuilderIfAbsent(
+          java.lang.String key) {
+        java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder> builderMap = internalGetMutableMapStringForeignMessage().ensureBuilderMap();
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder entry = builderMap.get(key);
+        if (entry == null) {
+          entry = legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.newBuilder();
+          builderMap.put(key, entry);
+        }
+        if (entry instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage) {
+          entry = ((legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage) entry).toBuilder();
+          builderMap.put(key, entry);
+        }
+        return (legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder) entry;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.String, java.lang.Integer> mapStringNestedEnum_;
+      private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
+          internalGetMapStringNestedEnum() {
+        if (mapStringNestedEnum_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapStringNestedEnumDefaultEntryHolder.defaultEntry);
+        }
+        return mapStringNestedEnum_;
+      }
+      private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
+          internalGetMutableMapStringNestedEnum() {
+        if (mapStringNestedEnum_ == null) {
+          mapStringNestedEnum_ = com.google.protobuf.MapField.newMapField(
+              MapStringNestedEnumDefaultEntryHolder.defaultEntry);
+        }
+        if (!mapStringNestedEnum_.isMutable()) {
+          mapStringNestedEnum_ = mapStringNestedEnum_.copy();
+        }
+        bitField2_ |= 0x00200000;
+        onChanged();
+        return mapStringNestedEnum_;
+      }
+      public int getMapStringNestedEnumCount() {
+        return internalGetMapStringNestedEnum().getMap().size();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapStringNestedEnum(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        return internalGetMapStringNestedEnum().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapStringNestedEnumMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>
+      getMapStringNestedEnum() {
+        return getMapStringNestedEnumMap();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>
+      getMapStringNestedEnumMap() {
+        return internalGetAdaptedMapStringNestedEnumMap(
+            internalGetMapStringNestedEnum().getMap());}
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+       */
+      @java.lang.Override
+      public /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getMapStringNestedEnumOrDefault(
+          java.lang.String key,
+          /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, java.lang.Integer> map =
+            internalGetMapStringNestedEnum().getMap();
+        return map.containsKey(key)
+               ? mapStringNestedEnumValueConverter.doForward(map.get(key))
+               : defaultValue;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getMapStringNestedEnumOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, java.lang.Integer> map =
+            internalGetMapStringNestedEnum().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return mapStringNestedEnumValueConverter.doForward(map.get(key));
+      }
+      public Builder clearMapStringNestedEnum() {
+        bitField2_ = (bitField2_ & ~0x00200000);
+        internalGetMutableMapStringNestedEnum().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+       */
+      public Builder removeMapStringNestedEnum(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringNestedEnum().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>
+          getMutableMapStringNestedEnum() {
+        bitField2_ |= 0x00200000;
+        return internalGetAdaptedMapStringNestedEnumMap(
+             internalGetMutableMapStringNestedEnum().getMutableMap());
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+       */
+      public Builder putMapStringNestedEnum(
+          java.lang.String key,
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value) {
+        if (key == null) { throw new NullPointerException("map key"); }
+
+        internalGetMutableMapStringNestedEnum().getMutableMap()
+            .put(key, mapStringNestedEnumValueConverter.doBackward(value));
+        bitField2_ |= 0x00200000;
+        return this;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+       */
+      public Builder putAllMapStringNestedEnum(
+          java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> values) {
+        internalGetAdaptedMapStringNestedEnumMap(
+            internalGetMutableMapStringNestedEnum().getMutableMap())
+                .putAll(values);
+        bitField2_ |= 0x00200000;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.String, java.lang.Integer> mapStringForeignEnum_;
+      private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
+          internalGetMapStringForeignEnum() {
+        if (mapStringForeignEnum_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapStringForeignEnumDefaultEntryHolder.defaultEntry);
+        }
+        return mapStringForeignEnum_;
+      }
+      private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
+          internalGetMutableMapStringForeignEnum() {
+        if (mapStringForeignEnum_ == null) {
+          mapStringForeignEnum_ = com.google.protobuf.MapField.newMapField(
+              MapStringForeignEnumDefaultEntryHolder.defaultEntry);
+        }
+        if (!mapStringForeignEnum_.isMutable()) {
+          mapStringForeignEnum_ = mapStringForeignEnum_.copy();
+        }
+        bitField2_ |= 0x00400000;
+        onChanged();
+        return mapStringForeignEnum_;
+      }
+      public int getMapStringForeignEnumCount() {
+        return internalGetMapStringForeignEnum().getMap().size();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapStringForeignEnum(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        return internalGetMapStringForeignEnum().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapStringForeignEnumMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum>
+      getMapStringForeignEnum() {
+        return getMapStringForeignEnumMap();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum>
+      getMapStringForeignEnumMap() {
+        return internalGetAdaptedMapStringForeignEnumMap(
+            internalGetMapStringForeignEnum().getMap());}
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+       */
+      @java.lang.Override
+      public /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getMapStringForeignEnumOrDefault(
+          java.lang.String key,
+          /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, java.lang.Integer> map =
+            internalGetMapStringForeignEnum().getMap();
+        return map.containsKey(key)
+               ? mapStringForeignEnumValueConverter.doForward(map.get(key))
+               : defaultValue;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getMapStringForeignEnumOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, java.lang.Integer> map =
+            internalGetMapStringForeignEnum().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return mapStringForeignEnumValueConverter.doForward(map.get(key));
+      }
+      public Builder clearMapStringForeignEnum() {
+        bitField2_ = (bitField2_ & ~0x00400000);
+        internalGetMutableMapStringForeignEnum().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+       */
+      public Builder removeMapStringForeignEnum(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringForeignEnum().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum>
+          getMutableMapStringForeignEnum() {
+        bitField2_ |= 0x00400000;
+        return internalGetAdaptedMapStringForeignEnumMap(
+             internalGetMutableMapStringForeignEnum().getMutableMap());
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+       */
+      public Builder putMapStringForeignEnum(
+          java.lang.String key,
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum value) {
+        if (key == null) { throw new NullPointerException("map key"); }
+
+        internalGetMutableMapStringForeignEnum().getMutableMap()
+            .put(key, mapStringForeignEnumValueConverter.doBackward(value));
+        bitField2_ |= 0x00400000;
+        return this;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+       */
+      public Builder putAllMapStringForeignEnum(
+          java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum> values) {
+        internalGetAdaptedMapStringForeignEnumMap(
+            internalGetMutableMapStringForeignEnum().getMutableMap())
+                .putAll(values);
+        bitField2_ |= 0x00400000;
+        return this;
+      }
+
+      /**
+       * <code>uint32 oneof_uint32 = 111;</code>
+       * @return Whether the oneofUint32 field is set.
+       */
+      public boolean hasOneofUint32() {
+        return oneofFieldCase_ == 111;
+      }
+      /**
+       * <code>uint32 oneof_uint32 = 111;</code>
+       * @return The oneofUint32.
+       */
+      public int getOneofUint32() {
+        if (oneofFieldCase_ == 111) {
+          return (java.lang.Integer) oneofField_;
+        }
+        return 0;
+      }
+      /**
+       * <code>uint32 oneof_uint32 = 111;</code>
+       * @param value The oneofUint32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOneofUint32(int value) {
+
+        oneofFieldCase_ = 111;
+        oneofField_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 oneof_uint32 = 111;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOneofUint32() {
+        if (oneofFieldCase_ == 111) {
+          oneofFieldCase_ = 0;
+          oneofField_ = null;
+          onChanged();
+        }
+        return this;
+      }
+
+      private com.google.protobuf.SingleFieldBuilder<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> oneofNestedMessageBuilder_;
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+       * @return Whether the oneofNestedMessage field is set.
+       */
+      @java.lang.Override
+      public boolean hasOneofNestedMessage() {
+        return oneofFieldCase_ == 112;
+      }
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+       * @return The oneofNestedMessage.
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getOneofNestedMessage() {
+        if (oneofNestedMessageBuilder_ == null) {
+          if (oneofFieldCase_ == 112) {
+            return (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) oneofField_;
+          }
+          return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance();
+        } else {
+          if (oneofFieldCase_ == 112) {
+            return oneofNestedMessageBuilder_.getMessage();
+          }
+          return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance();
+        }
+      }
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+       */
+      public Builder setOneofNestedMessage(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage value) {
+        if (oneofNestedMessageBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          oneofField_ = value;
+          onChanged();
+        } else {
+          oneofNestedMessageBuilder_.setMessage(value);
+        }
+        oneofFieldCase_ = 112;
+        return this;
+      }
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+       */
+      public Builder setOneofNestedMessage(
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder builderForValue) {
+        if (oneofNestedMessageBuilder_ == null) {
+          oneofField_ = builderForValue.build();
+          onChanged();
+        } else {
+          oneofNestedMessageBuilder_.setMessage(builderForValue.build());
+        }
+        oneofFieldCase_ = 112;
+        return this;
+      }
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+       */
+      public Builder mergeOneofNestedMessage(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage value) {
+        if (oneofNestedMessageBuilder_ == null) {
+          if (oneofFieldCase_ == 112 &&
+              oneofField_ != legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance()) {
+            oneofField_ = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.newBuilder((legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) oneofField_)
+                .mergeFrom(value).buildPartial();
+          } else {
+            oneofField_ = value;
+          }
+          onChanged();
+        } else {
+          if (oneofFieldCase_ == 112) {
+            oneofNestedMessageBuilder_.mergeFrom(value);
+          } else {
+            oneofNestedMessageBuilder_.setMessage(value);
+          }
+        }
+        oneofFieldCase_ = 112;
+        return this;
+      }
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+       */
+      public Builder clearOneofNestedMessage() {
+        if (oneofNestedMessageBuilder_ == null) {
+          if (oneofFieldCase_ == 112) {
+            oneofFieldCase_ = 0;
+            oneofField_ = null;
+            onChanged();
+          }
+        } else {
+          if (oneofFieldCase_ == 112) {
+            oneofFieldCase_ = 0;
+            oneofField_ = null;
+          }
+          oneofNestedMessageBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder getOneofNestedMessageBuilder() {
+        return getOneofNestedMessageFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder getOneofNestedMessageOrBuilder() {
+        if ((oneofFieldCase_ == 112) && (oneofNestedMessageBuilder_ != null)) {
+          return oneofNestedMessageBuilder_.getMessageOrBuilder();
+        } else {
+          if (oneofFieldCase_ == 112) {
+            return (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) oneofField_;
+          }
+          return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance();
+        }
+      }
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilder<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> 
+          getOneofNestedMessageFieldBuilder() {
+        if (oneofNestedMessageBuilder_ == null) {
+          if (!(oneofFieldCase_ == 112)) {
+            oneofField_ = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance();
+          }
+          oneofNestedMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder>(
+                  (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) oneofField_,
+                  getParentForChildren(),
+                  isClean());
+          oneofField_ = null;
+        }
+        oneofFieldCase_ = 112;
+        onChanged();
+        return oneofNestedMessageBuilder_;
+      }
+
+      /**
+       * <code>string oneof_string = 113;</code>
+       * @return Whether the oneofString field is set.
+       */
+      @java.lang.Override
+      public boolean hasOneofString() {
+        return oneofFieldCase_ == 113;
+      }
+      /**
+       * <code>string oneof_string = 113;</code>
+       * @return The oneofString.
+       */
+      @java.lang.Override
+      public java.lang.String getOneofString() {
+        java.lang.Object ref = "";
+        if (oneofFieldCase_ == 113) {
+          ref = oneofField_;
+        }
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          if (oneofFieldCase_ == 113) {
+            if (bs.isValidUtf8()) {
+              oneofField_ = s;
+            }
+          }
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string oneof_string = 113;</code>
+       * @return The bytes for oneofString.
+       */
+      @java.lang.Override
+      public com.google.protobuf.ByteString
+          getOneofStringBytes() {
+        java.lang.Object ref = "";
+        if (oneofFieldCase_ == 113) {
+          ref = oneofField_;
+        }
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          if (oneofFieldCase_ == 113) {
+            oneofField_ = b;
+          }
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string oneof_string = 113;</code>
+       * @param value The oneofString to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOneofString(
+          java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
+        oneofFieldCase_ = 113;
+        oneofField_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string oneof_string = 113;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOneofString() {
+        if (oneofFieldCase_ == 113) {
+          oneofFieldCase_ = 0;
+          oneofField_ = null;
+          onChanged();
+        }
+        return this;
+      }
+      /**
+       * <code>string oneof_string = 113;</code>
+       * @param value The bytes for oneofString to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOneofStringBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
+        oneofFieldCase_ = 113;
+        oneofField_ = value;
+        onChanged();
+        return this;
+      }
+
+      /**
+       * <code>bytes oneof_bytes = 114;</code>
+       * @return Whether the oneofBytes field is set.
+       */
+      public boolean hasOneofBytes() {
+        return oneofFieldCase_ == 114;
+      }
+      /**
+       * <code>bytes oneof_bytes = 114;</code>
+       * @return The oneofBytes.
+       */
+      public com.google.protobuf.ByteString getOneofBytes() {
+        if (oneofFieldCase_ == 114) {
+          return (com.google.protobuf.ByteString) oneofField_;
+        }
+        return com.google.protobuf.ByteString.EMPTY;
+      }
+      /**
+       * <code>bytes oneof_bytes = 114;</code>
+       * @param value The oneofBytes to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOneofBytes(com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
+        oneofFieldCase_ = 114;
+        oneofField_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bytes oneof_bytes = 114;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOneofBytes() {
+        if (oneofFieldCase_ == 114) {
+          oneofFieldCase_ = 0;
+          oneofField_ = null;
+          onChanged();
+        }
+        return this;
+      }
+
+      /**
+       * <code>bool oneof_bool = 115;</code>
+       * @return Whether the oneofBool field is set.
+       */
+      public boolean hasOneofBool() {
+        return oneofFieldCase_ == 115;
+      }
+      /**
+       * <code>bool oneof_bool = 115;</code>
+       * @return The oneofBool.
+       */
+      public boolean getOneofBool() {
+        if (oneofFieldCase_ == 115) {
+          return (java.lang.Boolean) oneofField_;
+        }
+        return false;
+      }
+      /**
+       * <code>bool oneof_bool = 115;</code>
+       * @param value The oneofBool to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOneofBool(boolean value) {
+
+        oneofFieldCase_ = 115;
+        oneofField_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool oneof_bool = 115;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOneofBool() {
+        if (oneofFieldCase_ == 115) {
+          oneofFieldCase_ = 0;
+          oneofField_ = null;
+          onChanged();
+        }
+        return this;
+      }
+
+      /**
+       * <code>uint64 oneof_uint64 = 116;</code>
+       * @return Whether the oneofUint64 field is set.
+       */
+      public boolean hasOneofUint64() {
+        return oneofFieldCase_ == 116;
+      }
+      /**
+       * <code>uint64 oneof_uint64 = 116;</code>
+       * @return The oneofUint64.
+       */
+      public long getOneofUint64() {
+        if (oneofFieldCase_ == 116) {
+          return (java.lang.Long) oneofField_;
+        }
+        return 0L;
+      }
+      /**
+       * <code>uint64 oneof_uint64 = 116;</code>
+       * @param value The oneofUint64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOneofUint64(long value) {
+
+        oneofFieldCase_ = 116;
+        oneofField_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 oneof_uint64 = 116;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOneofUint64() {
+        if (oneofFieldCase_ == 116) {
+          oneofFieldCase_ = 0;
+          oneofField_ = null;
+          onChanged();
+        }
+        return this;
+      }
+
+      /**
+       * <code>float oneof_float = 117;</code>
+       * @return Whether the oneofFloat field is set.
+       */
+      public boolean hasOneofFloat() {
+        return oneofFieldCase_ == 117;
+      }
+      /**
+       * <code>float oneof_float = 117;</code>
+       * @return The oneofFloat.
+       */
+      public float getOneofFloat() {
+        if (oneofFieldCase_ == 117) {
+          return (java.lang.Float) oneofField_;
+        }
+        return 0F;
+      }
+      /**
+       * <code>float oneof_float = 117;</code>
+       * @param value The oneofFloat to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOneofFloat(float value) {
+
+        oneofFieldCase_ = 117;
+        oneofField_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>float oneof_float = 117;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOneofFloat() {
+        if (oneofFieldCase_ == 117) {
+          oneofFieldCase_ = 0;
+          oneofField_ = null;
+          onChanged();
+        }
+        return this;
+      }
+
+      /**
+       * <code>double oneof_double = 118;</code>
+       * @return Whether the oneofDouble field is set.
+       */
+      public boolean hasOneofDouble() {
+        return oneofFieldCase_ == 118;
+      }
+      /**
+       * <code>double oneof_double = 118;</code>
+       * @return The oneofDouble.
+       */
+      public double getOneofDouble() {
+        if (oneofFieldCase_ == 118) {
+          return (java.lang.Double) oneofField_;
+        }
+        return 0D;
+      }
+      /**
+       * <code>double oneof_double = 118;</code>
+       * @param value The oneofDouble to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOneofDouble(double value) {
+
+        oneofFieldCase_ = 118;
+        oneofField_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>double oneof_double = 118;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOneofDouble() {
+        if (oneofFieldCase_ == 118) {
+          oneofFieldCase_ = 0;
+          oneofField_ = null;
+          onChanged();
+        }
+        return this;
+      }
+
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum oneof_enum = 119;</code>
+       * @return Whether the oneofEnum field is set.
+       */
+      @java.lang.Override
+      public boolean hasOneofEnum() {
+        return oneofFieldCase_ == 119;
+      }
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum oneof_enum = 119;</code>
+       * @return The oneofEnum.
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getOneofEnum() {
+        if (oneofFieldCase_ == 119) {
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(
+              (java.lang.Integer) oneofField_);
+          return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.FOO : result;
+        }
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.FOO;
+      }
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum oneof_enum = 119;</code>
+       * @param value The oneofEnum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOneofEnum(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        oneofFieldCase_ = 119;
+        oneofField_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum oneof_enum = 119;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOneofEnum() {
+        if (oneofFieldCase_ == 119) {
+          oneofFieldCase_ = 0;
+          oneofField_ = null;
+          onChanged();
+        }
+        return this;
+      }
+
+      // @@protoc_insertion_point(builder_scope:legacy_gencode_test.proto2.TestMostTypesProto2)
+    }
+
+    // @@protoc_insertion_point(class_scope:legacy_gencode_test.proto2.TestMostTypesProto2)
+    private static final legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2();
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<TestMostTypesProto2>
+        PARSER = new com.google.protobuf.AbstractParser<TestMostTypesProto2>() {
+      @java.lang.Override
+      public TestMostTypesProto2 parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (com.google.protobuf.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new com.google.protobuf.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
+      }
+    };
+
+    public static com.google.protobuf.Parser<TestMostTypesProto2> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<TestMostTypesProto2> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  public interface ForeignMessageOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:legacy_gencode_test.proto2.ForeignMessage)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>optional int32 c = 1;</code>
+     * @return Whether the c field is set.
+     */
+    boolean hasC();
+    /**
+     * <code>optional int32 c = 1;</code>
+     * @return The c.
+     */
+    int getC();
+  }
+  /**
+   * Protobuf type {@code legacy_gencode_test.proto2.ForeignMessage}
+   */
+  public static final class ForeignMessage extends
+      com.google.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:legacy_gencode_test.proto2.ForeignMessage)
+      ForeignMessageOrBuilder {
+  private static final long serialVersionUID = 0L;
+    static {
+      com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
+        com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+        /* major= */ 4,
+        /* minor= */ 26,
+        /* patch= */ 0,
+        /* suffix= */ "",
+        ForeignMessage.class.getName());
+    }
+    // Use ForeignMessage.newBuilder() to construct.
+    private ForeignMessage(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      super(builder);
+    }
+    private ForeignMessage() {
+    }
+
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_ForeignMessage_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_ForeignMessage_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.class, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder.class);
+    }
+
+    private int bitField0_;
+    public static final int C_FIELD_NUMBER = 1;
+    private int c_ = 0;
+    /**
+     * <code>optional int32 c = 1;</code>
+     * @return Whether the c field is set.
+     */
+    @java.lang.Override
+    public boolean hasC() {
+      return ((bitField0_ & 0x00000001) != 0);
+    }
+    /**
+     * <code>optional int32 c = 1;</code>
+     * @return The c.
+     */
+    @java.lang.Override
+    public int getC() {
+      return c_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (((bitField0_ & 0x00000001) != 0)) {
+        output.writeInt32(1, c_);
+      }
+      getUnknownFields().writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(1, c_);
+      }
+      size += getUnknownFields().getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage)) {
+        return super.equals(obj);
+      }
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage other = (legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage) obj;
+
+      if (hasC() != other.hasC()) return false;
+      if (hasC()) {
+        if (getC()
+            != other.getC()) return false;
+      }
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasC()) {
+        hash = (37 * hash) + C_FIELD_NUMBER;
+        hash = (53 * hash) + getC();
+      }
+      hash = (29 * hash) + getUnknownFields().hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code legacy_gencode_test.proto2.ForeignMessage}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:legacy_gencode_test.proto2.ForeignMessage)
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_ForeignMessage_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_ForeignMessage_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.class, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder.class);
+      }
+
+      // Construct using legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.newBuilder()
+      private Builder() {
+
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        super(parent);
+
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        bitField0_ = 0;
+        c_ = 0;
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_ForeignMessage_descriptor;
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getDefaultInstanceForType() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage build() {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage buildPartial() {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage result = new legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage result) {
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.c_ = c_;
+          to_bitField0_ |= 0x00000001;
+        }
+        result.bitField0_ |= to_bitField0_;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage) {
+          return mergeFrom((legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage other) {
+        if (other == legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.getDefaultInstance()) return this;
+        if (other.hasC()) {
+          setC(other.getC());
+        }
+        this.mergeUnknownFields(other.getUnknownFields());
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
+        try {
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                c_ = input.readInt32();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.unwrapIOException();
+        } finally {
+          onChanged();
+        } // finally
+        return this;
+      }
+      private int bitField0_;
+
+      private int c_ ;
+      /**
+       * <code>optional int32 c = 1;</code>
+       * @return Whether the c field is set.
+       */
+      @java.lang.Override
+      public boolean hasC() {
+        return ((bitField0_ & 0x00000001) != 0);
+      }
+      /**
+       * <code>optional int32 c = 1;</code>
+       * @return The c.
+       */
+      @java.lang.Override
+      public int getC() {
+        return c_;
+      }
+      /**
+       * <code>optional int32 c = 1;</code>
+       * @param value The c to set.
+       * @return This builder for chaining.
+       */
+      public Builder setC(int value) {
+
+        c_ = value;
+        bitField0_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional int32 c = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearC() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        c_ = 0;
+        onChanged();
+        return this;
+      }
+
+      // @@protoc_insertion_point(builder_scope:legacy_gencode_test.proto2.ForeignMessage)
+    }
+
+    // @@protoc_insertion_point(class_scope:legacy_gencode_test.proto2.ForeignMessage)
+    private static final legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage();
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<ForeignMessage>
+        PARSER = new com.google.protobuf.AbstractParser<ForeignMessage>() {
+      @java.lang.Override
+      public ForeignMessage parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (com.google.protobuf.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new com.google.protobuf.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
+      }
+    };
+
+    public static com.google.protobuf.Parser<ForeignMessage> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<ForeignMessage> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  public static final int EXTENSION_INT32_FIELD_NUMBER = 1001;
+  /**
+   * <code>extend .legacy_gencode_test.proto2.TestMostTypesProto2 { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2,
+      java.lang.Integer> extensionInt32 = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        java.lang.Integer.class,
+        null);
+  public static final int EXTENSION_MESSAGE_FIELD_NUMBER = 1002;
+  /**
+   * <code>extend .legacy_gencode_test.proto2.TestMostTypesProto2 { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2,
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> extensionMessage = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.class,
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.getDefaultInstance());
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMessage_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMessage_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_NestedTestMessage_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_NestedTestMessage_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_NestedMessage_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_NestedMessage_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32Int32Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32Int32Entry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt64Int64Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt64Int64Entry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint32Uint32Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint32Uint32Entry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint64Uint64Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint64Uint64Entry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint32Sint32Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint32Sint32Entry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint64Sint64Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint64Sint64Entry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed32Fixed32Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed32Fixed32Entry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed64Fixed64Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed64Fixed64Entry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed32Sfixed32Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed32Sfixed32Entry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed64Sfixed64Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed64Sfixed64Entry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32FloatEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32FloatEntry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32DoubleEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32DoubleEntry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapBoolBoolEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapBoolBoolEntry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringStringEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringStringEntry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringBytesEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringBytesEntry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedMessageEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedMessageEntry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignMessageEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignMessageEntry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedEnumEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedEnumEntry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignEnumEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignEnumEntry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_ForeignMessage_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_ForeignMessage_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\031proto2_gencode_test.proto\022\032legacy_genc" +
+      "ode_test.proto2\"R\n\013TestMessage\022\t\n\001x\030\002 \001(" +
+      "\t\0228\n\001y\030\003 \001(\0132-.legacy_gencode_test.proto" +
+      "2.NestedTestMessage\"\036\n\021NestedTestMessage" +
+      "\022\t\n\001z\030\001 \003(\005\"\2751\n\023TestMostTypesProto2\022\026\n\016o" +
+      "ptional_int32\030\001 \001(\005\022\026\n\016optional_int64\030\002 " +
+      "\001(\003\022\027\n\017optional_uint32\030\003 \001(\r\022\027\n\017optional" +
+      "_uint64\030\004 \001(\004\022\027\n\017optional_sint32\030\005 \001(\021\022\027" +
+      "\n\017optional_sint64\030\006 \001(\022\022\030\n\020optional_fixe" +
+      "d32\030\007 \001(\007\022\030\n\020optional_fixed64\030\010 \001(\006\022\031\n\021o" +
+      "ptional_sfixed32\030\t \001(\017\022\031\n\021optional_sfixe" +
+      "d64\030\n \001(\020\022\026\n\016optional_float\030\013 \001(\002\022\027\n\017opt" +
+      "ional_double\030\014 \001(\001\022\025\n\roptional_bool\030\r \001(" +
+      "\010\022\027\n\017optional_string\030\016 \001(\t\022\026\n\016optional_b" +
+      "ytes\030\017 \001(\014\022^\n\027optional_nested_message\030\022 " +
+      "\001(\0132=.legacy_gencode_test.proto2.TestMos" +
+      "tTypesProto2.NestedMessage\022L\n\030optional_f" +
+      "oreign_message\030\023 \001(\0132*.legacy_gencode_te" +
+      "st.proto2.ForeignMessage\022X\n\024optional_nes" +
+      "ted_enum\030\025 \001(\0162:.legacy_gencode_test.pro" +
+      "to2.TestMostTypesProto2.NestedEnum\022F\n\025op" +
+      "tional_foreign_enum\030\026 \001(\0162\'.legacy_genco" +
+      "de_test.proto2.ForeignEnum\022Z\n\025optional_a" +
+      "liased_enum\030\027 \001(\0162;.legacy_gencode_test." +
+      "proto2.TestMostTypesProto2.AliasedEnum\022J" +
+      "\n\021recursive_message\030\033 \001(\0132/.legacy_genco" +
+      "de_test.proto2.TestMostTypesProto2\022\026\n\016re" +
+      "peated_int32\030\037 \003(\005\022\026\n\016repeated_int64\030  \003" +
+      "(\003\022\027\n\017repeated_uint32\030! \003(\r\022\027\n\017repeated_" +
+      "uint64\030\" \003(\004\022\027\n\017repeated_sint32\030# \003(\021\022\027\n" +
+      "\017repeated_sint64\030$ \003(\022\022\030\n\020repeated_fixed" +
+      "32\030% \003(\007\022\030\n\020repeated_fixed64\030& \003(\006\022\031\n\021re" +
+      "peated_sfixed32\030\' \003(\017\022\031\n\021repeated_sfixed" +
+      "64\030( \003(\020\022\026\n\016repeated_float\030) \003(\002\022\027\n\017repe" +
+      "ated_double\030* \003(\001\022\025\n\rrepeated_bool\030+ \003(\010" +
+      "\022\027\n\017repeated_string\030, \003(\t\022\026\n\016repeated_by" +
+      "tes\030- \003(\014\022^\n\027repeated_nested_message\0300 \003" +
+      "(\0132=.legacy_gencode_test.proto2.TestMost" +
+      "TypesProto2.NestedMessage\022L\n\030repeated_fo" +
+      "reign_message\0301 \003(\0132*.legacy_gencode_tes" +
+      "t.proto2.ForeignMessage\022X\n\024repeated_nest" +
+      "ed_enum\0303 \003(\0162:.legacy_gencode_test.prot" +
+      "o2.TestMostTypesProto2.NestedEnum\022F\n\025rep" +
+      "eated_foreign_enum\0304 \003(\0162\'.legacy_gencod" +
+      "e_test.proto2.ForeignEnum\022\030\n\014packed_int3" +
+      "2\030K \003(\005B\002\020\001\022\030\n\014packed_int64\030L \003(\003B\002\020\001\022\031\n" +
+      "\rpacked_uint32\030M \003(\rB\002\020\001\022\031\n\rpacked_uint6" +
+      "4\030N \003(\004B\002\020\001\022\031\n\rpacked_sint32\030O \003(\021B\002\020\001\022\031" +
+      "\n\rpacked_sint64\030P \003(\022B\002\020\001\022\032\n\016packed_fixe" +
+      "d32\030Q \003(\007B\002\020\001\022\032\n\016packed_fixed64\030R \003(\006B\002\020" +
+      "\001\022\033\n\017packed_sfixed32\030S \003(\017B\002\020\001\022\033\n\017packed" +
+      "_sfixed64\030T \003(\020B\002\020\001\022\030\n\014packed_float\030U \003(" +
+      "\002B\002\020\001\022\031\n\rpacked_double\030V \003(\001B\002\020\001\022\027\n\013pack" +
+      "ed_bool\030W \003(\010B\002\020\001\022Z\n\022packed_nested_enum\030" +
+      "X \003(\0162:.legacy_gencode_test.proto2.TestM" +
+      "ostTypesProto2.NestedEnumB\002\020\001\022\032\n\016unpacke" +
+      "d_int32\030Y \003(\005B\002\020\000\022\032\n\016unpacked_int64\030Z \003(" +
+      "\003B\002\020\000\022\033\n\017unpacked_uint32\030[ \003(\rB\002\020\000\022\033\n\017un" +
+      "packed_uint64\030\\ \003(\004B\002\020\000\022\033\n\017unpacked_sint" +
+      "32\030] \003(\021B\002\020\000\022\033\n\017unpacked_sint64\030^ \003(\022B\002\020" +
+      "\000\022\034\n\020unpacked_fixed32\030_ \003(\007B\002\020\000\022\034\n\020unpac" +
+      "ked_fixed64\030` \003(\006B\002\020\000\022\035\n\021unpacked_sfixed" +
+      "32\030a \003(\017B\002\020\000\022\035\n\021unpacked_sfixed64\030b \003(\020B" +
+      "\002\020\000\022\032\n\016unpacked_float\030c \003(\002B\002\020\000\022\033\n\017unpac" +
+      "ked_double\030d \003(\001B\002\020\000\022\031\n\runpacked_bool\030e " +
+      "\003(\010B\002\020\000\022\\\n\024unpacked_nested_enum\030f \003(\0162:." +
+      "legacy_gencode_test.proto2.TestMostTypes" +
+      "Proto2.NestedEnumB\002\020\000\022[\n\017map_int32_int32" +
+      "\0308 \003(\0132B.legacy_gencode_test.proto2.Test" +
+      "MostTypesProto2.MapInt32Int32Entry\022[\n\017ma" +
+      "p_int64_int64\0309 \003(\0132B.legacy_gencode_tes" +
+      "t.proto2.TestMostTypesProto2.MapInt64Int" +
+      "64Entry\022_\n\021map_uint32_uint32\030: \003(\0132D.leg" +
+      "acy_gencode_test.proto2.TestMostTypesPro" +
+      "to2.MapUint32Uint32Entry\022_\n\021map_uint64_u" +
+      "int64\030; \003(\0132D.legacy_gencode_test.proto2" +
+      ".TestMostTypesProto2.MapUint64Uint64Entr" +
+      "y\022_\n\021map_sint32_sint32\030< \003(\0132D.legacy_ge" +
+      "ncode_test.proto2.TestMostTypesProto2.Ma" +
+      "pSint32Sint32Entry\022_\n\021map_sint64_sint64\030" +
+      "= \003(\0132D.legacy_gencode_test.proto2.TestM" +
+      "ostTypesProto2.MapSint64Sint64Entry\022c\n\023m" +
+      "ap_fixed32_fixed32\030> \003(\0132F.legacy_gencod" +
+      "e_test.proto2.TestMostTypesProto2.MapFix" +
+      "ed32Fixed32Entry\022c\n\023map_fixed64_fixed64\030" +
+      "? \003(\0132F.legacy_gencode_test.proto2.TestM" +
+      "ostTypesProto2.MapFixed64Fixed64Entry\022g\n" +
+      "\025map_sfixed32_sfixed32\030@ \003(\0132H.legacy_ge" +
+      "ncode_test.proto2.TestMostTypesProto2.Ma" +
+      "pSfixed32Sfixed32Entry\022g\n\025map_sfixed64_s" +
+      "fixed64\030A \003(\0132H.legacy_gencode_test.prot" +
+      "o2.TestMostTypesProto2.MapSfixed64Sfixed" +
+      "64Entry\022[\n\017map_int32_float\030B \003(\0132B.legac" +
+      "y_gencode_test.proto2.TestMostTypesProto" +
+      "2.MapInt32FloatEntry\022]\n\020map_int32_double" +
+      "\030C \003(\0132C.legacy_gencode_test.proto2.Test" +
+      "MostTypesProto2.MapInt32DoubleEntry\022W\n\rm" +
+      "ap_bool_bool\030D \003(\0132@.legacy_gencode_test" +
+      ".proto2.TestMostTypesProto2.MapBoolBoolE" +
+      "ntry\022_\n\021map_string_string\030E \003(\0132D.legacy" +
+      "_gencode_test.proto2.TestMostTypesProto2" +
+      ".MapStringStringEntry\022]\n\020map_string_byte" +
+      "s\030F \003(\0132C.legacy_gencode_test.proto2.Tes" +
+      "tMostTypesProto2.MapStringBytesEntry\022n\n\031" +
+      "map_string_nested_message\030G \003(\0132K.legacy" +
+      "_gencode_test.proto2.TestMostTypesProto2" +
+      ".MapStringNestedMessageEntry\022p\n\032map_stri" +
+      "ng_foreign_message\030H \003(\0132L.legacy_gencod" +
+      "e_test.proto2.TestMostTypesProto2.MapStr" +
+      "ingForeignMessageEntry\022h\n\026map_string_nes" +
+      "ted_enum\030I \003(\0132H.legacy_gencode_test.pro" +
+      "to2.TestMostTypesProto2.MapStringNestedE" +
+      "numEntry\022j\n\027map_string_foreign_enum\030J \003(" +
+      "\0132I.legacy_gencode_test.proto2.TestMostT" +
+      "ypesProto2.MapStringForeignEnumEntry\022\026\n\014" +
+      "oneof_uint32\030o \001(\rH\000\022]\n\024oneof_nested_mes" +
+      "sage\030p \001(\0132=.legacy_gencode_test.proto2." +
+      "TestMostTypesProto2.NestedMessageH\000\022\026\n\014o" +
+      "neof_string\030q \001(\tH\000\022\025\n\013oneof_bytes\030r \001(\014" +
+      "H\000\022\024\n\noneof_bool\030s \001(\010H\000\022\026\n\014oneof_uint64" +
+      "\030t \001(\004H\000\022\025\n\013oneof_float\030u \001(\002H\000\022\026\n\014oneof" +
+      "_double\030v \001(\001H\000\022P\n\noneof_enum\030w \001(\0162:.le" +
+      "gacy_gencode_test.proto2.TestMostTypesPr" +
+      "oto2.NestedEnumH\000\032`\n\rNestedMessage\022\t\n\001a\030" +
+      "\001 \001(\005\022D\n\013corecursive\030\002 \001(\0132/.legacy_genc" +
+      "ode_test.proto2.TestMostTypesProto2\0324\n\022M" +
+      "apInt32Int32Entry\022\013\n\003key\030\001 \001(\005\022\r\n\005value\030" +
+      "\002 \001(\005:\0028\001\0324\n\022MapInt64Int64Entry\022\013\n\003key\030\001" +
+      " \001(\003\022\r\n\005value\030\002 \001(\003:\0028\001\0326\n\024MapUint32Uint" +
+      "32Entry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001\032" +
+      "6\n\024MapUint64Uint64Entry\022\013\n\003key\030\001 \001(\004\022\r\n\005" +
+      "value\030\002 \001(\004:\0028\001\0326\n\024MapSint32Sint32Entry\022" +
+      "\013\n\003key\030\001 \001(\021\022\r\n\005value\030\002 \001(\021:\0028\001\0326\n\024MapSi" +
+      "nt64Sint64Entry\022\013\n\003key\030\001 \001(\022\022\r\n\005value\030\002 " +
+      "\001(\022:\0028\001\0328\n\026MapFixed32Fixed32Entry\022\013\n\003key" +
+      "\030\001 \001(\007\022\r\n\005value\030\002 \001(\007:\0028\001\0328\n\026MapFixed64F" +
+      "ixed64Entry\022\013\n\003key\030\001 \001(\006\022\r\n\005value\030\002 \001(\006:" +
+      "\0028\001\032:\n\030MapSfixed32Sfixed32Entry\022\013\n\003key\030\001" +
+      " \001(\017\022\r\n\005value\030\002 \001(\017:\0028\001\032:\n\030MapSfixed64Sf" +
+      "ixed64Entry\022\013\n\003key\030\001 \001(\020\022\r\n\005value\030\002 \001(\020:" +
+      "\0028\001\0324\n\022MapInt32FloatEntry\022\013\n\003key\030\001 \001(\005\022\r" +
+      "\n\005value\030\002 \001(\002:\0028\001\0325\n\023MapInt32DoubleEntry" +
+      "\022\013\n\003key\030\001 \001(\005\022\r\n\005value\030\002 \001(\001:\0028\001\0322\n\020MapB" +
+      "oolBoolEntry\022\013\n\003key\030\001 \001(\010\022\r\n\005value\030\002 \001(\010" +
+      ":\0028\001\0326\n\024MapStringStringEntry\022\013\n\003key\030\001 \001(" +
+      "\t\022\r\n\005value\030\002 \001(\t:\0028\001\0325\n\023MapStringBytesEn" +
+      "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\014:\0028\001\032|\n\033M" +
+      "apStringNestedMessageEntry\022\013\n\003key\030\001 \001(\t\022" +
+      "L\n\005value\030\002 \001(\0132=.legacy_gencode_test.pro" +
+      "to2.TestMostTypesProto2.NestedMessage:\0028" +
+      "\001\032j\n\034MapStringForeignMessageEntry\022\013\n\003key" +
+      "\030\001 \001(\t\0229\n\005value\030\002 \001(\0132*.legacy_gencode_t" +
+      "est.proto2.ForeignMessage:\0028\001\032v\n\030MapStri" +
+      "ngNestedEnumEntry\022\013\n\003key\030\001 \001(\t\022I\n\005value\030" +
+      "\002 \001(\0162:.legacy_gencode_test.proto2.TestM" +
+      "ostTypesProto2.NestedEnum:\0028\001\032d\n\031MapStri" +
+      "ngForeignEnumEntry\022\013\n\003key\030\001 \001(\t\0226\n\005value" +
+      "\030\002 \001(\0162\'.legacy_gencode_test.proto2.Fore" +
+      "ignEnum:\0028\001\"9\n\nNestedEnum\022\007\n\003FOO\020\000\022\007\n\003BA" +
+      "R\020\001\022\007\n\003BAZ\020\002\022\020\n\003NEG\020\377\377\377\377\377\377\377\377\377\001\"Y\n\013Aliase" +
+      "dEnum\022\r\n\tALIAS_FOO\020\000\022\r\n\tALIAS_BAR\020\001\022\r\n\tA" +
+      "LIAS_BAZ\020\002\022\007\n\003MOO\020\002\022\007\n\003moo\020\002\022\007\n\003bAz\020\002\032\002\020" +
+      "\001*\t\010\350\007\020\200\200\200\200\002B\r\n\013oneof_field\"\033\n\016ForeignMe" +
+      "ssage\022\t\n\001c\030\001 \001(\005*@\n\013ForeignEnum\022\017\n\013FOREI" +
+      "GN_FOO\020\000\022\017\n\013FOREIGN_BAR\020\001\022\017\n\013FOREIGN_BAZ" +
+      "\020\002:I\n\017extension_int32\022/.legacy_gencode_t" +
+      "est.proto2.TestMostTypesProto2\030\351\007 \001(\005:w\n" +
+      "\021extension_message\022/.legacy_gencode_test" +
+      ".proto2.TestMostTypesProto2\030\352\007 \001(\0132*.leg" +
+      "acy_gencode_test.proto2.ForeignMessageB\030" +
+      "B\026Proto2GencodeTestProto"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_legacy_gencode_test_proto2_TestMessage_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_legacy_gencode_test_proto2_TestMessage_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMessage_descriptor,
+        new java.lang.String[] { "X", "Y", });
+    internal_static_legacy_gencode_test_proto2_NestedTestMessage_descriptor =
+      getDescriptor().getMessageTypes().get(1);
+    internal_static_legacy_gencode_test_proto2_NestedTestMessage_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_NestedTestMessage_descriptor,
+        new java.lang.String[] { "Z", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor =
+      getDescriptor().getMessageTypes().get(2);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor,
+        new java.lang.String[] { "OptionalInt32", "OptionalInt64", "OptionalUint32", "OptionalUint64", "OptionalSint32", "OptionalSint64", "OptionalFixed32", "OptionalFixed64", "OptionalSfixed32", "OptionalSfixed64", "OptionalFloat", "OptionalDouble", "OptionalBool", "OptionalString", "OptionalBytes", "OptionalNestedMessage", "OptionalForeignMessage", "OptionalNestedEnum", "OptionalForeignEnum", "OptionalAliasedEnum", "RecursiveMessage", "RepeatedInt32", "RepeatedInt64", "RepeatedUint32", "RepeatedUint64", "RepeatedSint32", "RepeatedSint64", "RepeatedFixed32", "RepeatedFixed64", "RepeatedSfixed32", "RepeatedSfixed64", "RepeatedFloat", "RepeatedDouble", "RepeatedBool", "RepeatedString", "RepeatedBytes", "RepeatedNestedMessage", "RepeatedForeignMessage", "RepeatedNestedEnum", "RepeatedForeignEnum", "PackedInt32", "PackedInt64", "PackedUint32", "PackedUint64", "PackedSint32", "PackedSint64", "PackedFixed32", "PackedFixed64", "PackedSfixed32", "PackedSfixed64", "PackedFloat", "PackedDouble", "PackedBool", "PackedNestedEnum", "UnpackedInt32", "UnpackedInt64", "UnpackedUint32", "UnpackedUint64", "UnpackedSint32", "UnpackedSint64", "UnpackedFixed32", "UnpackedFixed64", "UnpackedSfixed32", "UnpackedSfixed64", "UnpackedFloat", "UnpackedDouble", "UnpackedBool", "UnpackedNestedEnum", "MapInt32Int32", "MapInt64Int64", "MapUint32Uint32", "MapUint64Uint64", "MapSint32Sint32", "MapSint64Sint64", "MapFixed32Fixed32", "MapFixed64Fixed64", "MapSfixed32Sfixed32", "MapSfixed64Sfixed64", "MapInt32Float", "MapInt32Double", "MapBoolBool", "MapStringString", "MapStringBytes", "MapStringNestedMessage", "MapStringForeignMessage", "MapStringNestedEnum", "MapStringForeignEnum", "OneofUint32", "OneofNestedMessage", "OneofString", "OneofBytes", "OneofBool", "OneofUint64", "OneofFloat", "OneofDouble", "OneofEnum", "OneofField", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_NestedMessage_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(0);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_NestedMessage_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_NestedMessage_descriptor,
+        new java.lang.String[] { "A", "Corecursive", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32Int32Entry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(1);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32Int32Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32Int32Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt64Int64Entry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(2);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt64Int64Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt64Int64Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint32Uint32Entry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(3);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint32Uint32Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint32Uint32Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint64Uint64Entry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(4);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint64Uint64Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint64Uint64Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint32Sint32Entry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(5);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint32Sint32Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint32Sint32Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint64Sint64Entry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(6);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint64Sint64Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint64Sint64Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed32Fixed32Entry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(7);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed32Fixed32Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed32Fixed32Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed64Fixed64Entry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(8);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed64Fixed64Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed64Fixed64Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed32Sfixed32Entry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(9);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed32Sfixed32Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed32Sfixed32Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed64Sfixed64Entry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(10);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed64Sfixed64Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed64Sfixed64Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32FloatEntry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(11);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32FloatEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32FloatEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32DoubleEntry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(12);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32DoubleEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32DoubleEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapBoolBoolEntry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(13);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapBoolBoolEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapBoolBoolEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringStringEntry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(14);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringStringEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringStringEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringBytesEntry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(15);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringBytesEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringBytesEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedMessageEntry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(16);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedMessageEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedMessageEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignMessageEntry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(17);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignMessageEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignMessageEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedEnumEntry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(18);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedEnumEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedEnumEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignEnumEntry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(19);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignEnumEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignEnumEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_ForeignMessage_descriptor =
+      getDescriptor().getMessageTypes().get(3);
+    internal_static_legacy_gencode_test_proto2_ForeignMessage_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_ForeignMessage_descriptor,
+        new java.lang.String[] { "C", });
+    extensionInt32.internalInit(descriptor.getExtensions().get(0));
+    extensionMessage.internalInit(descriptor.getExtensions().get(1));
+    descriptor.resolveAllFeaturesImmutable();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/compatibility/smoke/v26.0/legacy_gencode_test/proto3/Proto3GencodeTestProto.java b/compatibility/smoke/v26.0/legacy_gencode_test/proto3/Proto3GencodeTestProto.java
index b8d4e1ee516e2..63364f393dfaa 100644
--- a/compatibility/smoke/v26.0/legacy_gencode_test/proto3/Proto3GencodeTestProto.java
+++ b/compatibility/smoke/v26.0/legacy_gencode_test/proto3/Proto3GencodeTestProto.java
@@ -8,50 +8,65 @@ public final class Proto3GencodeTestProto {
   private Proto3GencodeTestProto() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
-        com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
-        /* major= */ 4,
-        /* minor= */ 26,
-        /* patch= */ 0,
-        /* suffix= */ "",
-        Proto3GencodeTestProto.class.getName());
+      com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+      /* major= */ 4,
+      /* minor= */ 26,
+      /* patch= */ 0,
+      /* suffix= */ "",
+      Proto3GencodeTestProto.class.getName());
   }
-
-  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {}
-
-  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
   }
 
-  /** Protobuf enum {@code legacy_gencode_test.proto3.ForeignEnum} */
-  public enum ForeignEnum implements com.google.protobuf.ProtocolMessageEnum {
-    /** <code>FOREIGN_FOO = 0;</code> */
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  /**
+   * Protobuf enum {@code legacy_gencode_test.proto3.ForeignEnum}
+   */
+  public enum ForeignEnum
+      implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     * <code>FOREIGN_FOO = 0;</code>
+     */
     FOREIGN_FOO(0),
-    /** <code>FOREIGN_BAR = 1;</code> */
+    /**
+     * <code>FOREIGN_BAR = 1;</code>
+     */
     FOREIGN_BAR(1),
-    /** <code>FOREIGN_BAZ = 2;</code> */
+    /**
+     * <code>FOREIGN_BAZ = 2;</code>
+     */
     FOREIGN_BAZ(2),
     UNRECOGNIZED(-1),
     ;
 
     static {
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
-          com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
-          /* major= */ 4,
-          /* minor= */ 26,
-          /* patch= */ 0,
-          /* suffix= */ "",
-          ForeignEnum.class.getName());
+        com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+        /* major= */ 4,
+        /* minor= */ 26,
+        /* patch= */ 0,
+        /* suffix= */ "",
+        ForeignEnum.class.getName());
     }
-
-    /** <code>FOREIGN_FOO = 0;</code> */
+    /**
+     * <code>FOREIGN_FOO = 0;</code>
+     */
     public static final int FOREIGN_FOO_VALUE = 0;
-
-    /** <code>FOREIGN_BAR = 1;</code> */
+    /**
+     * <code>FOREIGN_BAR = 1;</code>
+     */
     public static final int FOREIGN_BAR_VALUE = 1;
-
-    /** <code>FOREIGN_BAZ = 2;</code> */
+    /**
+     * <code>FOREIGN_BAZ = 2;</code>
+     */
     public static final int FOREIGN_BAZ_VALUE = 2;
 
+
     public final int getNumber() {
       if (this == UNRECOGNIZED) {
         throw new java.lang.IllegalArgumentException(
@@ -76,51 +91,49 @@ public static ForeignEnum valueOf(int value) {
      */
     public static ForeignEnum forNumber(int value) {
       switch (value) {
-        case 0:
-          return FOREIGN_FOO;
-        case 1:
-          return FOREIGN_BAR;
-        case 2:
-          return FOREIGN_BAZ;
-        default:
-          return null;
+        case 0: return FOREIGN_FOO;
+        case 1: return FOREIGN_BAR;
+        case 2: return FOREIGN_BAZ;
+        default: return null;
       }
     }
 
-    public static com.google.protobuf.Internal.EnumLiteMap<ForeignEnum> internalGetValueMap() {
+    public static com.google.protobuf.Internal.EnumLiteMap<ForeignEnum>
+        internalGetValueMap() {
       return internalValueMap;
     }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        ForeignEnum> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap<ForeignEnum>() {
+            public ForeignEnum findValueByNumber(int number) {
+              return ForeignEnum.forNumber(number);
+            }
+          };
 
-    private static final com.google.protobuf.Internal.EnumLiteMap<ForeignEnum> internalValueMap =
-        new com.google.protobuf.Internal.EnumLiteMap<ForeignEnum>() {
-          public ForeignEnum findValueByNumber(int number) {
-            return ForeignEnum.forNumber(number);
-          }
-        };
-
-    public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
       if (this == UNRECOGNIZED) {
         throw new java.lang.IllegalStateException(
             "Can't get the descriptor of an unrecognized enum value.");
       }
       return getDescriptor().getValues().get(ordinal());
     }
-
-    public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
       return getDescriptor();
     }
-
-    public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
-      return legacy_gencode_test.proto3.Proto3GencodeTestProto.getDescriptor()
-          .getEnumTypes()
-          .get(0);
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
+      return legacy_gencode_test.proto3.Proto3GencodeTestProto.getDescriptor().getEnumTypes().get(0);
     }
 
     private static final ForeignEnum[] VALUES = values();
 
-    public static ForeignEnum valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+    public static ForeignEnum valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
       if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
       }
       if (desc.getIndex() == -1) {
         return UNRECOGNIZED;
@@ -137,8 +150,7 @@ private ForeignEnum(int value) {
     // @@protoc_insertion_point(enum_scope:legacy_gencode_test.proto3.ForeignEnum)
   }
 
-  public interface TestMessageOrBuilder
-      extends
+  public interface TestMessageOrBuilder extends
       // @@protoc_insertion_point(interface_extends:legacy_gencode_test.proto3.TestMessage)
       com.google.protobuf.MessageOrBuilder {
 
@@ -147,13 +159,12 @@ public interface TestMessageOrBuilder
      * @return The x.
      */
     java.lang.String getX();
-
     /**
      * <code>string x = 2;</code>
-     *
      * @return The bytes for x.
      */
-    com.google.protobuf.ByteString getXBytes();
+    com.google.protobuf.ByteString
+        getXBytes();
 
     /**
      * <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code>
@@ -165,26 +176,27 @@ public interface TestMessageOrBuilder
      * @return The y.
      */
     legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage getY();
-
-    /** <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code> */
+    /**
+     * <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code>
+     */
     legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder getYOrBuilder();
   }
-
-  /** Protobuf type {@code legacy_gencode_test.proto3.TestMessage} */
-  public static final class TestMessage extends com.google.protobuf.GeneratedMessage
-      implements
+  /**
+   * Protobuf type {@code legacy_gencode_test.proto3.TestMessage}
+   */
+  public static final class TestMessage extends
+      com.google.protobuf.GeneratedMessage implements
       // @@protoc_insertion_point(message_implements:legacy_gencode_test.proto3.TestMessage)
       TestMessageOrBuilder {
-    private static final long serialVersionUID = 0L;
-
+  private static final long serialVersionUID = 0L;
     static {
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
-          com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
-          /* major= */ 4,
-          /* minor= */ 26,
-          /* patch= */ 0,
-          /* suffix= */ "",
-          TestMessage.class.getName());
+        com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+        /* major= */ 4,
+        /* minor= */ 26,
+        /* patch= */ 0,
+        /* suffix= */ "",
+        TestMessage.class.getName());
     }
     // Use TestMessage.newBuilder() to construct.
     private TestMessage(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
@@ -194,19 +206,17 @@ private TestMessage() {
       x_ = "";
     }
 
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return legacy_gencode_test.proto3.Proto3GencodeTestProto
-          .internal_static_legacy_gencode_test_proto3_TestMessage_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMessage_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return legacy_gencode_test.proto3.Proto3GencodeTestProto
-          .internal_static_legacy_gencode_test_proto3_TestMessage_fieldAccessorTable
+      return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMessage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.class,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.Builder.class);
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.class, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.Builder.class);
     }
 
     private int bitField0_;
@@ -223,24 +233,25 @@ public java.lang.String getX() {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         x_ = s;
         return s;
       }
     }
-
     /**
      * <code>string x = 2;</code>
-     *
      * @return The bytes for x.
      */
     @java.lang.Override
-    public com.google.protobuf.ByteString getXBytes() {
+    public com.google.protobuf.ByteString
+        getXBytes() {
       java.lang.Object ref = x_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
         x_ = b;
         return b;
       } else {
@@ -264,18 +275,14 @@ public boolean hasY() {
      */
     @java.lang.Override
     public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage getY() {
-      return y_ == null
-          ? legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.getDefaultInstance()
-          : y_;
+      return y_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.getDefaultInstance() : y_;
     }
-
-    /** <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code> */
+    /**
+     * <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code>
+     */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder
-        getYOrBuilder() {
-      return y_ == null
-          ? legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.getDefaultInstance()
-          : y_;
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder getYOrBuilder() {
+      return y_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.getDefaultInstance() : y_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -290,7 +297,8 @@ public final boolean isInitialized() {
     }
 
     @java.lang.Override
-    public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
       if (!com.google.protobuf.GeneratedMessage.isStringEmpty(x_)) {
         com.google.protobuf.GeneratedMessage.writeString(output, 2, x_);
       }
@@ -310,7 +318,8 @@ public int getSerializedSize() {
         size += com.google.protobuf.GeneratedMessage.computeStringSize(2, x_);
       }
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getY());
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(3, getY());
       }
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
@@ -320,18 +329,19 @@ public int getSerializedSize() {
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
-        return true;
+       return true;
       }
       if (!(obj instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage)) {
         return super.equals(obj);
       }
-      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage other =
-          (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage) obj;
+      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage other = (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage) obj;
 
-      if (!getX().equals(other.getX())) return false;
+      if (!getX()
+          .equals(other.getX())) return false;
       if (hasY() != other.hasY()) return false;
       if (hasY()) {
-        if (!getY().equals(other.getY())) return false;
+        if (!getY()
+            .equals(other.getY())) return false;
       }
       if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
@@ -356,12 +366,13 @@ public int hashCode() {
     }
 
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseFrom(
-        java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseFrom(
-        java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
@@ -376,96 +387,94 @@ public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage pars
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseFrom(
-        byte[] data) throws com.google.protobuf.InvalidProtocolBufferException {
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseFrom(
-        byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseFrom(
-        java.io.InputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input);
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseFrom(
-        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseDelimitedFrom(
-        java.io.InputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseDelimitedWithIOException(PARSER, input);
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseDelimitedWithIOException(PARSER, input);
     }
 
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseDelimitedFrom(
-        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseDelimitedWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessage
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseFrom(
-        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input);
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input);
     }
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
     @java.lang.Override
-    public Builder newBuilderForType() {
-      return newBuilder();
-    }
-
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-
-    public static Builder newBuilder(
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage prototype) {
+    public static Builder newBuilder(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
     public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
 
     @java.lang.Override
-    protected Builder newBuilderForType(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
-
-    /** Protobuf type {@code legacy_gencode_test.proto3.TestMessage} */
-    public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder<Builder>
-        implements
+    /**
+     * Protobuf type {@code legacy_gencode_test.proto3.TestMessage}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:legacy_gencode_test.proto3.TestMessage)
         legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessageOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_TestMessage_descriptor;
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMessage_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_TestMessage_fieldAccessorTable
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.class,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.Builder.class);
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.class, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.Builder.class);
       }
 
       // Construct using legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.newBuilder()
@@ -473,12 +482,14 @@ private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessage
+                .alwaysUseFieldBuilders) {
           getYFieldBuilder();
         }
       }
@@ -496,14 +507,13 @@ public Builder clear() {
       }
 
       @java.lang.Override
-      public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_TestMessage_descriptor;
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMessage_descriptor;
       }
 
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage
-          getDefaultInstanceForType() {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage getDefaultInstanceForType() {
         return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.getDefaultInstance();
       }
 
@@ -518,24 +528,22 @@ public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage build() {
 
       @java.lang.Override
       public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage buildPartial() {
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage result =
-            new legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage result = new legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage result) {
+      private void buildPartial0(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.x_ = x_;
         }
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.y_ = yBuilder_ == null ? y_ : yBuilder_.build();
+          result.y_ = yBuilder_ == null
+              ? y_
+              : yBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         result.bitField0_ |= to_bitField0_;
@@ -544,18 +552,15 @@ private void buildPartial0(
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage) {
-          return mergeFrom((legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage) other);
+          return mergeFrom((legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage other) {
-        if (other
-            == legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.getDefaultInstance())
-          return this;
+      public Builder mergeFrom(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage other) {
+        if (other == legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.getDefaultInstance()) return this;
         if (!other.getX().isEmpty()) {
           x_ = other.x_;
           bitField0_ |= 0x00000001;
@@ -590,25 +595,24 @@ public Builder mergeFrom(
               case 0:
                 done = true;
                 break;
-              case 18:
-                {
-                  x_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000001;
-                  break;
-                } // case 18
-              case 26:
-                {
-                  input.readMessage(getYFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000002;
-                  break;
-                } // case 26
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
+              case 18: {
+                x_ = input.readStringRequireUtf8();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 18
+              case 26: {
+                input.readMessage(
+                    getYFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 26
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
             } // switch (tag)
           } // while (!done)
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -628,7 +632,8 @@ public Builder mergeFrom(
       public java.lang.String getX() {
         java.lang.Object ref = x_;
         if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           x_ = s;
           return s;
@@ -636,34 +641,31 @@ public java.lang.String getX() {
           return (java.lang.String) ref;
         }
       }
-
       /**
        * <code>string x = 2;</code>
-       *
        * @return The bytes for x.
        */
-      public com.google.protobuf.ByteString getXBytes() {
+      public com.google.protobuf.ByteString
+          getXBytes() {
         java.lang.Object ref = x_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
-              com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
           x_ = b;
           return b;
         } else {
           return (com.google.protobuf.ByteString) ref;
         }
       }
-
       /**
        * <code>string x = 2;</code>
-       *
        * @param value The x to set.
        * @return This builder for chaining.
        */
-      public Builder setX(java.lang.String value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setX(
+          java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
         x_ = value;
         bitField0_ |= 0x00000001;
         onChanged();
@@ -679,17 +681,14 @@ public Builder clearX() {
         onChanged();
         return this;
       }
-
       /**
        * <code>string x = 2;</code>
-       *
        * @param value The bytes for x to set.
        * @return This builder for chaining.
        */
-      public Builder setXBytes(com.google.protobuf.ByteString value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setXBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
         checkByteStringIsUtf8(value);
         x_ = value;
         bitField0_ |= 0x00000001;
@@ -699,11 +698,7 @@ public Builder setXBytes(com.google.protobuf.ByteString value) {
 
       private legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage y_;
       private com.google.protobuf.SingleFieldBuilder<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder>
-          yBuilder_;
-
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder> yBuilder_;
       /**
        * <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code>
        * @return Whether the y field is set.
@@ -717,18 +712,15 @@ public boolean hasY() {
        */
       public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage getY() {
         if (yBuilder_ == null) {
-          return y_ == null
-              ? legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage
-                  .getDefaultInstance()
-              : y_;
+          return y_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.getDefaultInstance() : y_;
         } else {
           return yBuilder_.getMessage();
         }
       }
-
-      /** <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code> */
-      public Builder setY(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage value) {
+      /**
+       * <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code>
+       */
+      public Builder setY(legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage value) {
         if (yBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -741,11 +733,11 @@ public Builder setY(
         onChanged();
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code> */
+      /**
+       * <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code>
+       */
       public Builder setY(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder
-              builderForValue) {
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder builderForValue) {
         if (yBuilder_ == null) {
           y_ = builderForValue.build();
         } else {
@@ -755,16 +747,14 @@ public Builder setY(
         onChanged();
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code> */
-      public Builder mergeY(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage value) {
+      /**
+       * <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code>
+       */
+      public Builder mergeY(legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage value) {
         if (yBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) != 0)
-              && y_ != null
-              && y_
-                  != legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage
-                      .getDefaultInstance()) {
+          if (((bitField0_ & 0x00000002) != 0) &&
+            y_ != null &&
+            y_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.getDefaultInstance()) {
             getYBuilder().mergeFrom(value);
           } else {
             y_ = value;
@@ -778,8 +768,9 @@ public Builder mergeY(
         }
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code> */
+      /**
+       * <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code>
+       */
       public Builder clearY() {
         bitField0_ = (bitField0_ & ~0x00000002);
         y_ = null;
@@ -790,41 +781,37 @@ public Builder clearY() {
         onChanged();
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code> */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder
-          getYBuilder() {
+      /**
+       * <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code>
+       */
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder getYBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getYFieldBuilder().getBuilder();
       }
-
-      /** <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code> */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder
-          getYOrBuilder() {
+      /**
+       * <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code>
+       */
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder getYOrBuilder() {
         if (yBuilder_ != null) {
           return yBuilder_.getMessageOrBuilder();
         } else {
-          return y_ == null
-              ? legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage
-                  .getDefaultInstance()
-              : y_;
+          return y_ == null ?
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.getDefaultInstance() : y_;
         }
       }
-
-      /** <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code> */
+      /**
+       * <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code>
+       */
       private com.google.protobuf.SingleFieldBuilder<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder>
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder> 
           getYFieldBuilder() {
         if (yBuilder_ == null) {
-          yBuilder_ =
-              new com.google.protobuf.SingleFieldBuilder<
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder>(
-                  getY(), getParentForChildren(), isClean());
+          yBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder>(
+                  getY(),
+                  getParentForChildren(),
+                  isClean());
           y_ = null;
         }
         return yBuilder_;
@@ -834,40 +821,36 @@ public Builder clearY() {
     }
 
     // @@protoc_insertion_point(class_scope:legacy_gencode_test.proto3.TestMessage)
-    private static final legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage
-        DEFAULT_INSTANCE;
-
+    private static final legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage DEFAULT_INSTANCE;
     static {
       DEFAULT_INSTANCE = new legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage();
     }
 
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage
-        getDefaultInstance() {
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    private static final com.google.protobuf.Parser<TestMessage> PARSER =
-        new com.google.protobuf.AbstractParser<TestMessage>() {
-          @java.lang.Override
-          public TestMessage parsePartialFrom(
-              com.google.protobuf.CodedInputStream input,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
-          }
-        };
+    private static final com.google.protobuf.Parser<TestMessage>
+        PARSER = new com.google.protobuf.AbstractParser<TestMessage>() {
+      @java.lang.Override
+      public TestMessage parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (com.google.protobuf.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new com.google.protobuf.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
+      }
+    };
 
     public static com.google.protobuf.Parser<TestMessage> parser() {
       return PARSER;
@@ -879,15 +862,13 @@ public com.google.protobuf.Parser<TestMessage> getParserForType() {
     }
 
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage
-        getDefaultInstanceForType() {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
-  public interface NestedTestMessageOrBuilder
-      extends
+  public interface NestedTestMessageOrBuilder extends
       // @@protoc_insertion_point(interface_extends:legacy_gencode_test.proto3.NestedTestMessage)
       com.google.protobuf.MessageOrBuilder {
 
@@ -908,22 +889,22 @@ public interface NestedTestMessageOrBuilder
      */
     int getZ(int index);
   }
-
-  /** Protobuf type {@code legacy_gencode_test.proto3.NestedTestMessage} */
-  public static final class NestedTestMessage extends com.google.protobuf.GeneratedMessage
-      implements
+  /**
+   * Protobuf type {@code legacy_gencode_test.proto3.NestedTestMessage}
+   */
+  public static final class NestedTestMessage extends
+      com.google.protobuf.GeneratedMessage implements
       // @@protoc_insertion_point(message_implements:legacy_gencode_test.proto3.NestedTestMessage)
       NestedTestMessageOrBuilder {
-    private static final long serialVersionUID = 0L;
-
+  private static final long serialVersionUID = 0L;
     static {
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
-          com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
-          /* major= */ 4,
-          /* minor= */ 26,
-          /* patch= */ 0,
-          /* suffix= */ "",
-          NestedTestMessage.class.getName());
+        com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+        /* major= */ 4,
+        /* minor= */ 26,
+        /* patch= */ 0,
+        /* suffix= */ "",
+        NestedTestMessage.class.getName());
     }
     // Use NestedTestMessage.newBuilder() to construct.
     private NestedTestMessage(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
@@ -933,33 +914,30 @@ private NestedTestMessage() {
       z_ = emptyIntList();
     }
 
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return legacy_gencode_test.proto3.Proto3GencodeTestProto
-          .internal_static_legacy_gencode_test_proto3_NestedTestMessage_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_NestedTestMessage_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return legacy_gencode_test.proto3.Proto3GencodeTestProto
-          .internal_static_legacy_gencode_test_proto3_NestedTestMessage_fieldAccessorTable
+      return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_NestedTestMessage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.class,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder.class);
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.class, legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder.class);
     }
 
     public static final int Z_FIELD_NUMBER = 1;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList z_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList z_ =
+        emptyIntList();
     /**
      * <code>repeated int32 z = 1;</code>
-     *
      * @return A list containing the z.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getZList() {
+    public java.util.List<java.lang.Integer>
+        getZList() {
       return z_;
     }
     /**
@@ -991,7 +969,8 @@ public final boolean isInitialized() {
     }
 
     @java.lang.Override
-    public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
       getSerializedSize();
       if (getZList().size() > 0) {
         output.writeUInt32NoTag(10);
@@ -1012,12 +991,14 @@ public int getSerializedSize() {
       {
         int dataSize = 0;
         for (int i = 0; i < z_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(z_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt32SizeNoTag(z_.getInt(i));
         }
         size += dataSize;
         if (!getZList().isEmpty()) {
           size += 1;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         zMemoizedSerializedSize = dataSize;
       }
@@ -1029,15 +1010,15 @@ public int getSerializedSize() {
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
-        return true;
+       return true;
       }
       if (!(obj instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage)) {
         return super.equals(obj);
       }
-      legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage other =
-          (legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage) obj;
+      legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage other = (legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage) obj;
 
-      if (!getZList().equals(other.getZList())) return false;
+      if (!getZList()
+          .equals(other.getZList())) return false;
       if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
@@ -1059,12 +1040,13 @@ public int hashCode() {
     }
 
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseFrom(
-        java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseFrom(
-        java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
@@ -1079,104 +1061,103 @@ public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessag
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseFrom(
-        byte[] data) throws com.google.protobuf.InvalidProtocolBufferException {
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseFrom(
-        byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseFrom(
-        java.io.InputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input);
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseFrom(
-        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage
-        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseDelimitedWithIOException(PARSER, input);
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage
-        parseDelimitedFrom(
-            java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseDelimitedWithIOException(
-          PARSER, input, extensionRegistry);
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseFrom(
-        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input);
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input);
     }
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
     @java.lang.Override
-    public Builder newBuilderForType() {
-      return newBuilder();
-    }
-
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-
-    public static Builder newBuilder(
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage prototype) {
+    public static Builder newBuilder(legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
     public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
 
     @java.lang.Override
-    protected Builder newBuilderForType(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
-
-    /** Protobuf type {@code legacy_gencode_test.proto3.NestedTestMessage} */
-    public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder<Builder>
-        implements
+    /**
+     * Protobuf type {@code legacy_gencode_test.proto3.NestedTestMessage}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:legacy_gencode_test.proto3.NestedTestMessage)
         legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_NestedTestMessage_descriptor;
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_NestedTestMessage_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_NestedTestMessage_fieldAccessorTable
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_NestedTestMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.class,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder.class);
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.class, legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder.class);
       }
 
-      // Construct using
-      // legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.newBuilder()
-      private Builder() {}
+      // Construct using legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.newBuilder()
+      private Builder() {
+
+      }
 
-      private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
 
       }
@@ -1189,16 +1170,14 @@ public Builder clear() {
       }
 
       @java.lang.Override
-      public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_NestedTestMessage_descriptor;
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_NestedTestMessage_descriptor;
       }
 
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage
-          getDefaultInstanceForType() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage
-            .getDefaultInstance();
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage getDefaultInstanceForType() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.getDefaultInstance();
       }
 
       @java.lang.Override
@@ -1212,17 +1191,13 @@ public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage build
 
       @java.lang.Override
       public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage buildPartial() {
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage result =
-            new legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage result = new legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage result) {
+      private void buildPartial0(legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           z_.makeImmutable();
@@ -1233,19 +1208,15 @@ private void buildPartial0(
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage) {
-          return mergeFrom(
-              (legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage) other);
+          return mergeFrom((legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage other) {
-        if (other
-            == legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage
-                .getDefaultInstance()) return this;
+      public Builder mergeFrom(legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage other) {
+        if (other == legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.getDefaultInstance()) return this;
         if (!other.z_.isEmpty()) {
           if (z_.isEmpty()) {
             z_ = other.z_;
@@ -1283,31 +1254,28 @@ public Builder mergeFrom(
               case 0:
                 done = true;
                 break;
-              case 8:
-                {
-                  int v = input.readInt32();
-                  ensureZIsMutable();
-                  z_.addInt(v);
-                  break;
-                } // case 8
-              case 10:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureZIsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    z_.addInt(input.readInt32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 10
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
+              case 8: {
+                int v = input.readInt32();
+                ensureZIsMutable();
+                z_.addInt(v);
+                break;
+              } // case 8
+              case 10: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureZIsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  z_.addInt(input.readInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
             } // switch (tag)
           } // while (!done)
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1326,13 +1294,12 @@ private void ensureZIsMutable() {
         }
         bitField0_ |= 0x00000001;
       }
-
       /**
        * <code>repeated int32 z = 1;</code>
-       *
        * @return A list containing the z.
        */
-      public java.util.List<java.lang.Integer> getZList() {
+      public java.util.List<java.lang.Integer>
+          getZList() {
         z_.makeImmutable();
         return z_;
       }
@@ -1351,15 +1318,14 @@ public int getZCount() {
       public int getZ(int index) {
         return z_.getInt(index);
       }
-
       /**
        * <code>repeated int32 z = 1;</code>
-       *
        * @param index The index to set the value at.
        * @param value The z to set.
        * @return This builder for chaining.
        */
-      public Builder setZ(int index, int value) {
+      public Builder setZ(
+          int index, int value) {
 
         ensureZIsMutable();
         z_.setInt(index, value);
@@ -1380,16 +1346,16 @@ public Builder addZ(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated int32 z = 1;</code>
-       *
        * @param values The z to add.
        * @return This builder for chaining.
        */
-      public Builder addAllZ(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllZ(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureZIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, z_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, z_);
         bitField0_ |= 0x00000001;
         onChanged();
         return this;
@@ -1409,40 +1375,36 @@ public Builder clearZ() {
     }
 
     // @@protoc_insertion_point(class_scope:legacy_gencode_test.proto3.NestedTestMessage)
-    private static final legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage
-        DEFAULT_INSTANCE;
-
+    private static final legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage DEFAULT_INSTANCE;
     static {
       DEFAULT_INSTANCE = new legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage();
     }
 
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage
-        getDefaultInstance() {
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    private static final com.google.protobuf.Parser<NestedTestMessage> PARSER =
-        new com.google.protobuf.AbstractParser<NestedTestMessage>() {
-          @java.lang.Override
-          public NestedTestMessage parsePartialFrom(
-              com.google.protobuf.CodedInputStream input,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
-          }
-        };
+    private static final com.google.protobuf.Parser<NestedTestMessage>
+        PARSER = new com.google.protobuf.AbstractParser<NestedTestMessage>() {
+      @java.lang.Override
+      public NestedTestMessage parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (com.google.protobuf.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new com.google.protobuf.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
+      }
+    };
 
     public static com.google.protobuf.Parser<NestedTestMessage> parser() {
       return PARSER;
@@ -1454,275 +1416,214 @@ public com.google.protobuf.Parser<NestedTestMessage> getParserForType() {
     }
 
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage
-        getDefaultInstanceForType() {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
+
   }
 
-  public interface TestMostTypesProto3OrBuilder
-      extends
+  public interface TestMostTypesProto3OrBuilder extends
       // @@protoc_insertion_point(interface_extends:legacy_gencode_test.proto3.TestMostTypesProto3)
       com.google.protobuf.MessageOrBuilder {
 
     /**
      * <code>int32 optional_int32 = 1;</code>
-     *
      * @return The optionalInt32.
      */
     int getOptionalInt32();
 
     /**
      * <code>int64 optional_int64 = 2;</code>
-     *
      * @return The optionalInt64.
      */
     long getOptionalInt64();
 
     /**
      * <code>uint32 optional_uint32 = 3;</code>
-     *
      * @return The optionalUint32.
      */
     int getOptionalUint32();
 
     /**
      * <code>uint64 optional_uint64 = 4;</code>
-     *
      * @return The optionalUint64.
      */
     long getOptionalUint64();
 
     /**
      * <code>sint32 optional_sint32 = 5;</code>
-     *
      * @return The optionalSint32.
      */
     int getOptionalSint32();
 
     /**
      * <code>sint64 optional_sint64 = 6;</code>
-     *
      * @return The optionalSint64.
      */
     long getOptionalSint64();
 
     /**
      * <code>fixed32 optional_fixed32 = 7;</code>
-     *
      * @return The optionalFixed32.
      */
     int getOptionalFixed32();
 
     /**
      * <code>fixed64 optional_fixed64 = 8;</code>
-     *
      * @return The optionalFixed64.
      */
     long getOptionalFixed64();
 
     /**
      * <code>sfixed32 optional_sfixed32 = 9;</code>
-     *
      * @return The optionalSfixed32.
      */
     int getOptionalSfixed32();
 
     /**
      * <code>sfixed64 optional_sfixed64 = 10;</code>
-     *
      * @return The optionalSfixed64.
      */
     long getOptionalSfixed64();
 
     /**
      * <code>float optional_float = 11;</code>
-     *
      * @return The optionalFloat.
      */
     float getOptionalFloat();
 
     /**
      * <code>double optional_double = 12;</code>
-     *
      * @return The optionalDouble.
      */
     double getOptionalDouble();
 
     /**
      * <code>bool optional_bool = 13;</code>
-     *
      * @return The optionalBool.
      */
     boolean getOptionalBool();
 
     /**
      * <code>string optional_string = 14;</code>
-     *
      * @return The optionalString.
      */
     java.lang.String getOptionalString();
-
     /**
      * <code>string optional_string = 14;</code>
-     *
      * @return The bytes for optionalString.
      */
-    com.google.protobuf.ByteString getOptionalStringBytes();
+    com.google.protobuf.ByteString
+        getOptionalStringBytes();
 
     /**
      * <code>bytes optional_bytes = 15;</code>
-     *
      * @return The optionalBytes.
      */
     com.google.protobuf.ByteString getOptionalBytes();
 
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
      * @return Whether the optionalNestedMessage field is set.
      */
     boolean hasOptionalNestedMessage();
-
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
      * @return The optionalNestedMessage.
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-        getOptionalNestedMessage();
-
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getOptionalNestedMessage();
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-     * </code>
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder
-        getOptionalNestedMessageOrBuilder();
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder getOptionalNestedMessageOrBuilder();
 
     /**
      * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
-     *
      * @return Whether the optionalForeignMessage field is set.
      */
     boolean hasOptionalForeignMessage();
-
     /**
      * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
-     *
      * @return The optionalForeignMessage.
      */
     legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getOptionalForeignMessage();
-
-    /** <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code> */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder
-        getOptionalForeignMessageOrBuilder();
+    /**
+     * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
+     */
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder getOptionalForeignMessageOrBuilder();
 
     /**
-     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;</code>
      * @return The enum numeric value on the wire for optionalNestedEnum.
      */
     int getOptionalNestedEnumValue();
-
     /**
-     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;</code>
      * @return The optionalNestedEnum.
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getOptionalNestedEnum();
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getOptionalNestedEnum();
 
     /**
      * <code>.legacy_gencode_test.proto3.ForeignEnum optional_foreign_enum = 22;</code>
-     *
      * @return The enum numeric value on the wire for optionalForeignEnum.
      */
     int getOptionalForeignEnumValue();
-
     /**
      * <code>.legacy_gencode_test.proto3.ForeignEnum optional_foreign_enum = 22;</code>
-     *
      * @return The optionalForeignEnum.
      */
     legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getOptionalForeignEnum();
 
     /**
-     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;</code>
      * @return The enum numeric value on the wire for optionalAliasedEnum.
      */
     int getOptionalAliasedEnumValue();
-
     /**
-     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;</code>
      * @return The optionalAliasedEnum.
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum
-        getOptionalAliasedEnum();
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum getOptionalAliasedEnum();
 
     /**
      * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
-     *
      * @return Whether the recursiveMessage field is set.
      */
     boolean hasRecursiveMessage();
-
     /**
      * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
-     *
      * @return The recursiveMessage.
      */
     legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 getRecursiveMessage();
-
-    /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code> */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder
-        getRecursiveMessageOrBuilder();
+    /**
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
+     */
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder getRecursiveMessageOrBuilder();
 
     /**
-     *
-     *
      * <pre>
      * Repeated
      * </pre>
      *
      * <code>repeated int32 repeated_int32 = 31;</code>
-     *
      * @return A list containing the repeatedInt32.
      */
     java.util.List<java.lang.Integer> getRepeatedInt32List();
-
     /**
-     *
-     *
      * <pre>
      * Repeated
      * </pre>
      *
      * <code>repeated int32 repeated_int32 = 31;</code>
-     *
      * @return The count of repeatedInt32.
      */
     int getRepeatedInt32Count();
-
     /**
-     *
-     *
      * <pre>
      * Repeated
      * </pre>
      *
      * <code>repeated int32 repeated_int32 = 31;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedInt32 at the given index.
      */
@@ -1730,21 +1631,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated int64 repeated_int64 = 32;</code>
-     *
      * @return A list containing the repeatedInt64.
      */
     java.util.List<java.lang.Long> getRepeatedInt64List();
-
     /**
      * <code>repeated int64 repeated_int64 = 32;</code>
-     *
      * @return The count of repeatedInt64.
      */
     int getRepeatedInt64Count();
-
     /**
      * <code>repeated int64 repeated_int64 = 32;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedInt64 at the given index.
      */
@@ -1752,21 +1648,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated uint32 repeated_uint32 = 33;</code>
-     *
      * @return A list containing the repeatedUint32.
      */
     java.util.List<java.lang.Integer> getRepeatedUint32List();
-
     /**
      * <code>repeated uint32 repeated_uint32 = 33;</code>
-     *
      * @return The count of repeatedUint32.
      */
     int getRepeatedUint32Count();
-
     /**
      * <code>repeated uint32 repeated_uint32 = 33;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedUint32 at the given index.
      */
@@ -1774,21 +1665,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated uint64 repeated_uint64 = 34;</code>
-     *
      * @return A list containing the repeatedUint64.
      */
     java.util.List<java.lang.Long> getRepeatedUint64List();
-
     /**
      * <code>repeated uint64 repeated_uint64 = 34;</code>
-     *
      * @return The count of repeatedUint64.
      */
     int getRepeatedUint64Count();
-
     /**
      * <code>repeated uint64 repeated_uint64 = 34;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedUint64 at the given index.
      */
@@ -1796,21 +1682,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated sint32 repeated_sint32 = 35;</code>
-     *
      * @return A list containing the repeatedSint32.
      */
     java.util.List<java.lang.Integer> getRepeatedSint32List();
-
     /**
      * <code>repeated sint32 repeated_sint32 = 35;</code>
-     *
      * @return The count of repeatedSint32.
      */
     int getRepeatedSint32Count();
-
     /**
      * <code>repeated sint32 repeated_sint32 = 35;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedSint32 at the given index.
      */
@@ -1818,21 +1699,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated sint64 repeated_sint64 = 36;</code>
-     *
      * @return A list containing the repeatedSint64.
      */
     java.util.List<java.lang.Long> getRepeatedSint64List();
-
     /**
      * <code>repeated sint64 repeated_sint64 = 36;</code>
-     *
      * @return The count of repeatedSint64.
      */
     int getRepeatedSint64Count();
-
     /**
      * <code>repeated sint64 repeated_sint64 = 36;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedSint64 at the given index.
      */
@@ -1840,21 +1716,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-     *
      * @return A list containing the repeatedFixed32.
      */
     java.util.List<java.lang.Integer> getRepeatedFixed32List();
-
     /**
      * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-     *
      * @return The count of repeatedFixed32.
      */
     int getRepeatedFixed32Count();
-
     /**
      * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedFixed32 at the given index.
      */
@@ -1862,21 +1733,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-     *
      * @return A list containing the repeatedFixed64.
      */
     java.util.List<java.lang.Long> getRepeatedFixed64List();
-
     /**
      * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-     *
      * @return The count of repeatedFixed64.
      */
     int getRepeatedFixed64Count();
-
     /**
      * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedFixed64 at the given index.
      */
@@ -1884,21 +1750,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-     *
      * @return A list containing the repeatedSfixed32.
      */
     java.util.List<java.lang.Integer> getRepeatedSfixed32List();
-
     /**
      * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-     *
      * @return The count of repeatedSfixed32.
      */
     int getRepeatedSfixed32Count();
-
     /**
      * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedSfixed32 at the given index.
      */
@@ -1906,21 +1767,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-     *
      * @return A list containing the repeatedSfixed64.
      */
     java.util.List<java.lang.Long> getRepeatedSfixed64List();
-
     /**
      * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-     *
      * @return The count of repeatedSfixed64.
      */
     int getRepeatedSfixed64Count();
-
     /**
      * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedSfixed64 at the given index.
      */
@@ -1928,21 +1784,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated float repeated_float = 41;</code>
-     *
      * @return A list containing the repeatedFloat.
      */
     java.util.List<java.lang.Float> getRepeatedFloatList();
-
     /**
      * <code>repeated float repeated_float = 41;</code>
-     *
      * @return The count of repeatedFloat.
      */
     int getRepeatedFloatCount();
-
     /**
      * <code>repeated float repeated_float = 41;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedFloat at the given index.
      */
@@ -1950,21 +1801,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated double repeated_double = 42;</code>
-     *
      * @return A list containing the repeatedDouble.
      */
     java.util.List<java.lang.Double> getRepeatedDoubleList();
-
     /**
      * <code>repeated double repeated_double = 42;</code>
-     *
      * @return The count of repeatedDouble.
      */
     int getRepeatedDoubleCount();
-
     /**
      * <code>repeated double repeated_double = 42;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedDouble at the given index.
      */
@@ -1972,21 +1818,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated bool repeated_bool = 43;</code>
-     *
      * @return A list containing the repeatedBool.
      */
     java.util.List<java.lang.Boolean> getRepeatedBoolList();
-
     /**
      * <code>repeated bool repeated_bool = 43;</code>
-     *
      * @return The count of repeatedBool.
      */
     int getRepeatedBoolCount();
-
     /**
      * <code>repeated bool repeated_bool = 43;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedBool at the given index.
      */
@@ -1994,178 +1835,118 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated string repeated_string = 44;</code>
-     *
      * @return A list containing the repeatedString.
      */
-    java.util.List<java.lang.String> getRepeatedStringList();
-
+    java.util.List<java.lang.String>
+        getRepeatedStringList();
     /**
      * <code>repeated string repeated_string = 44;</code>
-     *
      * @return The count of repeatedString.
      */
     int getRepeatedStringCount();
-
     /**
      * <code>repeated string repeated_string = 44;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedString at the given index.
      */
     java.lang.String getRepeatedString(int index);
-
     /**
      * <code>repeated string repeated_string = 44;</code>
-     *
      * @param index The index of the value to return.
      * @return The bytes of the repeatedString at the given index.
      */
-    com.google.protobuf.ByteString getRepeatedStringBytes(int index);
+    com.google.protobuf.ByteString
+        getRepeatedStringBytes(int index);
 
     /**
      * <code>repeated bytes repeated_bytes = 45;</code>
-     *
      * @return A list containing the repeatedBytes.
      */
     java.util.List<com.google.protobuf.ByteString> getRepeatedBytesList();
-
     /**
      * <code>repeated bytes repeated_bytes = 45;</code>
-     *
      * @return The count of repeatedBytes.
      */
     int getRepeatedBytesCount();
-
     /**
      * <code>repeated bytes repeated_bytes = 45;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedBytes at the given index.
      */
     com.google.protobuf.ByteString getRepeatedBytes(int index);
 
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
      */
-    java.util.List<
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
+    java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> 
         getRepeatedNestedMessageList();
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-        getRepeatedNestedMessage(int index);
-
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getRepeatedNestedMessage(int index);
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
      */
     int getRepeatedNestedMessageCount();
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
      */
-    java.util.List<
-            ? extends
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .NestedMessageOrBuilder>
+    java.util.List<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> 
         getRepeatedNestedMessageOrBuilderList();
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder
-        getRepeatedNestedMessageOrBuilder(int index);
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder getRepeatedNestedMessageOrBuilder(
+        int index);
 
     /**
-     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
      */
-    java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
+    java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> 
         getRepeatedForeignMessageList();
-
     /**
-     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedForeignMessage(
-        int index);
-
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedForeignMessage(int index);
     /**
-     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
      */
     int getRepeatedForeignMessageCount();
-
     /**
-     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
      */
-    java.util.List<
-            ? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>
+    java.util.List<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder> 
         getRepeatedForeignMessageOrBuilderList();
-
     /**
-     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder
-        getRepeatedForeignMessageOrBuilder(int index);
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder getRepeatedForeignMessageOrBuilder(
+        int index);
 
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
      * @return A list containing the repeatedNestedEnum.
      */
-    java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        getRepeatedNestedEnumList();
-
+    java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> getRepeatedNestedEnumList();
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
      * @return The count of repeatedNestedEnum.
      */
     int getRepeatedNestedEnumCount();
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
      * @param index The index of the element to return.
      * @return The repeatedNestedEnum at the given index.
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getRepeatedNestedEnum(int index);
-
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getRepeatedNestedEnum(int index);
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
      * @return A list containing the enum numeric values on the wire for repeatedNestedEnum.
      */
-    java.util.List<java.lang.Integer> getRepeatedNestedEnumValueList();
-
+    java.util.List<java.lang.Integer>
+    getRepeatedNestedEnumValueList();
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
      * @param index The index of the value to return.
      * @return The enum numeric value on the wire of repeatedNestedEnum at the given index.
      */
@@ -2173,77 +1954,57 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-     *
      * @return A list containing the repeatedForeignEnum.
      */
-    java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-        getRepeatedForeignEnumList();
-
+    java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum> getRepeatedForeignEnumList();
     /**
      * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-     *
      * @return The count of repeatedForeignEnum.
      */
     int getRepeatedForeignEnumCount();
-
     /**
      * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedForeignEnum at the given index.
      */
     legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getRepeatedForeignEnum(int index);
-
     /**
      * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-     *
      * @return A list containing the enum numeric values on the wire for repeatedForeignEnum.
      */
-    java.util.List<java.lang.Integer> getRepeatedForeignEnumValueList();
-
+    java.util.List<java.lang.Integer>
+    getRepeatedForeignEnumValueList();
     /**
      * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-     *
      * @param index The index of the value to return.
      * @return The enum numeric value on the wire of repeatedForeignEnum at the given index.
      */
     int getRepeatedForeignEnumValue(int index);
 
     /**
-     *
-     *
      * <pre>
      * Packed
      * </pre>
      *
      * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-     *
      * @return A list containing the packedInt32.
      */
     java.util.List<java.lang.Integer> getPackedInt32List();
-
     /**
-     *
-     *
      * <pre>
      * Packed
      * </pre>
      *
      * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-     *
      * @return The count of packedInt32.
      */
     int getPackedInt32Count();
-
     /**
-     *
-     *
      * <pre>
      * Packed
      * </pre>
      *
      * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedInt32 at the given index.
      */
@@ -2251,21 +2012,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-     *
      * @return A list containing the packedInt64.
      */
     java.util.List<java.lang.Long> getPackedInt64List();
-
     /**
      * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-     *
      * @return The count of packedInt64.
      */
     int getPackedInt64Count();
-
     /**
      * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedInt64 at the given index.
      */
@@ -2273,21 +2029,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-     *
      * @return A list containing the packedUint32.
      */
     java.util.List<java.lang.Integer> getPackedUint32List();
-
     /**
      * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-     *
      * @return The count of packedUint32.
      */
     int getPackedUint32Count();
-
     /**
      * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedUint32 at the given index.
      */
@@ -2295,21 +2046,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-     *
      * @return A list containing the packedUint64.
      */
     java.util.List<java.lang.Long> getPackedUint64List();
-
     /**
      * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-     *
      * @return The count of packedUint64.
      */
     int getPackedUint64Count();
-
     /**
      * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedUint64 at the given index.
      */
@@ -2317,21 +2063,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-     *
      * @return A list containing the packedSint32.
      */
     java.util.List<java.lang.Integer> getPackedSint32List();
-
     /**
      * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-     *
      * @return The count of packedSint32.
      */
     int getPackedSint32Count();
-
     /**
      * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedSint32 at the given index.
      */
@@ -2339,21 +2080,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-     *
      * @return A list containing the packedSint64.
      */
     java.util.List<java.lang.Long> getPackedSint64List();
-
     /**
      * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-     *
      * @return The count of packedSint64.
      */
     int getPackedSint64Count();
-
     /**
      * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedSint64 at the given index.
      */
@@ -2361,21 +2097,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-     *
      * @return A list containing the packedFixed32.
      */
     java.util.List<java.lang.Integer> getPackedFixed32List();
-
     /**
      * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-     *
      * @return The count of packedFixed32.
      */
     int getPackedFixed32Count();
-
     /**
      * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedFixed32 at the given index.
      */
@@ -2383,21 +2114,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-     *
      * @return A list containing the packedFixed64.
      */
     java.util.List<java.lang.Long> getPackedFixed64List();
-
     /**
      * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-     *
      * @return The count of packedFixed64.
      */
     int getPackedFixed64Count();
-
     /**
      * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedFixed64 at the given index.
      */
@@ -2405,21 +2131,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-     *
      * @return A list containing the packedSfixed32.
      */
     java.util.List<java.lang.Integer> getPackedSfixed32List();
-
     /**
      * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-     *
      * @return The count of packedSfixed32.
      */
     int getPackedSfixed32Count();
-
     /**
      * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedSfixed32 at the given index.
      */
@@ -2427,21 +2148,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-     *
      * @return A list containing the packedSfixed64.
      */
     java.util.List<java.lang.Long> getPackedSfixed64List();
-
     /**
      * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-     *
      * @return The count of packedSfixed64.
      */
     int getPackedSfixed64Count();
-
     /**
      * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedSfixed64 at the given index.
      */
@@ -2449,21 +2165,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated float packed_float = 85 [packed = true];</code>
-     *
      * @return A list containing the packedFloat.
      */
     java.util.List<java.lang.Float> getPackedFloatList();
-
     /**
      * <code>repeated float packed_float = 85 [packed = true];</code>
-     *
      * @return The count of packedFloat.
      */
     int getPackedFloatCount();
-
     /**
      * <code>repeated float packed_float = 85 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedFloat at the given index.
      */
@@ -2471,21 +2182,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated double packed_double = 86 [packed = true];</code>
-     *
      * @return A list containing the packedDouble.
      */
     java.util.List<java.lang.Double> getPackedDoubleList();
-
     /**
      * <code>repeated double packed_double = 86 [packed = true];</code>
-     *
      * @return The count of packedDouble.
      */
     int getPackedDoubleCount();
-
     /**
      * <code>repeated double packed_double = 86 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedDouble at the given index.
      */
@@ -2493,110 +2199,74 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated bool packed_bool = 87 [packed = true];</code>
-     *
      * @return A list containing the packedBool.
      */
     java.util.List<java.lang.Boolean> getPackedBoolList();
-
     /**
      * <code>repeated bool packed_bool = 87 [packed = true];</code>
-     *
      * @return The count of packedBool.
      */
     int getPackedBoolCount();
-
     /**
      * <code>repeated bool packed_bool = 87 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedBool at the given index.
      */
     boolean getPackedBool(int index);
 
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
      * @return A list containing the packedNestedEnum.
      */
-    java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        getPackedNestedEnumList();
-
+    java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> getPackedNestedEnumList();
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
      * @return The count of packedNestedEnum.
      */
     int getPackedNestedEnumCount();
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
      * @param index The index of the element to return.
      * @return The packedNestedEnum at the given index.
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getPackedNestedEnum(int index);
-
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getPackedNestedEnum(int index);
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
      * @return A list containing the enum numeric values on the wire for packedNestedEnum.
      */
-    java.util.List<java.lang.Integer> getPackedNestedEnumValueList();
-
+    java.util.List<java.lang.Integer>
+    getPackedNestedEnumValueList();
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
      * @param index The index of the value to return.
      * @return The enum numeric value on the wire of packedNestedEnum at the given index.
      */
     int getPackedNestedEnumValue(int index);
 
     /**
-     *
-     *
      * <pre>
      * Unpacked
      * </pre>
      *
      * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-     *
      * @return A list containing the unpackedInt32.
      */
     java.util.List<java.lang.Integer> getUnpackedInt32List();
-
     /**
-     *
-     *
      * <pre>
      * Unpacked
      * </pre>
      *
      * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-     *
      * @return The count of unpackedInt32.
      */
     int getUnpackedInt32Count();
-
     /**
-     *
-     *
      * <pre>
      * Unpacked
      * </pre>
      *
      * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedInt32 at the given index.
      */
@@ -2604,21 +2274,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-     *
      * @return A list containing the unpackedInt64.
      */
     java.util.List<java.lang.Long> getUnpackedInt64List();
-
     /**
      * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-     *
      * @return The count of unpackedInt64.
      */
     int getUnpackedInt64Count();
-
     /**
      * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedInt64 at the given index.
      */
@@ -2626,21 +2291,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-     *
      * @return A list containing the unpackedUint32.
      */
     java.util.List<java.lang.Integer> getUnpackedUint32List();
-
     /**
      * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-     *
      * @return The count of unpackedUint32.
      */
     int getUnpackedUint32Count();
-
     /**
      * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedUint32 at the given index.
      */
@@ -2648,21 +2308,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-     *
      * @return A list containing the unpackedUint64.
      */
     java.util.List<java.lang.Long> getUnpackedUint64List();
-
     /**
      * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-     *
      * @return The count of unpackedUint64.
      */
     int getUnpackedUint64Count();
-
     /**
      * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedUint64 at the given index.
      */
@@ -2670,21 +2325,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-     *
      * @return A list containing the unpackedSint32.
      */
     java.util.List<java.lang.Integer> getUnpackedSint32List();
-
     /**
      * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-     *
      * @return The count of unpackedSint32.
      */
     int getUnpackedSint32Count();
-
     /**
      * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedSint32 at the given index.
      */
@@ -2692,21 +2342,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-     *
      * @return A list containing the unpackedSint64.
      */
     java.util.List<java.lang.Long> getUnpackedSint64List();
-
     /**
      * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-     *
      * @return The count of unpackedSint64.
      */
     int getUnpackedSint64Count();
-
     /**
      * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedSint64 at the given index.
      */
@@ -2714,21 +2359,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-     *
      * @return A list containing the unpackedFixed32.
      */
     java.util.List<java.lang.Integer> getUnpackedFixed32List();
-
     /**
      * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-     *
      * @return The count of unpackedFixed32.
      */
     int getUnpackedFixed32Count();
-
     /**
      * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedFixed32 at the given index.
      */
@@ -2736,21 +2376,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-     *
      * @return A list containing the unpackedFixed64.
      */
     java.util.List<java.lang.Long> getUnpackedFixed64List();
-
     /**
      * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-     *
      * @return The count of unpackedFixed64.
      */
     int getUnpackedFixed64Count();
-
     /**
      * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedFixed64 at the given index.
      */
@@ -2758,21 +2393,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-     *
      * @return A list containing the unpackedSfixed32.
      */
     java.util.List<java.lang.Integer> getUnpackedSfixed32List();
-
     /**
      * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-     *
      * @return The count of unpackedSfixed32.
      */
     int getUnpackedSfixed32Count();
-
     /**
      * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedSfixed32 at the given index.
      */
@@ -2780,21 +2410,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-     *
      * @return A list containing the unpackedSfixed64.
      */
     java.util.List<java.lang.Long> getUnpackedSfixed64List();
-
     /**
      * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-     *
      * @return The count of unpackedSfixed64.
      */
     int getUnpackedSfixed64Count();
-
     /**
      * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedSfixed64 at the given index.
      */
@@ -2802,21 +2427,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated float unpacked_float = 99 [packed = false];</code>
-     *
      * @return A list containing the unpackedFloat.
      */
     java.util.List<java.lang.Float> getUnpackedFloatList();
-
     /**
      * <code>repeated float unpacked_float = 99 [packed = false];</code>
-     *
      * @return The count of unpackedFloat.
      */
     int getUnpackedFloatCount();
-
     /**
      * <code>repeated float unpacked_float = 99 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedFloat at the given index.
      */
@@ -2824,21 +2444,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated double unpacked_double = 100 [packed = false];</code>
-     *
      * @return A list containing the unpackedDouble.
      */
     java.util.List<java.lang.Double> getUnpackedDoubleList();
-
     /**
      * <code>repeated double unpacked_double = 100 [packed = false];</code>
-     *
      * @return The count of unpackedDouble.
      */
     int getUnpackedDoubleCount();
-
     /**
      * <code>repeated double unpacked_double = 100 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedDouble at the given index.
      */
@@ -2846,78 +2461,51 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-     *
      * @return A list containing the unpackedBool.
      */
     java.util.List<java.lang.Boolean> getUnpackedBoolList();
-
     /**
      * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-     *
      * @return The count of unpackedBool.
      */
     int getUnpackedBoolCount();
-
     /**
      * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedBool at the given index.
      */
     boolean getUnpackedBool(int index);
 
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
      * @return A list containing the unpackedNestedEnum.
      */
-    java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        getUnpackedNestedEnumList();
-
+    java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> getUnpackedNestedEnumList();
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
      * @return The count of unpackedNestedEnum.
      */
     int getUnpackedNestedEnumCount();
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
      * @param index The index of the element to return.
      * @return The unpackedNestedEnum at the given index.
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getUnpackedNestedEnum(int index);
-
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getUnpackedNestedEnum(int index);
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
      * @return A list containing the enum numeric values on the wire for unpackedNestedEnum.
      */
-    java.util.List<java.lang.Integer> getUnpackedNestedEnumValueList();
-
+    java.util.List<java.lang.Integer>
+    getUnpackedNestedEnumValueList();
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
      * @param index The index of the value to return.
      * @return The enum numeric value on the wire of unpackedNestedEnum at the given index.
      */
     int getUnpackedNestedEnumValue(int index);
 
     /**
-     *
-     *
      * <pre>
      * Map
      * </pre>
@@ -2925,766 +2513,824 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
      * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
      */
     int getMapInt32Int32Count();
-
     /**
-     *
-     *
      * <pre>
      * Map
      * </pre>
      *
      * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
      */
-    boolean containsMapInt32Int32(int key);
-
-    /** Use {@link #getMapInt32Int32Map()} instead. */
+    boolean containsMapInt32Int32(
+        int key);
+    /**
+     * Use {@link #getMapInt32Int32Map()} instead.
+     */
     @java.lang.Deprecated
-    java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32();
-
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapInt32Int32();
     /**
-     *
-     *
      * <pre>
      * Map
      * </pre>
      *
      * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
      */
-    java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32Map();
-
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapInt32Int32Map();
     /**
-     *
-     *
      * <pre>
      * Map
      * </pre>
      *
      * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
      */
-    int getMapInt32Int32OrDefault(int key, int defaultValue);
-
+    int getMapInt32Int32OrDefault(
+        int key,
+        int defaultValue);
     /**
-     *
-     *
      * <pre>
      * Map
      * </pre>
      *
      * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
      */
-    int getMapInt32Int32OrThrow(int key);
+    int getMapInt32Int32OrThrow(
+        int key);
 
-    /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
     int getMapInt64Int64Count();
-
-    /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
-    boolean containsMapInt64Int64(long key);
-
-    /** Use {@link #getMapInt64Int64Map()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Long, java.lang.Long> getMapInt64Int64();
-
-    /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
-    java.util.Map<java.lang.Long, java.lang.Long> getMapInt64Int64Map();
-
-    /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
-    long getMapInt64Int64OrDefault(long key, long defaultValue);
-
-    /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
-    long getMapInt64Int64OrThrow(long key);
-
-    /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
-    int getMapUint32Uint32Count();
-
-    /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
-    boolean containsMapUint32Uint32(int key);
-
-    /** Use {@link #getMapUint32Uint32Map()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Integer, java.lang.Integer> getMapUint32Uint32();
-
-    /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
-    java.util.Map<java.lang.Integer, java.lang.Integer> getMapUint32Uint32Map();
-
-    /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
-    int getMapUint32Uint32OrDefault(int key, int defaultValue);
-
-    /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
-    int getMapUint32Uint32OrThrow(int key);
-
-    /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
-    int getMapUint64Uint64Count();
-
-    /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
-    boolean containsMapUint64Uint64(long key);
-
-    /** Use {@link #getMapUint64Uint64Map()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Long, java.lang.Long> getMapUint64Uint64();
-
-    /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
-    java.util.Map<java.lang.Long, java.lang.Long> getMapUint64Uint64Map();
-
-    /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
-    long getMapUint64Uint64OrDefault(long key, long defaultValue);
-
-    /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
-    long getMapUint64Uint64OrThrow(long key);
-
-    /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
-    int getMapSint32Sint32Count();
-
-    /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
-    boolean containsMapSint32Sint32(int key);
-
-    /** Use {@link #getMapSint32Sint32Map()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Integer, java.lang.Integer> getMapSint32Sint32();
-
-    /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
-    java.util.Map<java.lang.Integer, java.lang.Integer> getMapSint32Sint32Map();
-
-    /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
-    int getMapSint32Sint32OrDefault(int key, int defaultValue);
-
-    /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
-    int getMapSint32Sint32OrThrow(int key);
-
-    /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
-    int getMapSint64Sint64Count();
-
-    /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
-    boolean containsMapSint64Sint64(long key);
-
-    /** Use {@link #getMapSint64Sint64Map()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Long, java.lang.Long> getMapSint64Sint64();
-
-    /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
-    java.util.Map<java.lang.Long, java.lang.Long> getMapSint64Sint64Map();
-
-    /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
-    long getMapSint64Sint64OrDefault(long key, long defaultValue);
-
-    /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
-    long getMapSint64Sint64OrThrow(long key);
-
-    /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
-    int getMapFixed32Fixed32Count();
-
-    /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
-    boolean containsMapFixed32Fixed32(int key);
-
-    /** Use {@link #getMapFixed32Fixed32Map()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Integer, java.lang.Integer> getMapFixed32Fixed32();
-
-    /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
-    java.util.Map<java.lang.Integer, java.lang.Integer> getMapFixed32Fixed32Map();
-
-    /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
-    int getMapFixed32Fixed32OrDefault(int key, int defaultValue);
-
-    /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
-    int getMapFixed32Fixed32OrThrow(int key);
-
-    /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
-    int getMapFixed64Fixed64Count();
-
-    /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
-    boolean containsMapFixed64Fixed64(long key);
-
-    /** Use {@link #getMapFixed64Fixed64Map()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Long, java.lang.Long> getMapFixed64Fixed64();
-
-    /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
-    java.util.Map<java.lang.Long, java.lang.Long> getMapFixed64Fixed64Map();
-
-    /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
-    long getMapFixed64Fixed64OrDefault(long key, long defaultValue);
-
-    /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
-    long getMapFixed64Fixed64OrThrow(long key);
-
-    /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
-    int getMapSfixed32Sfixed32Count();
-
-    /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
-    boolean containsMapSfixed32Sfixed32(int key);
-
-    /** Use {@link #getMapSfixed32Sfixed32Map()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Integer, java.lang.Integer> getMapSfixed32Sfixed32();
-
-    /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
-    java.util.Map<java.lang.Integer, java.lang.Integer> getMapSfixed32Sfixed32Map();
-
-    /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
-    int getMapSfixed32Sfixed32OrDefault(int key, int defaultValue);
-
-    /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
-    int getMapSfixed32Sfixed32OrThrow(int key);
-
-    /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
-    int getMapSfixed64Sfixed64Count();
-
-    /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
-    boolean containsMapSfixed64Sfixed64(long key);
-
-    /** Use {@link #getMapSfixed64Sfixed64Map()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Long, java.lang.Long> getMapSfixed64Sfixed64();
-
-    /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
-    java.util.Map<java.lang.Long, java.lang.Long> getMapSfixed64Sfixed64Map();
-
-    /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
-    long getMapSfixed64Sfixed64OrDefault(long key, long defaultValue);
-
-    /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
-    long getMapSfixed64Sfixed64OrThrow(long key);
-
-    /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
-    int getMapInt32FloatCount();
-
-    /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
-    boolean containsMapInt32Float(int key);
-
-    /** Use {@link #getMapInt32FloatMap()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Integer, java.lang.Float> getMapInt32Float();
-
-    /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
-    java.util.Map<java.lang.Integer, java.lang.Float> getMapInt32FloatMap();
-
-    /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
-    float getMapInt32FloatOrDefault(int key, float defaultValue);
-
-    /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
-    float getMapInt32FloatOrThrow(int key);
-
-    /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
-    int getMapInt32DoubleCount();
-
-    /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
-    boolean containsMapInt32Double(int key);
-
-    /** Use {@link #getMapInt32DoubleMap()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Integer, java.lang.Double> getMapInt32Double();
-
-    /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
-    java.util.Map<java.lang.Integer, java.lang.Double> getMapInt32DoubleMap();
-
-    /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
-    double getMapInt32DoubleOrDefault(int key, double defaultValue);
-
-    /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
-    double getMapInt32DoubleOrThrow(int key);
-
-    /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
-    int getMapBoolBoolCount();
-
-    /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
-    boolean containsMapBoolBool(boolean key);
-
-    /** Use {@link #getMapBoolBoolMap()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Boolean, java.lang.Boolean> getMapBoolBool();
-
-    /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
-    java.util.Map<java.lang.Boolean, java.lang.Boolean> getMapBoolBoolMap();
-
-    /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
-    boolean getMapBoolBoolOrDefault(boolean key, boolean defaultValue);
-
-    /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
-    boolean getMapBoolBoolOrThrow(boolean key);
-
-    /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
-    int getMapStringStringCount();
-
-    /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
-    boolean containsMapStringString(java.lang.String key);
-
-    /** Use {@link #getMapStringStringMap()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.String, java.lang.String> getMapStringString();
-
-    /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
-    java.util.Map<java.lang.String, java.lang.String> getMapStringStringMap();
-
-    /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
-    /* nullable */
-    java.lang.String getMapStringStringOrDefault(
-        java.lang.String key,
-        /* nullable */
-        java.lang.String defaultValue);
-
-    /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
-    java.lang.String getMapStringStringOrThrow(java.lang.String key);
-
-    /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
-    int getMapStringBytesCount();
-
-    /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
-    boolean containsMapStringBytes(java.lang.String key);
-
-    /** Use {@link #getMapStringBytesMap()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.String, com.google.protobuf.ByteString> getMapStringBytes();
-
-    /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
-    java.util.Map<java.lang.String, com.google.protobuf.ByteString> getMapStringBytesMap();
-
-    /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
-    /* nullable */
-    com.google.protobuf.ByteString getMapStringBytesOrDefault(
-        java.lang.String key,
-        /* nullable */
-        com.google.protobuf.ByteString defaultValue);
-
-    /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
-    com.google.protobuf.ByteString getMapStringBytesOrThrow(java.lang.String key);
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-     * </code>
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
      */
-    int getMapStringNestedMessageCount();
-
+    boolean containsMapInt64Int64(
+        long key);
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-     * </code>
+     * Use {@link #getMapInt64Int64Map()} instead.
      */
-    boolean containsMapStringNestedMessage(java.lang.String key);
-
-    /** Use {@link #getMapStringNestedMessageMap()} instead. */
     @java.lang.Deprecated
-    java.util.Map<
-            java.lang.String,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-        getMapStringNestedMessage();
-
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapInt64Int64();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-     * </code>
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
      */
-    java.util.Map<
-            java.lang.String,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-        getMapStringNestedMessageMap();
-
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapInt64Int64Map();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-     * </code>
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
      */
-    /* nullable */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-        getMapStringNestedMessageOrDefault(
-            java.lang.String key,
-            /* nullable */
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                defaultValue);
-
+    long getMapInt64Int64OrDefault(
+        long key,
+        long defaultValue);
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-     * </code>
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-        getMapStringNestedMessageOrThrow(java.lang.String key);
+    long getMapInt64Int64OrThrow(
+        long key);
 
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-     * </code>
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
      */
-    int getMapStringForeignMessageCount();
-
+    int getMapUint32Uint32Count();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-     * </code>
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
+    boolean containsMapUint32Uint32(
+        int key);
+    /**
+     * Use {@link #getMapUint32Uint32Map()} instead.
      */
-    boolean containsMapStringForeignMessage(java.lang.String key);
-
-    /** Use {@link #getMapStringForeignMessageMap()} instead. */
     @java.lang.Deprecated
-    java.util.Map<
-            java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-        getMapStringForeignMessage();
-
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapUint32Uint32();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-     * </code>
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
      */
-    java.util.Map<
-            java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-        getMapStringForeignMessageMap();
-
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapUint32Uint32Map();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-     * </code>
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
      */
-    /* nullable */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        getMapStringForeignMessageOrDefault(
-            java.lang.String key,
-            /* nullable */
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage defaultValue);
-
+    int getMapUint32Uint32OrDefault(
+        int key,
+        int defaultValue);
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-     * </code>
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        getMapStringForeignMessageOrThrow(java.lang.String key);
+    int getMapUint32Uint32OrThrow(
+        int key);
 
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
      */
-    int getMapStringNestedEnumCount();
-
+    int getMapUint64Uint64Count();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
+    boolean containsMapUint64Uint64(
+        long key);
+    /**
+     * Use {@link #getMapUint64Uint64Map()} instead.
      */
-    boolean containsMapStringNestedEnum(java.lang.String key);
-
-    /** Use {@link #getMapStringNestedEnumMap()} instead. */
     @java.lang.Deprecated
-    java.util.Map<
-            java.lang.String,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        getMapStringNestedEnum();
-
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapUint64Uint64();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
      */
-    java.util.Map<
-            java.lang.String,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        getMapStringNestedEnumMap();
-
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapUint64Uint64Map();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
      */
-    /* nullable */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getMapStringNestedEnumOrDefault(
-            java.lang.String key,
-            /* nullable */
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                defaultValue);
-
+    long getMapUint64Uint64OrDefault(
+        long key,
+        long defaultValue);
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getMapStringNestedEnumOrThrow(java.lang.String key);
-
-    /** Use {@link #getMapStringNestedEnumValueMap()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.String, java.lang.Integer> getMapStringNestedEnumValue();
+    long getMapUint64Uint64OrThrow(
+        long key);
 
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
      */
-    java.util.Map<java.lang.String, java.lang.Integer> getMapStringNestedEnumValueMap();
-
+    int getMapSint32Sint32Count();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
      */
-    int getMapStringNestedEnumValueOrDefault(java.lang.String key, int defaultValue);
-
+    boolean containsMapSint32Sint32(
+        int key);
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * Use {@link #getMapSint32Sint32Map()} instead.
      */
-    int getMapStringNestedEnumValueOrThrow(java.lang.String key);
-
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapSint32Sint32();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
      */
-    int getMapStringForeignEnumCount();
-
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapSint32Sint32Map();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
      */
-    boolean containsMapStringForeignEnum(java.lang.String key);
-
-    /** Use {@link #getMapStringForeignEnumMap()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-        getMapStringForeignEnum();
-
+    int getMapSint32Sint32OrDefault(
+        int key,
+        int defaultValue);
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
      */
-    java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-        getMapStringForeignEnumMap();
+    int getMapSint32Sint32OrThrow(
+        int key);
 
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
      */
-    /* nullable */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getMapStringForeignEnumOrDefault(
-        java.lang.String key,
-        /* nullable */
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum defaultValue);
-
+    int getMapSint64Sint64Count();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
+    boolean containsMapSint64Sint64(
+        long key);
+    /**
+     * Use {@link #getMapSint64Sint64Map()} instead.
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getMapStringForeignEnumOrThrow(
-        java.lang.String key);
-
-    /** Use {@link #getMapStringForeignEnumValueMap()} instead. */
     @java.lang.Deprecated
-    java.util.Map<java.lang.String, java.lang.Integer> getMapStringForeignEnumValue();
-
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapSint64Sint64();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
      */
-    java.util.Map<java.lang.String, java.lang.Integer> getMapStringForeignEnumValueMap();
-
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapSint64Sint64Map();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
      */
-    int getMapStringForeignEnumValueOrDefault(java.lang.String key, int defaultValue);
-
+    long getMapSint64Sint64OrDefault(
+        long key,
+        long defaultValue);
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
      */
-    int getMapStringForeignEnumValueOrThrow(java.lang.String key);
+    long getMapSint64Sint64OrThrow(
+        long key);
 
     /**
-     * <code>uint32 oneof_uint32 = 111;</code>
-     *
-     * @return Whether the oneofUint32 field is set.
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
      */
-    boolean hasOneofUint32();
-
+    int getMapFixed32Fixed32Count();
     /**
-     * <code>uint32 oneof_uint32 = 111;</code>
-     *
-     * @return The oneofUint32.
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
      */
-    int getOneofUint32();
-
+    boolean containsMapFixed32Fixed32(
+        int key);
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-     * </code>
-     *
-     * @return Whether the oneofNestedMessage field is set.
+     * Use {@link #getMapFixed32Fixed32Map()} instead.
      */
-    boolean hasOneofNestedMessage();
-
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapFixed32Fixed32();
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-     * </code>
-     *
-     * @return The oneofNestedMessage.
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-        getOneofNestedMessage();
-
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapFixed32Fixed32Map();
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-     * </code>
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder
-        getOneofNestedMessageOrBuilder();
-
+    int getMapFixed32Fixed32OrDefault(
+        int key,
+        int defaultValue);
     /**
-     * <code>string oneof_string = 113;</code>
-     *
-     * @return Whether the oneofString field is set.
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
      */
-    boolean hasOneofString();
+    int getMapFixed32Fixed32OrThrow(
+        int key);
 
     /**
-     * <code>string oneof_string = 113;</code>
-     *
-     * @return The oneofString.
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
      */
-    java.lang.String getOneofString();
-
+    int getMapFixed64Fixed64Count();
     /**
-     * <code>string oneof_string = 113;</code>
-     *
-     * @return The bytes for oneofString.
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
      */
-    com.google.protobuf.ByteString getOneofStringBytes();
-
+    boolean containsMapFixed64Fixed64(
+        long key);
     /**
-     * <code>bytes oneof_bytes = 114;</code>
-     *
-     * @return Whether the oneofBytes field is set.
+     * Use {@link #getMapFixed64Fixed64Map()} instead.
      */
-    boolean hasOneofBytes();
-
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapFixed64Fixed64();
     /**
-     * <code>bytes oneof_bytes = 114;</code>
-     *
-     * @return The oneofBytes.
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
      */
-    com.google.protobuf.ByteString getOneofBytes();
-
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapFixed64Fixed64Map();
     /**
-     * <code>bool oneof_bool = 115;</code>
-     *
-     * @return Whether the oneofBool field is set.
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
      */
-    boolean hasOneofBool();
-
+    long getMapFixed64Fixed64OrDefault(
+        long key,
+        long defaultValue);
     /**
-     * <code>bool oneof_bool = 115;</code>
-     *
-     * @return The oneofBool.
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
      */
-    boolean getOneofBool();
+    long getMapFixed64Fixed64OrThrow(
+        long key);
 
     /**
-     * <code>uint64 oneof_uint64 = 116;</code>
-     *
-     * @return Whether the oneofUint64 field is set.
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
      */
-    boolean hasOneofUint64();
-
+    int getMapSfixed32Sfixed32Count();
     /**
-     * <code>uint64 oneof_uint64 = 116;</code>
-     *
-     * @return The oneofUint64.
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
      */
-    long getOneofUint64();
+    boolean containsMapSfixed32Sfixed32(
+        int key);
+    /**
+     * Use {@link #getMapSfixed32Sfixed32Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapSfixed32Sfixed32();
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapSfixed32Sfixed32Map();
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    int getMapSfixed32Sfixed32OrDefault(
+        int key,
+        int defaultValue);
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    int getMapSfixed32Sfixed32OrThrow(
+        int key);
 
     /**
-     * <code>float oneof_float = 117;</code>
-     *
-     * @return Whether the oneofFloat field is set.
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
      */
-    boolean hasOneofFloat();
+    int getMapSfixed64Sfixed64Count();
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    boolean containsMapSfixed64Sfixed64(
+        long key);
+    /**
+     * Use {@link #getMapSfixed64Sfixed64Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapSfixed64Sfixed64();
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapSfixed64Sfixed64Map();
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    long getMapSfixed64Sfixed64OrDefault(
+        long key,
+        long defaultValue);
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    long getMapSfixed64Sfixed64OrThrow(
+        long key);
 
     /**
-     * <code>float oneof_float = 117;</code>
-     *
-     * @return The oneofFloat.
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
      */
-    float getOneofFloat();
+    int getMapInt32FloatCount();
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    boolean containsMapInt32Float(
+        int key);
+    /**
+     * Use {@link #getMapInt32FloatMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Float>
+    getMapInt32Float();
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Float>
+    getMapInt32FloatMap();
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    float getMapInt32FloatOrDefault(
+        int key,
+        float defaultValue);
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    float getMapInt32FloatOrThrow(
+        int key);
 
     /**
-     * <code>double oneof_double = 118;</code>
-     *
-     * @return Whether the oneofDouble field is set.
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
      */
-    boolean hasOneofDouble();
+    int getMapInt32DoubleCount();
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    boolean containsMapInt32Double(
+        int key);
+    /**
+     * Use {@link #getMapInt32DoubleMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Double>
+    getMapInt32Double();
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Double>
+    getMapInt32DoubleMap();
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    double getMapInt32DoubleOrDefault(
+        int key,
+        double defaultValue);
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    double getMapInt32DoubleOrThrow(
+        int key);
 
     /**
-     * <code>double oneof_double = 118;</code>
-     *
-     * @return The oneofDouble.
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
      */
-    double getOneofDouble();
+    int getMapBoolBoolCount();
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    boolean containsMapBoolBool(
+        boolean key);
+    /**
+     * Use {@link #getMapBoolBoolMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Boolean, java.lang.Boolean>
+    getMapBoolBool();
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    java.util.Map<java.lang.Boolean, java.lang.Boolean>
+    getMapBoolBoolMap();
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    boolean getMapBoolBoolOrDefault(
+        boolean key,
+        boolean defaultValue);
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    boolean getMapBoolBoolOrThrow(
+        boolean key);
 
     /**
-     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-     *
-     * @return Whether the oneofEnum field is set.
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
      */
-    boolean hasOneofEnum();
+    int getMapStringStringCount();
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    boolean containsMapStringString(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringStringMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, java.lang.String>
+    getMapStringString();
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    java.util.Map<java.lang.String, java.lang.String>
+    getMapStringStringMap();
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    /* nullable */
+java.lang.String getMapStringStringOrDefault(
+        java.lang.String key,
+        /* nullable */
+java.lang.String defaultValue);
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    java.lang.String getMapStringStringOrThrow(
+        java.lang.String key);
 
     /**
-     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-     *
-     * @return The enum numeric value on the wire for oneofEnum.
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
      */
-    int getOneofEnumValue();
+    int getMapStringBytesCount();
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    boolean containsMapStringBytes(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringBytesMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, com.google.protobuf.ByteString>
+    getMapStringBytes();
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    java.util.Map<java.lang.String, com.google.protobuf.ByteString>
+    getMapStringBytesMap();
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    /* nullable */
+com.google.protobuf.ByteString getMapStringBytesOrDefault(
+        java.lang.String key,
+        /* nullable */
+com.google.protobuf.ByteString defaultValue);
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    com.google.protobuf.ByteString getMapStringBytesOrThrow(
+        java.lang.String key);
 
     /**
-     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-     *
-     * @return The oneofEnum.
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getOneofEnum();
+    int getMapStringNestedMessageCount();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    boolean containsMapStringNestedMessage(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringNestedMessageMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
+    getMapStringNestedMessage();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
+    getMapStringNestedMessageMap();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getMapStringNestedMessageOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage defaultValue);
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getMapStringNestedMessageOrThrow(
+        java.lang.String key);
 
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.OneofFieldCase
-        getOneofFieldCase();
-  }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    int getMapStringForeignMessageCount();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    boolean containsMapStringForeignMessage(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringForeignMessageMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
+    getMapStringForeignMessage();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
+    getMapStringForeignMessageMap();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getMapStringForeignMessageOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage defaultValue);
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getMapStringForeignMessageOrThrow(
+        java.lang.String key);
 
-  /**
-   *
-   *
-   * <pre>
-   * This is a slightly trimmed-down version of TestAllTypesProto3 from
-   * google/protobuf/test_messages_proto3.proto but without imports/ctypes.
-   * </pre>
-   *
-   * Protobuf type {@code legacy_gencode_test.proto3.TestMostTypesProto3}
-   */
-  public static final class TestMostTypesProto3 extends com.google.protobuf.GeneratedMessage
-      implements
-      // @@protoc_insertion_point(message_implements:legacy_gencode_test.proto3.TestMostTypesProto3)
-      TestMostTypesProto3OrBuilder {
-    private static final long serialVersionUID = 0L;
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    int getMapStringNestedEnumCount();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    boolean containsMapStringNestedEnum(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringNestedEnumMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
+    getMapStringNestedEnum();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
+    getMapStringNestedEnumMap();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getMapStringNestedEnumOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum         defaultValue);
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getMapStringNestedEnumOrThrow(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringNestedEnumValueMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, java.lang.Integer>
+    getMapStringNestedEnumValue();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    java.util.Map<java.lang.String, java.lang.Integer>
+    getMapStringNestedEnumValueMap();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    int getMapStringNestedEnumValueOrDefault(
+        java.lang.String key,
+        int defaultValue);
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    int getMapStringNestedEnumValueOrThrow(
+        java.lang.String key);
 
-    static {
-      com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
-          com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
-          /* major= */ 4,
-          /* minor= */ 26,
-          /* patch= */ 0,
-          /* suffix= */ "",
-          TestMostTypesProto3.class.getName());
-    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    int getMapStringForeignEnumCount();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    boolean containsMapStringForeignEnum(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringForeignEnumMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
+    getMapStringForeignEnum();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
+    getMapStringForeignEnumMap();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getMapStringForeignEnumOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum         defaultValue);
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getMapStringForeignEnumOrThrow(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringForeignEnumValueMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, java.lang.Integer>
+    getMapStringForeignEnumValue();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    java.util.Map<java.lang.String, java.lang.Integer>
+    getMapStringForeignEnumValueMap();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    int getMapStringForeignEnumValueOrDefault(
+        java.lang.String key,
+        int defaultValue);
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    int getMapStringForeignEnumValueOrThrow(
+        java.lang.String key);
+
+    /**
+     * <code>uint32 oneof_uint32 = 111;</code>
+     * @return Whether the oneofUint32 field is set.
+     */
+    boolean hasOneofUint32();
+    /**
+     * <code>uint32 oneof_uint32 = 111;</code>
+     * @return The oneofUint32.
+     */
+    int getOneofUint32();
+
+    /**
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
+     * @return Whether the oneofNestedMessage field is set.
+     */
+    boolean hasOneofNestedMessage();
+    /**
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
+     * @return The oneofNestedMessage.
+     */
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getOneofNestedMessage();
+    /**
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
+     */
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder getOneofNestedMessageOrBuilder();
+
+    /**
+     * <code>string oneof_string = 113;</code>
+     * @return Whether the oneofString field is set.
+     */
+    boolean hasOneofString();
+    /**
+     * <code>string oneof_string = 113;</code>
+     * @return The oneofString.
+     */
+    java.lang.String getOneofString();
+    /**
+     * <code>string oneof_string = 113;</code>
+     * @return The bytes for oneofString.
+     */
+    com.google.protobuf.ByteString
+        getOneofStringBytes();
+
+    /**
+     * <code>bytes oneof_bytes = 114;</code>
+     * @return Whether the oneofBytes field is set.
+     */
+    boolean hasOneofBytes();
+    /**
+     * <code>bytes oneof_bytes = 114;</code>
+     * @return The oneofBytes.
+     */
+    com.google.protobuf.ByteString getOneofBytes();
+
+    /**
+     * <code>bool oneof_bool = 115;</code>
+     * @return Whether the oneofBool field is set.
+     */
+    boolean hasOneofBool();
+    /**
+     * <code>bool oneof_bool = 115;</code>
+     * @return The oneofBool.
+     */
+    boolean getOneofBool();
+
+    /**
+     * <code>uint64 oneof_uint64 = 116;</code>
+     * @return Whether the oneofUint64 field is set.
+     */
+    boolean hasOneofUint64();
+    /**
+     * <code>uint64 oneof_uint64 = 116;</code>
+     * @return The oneofUint64.
+     */
+    long getOneofUint64();
+
+    /**
+     * <code>float oneof_float = 117;</code>
+     * @return Whether the oneofFloat field is set.
+     */
+    boolean hasOneofFloat();
+    /**
+     * <code>float oneof_float = 117;</code>
+     * @return The oneofFloat.
+     */
+    float getOneofFloat();
+
+    /**
+     * <code>double oneof_double = 118;</code>
+     * @return Whether the oneofDouble field is set.
+     */
+    boolean hasOneofDouble();
+    /**
+     * <code>double oneof_double = 118;</code>
+     * @return The oneofDouble.
+     */
+    double getOneofDouble();
+
+    /**
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
+     * @return Whether the oneofEnum field is set.
+     */
+    boolean hasOneofEnum();
+    /**
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
+     * @return The enum numeric value on the wire for oneofEnum.
+     */
+    int getOneofEnumValue();
+    /**
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
+     * @return The oneofEnum.
+     */
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getOneofEnum();
 
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.OneofFieldCase getOneofFieldCase();
+  }
+  /**
+   * <pre>
+   * This is a slightly trimmed-down version of TestAllTypesProto3 from
+   * google/protobuf/test_messages_proto3.proto but without imports/ctypes.
+   * </pre>
+   *
+   * Protobuf type {@code legacy_gencode_test.proto3.TestMostTypesProto3}
+   */
+  public static final class TestMostTypesProto3 extends
+      com.google.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:legacy_gencode_test.proto3.TestMostTypesProto3)
+      TestMostTypesProto3OrBuilder {
+  private static final long serialVersionUID = 0L;
+    static {
+      com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
+        com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+        /* major= */ 4,
+        /* minor= */ 26,
+        /* patch= */ 0,
+        /* suffix= */ "",
+        TestMostTypesProto3.class.getName());
+    }
     // Use TestMostTypesProto3.newBuilder() to construct.
     private TestMostTypesProto3(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
     }
-
     private TestMostTypesProto3() {
       optionalString_ = "";
       optionalBytes_ = com.google.protobuf.ByteString.EMPTY;
@@ -3704,7 +3350,8 @@ private TestMostTypesProto3() {
       repeatedFloat_ = emptyFloatList();
       repeatedDouble_ = emptyDoubleList();
       repeatedBool_ = emptyBooleanList();
-      repeatedString_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      repeatedString_ =
+          com.google.protobuf.LazyStringArrayList.emptyList();
       repeatedBytes_ = emptyList(com.google.protobuf.ByteString.class);
       repeatedNestedMessage_ = java.util.Collections.emptyList();
       repeatedForeignMessage_ = java.util.Collections.emptyList();
@@ -3740,9 +3387,9 @@ private TestMostTypesProto3() {
       unpackedNestedEnum_ = java.util.Collections.emptyList();
     }
 
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return legacy_gencode_test.proto3.Proto3GencodeTestProto
-          .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor;
     }
 
     @SuppressWarnings({"rawtypes"})
@@ -3789,31 +3436,36 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
         case 74:
           return internalGetMapStringForeignEnum();
         default:
-          throw new RuntimeException("Invalid map field number: " + number);
+          throw new RuntimeException(
+              "Invalid map field number: " + number);
       }
     }
-
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return legacy_gencode_test.proto3.Proto3GencodeTestProto
-          .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_fieldAccessorTable
+      return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.class,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder.class);
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.class, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder.class);
     }
 
-    /** Protobuf enum {@code legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum} */
-    public enum NestedEnum implements com.google.protobuf.ProtocolMessageEnum {
-      /** <code>FOO = 0;</code> */
+    /**
+     * Protobuf enum {@code legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum}
+     */
+    public enum NestedEnum
+        implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * <code>FOO = 0;</code>
+       */
       FOO(0),
-      /** <code>BAR = 1;</code> */
+      /**
+       * <code>BAR = 1;</code>
+       */
       BAR(1),
-      /** <code>BAZ = 2;</code> */
+      /**
+       * <code>BAZ = 2;</code>
+       */
       BAZ(2),
       /**
-       *
-       *
        * <pre>
        * Intentionally negative.
        * </pre>
@@ -3826,26 +3478,26 @@ public enum NestedEnum implements com.google.protobuf.ProtocolMessageEnum {
 
       static {
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
-            com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
-            /* major= */ 4,
-            /* minor= */ 26,
-            /* patch= */ 0,
-            /* suffix= */ "",
-            NestedEnum.class.getName());
+          com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+          /* major= */ 4,
+          /* minor= */ 26,
+          /* patch= */ 0,
+          /* suffix= */ "",
+          NestedEnum.class.getName());
       }
-
-      /** <code>FOO = 0;</code> */
+      /**
+       * <code>FOO = 0;</code>
+       */
       public static final int FOO_VALUE = 0;
-
-      /** <code>BAR = 1;</code> */
+      /**
+       * <code>BAR = 1;</code>
+       */
       public static final int BAR_VALUE = 1;
-
-      /** <code>BAZ = 2;</code> */
+      /**
+       * <code>BAZ = 2;</code>
+       */
       public static final int BAZ_VALUE = 2;
-
       /**
-       *
-       *
        * <pre>
        * Intentionally negative.
        * </pre>
@@ -3854,6 +3506,7 @@ public enum NestedEnum implements com.google.protobuf.ProtocolMessageEnum {
        */
       public static final int NEG_VALUE = -1;
 
+
       public final int getNumber() {
         if (this == UNRECOGNIZED) {
           throw new java.lang.IllegalArgumentException(
@@ -3878,53 +3531,50 @@ public static NestedEnum valueOf(int value) {
        */
       public static NestedEnum forNumber(int value) {
         switch (value) {
-          case 0:
-            return FOO;
-          case 1:
-            return BAR;
-          case 2:
-            return BAZ;
-          case -1:
-            return NEG;
-          default:
-            return null;
+          case 0: return FOO;
+          case 1: return BAR;
+          case 2: return BAZ;
+          case -1: return NEG;
+          default: return null;
         }
       }
 
-      public static com.google.protobuf.Internal.EnumLiteMap<NestedEnum> internalGetValueMap() {
+      public static com.google.protobuf.Internal.EnumLiteMap<NestedEnum>
+          internalGetValueMap() {
         return internalValueMap;
       }
+      private static final com.google.protobuf.Internal.EnumLiteMap<
+          NestedEnum> internalValueMap =
+            new com.google.protobuf.Internal.EnumLiteMap<NestedEnum>() {
+              public NestedEnum findValueByNumber(int number) {
+                return NestedEnum.forNumber(number);
+              }
+            };
 
-      private static final com.google.protobuf.Internal.EnumLiteMap<NestedEnum> internalValueMap =
-          new com.google.protobuf.Internal.EnumLiteMap<NestedEnum>() {
-            public NestedEnum findValueByNumber(int number) {
-              return NestedEnum.forNumber(number);
-            }
-          };
-
-      public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+      public final com.google.protobuf.Descriptors.EnumValueDescriptor
+          getValueDescriptor() {
         if (this == UNRECOGNIZED) {
           throw new java.lang.IllegalStateException(
               "Can't get the descriptor of an unrecognized enum value.");
         }
         return getDescriptor().getValues().get(ordinal());
       }
-
-      public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
+      public final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptorForType() {
         return getDescriptor();
       }
-
-      public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDescriptor()
-            .getEnumTypes()
-            .get(0);
+      public static final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDescriptor().getEnumTypes().get(0);
       }
 
       private static final NestedEnum[] VALUES = values();
 
-      public static NestedEnum valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      public static NestedEnum valueOf(
+          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
         if (desc.getType() != getDescriptor()) {
-          throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
+          throw new java.lang.IllegalArgumentException(
+            "EnumValueDescriptor is not for this type.");
         }
         if (desc.getIndex() == -1) {
           return UNRECOGNIZED;
@@ -3941,54 +3591,73 @@ private NestedEnum(int value) {
       // @@protoc_insertion_point(enum_scope:legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum)
     }
 
-    /** Protobuf enum {@code legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum} */
-    public enum AliasedEnum implements com.google.protobuf.ProtocolMessageEnum {
-      /** <code>ALIAS_FOO = 0;</code> */
+    /**
+     * Protobuf enum {@code legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum}
+     */
+    public enum AliasedEnum
+        implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * <code>ALIAS_FOO = 0;</code>
+       */
       ALIAS_FOO(0),
-      /** <code>ALIAS_BAR = 1;</code> */
+      /**
+       * <code>ALIAS_BAR = 1;</code>
+       */
       ALIAS_BAR(1),
-      /** <code>ALIAS_BAZ = 2;</code> */
+      /**
+       * <code>ALIAS_BAZ = 2;</code>
+       */
       ALIAS_BAZ(2),
       UNRECOGNIZED(-1),
       ;
 
       static {
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
-            com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
-            /* major= */ 4,
-            /* minor= */ 26,
-            /* patch= */ 0,
-            /* suffix= */ "",
-            AliasedEnum.class.getName());
+          com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+          /* major= */ 4,
+          /* minor= */ 26,
+          /* patch= */ 0,
+          /* suffix= */ "",
+          AliasedEnum.class.getName());
       }
-
-      /** <code>MOO = 2;</code> */
+      /**
+       * <code>MOO = 2;</code>
+       */
       public static final AliasedEnum MOO = ALIAS_BAZ;
-
-      /** <code>moo = 2;</code> */
+      /**
+       * <code>moo = 2;</code>
+       */
       public static final AliasedEnum moo = ALIAS_BAZ;
-
-      /** <code>bAz = 2;</code> */
+      /**
+       * <code>bAz = 2;</code>
+       */
       public static final AliasedEnum bAz = ALIAS_BAZ;
-
-      /** <code>ALIAS_FOO = 0;</code> */
+      /**
+       * <code>ALIAS_FOO = 0;</code>
+       */
       public static final int ALIAS_FOO_VALUE = 0;
-
-      /** <code>ALIAS_BAR = 1;</code> */
+      /**
+       * <code>ALIAS_BAR = 1;</code>
+       */
       public static final int ALIAS_BAR_VALUE = 1;
-
-      /** <code>ALIAS_BAZ = 2;</code> */
+      /**
+       * <code>ALIAS_BAZ = 2;</code>
+       */
       public static final int ALIAS_BAZ_VALUE = 2;
-
-      /** <code>MOO = 2;</code> */
+      /**
+       * <code>MOO = 2;</code>
+       */
       public static final int MOO_VALUE = 2;
-
-      /** <code>moo = 2;</code> */
+      /**
+       * <code>moo = 2;</code>
+       */
       public static final int moo_VALUE = 2;
-
-      /** <code>bAz = 2;</code> */
+      /**
+       * <code>bAz = 2;</code>
+       */
       public static final int bAz_VALUE = 2;
 
+
       public final int getNumber() {
         if (this == UNRECOGNIZED) {
           throw new java.lang.IllegalArgumentException(
@@ -4013,57 +3682,53 @@ public static AliasedEnum valueOf(int value) {
        */
       public static AliasedEnum forNumber(int value) {
         switch (value) {
-          case 0:
-            return ALIAS_FOO;
-          case 1:
-            return ALIAS_BAR;
-          case 2:
-            return ALIAS_BAZ;
-          default:
-            return null;
+          case 0: return ALIAS_FOO;
+          case 1: return ALIAS_BAR;
+          case 2: return ALIAS_BAZ;
+          default: return null;
         }
       }
 
-      public static com.google.protobuf.Internal.EnumLiteMap<AliasedEnum> internalGetValueMap() {
+      public static com.google.protobuf.Internal.EnumLiteMap<AliasedEnum>
+          internalGetValueMap() {
         return internalValueMap;
       }
+      private static final com.google.protobuf.Internal.EnumLiteMap<
+          AliasedEnum> internalValueMap =
+            new com.google.protobuf.Internal.EnumLiteMap<AliasedEnum>() {
+              public AliasedEnum findValueByNumber(int number) {
+                return AliasedEnum.forNumber(number);
+              }
+            };
 
-      private static final com.google.protobuf.Internal.EnumLiteMap<AliasedEnum> internalValueMap =
-          new com.google.protobuf.Internal.EnumLiteMap<AliasedEnum>() {
-            public AliasedEnum findValueByNumber(int number) {
-              return AliasedEnum.forNumber(number);
-            }
-          };
-
-      public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+      public final com.google.protobuf.Descriptors.EnumValueDescriptor
+          getValueDescriptor() {
         if (this == UNRECOGNIZED) {
           throw new java.lang.IllegalStateException(
               "Can't get the descriptor of an unrecognized enum value.");
         }
         return getDescriptor().getValues().get(ordinal());
       }
-
-      public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
+      public final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptorForType() {
         return getDescriptor();
       }
-
-      public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDescriptor()
-            .getEnumTypes()
-            .get(1);
+      public static final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDescriptor().getEnumTypes().get(1);
       }
 
       private static final AliasedEnum[] VALUES = getStaticValuesArray();
-
       private static AliasedEnum[] getStaticValuesArray() {
         return new AliasedEnum[] {
-          ALIAS_FOO, ALIAS_BAR, ALIAS_BAZ, MOO, moo, bAz,
+        ALIAS_FOO, ALIAS_BAR, ALIAS_BAZ, MOO, moo, bAz, 
         };
       }
-
-      public static AliasedEnum valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      public static AliasedEnum valueOf(
+          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
         if (desc.getType() != getDescriptor()) {
-          throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
+          throw new java.lang.IllegalArgumentException(
+            "EnumValueDescriptor is not for this type.");
         }
         if (desc.getIndex() == -1) {
           return UNRECOGNIZED;
@@ -4080,85 +3745,73 @@ private AliasedEnum(int value) {
       // @@protoc_insertion_point(enum_scope:legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum)
     }
 
-    public interface NestedMessageOrBuilder
-        extends
+    public interface NestedMessageOrBuilder extends
         // @@protoc_insertion_point(interface_extends:legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage)
         com.google.protobuf.MessageOrBuilder {
 
       /**
        * <code>int32 a = 1;</code>
-       *
        * @return The a.
        */
       int getA();
 
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
-       *
        * @return Whether the corecursive field is set.
        */
       boolean hasCorecursive();
-
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
-       *
        * @return The corecursive.
        */
       legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 getCorecursive();
-
-      /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code> */
-      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder
-          getCorecursiveOrBuilder();
+      /**
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
+       */
+      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder getCorecursiveOrBuilder();
     }
-
-    /** Protobuf type {@code legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage} */
-    public static final class NestedMessage extends com.google.protobuf.GeneratedMessage
-        implements
+    /**
+     * Protobuf type {@code legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage}
+     */
+    public static final class NestedMessage extends
+        com.google.protobuf.GeneratedMessage implements
         // @@protoc_insertion_point(message_implements:legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage)
         NestedMessageOrBuilder {
-      private static final long serialVersionUID = 0L;
-
+    private static final long serialVersionUID = 0L;
       static {
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
-            com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
-            /* major= */ 4,
-            /* minor= */ 26,
-            /* patch= */ 0,
-            /* suffix= */ "",
-            NestedMessage.class.getName());
+          com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+          /* major= */ 4,
+          /* minor= */ 26,
+          /* patch= */ 0,
+          /* suffix= */ "",
+          NestedMessage.class.getName());
       }
-
       // Use NestedMessage.newBuilder() to construct.
       private NestedMessage(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
         super(builder);
       }
+      private NestedMessage() {
+      }
 
-      private NestedMessage() {}
-
-      public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_descriptor;
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_fieldAccessorTable
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                    .class,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                    .Builder.class);
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.class, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder.class);
       }
 
       private int bitField0_;
       public static final int A_FIELD_NUMBER = 1;
       private int a_ = 0;
-
       /**
        * <code>int32 a = 1;</code>
-       *
        * @return The a.
        */
       @java.lang.Override
@@ -4168,43 +3821,31 @@ public int getA() {
 
       public static final int CORECURSIVE_FIELD_NUMBER = 2;
       private legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 corecursive_;
-
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
-       *
        * @return Whether the corecursive field is set.
        */
       @java.lang.Override
       public boolean hasCorecursive() {
         return ((bitField0_ & 0x00000001) != 0);
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
-       *
        * @return The corecursive.
        */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-          getCorecursive() {
-        return corecursive_ == null
-            ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                .getDefaultInstance()
-            : corecursive_;
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 getCorecursive() {
+        return corecursive_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance() : corecursive_;
       }
-
-      /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code> */
+      /**
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
+       */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder
-          getCorecursiveOrBuilder() {
-        return corecursive_ == null
-            ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                .getDefaultInstance()
-            : corecursive_;
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder getCorecursiveOrBuilder() {
+        return corecursive_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance() : corecursive_;
       }
 
       private byte memoizedIsInitialized = -1;
-
       @java.lang.Override
       public final boolean isInitialized() {
         byte isInitialized = memoizedIsInitialized;
@@ -4216,7 +3857,8 @@ public final boolean isInitialized() {
       }
 
       @java.lang.Override
-      public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+      public void writeTo(com.google.protobuf.CodedOutputStream output)
+                          throws java.io.IOException {
         if (a_ != 0) {
           output.writeInt32(1, a_);
         }
@@ -4233,10 +3875,12 @@ public int getSerializedSize() {
 
         size = 0;
         if (a_ != 0) {
-          size += com.google.protobuf.CodedOutputStream.computeInt32Size(1, a_);
+          size += com.google.protobuf.CodedOutputStream
+            .computeInt32Size(1, a_);
         }
         if (((bitField0_ & 0x00000001) != 0)) {
-          size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getCorecursive());
+          size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(2, getCorecursive());
         }
         size += getUnknownFields().getSerializedSize();
         memoizedSize = size;
@@ -4246,21 +3890,19 @@ public int getSerializedSize() {
       @java.lang.Override
       public boolean equals(final java.lang.Object obj) {
         if (obj == this) {
-          return true;
+         return true;
         }
-        if (!(obj
-            instanceof
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage)) {
+        if (!(obj instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage)) {
           return super.equals(obj);
         }
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage other =
-            (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage)
-                obj;
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage other = (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) obj;
 
-        if (getA() != other.getA()) return false;
+        if (getA()
+            != other.getA()) return false;
         if (hasCorecursive() != other.hasCorecursive()) return false;
         if (hasCorecursive()) {
-          if (!getCorecursive().equals(other.getCorecursive())) return false;
+          if (!getCorecursive()
+              .equals(other.getCorecursive())) return false;
         }
         if (!getUnknownFields().equals(other.getUnknownFields())) return false;
         return true;
@@ -4284,116 +3926,90 @@ public int hashCode() {
         return hash;
       }
 
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseFrom(java.nio.ByteBuffer data)
-              throws com.google.protobuf.InvalidProtocolBufferException {
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseFrom(
+          java.nio.ByteBuffer data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseFrom(
-              java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws com.google.protobuf.InvalidProtocolBufferException {
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseFrom(
+          java.nio.ByteBuffer data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseFrom(com.google.protobuf.ByteString data)
-              throws com.google.protobuf.InvalidProtocolBufferException {
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseFrom(
+          com.google.protobuf.ByteString data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseFrom(
-              com.google.protobuf.ByteString data,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws com.google.protobuf.InvalidProtocolBufferException {
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseFrom(
+          com.google.protobuf.ByteString data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException {
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseFrom(byte[] data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseFrom(byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws com.google.protobuf.InvalidProtocolBufferException {
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseFrom(
+          byte[] data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseFrom(java.io.InputStream input) throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input);
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseFrom(java.io.InputStream input)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessage
+            .parseWithIOException(PARSER, input);
       }
-
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseFrom(
-              java.io.InputStream input,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessage.parseWithIOException(
-            PARSER, input, extensionRegistry);
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseFrom(
+          java.io.InputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessage
+            .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessage.parseDelimitedWithIOException(PARSER, input);
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseDelimitedFrom(java.io.InputStream input)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessage
+            .parseDelimitedWithIOException(PARSER, input);
       }
 
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseDelimitedFrom(
-              java.io.InputStream input,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessage.parseDelimitedWithIOException(
-            PARSER, input, extensionRegistry);
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseDelimitedFrom(
+          java.io.InputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessage
+            .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
       }
-
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseFrom(com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input);
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseFrom(
+          com.google.protobuf.CodedInputStream input)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessage
+            .parseWithIOException(PARSER, input);
       }
-
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseFrom(
-              com.google.protobuf.CodedInputStream input,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessage.parseWithIOException(
-            PARSER, input, extensionRegistry);
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessage
+            .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
       @java.lang.Override
-      public Builder newBuilderForType() {
-        return newBuilder();
-      }
-
+      public Builder newBuilderForType() { return newBuilder(); }
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
       }
-
-      public static Builder newBuilder(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              prototype) {
+      public static Builder newBuilder(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
-
       @java.lang.Override
       public Builder toBuilder() {
-        return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+        return this == DEFAULT_INSTANCE
+            ? new Builder() : new Builder().mergeFrom(this);
       }
 
       @java.lang.Override
@@ -4402,48 +4018,42 @@ protected Builder newBuilderForType(
         Builder builder = new Builder(parent);
         return builder;
       }
-
-      /** Protobuf type {@code legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage} */
-      public static final class Builder
-          extends com.google.protobuf.GeneratedMessage.Builder<Builder>
-          implements
+      /**
+       * Protobuf type {@code legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage}
+       */
+      public static final class Builder extends
+          com.google.protobuf.GeneratedMessage.Builder<Builder> implements
           // @@protoc_insertion_point(builder_implements:legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage)
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessageOrBuilder {
-        public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-          return legacy_gencode_test.proto3.Proto3GencodeTestProto
-              .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_descriptor;
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder {
+        public static final com.google.protobuf.Descriptors.Descriptor
+            getDescriptor() {
+          return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_descriptor;
         }
 
         @java.lang.Override
         protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return legacy_gencode_test.proto3.Proto3GencodeTestProto
-              .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_fieldAccessorTable
+          return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage.class,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage.Builder.class);
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.class, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder.class);
         }
 
-        // Construct using
-        // legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.newBuilder()
+        // Construct using legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
 
-        private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        private Builder(
+            com.google.protobuf.GeneratedMessage.BuilderParent parent) {
           super(parent);
           maybeForceBuilderInitialization();
         }
-
         private void maybeForceBuilderInitialization() {
-          if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+          if (com.google.protobuf.GeneratedMessage
+                  .alwaysUseFieldBuilders) {
             getCorecursiveFieldBuilder();
           }
         }
-
         @java.lang.Override
         public Builder clear() {
           super.clear();
@@ -4458,23 +4068,19 @@ public Builder clear() {
         }
 
         @java.lang.Override
-        public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-          return legacy_gencode_test.proto3.Proto3GencodeTestProto
-              .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_descriptor;
+        public com.google.protobuf.Descriptors.Descriptor
+            getDescriptorForType() {
+          return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_descriptor;
         }
 
         @java.lang.Override
-        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-            getDefaultInstanceForType() {
-          return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .getDefaultInstance();
+        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getDefaultInstanceForType() {
+          return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance();
         }
 
         @java.lang.Override
-        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-            build() {
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              result = buildPartial();
+        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage build() {
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
@@ -4482,30 +4088,23 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
         }
 
         @java.lang.Override
-        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-            buildPartial() {
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              result =
-                  new legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage(this);
-          if (bitField0_ != 0) {
-            buildPartial0(result);
-          }
+        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage buildPartial() {
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage result = new legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage(this);
+          if (bitField0_ != 0) { buildPartial0(result); }
           onBuilt();
           return result;
         }
 
-        private void buildPartial0(
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                result) {
+        private void buildPartial0(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage result) {
           int from_bitField0_ = bitField0_;
           if (((from_bitField0_ & 0x00000001) != 0)) {
             result.a_ = a_;
           }
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000002) != 0)) {
-            result.corecursive_ =
-                corecursiveBuilder_ == null ? corecursive_ : corecursiveBuilder_.build();
+            result.corecursive_ = corecursiveBuilder_ == null
+                ? corecursive_
+                : corecursiveBuilder_.build();
             to_bitField0_ |= 0x00000001;
           }
           result.bitField0_ |= to_bitField0_;
@@ -4513,25 +4112,16 @@ private void buildPartial0(
 
         @java.lang.Override
         public Builder mergeFrom(com.google.protobuf.Message other) {
-          if (other
-              instanceof
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) {
-            return mergeFrom(
-                (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                        .NestedMessage)
-                    other);
+          if (other instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) {
+            return mergeFrom((legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                other) {
-          if (other
-              == legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .getDefaultInstance()) return this;
+        public Builder mergeFrom(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage other) {
+          if (other == legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance()) return this;
           if (other.getA() != 0) {
             setA(other.getA());
           }
@@ -4564,25 +4154,24 @@ public Builder mergeFrom(
                 case 0:
                   done = true;
                   break;
-                case 8:
-                  {
-                    a_ = input.readInt32();
-                    bitField0_ |= 0x00000001;
-                    break;
-                  } // case 8
-                case 18:
-                  {
-                    input.readMessage(getCorecursiveFieldBuilder().getBuilder(), extensionRegistry);
-                    bitField0_ |= 0x00000002;
-                    break;
-                  } // case 18
-                default:
-                  {
-                    if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                      done = true; // was an endgroup tag
-                    }
-                    break;
-                  } // default:
+                case 8: {
+                  a_ = input.readInt32();
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 8
+                case 18: {
+                  input.readMessage(
+                      getCorecursiveFieldBuilder().getBuilder(),
+                      extensionRegistry);
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 18
+                default: {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
               } // switch (tag)
             } // while (!done)
           } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -4592,24 +4181,19 @@ public Builder mergeFrom(
           } // finally
           return this;
         }
-
         private int bitField0_;
 
-        private int a_;
-
+        private int a_ ;
         /**
          * <code>int32 a = 1;</code>
-         *
          * @return The a.
          */
         @java.lang.Override
         public int getA() {
           return a_;
         }
-
         /**
          * <code>int32 a = 1;</code>
-         *
          * @param value The a to set.
          * @return This builder for chaining.
          */
@@ -4620,10 +4204,8 @@ public Builder setA(int value) {
           onChanged();
           return this;
         }
-
         /**
          * <code>int32 a = 1;</code>
-         *
          * @return This builder for chaining.
          */
         public Builder clearA() {
@@ -4635,40 +4217,29 @@ public Builder clearA() {
 
         private legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 corecursive_;
         private com.google.protobuf.SingleFieldBuilder<
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder>
-            corecursiveBuilder_;
-
+            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder> corecursiveBuilder_;
         /**
          * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
-         *
          * @return Whether the corecursive field is set.
          */
         public boolean hasCorecursive() {
           return ((bitField0_ & 0x00000002) != 0);
         }
-
         /**
          * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
-         *
          * @return The corecursive.
          */
-        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-            getCorecursive() {
+        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 getCorecursive() {
           if (corecursiveBuilder_ == null) {
-            return corecursive_ == null
-                ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .getDefaultInstance()
-                : corecursive_;
+            return corecursive_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance() : corecursive_;
           } else {
             return corecursiveBuilder_.getMessage();
           }
         }
-
-        /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code> */
-        public Builder setCorecursive(
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 value) {
+        /**
+         * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
+         */
+        public Builder setCorecursive(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 value) {
           if (corecursiveBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -4681,11 +4252,11 @@ public Builder setCorecursive(
           onChanged();
           return this;
         }
-
-        /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code> */
+        /**
+         * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
+         */
         public Builder setCorecursive(
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder
-                builderForValue) {
+            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder builderForValue) {
           if (corecursiveBuilder_ == null) {
             corecursive_ = builderForValue.build();
           } else {
@@ -4695,16 +4266,14 @@ public Builder setCorecursive(
           onChanged();
           return this;
         }
-
-        /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code> */
-        public Builder mergeCorecursive(
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 value) {
+        /**
+         * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
+         */
+        public Builder mergeCorecursive(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 value) {
           if (corecursiveBuilder_ == null) {
-            if (((bitField0_ & 0x00000002) != 0)
-                && corecursive_ != null
-                && corecursive_
-                    != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                        .getDefaultInstance()) {
+            if (((bitField0_ & 0x00000002) != 0) &&
+              corecursive_ != null &&
+              corecursive_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance()) {
               getCorecursiveBuilder().mergeFrom(value);
             } else {
               corecursive_ = value;
@@ -4718,8 +4287,9 @@ public Builder mergeCorecursive(
           }
           return this;
         }
-
-        /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code> */
+        /**
+         * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
+         */
         public Builder clearCorecursive() {
           bitField0_ = (bitField0_ & ~0x00000002);
           corecursive_ = null;
@@ -4730,41 +4300,37 @@ public Builder clearCorecursive() {
           onChanged();
           return this;
         }
-
-        /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code> */
-        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder
-            getCorecursiveBuilder() {
+        /**
+         * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
+         */
+        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder getCorecursiveBuilder() {
           bitField0_ |= 0x00000002;
           onChanged();
           return getCorecursiveFieldBuilder().getBuilder();
         }
-
-        /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code> */
-        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder
-            getCorecursiveOrBuilder() {
+        /**
+         * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
+         */
+        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder getCorecursiveOrBuilder() {
           if (corecursiveBuilder_ != null) {
             return corecursiveBuilder_.getMessageOrBuilder();
           } else {
-            return corecursive_ == null
-                ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .getDefaultInstance()
-                : corecursive_;
+            return corecursive_ == null ?
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance() : corecursive_;
           }
         }
-
-        /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code> */
+        /**
+         * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
+         */
         private com.google.protobuf.SingleFieldBuilder<
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder>
+            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder> 
             getCorecursiveFieldBuilder() {
           if (corecursiveBuilder_ == null) {
-            corecursiveBuilder_ =
-                new com.google.protobuf.SingleFieldBuilder<
-                    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3,
-                    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder,
-                    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder>(
-                    getCorecursive(), getParentForChildren(), isClean());
+            corecursiveBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder>(
+                    getCorecursive(),
+                    getParentForChildren(),
+                    isClean());
             corecursive_ = null;
           }
           return corecursiveBuilder_;
@@ -4774,44 +4340,36 @@ public Builder clearCorecursive() {
       }
 
       // @@protoc_insertion_point(class_scope:legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage)
-      private static final legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          DEFAULT_INSTANCE;
-
+      private static final legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage DEFAULT_INSTANCE;
       static {
-        DEFAULT_INSTANCE =
-            new legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                .NestedMessage();
+        DEFAULT_INSTANCE = new legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage();
       }
 
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          getDefaultInstance() {
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getDefaultInstance() {
         return DEFAULT_INSTANCE;
       }
 
-      private static final com.google.protobuf.Parser<NestedMessage> PARSER =
-          new com.google.protobuf.AbstractParser<NestedMessage>() {
-            @java.lang.Override
-            public NestedMessage parsePartialFrom(
-                com.google.protobuf.CodedInputStream input,
-                com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-                throws com.google.protobuf.InvalidProtocolBufferException {
-              Builder builder = newBuilder();
-              try {
-                builder.mergeFrom(input, extensionRegistry);
-              } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-                throw e.setUnfinishedMessage(builder.buildPartial());
-              } catch (com.google.protobuf.UninitializedMessageException e) {
-                throw e.asInvalidProtocolBufferException()
-                    .setUnfinishedMessage(builder.buildPartial());
-              } catch (java.io.IOException e) {
-                throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                    .setUnfinishedMessage(builder.buildPartial());
-              }
-              return builder.buildPartial();
-            }
-          };
+      private static final com.google.protobuf.Parser<NestedMessage>
+          PARSER = new com.google.protobuf.AbstractParser<NestedMessage>() {
+        @java.lang.Override
+        public NestedMessage parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
+        }
+      };
 
       public static com.google.protobuf.Parser<NestedMessage> parser() {
         return PARSER;
@@ -4823,21 +4381,18 @@ public com.google.protobuf.Parser<NestedMessage> getParserForType() {
       }
 
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-          getDefaultInstanceForType() {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
+
     }
 
     private int bitField0_;
     private int oneofFieldCase_ = 0;
-
     @SuppressWarnings("serial")
     private java.lang.Object oneofField_;
-
     public enum OneofFieldCase
-        implements
-            com.google.protobuf.Internal.EnumLite,
+        implements com.google.protobuf.Internal.EnumLite,
             com.google.protobuf.AbstractMessage.InternalOneOfEnum {
       ONEOF_UINT32(111),
       ONEOF_NESTED_MESSAGE(112),
@@ -4850,11 +4405,9 @@ public enum OneofFieldCase
       ONEOF_ENUM(119),
       ONEOFFIELD_NOT_SET(0);
       private final int value;
-
       private OneofFieldCase(int value) {
         this.value = value;
       }
-
       /**
        * @param value The number of the enum to look for.
        * @return The enum associated with the given number.
@@ -4867,46 +4420,34 @@ public static OneofFieldCase valueOf(int value) {
 
       public static OneofFieldCase forNumber(int value) {
         switch (value) {
-          case 111:
-            return ONEOF_UINT32;
-          case 112:
-            return ONEOF_NESTED_MESSAGE;
-          case 113:
-            return ONEOF_STRING;
-          case 114:
-            return ONEOF_BYTES;
-          case 115:
-            return ONEOF_BOOL;
-          case 116:
-            return ONEOF_UINT64;
-          case 117:
-            return ONEOF_FLOAT;
-          case 118:
-            return ONEOF_DOUBLE;
-          case 119:
-            return ONEOF_ENUM;
-          case 0:
-            return ONEOFFIELD_NOT_SET;
-          default:
-            return null;
+          case 111: return ONEOF_UINT32;
+          case 112: return ONEOF_NESTED_MESSAGE;
+          case 113: return ONEOF_STRING;
+          case 114: return ONEOF_BYTES;
+          case 115: return ONEOF_BOOL;
+          case 116: return ONEOF_UINT64;
+          case 117: return ONEOF_FLOAT;
+          case 118: return ONEOF_DOUBLE;
+          case 119: return ONEOF_ENUM;
+          case 0: return ONEOFFIELD_NOT_SET;
+          default: return null;
         }
       }
-
       public int getNumber() {
         return this.value;
       }
     };
 
-    public OneofFieldCase getOneofFieldCase() {
-      return OneofFieldCase.forNumber(oneofFieldCase_);
+    public OneofFieldCase
+    getOneofFieldCase() {
+      return OneofFieldCase.forNumber(
+          oneofFieldCase_);
     }
 
     public static final int OPTIONAL_INT32_FIELD_NUMBER = 1;
     private int optionalInt32_ = 0;
-
     /**
      * <code>int32 optional_int32 = 1;</code>
-     *
      * @return The optionalInt32.
      */
     @java.lang.Override
@@ -4916,10 +4457,8 @@ public int getOptionalInt32() {
 
     public static final int OPTIONAL_INT64_FIELD_NUMBER = 2;
     private long optionalInt64_ = 0L;
-
     /**
      * <code>int64 optional_int64 = 2;</code>
-     *
      * @return The optionalInt64.
      */
     @java.lang.Override
@@ -4929,10 +4468,8 @@ public long getOptionalInt64() {
 
     public static final int OPTIONAL_UINT32_FIELD_NUMBER = 3;
     private int optionalUint32_ = 0;
-
     /**
      * <code>uint32 optional_uint32 = 3;</code>
-     *
      * @return The optionalUint32.
      */
     @java.lang.Override
@@ -4942,10 +4479,8 @@ public int getOptionalUint32() {
 
     public static final int OPTIONAL_UINT64_FIELD_NUMBER = 4;
     private long optionalUint64_ = 0L;
-
     /**
      * <code>uint64 optional_uint64 = 4;</code>
-     *
      * @return The optionalUint64.
      */
     @java.lang.Override
@@ -4955,10 +4490,8 @@ public long getOptionalUint64() {
 
     public static final int OPTIONAL_SINT32_FIELD_NUMBER = 5;
     private int optionalSint32_ = 0;
-
     /**
      * <code>sint32 optional_sint32 = 5;</code>
-     *
      * @return The optionalSint32.
      */
     @java.lang.Override
@@ -4968,10 +4501,8 @@ public int getOptionalSint32() {
 
     public static final int OPTIONAL_SINT64_FIELD_NUMBER = 6;
     private long optionalSint64_ = 0L;
-
     /**
      * <code>sint64 optional_sint64 = 6;</code>
-     *
      * @return The optionalSint64.
      */
     @java.lang.Override
@@ -4981,10 +4512,8 @@ public long getOptionalSint64() {
 
     public static final int OPTIONAL_FIXED32_FIELD_NUMBER = 7;
     private int optionalFixed32_ = 0;
-
     /**
      * <code>fixed32 optional_fixed32 = 7;</code>
-     *
      * @return The optionalFixed32.
      */
     @java.lang.Override
@@ -4994,10 +4523,8 @@ public int getOptionalFixed32() {
 
     public static final int OPTIONAL_FIXED64_FIELD_NUMBER = 8;
     private long optionalFixed64_ = 0L;
-
     /**
      * <code>fixed64 optional_fixed64 = 8;</code>
-     *
      * @return The optionalFixed64.
      */
     @java.lang.Override
@@ -5007,10 +4534,8 @@ public long getOptionalFixed64() {
 
     public static final int OPTIONAL_SFIXED32_FIELD_NUMBER = 9;
     private int optionalSfixed32_ = 0;
-
     /**
      * <code>sfixed32 optional_sfixed32 = 9;</code>
-     *
      * @return The optionalSfixed32.
      */
     @java.lang.Override
@@ -5020,10 +4545,8 @@ public int getOptionalSfixed32() {
 
     public static final int OPTIONAL_SFIXED64_FIELD_NUMBER = 10;
     private long optionalSfixed64_ = 0L;
-
     /**
      * <code>sfixed64 optional_sfixed64 = 10;</code>
-     *
      * @return The optionalSfixed64.
      */
     @java.lang.Override
@@ -5033,10 +4556,8 @@ public long getOptionalSfixed64() {
 
     public static final int OPTIONAL_FLOAT_FIELD_NUMBER = 11;
     private float optionalFloat_ = 0F;
-
     /**
      * <code>float optional_float = 11;</code>
-     *
      * @return The optionalFloat.
      */
     @java.lang.Override
@@ -5046,10 +4567,8 @@ public float getOptionalFloat() {
 
     public static final int OPTIONAL_DOUBLE_FIELD_NUMBER = 12;
     private double optionalDouble_ = 0D;
-
     /**
      * <code>double optional_double = 12;</code>
-     *
      * @return The optionalDouble.
      */
     @java.lang.Override
@@ -5059,10 +4578,8 @@ public double getOptionalDouble() {
 
     public static final int OPTIONAL_BOOL_FIELD_NUMBER = 13;
     private boolean optionalBool_ = false;
-
     /**
      * <code>bool optional_bool = 13;</code>
-     *
      * @return The optionalBool.
      */
     @java.lang.Override
@@ -5071,13 +4588,10 @@ public boolean getOptionalBool() {
     }
 
     public static final int OPTIONAL_STRING_FIELD_NUMBER = 14;
-
     @SuppressWarnings("serial")
     private volatile java.lang.Object optionalString_ = "";
-
     /**
      * <code>string optional_string = 14;</code>
-     *
      * @return The optionalString.
      */
     @java.lang.Override
@@ -5086,24 +4600,25 @@ public java.lang.String getOptionalString() {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         optionalString_ = s;
         return s;
       }
     }
-
     /**
      * <code>string optional_string = 14;</code>
-     *
      * @return The bytes for optionalString.
      */
     @java.lang.Override
-    public com.google.protobuf.ByteString getOptionalStringBytes() {
+    public com.google.protobuf.ByteString
+        getOptionalStringBytes() {
       java.lang.Object ref = optionalString_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
         optionalString_ = b;
         return b;
       } else {
@@ -5113,10 +4628,8 @@ public com.google.protobuf.ByteString getOptionalStringBytes() {
 
     public static final int OPTIONAL_BYTES_FIELD_NUMBER = 15;
     private com.google.protobuf.ByteString optionalBytes_ = com.google.protobuf.ByteString.EMPTY;
-
     /**
      * <code>bytes optional_bytes = 15;</code>
-     *
      * @return The optionalBytes.
      */
     @java.lang.Override
@@ -5125,775 +4638,598 @@ public com.google.protobuf.ByteString getOptionalBytes() {
     }
 
     public static final int OPTIONAL_NESTED_MESSAGE_FIELD_NUMBER = 18;
-    private legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-        optionalNestedMessage_;
-
+    private legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage optionalNestedMessage_;
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
      * @return Whether the optionalNestedMessage field is set.
      */
     @java.lang.Override
     public boolean hasOptionalNestedMessage() {
       return ((bitField0_ & 0x00000001) != 0);
     }
-
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
      * @return The optionalNestedMessage.
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-        getOptionalNestedMessage() {
-      return optionalNestedMessage_ == null
-          ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .getDefaultInstance()
-          : optionalNestedMessage_;
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getOptionalNestedMessage() {
+      return optionalNestedMessage_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance() : optionalNestedMessage_;
     }
-
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-     * </code>
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-            .NestedMessageOrBuilder
-        getOptionalNestedMessageOrBuilder() {
-      return optionalNestedMessage_ == null
-          ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .getDefaultInstance()
-          : optionalNestedMessage_;
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder getOptionalNestedMessageOrBuilder() {
+      return optionalNestedMessage_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance() : optionalNestedMessage_;
     }
 
     public static final int OPTIONAL_FOREIGN_MESSAGE_FIELD_NUMBER = 19;
-    private legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        optionalForeignMessage_;
-
+    private legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage optionalForeignMessage_;
     /**
      * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
-     *
      * @return Whether the optionalForeignMessage field is set.
      */
     @java.lang.Override
     public boolean hasOptionalForeignMessage() {
       return ((bitField0_ & 0x00000002) != 0);
     }
-
     /**
      * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
-     *
      * @return The optionalForeignMessage.
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        getOptionalForeignMessage() {
-      return optionalForeignMessage_ == null
-          ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance()
-          : optionalForeignMessage_;
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getOptionalForeignMessage() {
+      return optionalForeignMessage_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance() : optionalForeignMessage_;
     }
-
-    /** <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code> */
+    /**
+     * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
+     */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder
-        getOptionalForeignMessageOrBuilder() {
-      return optionalForeignMessage_ == null
-          ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance()
-          : optionalForeignMessage_;
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder getOptionalForeignMessageOrBuilder() {
+      return optionalForeignMessage_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance() : optionalForeignMessage_;
     }
 
     public static final int OPTIONAL_NESTED_ENUM_FIELD_NUMBER = 21;
     private int optionalNestedEnum_ = 0;
-
     /**
-     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;</code>
      * @return The enum numeric value on the wire for optionalNestedEnum.
      */
-    @java.lang.Override
-    public int getOptionalNestedEnumValue() {
+    @java.lang.Override public int getOptionalNestedEnumValue() {
       return optionalNestedEnum_;
     }
-
     /**
-     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;</code>
      * @return The optionalNestedEnum.
      */
-    @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getOptionalNestedEnum() {
-      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum result =
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-              .forNumber(optionalNestedEnum_);
-      return result == null
-          ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-              .UNRECOGNIZED
-          : result;
+    @java.lang.Override public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getOptionalNestedEnum() {
+      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.forNumber(optionalNestedEnum_);
+      return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.UNRECOGNIZED : result;
     }
 
     public static final int OPTIONAL_FOREIGN_ENUM_FIELD_NUMBER = 22;
     private int optionalForeignEnum_ = 0;
-
     /**
      * <code>.legacy_gencode_test.proto3.ForeignEnum optional_foreign_enum = 22;</code>
-     *
      * @return The enum numeric value on the wire for optionalForeignEnum.
      */
-    @java.lang.Override
-    public int getOptionalForeignEnumValue() {
+    @java.lang.Override public int getOptionalForeignEnumValue() {
       return optionalForeignEnum_;
     }
-
     /**
      * <code>.legacy_gencode_test.proto3.ForeignEnum optional_foreign_enum = 22;</code>
-     *
      * @return The optionalForeignEnum.
      */
-    @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getOptionalForeignEnum() {
-      legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum result =
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.forNumber(
-              optionalForeignEnum_);
-      return result == null
-          ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.UNRECOGNIZED
-          : result;
+    @java.lang.Override public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getOptionalForeignEnum() {
+      legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.forNumber(optionalForeignEnum_);
+      return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.UNRECOGNIZED : result;
     }
 
     public static final int OPTIONAL_ALIASED_ENUM_FIELD_NUMBER = 23;
     private int optionalAliasedEnum_ = 0;
-
     /**
-     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;</code>
      * @return The enum numeric value on the wire for optionalAliasedEnum.
      */
-    @java.lang.Override
-    public int getOptionalAliasedEnumValue() {
+    @java.lang.Override public int getOptionalAliasedEnumValue() {
       return optionalAliasedEnum_;
     }
-
     /**
-     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;</code>
      * @return The optionalAliasedEnum.
      */
-    @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum
-        getOptionalAliasedEnum() {
-      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum result =
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum
-              .forNumber(optionalAliasedEnum_);
-      return result == null
-          ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum
-              .UNRECOGNIZED
-          : result;
+    @java.lang.Override public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum getOptionalAliasedEnum() {
+      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum.forNumber(optionalAliasedEnum_);
+      return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum.UNRECOGNIZED : result;
     }
 
     public static final int RECURSIVE_MESSAGE_FIELD_NUMBER = 27;
     private legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 recursiveMessage_;
-
     /**
      * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
-     *
      * @return Whether the recursiveMessage field is set.
      */
     @java.lang.Override
     public boolean hasRecursiveMessage() {
       return ((bitField0_ & 0x00000004) != 0);
     }
-
     /**
      * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
-     *
      * @return The recursiveMessage.
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-        getRecursiveMessage() {
-      return recursiveMessage_ == null
-          ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .getDefaultInstance()
-          : recursiveMessage_;
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 getRecursiveMessage() {
+      return recursiveMessage_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance() : recursiveMessage_;
     }
-
-    /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code> */
+    /**
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
+     */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder
-        getRecursiveMessageOrBuilder() {
-      return recursiveMessage_ == null
-          ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .getDefaultInstance()
-          : recursiveMessage_;
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder getRecursiveMessageOrBuilder() {
+      return recursiveMessage_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance() : recursiveMessage_;
     }
 
     public static final int REPEATED_INT32_FIELD_NUMBER = 31;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList repeatedInt32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList repeatedInt32_ =
+        emptyIntList();
     /**
-     *
-     *
      * <pre>
      * Repeated
      * </pre>
      *
      * <code>repeated int32 repeated_int32 = 31;</code>
-     *
      * @return A list containing the repeatedInt32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getRepeatedInt32List() {
+    public java.util.List<java.lang.Integer>
+        getRepeatedInt32List() {
       return repeatedInt32_;
     }
-
     /**
-     *
-     *
      * <pre>
      * Repeated
      * </pre>
      *
      * <code>repeated int32 repeated_int32 = 31;</code>
-     *
      * @return The count of repeatedInt32.
      */
     public int getRepeatedInt32Count() {
       return repeatedInt32_.size();
     }
-
     /**
-     *
-     *
      * <pre>
      * Repeated
      * </pre>
      *
      * <code>repeated int32 repeated_int32 = 31;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedInt32 at the given index.
      */
     public int getRepeatedInt32(int index) {
       return repeatedInt32_.getInt(index);
     }
-
     private int repeatedInt32MemoizedSerializedSize = -1;
 
     public static final int REPEATED_INT64_FIELD_NUMBER = 32;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList repeatedInt64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList repeatedInt64_ =
+        emptyLongList();
     /**
      * <code>repeated int64 repeated_int64 = 32;</code>
-     *
      * @return A list containing the repeatedInt64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getRepeatedInt64List() {
+    public java.util.List<java.lang.Long>
+        getRepeatedInt64List() {
       return repeatedInt64_;
     }
-
     /**
      * <code>repeated int64 repeated_int64 = 32;</code>
-     *
      * @return The count of repeatedInt64.
      */
     public int getRepeatedInt64Count() {
       return repeatedInt64_.size();
     }
-
     /**
      * <code>repeated int64 repeated_int64 = 32;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedInt64 at the given index.
      */
     public long getRepeatedInt64(int index) {
       return repeatedInt64_.getLong(index);
     }
-
     private int repeatedInt64MemoizedSerializedSize = -1;
 
     public static final int REPEATED_UINT32_FIELD_NUMBER = 33;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList repeatedUint32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList repeatedUint32_ =
+        emptyIntList();
     /**
      * <code>repeated uint32 repeated_uint32 = 33;</code>
-     *
      * @return A list containing the repeatedUint32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getRepeatedUint32List() {
+    public java.util.List<java.lang.Integer>
+        getRepeatedUint32List() {
       return repeatedUint32_;
     }
-
     /**
      * <code>repeated uint32 repeated_uint32 = 33;</code>
-     *
      * @return The count of repeatedUint32.
      */
     public int getRepeatedUint32Count() {
       return repeatedUint32_.size();
     }
-
     /**
      * <code>repeated uint32 repeated_uint32 = 33;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedUint32 at the given index.
      */
     public int getRepeatedUint32(int index) {
       return repeatedUint32_.getInt(index);
     }
-
     private int repeatedUint32MemoizedSerializedSize = -1;
 
     public static final int REPEATED_UINT64_FIELD_NUMBER = 34;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList repeatedUint64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList repeatedUint64_ =
+        emptyLongList();
     /**
      * <code>repeated uint64 repeated_uint64 = 34;</code>
-     *
      * @return A list containing the repeatedUint64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getRepeatedUint64List() {
+    public java.util.List<java.lang.Long>
+        getRepeatedUint64List() {
       return repeatedUint64_;
     }
-
     /**
      * <code>repeated uint64 repeated_uint64 = 34;</code>
-     *
      * @return The count of repeatedUint64.
      */
     public int getRepeatedUint64Count() {
       return repeatedUint64_.size();
     }
-
     /**
      * <code>repeated uint64 repeated_uint64 = 34;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedUint64 at the given index.
      */
     public long getRepeatedUint64(int index) {
       return repeatedUint64_.getLong(index);
     }
-
     private int repeatedUint64MemoizedSerializedSize = -1;
 
     public static final int REPEATED_SINT32_FIELD_NUMBER = 35;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList repeatedSint32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList repeatedSint32_ =
+        emptyIntList();
     /**
      * <code>repeated sint32 repeated_sint32 = 35;</code>
-     *
      * @return A list containing the repeatedSint32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getRepeatedSint32List() {
+    public java.util.List<java.lang.Integer>
+        getRepeatedSint32List() {
       return repeatedSint32_;
     }
-
     /**
      * <code>repeated sint32 repeated_sint32 = 35;</code>
-     *
      * @return The count of repeatedSint32.
      */
     public int getRepeatedSint32Count() {
       return repeatedSint32_.size();
     }
-
     /**
      * <code>repeated sint32 repeated_sint32 = 35;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedSint32 at the given index.
      */
     public int getRepeatedSint32(int index) {
       return repeatedSint32_.getInt(index);
     }
-
     private int repeatedSint32MemoizedSerializedSize = -1;
 
     public static final int REPEATED_SINT64_FIELD_NUMBER = 36;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList repeatedSint64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList repeatedSint64_ =
+        emptyLongList();
     /**
      * <code>repeated sint64 repeated_sint64 = 36;</code>
-     *
      * @return A list containing the repeatedSint64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getRepeatedSint64List() {
+    public java.util.List<java.lang.Long>
+        getRepeatedSint64List() {
       return repeatedSint64_;
     }
-
     /**
      * <code>repeated sint64 repeated_sint64 = 36;</code>
-     *
      * @return The count of repeatedSint64.
      */
     public int getRepeatedSint64Count() {
       return repeatedSint64_.size();
     }
-
     /**
      * <code>repeated sint64 repeated_sint64 = 36;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedSint64 at the given index.
      */
     public long getRepeatedSint64(int index) {
       return repeatedSint64_.getLong(index);
     }
-
     private int repeatedSint64MemoizedSerializedSize = -1;
 
     public static final int REPEATED_FIXED32_FIELD_NUMBER = 37;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList repeatedFixed32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList repeatedFixed32_ =
+        emptyIntList();
     /**
      * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-     *
      * @return A list containing the repeatedFixed32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getRepeatedFixed32List() {
+    public java.util.List<java.lang.Integer>
+        getRepeatedFixed32List() {
       return repeatedFixed32_;
     }
-
     /**
      * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-     *
      * @return The count of repeatedFixed32.
      */
     public int getRepeatedFixed32Count() {
       return repeatedFixed32_.size();
     }
-
     /**
      * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedFixed32 at the given index.
      */
     public int getRepeatedFixed32(int index) {
       return repeatedFixed32_.getInt(index);
     }
-
     private int repeatedFixed32MemoizedSerializedSize = -1;
 
     public static final int REPEATED_FIXED64_FIELD_NUMBER = 38;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList repeatedFixed64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList repeatedFixed64_ =
+        emptyLongList();
     /**
      * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-     *
      * @return A list containing the repeatedFixed64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getRepeatedFixed64List() {
+    public java.util.List<java.lang.Long>
+        getRepeatedFixed64List() {
       return repeatedFixed64_;
     }
-
     /**
      * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-     *
      * @return The count of repeatedFixed64.
      */
     public int getRepeatedFixed64Count() {
       return repeatedFixed64_.size();
     }
-
     /**
      * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedFixed64 at the given index.
      */
     public long getRepeatedFixed64(int index) {
       return repeatedFixed64_.getLong(index);
     }
-
     private int repeatedFixed64MemoizedSerializedSize = -1;
 
     public static final int REPEATED_SFIXED32_FIELD_NUMBER = 39;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList repeatedSfixed32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList repeatedSfixed32_ =
+        emptyIntList();
     /**
      * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-     *
      * @return A list containing the repeatedSfixed32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getRepeatedSfixed32List() {
+    public java.util.List<java.lang.Integer>
+        getRepeatedSfixed32List() {
       return repeatedSfixed32_;
     }
-
     /**
      * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-     *
      * @return The count of repeatedSfixed32.
      */
     public int getRepeatedSfixed32Count() {
       return repeatedSfixed32_.size();
     }
-
     /**
      * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedSfixed32 at the given index.
      */
     public int getRepeatedSfixed32(int index) {
       return repeatedSfixed32_.getInt(index);
     }
-
     private int repeatedSfixed32MemoizedSerializedSize = -1;
 
     public static final int REPEATED_SFIXED64_FIELD_NUMBER = 40;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList repeatedSfixed64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList repeatedSfixed64_ =
+        emptyLongList();
     /**
      * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-     *
      * @return A list containing the repeatedSfixed64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getRepeatedSfixed64List() {
+    public java.util.List<java.lang.Long>
+        getRepeatedSfixed64List() {
       return repeatedSfixed64_;
     }
-
     /**
      * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-     *
      * @return The count of repeatedSfixed64.
      */
     public int getRepeatedSfixed64Count() {
       return repeatedSfixed64_.size();
     }
-
     /**
      * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedSfixed64 at the given index.
      */
     public long getRepeatedSfixed64(int index) {
       return repeatedSfixed64_.getLong(index);
     }
-
     private int repeatedSfixed64MemoizedSerializedSize = -1;
 
     public static final int REPEATED_FLOAT_FIELD_NUMBER = 41;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.FloatList repeatedFloat_ = emptyFloatList();
-
+    private com.google.protobuf.Internal.FloatList repeatedFloat_ =
+        emptyFloatList();
     /**
      * <code>repeated float repeated_float = 41;</code>
-     *
      * @return A list containing the repeatedFloat.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Float> getRepeatedFloatList() {
+    public java.util.List<java.lang.Float>
+        getRepeatedFloatList() {
       return repeatedFloat_;
     }
-
     /**
      * <code>repeated float repeated_float = 41;</code>
-     *
      * @return The count of repeatedFloat.
      */
     public int getRepeatedFloatCount() {
       return repeatedFloat_.size();
     }
-
     /**
      * <code>repeated float repeated_float = 41;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedFloat at the given index.
      */
     public float getRepeatedFloat(int index) {
       return repeatedFloat_.getFloat(index);
     }
-
     private int repeatedFloatMemoizedSerializedSize = -1;
 
     public static final int REPEATED_DOUBLE_FIELD_NUMBER = 42;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.DoubleList repeatedDouble_ = emptyDoubleList();
-
+    private com.google.protobuf.Internal.DoubleList repeatedDouble_ =
+        emptyDoubleList();
     /**
      * <code>repeated double repeated_double = 42;</code>
-     *
      * @return A list containing the repeatedDouble.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Double> getRepeatedDoubleList() {
+    public java.util.List<java.lang.Double>
+        getRepeatedDoubleList() {
       return repeatedDouble_;
     }
-
     /**
      * <code>repeated double repeated_double = 42;</code>
-     *
      * @return The count of repeatedDouble.
      */
     public int getRepeatedDoubleCount() {
       return repeatedDouble_.size();
     }
-
     /**
      * <code>repeated double repeated_double = 42;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedDouble at the given index.
      */
     public double getRepeatedDouble(int index) {
       return repeatedDouble_.getDouble(index);
     }
-
     private int repeatedDoubleMemoizedSerializedSize = -1;
 
     public static final int REPEATED_BOOL_FIELD_NUMBER = 43;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.BooleanList repeatedBool_ = emptyBooleanList();
-
+    private com.google.protobuf.Internal.BooleanList repeatedBool_ =
+        emptyBooleanList();
     /**
      * <code>repeated bool repeated_bool = 43;</code>
-     *
      * @return A list containing the repeatedBool.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Boolean> getRepeatedBoolList() {
+    public java.util.List<java.lang.Boolean>
+        getRepeatedBoolList() {
       return repeatedBool_;
     }
-
     /**
      * <code>repeated bool repeated_bool = 43;</code>
-     *
      * @return The count of repeatedBool.
      */
     public int getRepeatedBoolCount() {
       return repeatedBool_.size();
     }
-
     /**
      * <code>repeated bool repeated_bool = 43;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedBool at the given index.
      */
     public boolean getRepeatedBool(int index) {
       return repeatedBool_.getBoolean(index);
     }
-
     private int repeatedBoolMemoizedSerializedSize = -1;
 
     public static final int REPEATED_STRING_FIELD_NUMBER = 44;
-
     @SuppressWarnings("serial")
     private com.google.protobuf.LazyStringArrayList repeatedString_ =
         com.google.protobuf.LazyStringArrayList.emptyList();
-
     /**
      * <code>repeated string repeated_string = 44;</code>
-     *
      * @return A list containing the repeatedString.
      */
-    public com.google.protobuf.ProtocolStringList getRepeatedStringList() {
+    public com.google.protobuf.ProtocolStringList
+        getRepeatedStringList() {
       return repeatedString_;
     }
-
     /**
      * <code>repeated string repeated_string = 44;</code>
-     *
      * @return The count of repeatedString.
      */
     public int getRepeatedStringCount() {
       return repeatedString_.size();
     }
-
     /**
      * <code>repeated string repeated_string = 44;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedString at the given index.
      */
     public java.lang.String getRepeatedString(int index) {
       return repeatedString_.get(index);
     }
-
     /**
      * <code>repeated string repeated_string = 44;</code>
-     *
      * @param index The index of the value to return.
      * @return The bytes of the repeatedString at the given index.
      */
-    public com.google.protobuf.ByteString getRepeatedStringBytes(int index) {
+    public com.google.protobuf.ByteString
+        getRepeatedStringBytes(int index) {
       return repeatedString_.getByteString(index);
     }
 
     public static final int REPEATED_BYTES_FIELD_NUMBER = 45;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.ProtobufList<com.google.protobuf.ByteString>
-        repeatedBytes_ = emptyList(com.google.protobuf.ByteString.class);
-
+    private com.google.protobuf.Internal.ProtobufList<com.google.protobuf.ByteString> repeatedBytes_ =
+        emptyList(com.google.protobuf.ByteString.class);
     /**
      * <code>repeated bytes repeated_bytes = 45;</code>
-     *
      * @return A list containing the repeatedBytes.
      */
     @java.lang.Override
-    public java.util.List<com.google.protobuf.ByteString> getRepeatedBytesList() {
+    public java.util.List<com.google.protobuf.ByteString>
+        getRepeatedBytesList() {
       return repeatedBytes_;
     }
-
     /**
      * <code>repeated bytes repeated_bytes = 45;</code>
-     *
      * @return The count of repeatedBytes.
      */
     public int getRepeatedBytesCount() {
       return repeatedBytes_.size();
     }
-
     /**
      * <code>repeated bytes repeated_bytes = 45;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedBytes at the given index.
      */
@@ -5902,214 +5238,136 @@ public com.google.protobuf.ByteString getRepeatedBytes(int index) {
     }
 
     public static final int REPEATED_NESTED_MESSAGE_FIELD_NUMBER = 48;
-
     @SuppressWarnings("serial")
-    private java.util.List<
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-        repeatedNestedMessage_;
-
+    private java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> repeatedNestedMessage_;
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
      */
     @java.lang.Override
-    public java.util.List<
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-        getRepeatedNestedMessageList() {
+    public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> getRepeatedNestedMessageList() {
       return repeatedNestedMessage_;
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
      */
     @java.lang.Override
-    public java.util.List<
-            ? extends
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .NestedMessageOrBuilder>
+    public java.util.List<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> 
         getRepeatedNestedMessageOrBuilderList() {
       return repeatedNestedMessage_;
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
      */
     @java.lang.Override
     public int getRepeatedNestedMessageCount() {
       return repeatedNestedMessage_.size();
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-        getRepeatedNestedMessage(int index) {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getRepeatedNestedMessage(int index) {
       return repeatedNestedMessage_.get(index);
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-            .NestedMessageOrBuilder
-        getRepeatedNestedMessageOrBuilder(int index) {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder getRepeatedNestedMessageOrBuilder(
+        int index) {
       return repeatedNestedMessage_.get(index);
     }
 
     public static final int REPEATED_FOREIGN_MESSAGE_FIELD_NUMBER = 49;
-
     @SuppressWarnings("serial")
-    private java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-        repeatedForeignMessage_;
-
+    private java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> repeatedForeignMessage_;
     /**
-     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
      */
     @java.lang.Override
-    public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-        getRepeatedForeignMessageList() {
+    public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> getRepeatedForeignMessageList() {
       return repeatedForeignMessage_;
     }
-
     /**
-     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
      */
     @java.lang.Override
-    public java.util.List<
-            ? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>
+    public java.util.List<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder> 
         getRepeatedForeignMessageOrBuilderList() {
       return repeatedForeignMessage_;
     }
-
     /**
-     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
      */
     @java.lang.Override
     public int getRepeatedForeignMessageCount() {
       return repeatedForeignMessage_.size();
     }
-
     /**
-     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        getRepeatedForeignMessage(int index) {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedForeignMessage(int index) {
       return repeatedForeignMessage_.get(index);
     }
-
     /**
-     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder
-        getRepeatedForeignMessageOrBuilder(int index) {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder getRepeatedForeignMessageOrBuilder(
+        int index) {
       return repeatedForeignMessage_.get(index);
     }
 
     public static final int REPEATED_NESTED_ENUM_FIELD_NUMBER = 51;
-
     @SuppressWarnings("serial")
     private java.util.List<java.lang.Integer> repeatedNestedEnum_;
-
     private static final com.google.protobuf.Internal.ListAdapter.Converter<
-            java.lang.Integer,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        repeatedNestedEnum_converter_ =
+        java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> repeatedNestedEnum_converter_ =
             new com.google.protobuf.Internal.ListAdapter.Converter<
-                java.lang.Integer,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .NestedEnum>() {
-              public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedEnum
-                  convert(java.lang.Integer from) {
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                    result =
-                        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                            .NestedEnum.forNumber(from);
-                return result == null
-                    ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                        .NestedEnum.UNRECOGNIZED
-                    : result;
+                java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>() {
+              public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum convert(java.lang.Integer from) {
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.forNumber(from);
+                return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.UNRECOGNIZED : result;
               }
             };
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
      * @return A list containing the repeatedNestedEnum.
      */
     @java.lang.Override
-    public java.util.List<
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        getRepeatedNestedEnumList() {
+    public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> getRepeatedNestedEnumList() {
       return new com.google.protobuf.Internal.ListAdapter<
-          java.lang.Integer,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(
-          repeatedNestedEnum_, repeatedNestedEnum_converter_);
+          java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(repeatedNestedEnum_, repeatedNestedEnum_converter_);
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
      * @return The count of repeatedNestedEnum.
      */
     @java.lang.Override
     public int getRepeatedNestedEnumCount() {
       return repeatedNestedEnum_.size();
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
      * @param index The index of the element to return.
      * @return The repeatedNestedEnum at the given index.
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getRepeatedNestedEnum(int index) {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getRepeatedNestedEnum(int index) {
       return repeatedNestedEnum_converter_.convert(repeatedNestedEnum_.get(index));
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
      * @return A list containing the enum numeric values on the wire for repeatedNestedEnum.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getRepeatedNestedEnumValueList() {
+    public java.util.List<java.lang.Integer>
+    getRepeatedNestedEnumValueList() {
       return repeatedNestedEnum_;
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
      * @param index The index of the value to return.
      * @return The enum numeric value on the wire of repeatedNestedEnum at the given index.
      */
@@ -6117,78 +5375,57 @@ public java.util.List<java.lang.Integer> getRepeatedNestedEnumValueList() {
     public int getRepeatedNestedEnumValue(int index) {
       return repeatedNestedEnum_.get(index);
     }
-
     private int repeatedNestedEnumMemoizedSerializedSize;
 
     public static final int REPEATED_FOREIGN_ENUM_FIELD_NUMBER = 52;
-
     @SuppressWarnings("serial")
     private java.util.List<java.lang.Integer> repeatedForeignEnum_;
-
     private static final com.google.protobuf.Internal.ListAdapter.Converter<
-            java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-        repeatedForeignEnum_converter_ =
+        java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum> repeatedForeignEnum_converter_ =
             new com.google.protobuf.Internal.ListAdapter.Converter<
-                java.lang.Integer,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>() {
-              public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum convert(
-                  java.lang.Integer from) {
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum result =
-                    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.forNumber(from);
-                return result == null
-                    ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.UNRECOGNIZED
-                    : result;
+                java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>() {
+              public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum convert(java.lang.Integer from) {
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.forNumber(from);
+                return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.UNRECOGNIZED : result;
               }
             };
-
     /**
      * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-     *
      * @return A list containing the repeatedForeignEnum.
      */
     @java.lang.Override
-    public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-        getRepeatedForeignEnumList() {
+    public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum> getRepeatedForeignEnumList() {
       return new com.google.protobuf.Internal.ListAdapter<
-          java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>(
-          repeatedForeignEnum_, repeatedForeignEnum_converter_);
+          java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>(repeatedForeignEnum_, repeatedForeignEnum_converter_);
     }
-
     /**
      * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-     *
      * @return The count of repeatedForeignEnum.
      */
     @java.lang.Override
     public int getRepeatedForeignEnumCount() {
       return repeatedForeignEnum_.size();
     }
-
     /**
      * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedForeignEnum at the given index.
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getRepeatedForeignEnum(
-        int index) {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getRepeatedForeignEnum(int index) {
       return repeatedForeignEnum_converter_.convert(repeatedForeignEnum_.get(index));
     }
-
     /**
      * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-     *
      * @return A list containing the enum numeric values on the wire for repeatedForeignEnum.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getRepeatedForeignEnumValueList() {
+    public java.util.List<java.lang.Integer>
+    getRepeatedForeignEnumValueList() {
       return repeatedForeignEnum_;
     }
-
     /**
      * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-     *
      * @param index The index of the value to return.
      * @return The enum numeric value on the wire of repeatedForeignEnum at the given index.
      */
@@ -6196,582 +5433,459 @@ public java.util.List<java.lang.Integer> getRepeatedForeignEnumValueList() {
     public int getRepeatedForeignEnumValue(int index) {
       return repeatedForeignEnum_.get(index);
     }
-
     private int repeatedForeignEnumMemoizedSerializedSize;
 
     public static final int PACKED_INT32_FIELD_NUMBER = 75;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList packedInt32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList packedInt32_ =
+        emptyIntList();
     /**
-     *
-     *
      * <pre>
      * Packed
      * </pre>
      *
      * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-     *
      * @return A list containing the packedInt32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getPackedInt32List() {
+    public java.util.List<java.lang.Integer>
+        getPackedInt32List() {
       return packedInt32_;
     }
-
     /**
-     *
-     *
      * <pre>
      * Packed
      * </pre>
      *
      * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-     *
      * @return The count of packedInt32.
      */
     public int getPackedInt32Count() {
       return packedInt32_.size();
     }
-
     /**
-     *
-     *
      * <pre>
      * Packed
      * </pre>
      *
      * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedInt32 at the given index.
      */
     public int getPackedInt32(int index) {
       return packedInt32_.getInt(index);
     }
-
     private int packedInt32MemoizedSerializedSize = -1;
 
     public static final int PACKED_INT64_FIELD_NUMBER = 76;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList packedInt64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList packedInt64_ =
+        emptyLongList();
     /**
      * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-     *
      * @return A list containing the packedInt64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getPackedInt64List() {
+    public java.util.List<java.lang.Long>
+        getPackedInt64List() {
       return packedInt64_;
     }
-
     /**
      * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-     *
      * @return The count of packedInt64.
      */
     public int getPackedInt64Count() {
       return packedInt64_.size();
     }
-
     /**
      * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedInt64 at the given index.
      */
     public long getPackedInt64(int index) {
       return packedInt64_.getLong(index);
     }
-
     private int packedInt64MemoizedSerializedSize = -1;
 
     public static final int PACKED_UINT32_FIELD_NUMBER = 77;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList packedUint32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList packedUint32_ =
+        emptyIntList();
     /**
      * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-     *
      * @return A list containing the packedUint32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getPackedUint32List() {
+    public java.util.List<java.lang.Integer>
+        getPackedUint32List() {
       return packedUint32_;
     }
-
     /**
      * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-     *
      * @return The count of packedUint32.
      */
     public int getPackedUint32Count() {
       return packedUint32_.size();
     }
-
     /**
      * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedUint32 at the given index.
      */
     public int getPackedUint32(int index) {
       return packedUint32_.getInt(index);
     }
-
     private int packedUint32MemoizedSerializedSize = -1;
 
     public static final int PACKED_UINT64_FIELD_NUMBER = 78;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList packedUint64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList packedUint64_ =
+        emptyLongList();
     /**
      * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-     *
      * @return A list containing the packedUint64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getPackedUint64List() {
+    public java.util.List<java.lang.Long>
+        getPackedUint64List() {
       return packedUint64_;
     }
-
     /**
      * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-     *
      * @return The count of packedUint64.
      */
     public int getPackedUint64Count() {
       return packedUint64_.size();
     }
-
     /**
      * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedUint64 at the given index.
      */
     public long getPackedUint64(int index) {
       return packedUint64_.getLong(index);
     }
-
     private int packedUint64MemoizedSerializedSize = -1;
 
     public static final int PACKED_SINT32_FIELD_NUMBER = 79;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList packedSint32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList packedSint32_ =
+        emptyIntList();
     /**
      * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-     *
      * @return A list containing the packedSint32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getPackedSint32List() {
+    public java.util.List<java.lang.Integer>
+        getPackedSint32List() {
       return packedSint32_;
     }
-
     /**
      * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-     *
      * @return The count of packedSint32.
      */
     public int getPackedSint32Count() {
       return packedSint32_.size();
     }
-
     /**
      * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedSint32 at the given index.
      */
     public int getPackedSint32(int index) {
       return packedSint32_.getInt(index);
     }
-
     private int packedSint32MemoizedSerializedSize = -1;
 
     public static final int PACKED_SINT64_FIELD_NUMBER = 80;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList packedSint64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList packedSint64_ =
+        emptyLongList();
     /**
      * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-     *
      * @return A list containing the packedSint64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getPackedSint64List() {
+    public java.util.List<java.lang.Long>
+        getPackedSint64List() {
       return packedSint64_;
     }
-
     /**
      * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-     *
      * @return The count of packedSint64.
      */
     public int getPackedSint64Count() {
       return packedSint64_.size();
     }
-
     /**
      * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedSint64 at the given index.
      */
     public long getPackedSint64(int index) {
       return packedSint64_.getLong(index);
     }
-
     private int packedSint64MemoizedSerializedSize = -1;
 
     public static final int PACKED_FIXED32_FIELD_NUMBER = 81;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList packedFixed32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList packedFixed32_ =
+        emptyIntList();
     /**
      * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-     *
      * @return A list containing the packedFixed32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getPackedFixed32List() {
+    public java.util.List<java.lang.Integer>
+        getPackedFixed32List() {
       return packedFixed32_;
     }
-
     /**
      * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-     *
      * @return The count of packedFixed32.
      */
     public int getPackedFixed32Count() {
       return packedFixed32_.size();
     }
-
     /**
      * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedFixed32 at the given index.
      */
     public int getPackedFixed32(int index) {
       return packedFixed32_.getInt(index);
     }
-
     private int packedFixed32MemoizedSerializedSize = -1;
 
     public static final int PACKED_FIXED64_FIELD_NUMBER = 82;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList packedFixed64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList packedFixed64_ =
+        emptyLongList();
     /**
      * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-     *
      * @return A list containing the packedFixed64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getPackedFixed64List() {
+    public java.util.List<java.lang.Long>
+        getPackedFixed64List() {
       return packedFixed64_;
     }
-
     /**
      * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-     *
      * @return The count of packedFixed64.
      */
     public int getPackedFixed64Count() {
       return packedFixed64_.size();
     }
-
     /**
      * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedFixed64 at the given index.
      */
     public long getPackedFixed64(int index) {
       return packedFixed64_.getLong(index);
     }
-
     private int packedFixed64MemoizedSerializedSize = -1;
 
     public static final int PACKED_SFIXED32_FIELD_NUMBER = 83;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList packedSfixed32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList packedSfixed32_ =
+        emptyIntList();
     /**
      * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-     *
      * @return A list containing the packedSfixed32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getPackedSfixed32List() {
+    public java.util.List<java.lang.Integer>
+        getPackedSfixed32List() {
       return packedSfixed32_;
     }
-
     /**
      * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-     *
      * @return The count of packedSfixed32.
      */
     public int getPackedSfixed32Count() {
       return packedSfixed32_.size();
     }
-
     /**
      * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedSfixed32 at the given index.
      */
     public int getPackedSfixed32(int index) {
       return packedSfixed32_.getInt(index);
     }
-
     private int packedSfixed32MemoizedSerializedSize = -1;
 
     public static final int PACKED_SFIXED64_FIELD_NUMBER = 84;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList packedSfixed64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList packedSfixed64_ =
+        emptyLongList();
     /**
      * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-     *
      * @return A list containing the packedSfixed64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getPackedSfixed64List() {
+    public java.util.List<java.lang.Long>
+        getPackedSfixed64List() {
       return packedSfixed64_;
     }
-
     /**
      * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-     *
      * @return The count of packedSfixed64.
      */
     public int getPackedSfixed64Count() {
       return packedSfixed64_.size();
     }
-
     /**
      * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedSfixed64 at the given index.
      */
     public long getPackedSfixed64(int index) {
       return packedSfixed64_.getLong(index);
     }
-
     private int packedSfixed64MemoizedSerializedSize = -1;
 
     public static final int PACKED_FLOAT_FIELD_NUMBER = 85;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.FloatList packedFloat_ = emptyFloatList();
-
+    private com.google.protobuf.Internal.FloatList packedFloat_ =
+        emptyFloatList();
     /**
      * <code>repeated float packed_float = 85 [packed = true];</code>
-     *
      * @return A list containing the packedFloat.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Float> getPackedFloatList() {
+    public java.util.List<java.lang.Float>
+        getPackedFloatList() {
       return packedFloat_;
     }
-
     /**
      * <code>repeated float packed_float = 85 [packed = true];</code>
-     *
      * @return The count of packedFloat.
      */
     public int getPackedFloatCount() {
       return packedFloat_.size();
     }
-
     /**
      * <code>repeated float packed_float = 85 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedFloat at the given index.
      */
     public float getPackedFloat(int index) {
       return packedFloat_.getFloat(index);
     }
-
     private int packedFloatMemoizedSerializedSize = -1;
 
     public static final int PACKED_DOUBLE_FIELD_NUMBER = 86;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.DoubleList packedDouble_ = emptyDoubleList();
-
+    private com.google.protobuf.Internal.DoubleList packedDouble_ =
+        emptyDoubleList();
     /**
      * <code>repeated double packed_double = 86 [packed = true];</code>
-     *
      * @return A list containing the packedDouble.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Double> getPackedDoubleList() {
+    public java.util.List<java.lang.Double>
+        getPackedDoubleList() {
       return packedDouble_;
     }
-
     /**
      * <code>repeated double packed_double = 86 [packed = true];</code>
-     *
      * @return The count of packedDouble.
      */
     public int getPackedDoubleCount() {
       return packedDouble_.size();
     }
-
     /**
      * <code>repeated double packed_double = 86 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedDouble at the given index.
      */
     public double getPackedDouble(int index) {
       return packedDouble_.getDouble(index);
     }
-
     private int packedDoubleMemoizedSerializedSize = -1;
 
     public static final int PACKED_BOOL_FIELD_NUMBER = 87;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.BooleanList packedBool_ = emptyBooleanList();
-
+    private com.google.protobuf.Internal.BooleanList packedBool_ =
+        emptyBooleanList();
     /**
      * <code>repeated bool packed_bool = 87 [packed = true];</code>
-     *
      * @return A list containing the packedBool.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Boolean> getPackedBoolList() {
+    public java.util.List<java.lang.Boolean>
+        getPackedBoolList() {
       return packedBool_;
     }
-
     /**
      * <code>repeated bool packed_bool = 87 [packed = true];</code>
-     *
      * @return The count of packedBool.
      */
     public int getPackedBoolCount() {
       return packedBool_.size();
     }
-
     /**
      * <code>repeated bool packed_bool = 87 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedBool at the given index.
      */
     public boolean getPackedBool(int index) {
       return packedBool_.getBoolean(index);
     }
-
     private int packedBoolMemoizedSerializedSize = -1;
 
     public static final int PACKED_NESTED_ENUM_FIELD_NUMBER = 88;
-
     @SuppressWarnings("serial")
     private java.util.List<java.lang.Integer> packedNestedEnum_;
-
     private static final com.google.protobuf.Internal.ListAdapter.Converter<
-            java.lang.Integer,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        packedNestedEnum_converter_ =
+        java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> packedNestedEnum_converter_ =
             new com.google.protobuf.Internal.ListAdapter.Converter<
-                java.lang.Integer,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .NestedEnum>() {
-              public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedEnum
-                  convert(java.lang.Integer from) {
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                    result =
-                        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                            .NestedEnum.forNumber(from);
-                return result == null
-                    ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                        .NestedEnum.UNRECOGNIZED
-                    : result;
+                java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>() {
+              public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum convert(java.lang.Integer from) {
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.forNumber(from);
+                return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.UNRECOGNIZED : result;
               }
             };
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
      * @return A list containing the packedNestedEnum.
      */
     @java.lang.Override
-    public java.util.List<
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        getPackedNestedEnumList() {
+    public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> getPackedNestedEnumList() {
       return new com.google.protobuf.Internal.ListAdapter<
-          java.lang.Integer,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(
-          packedNestedEnum_, packedNestedEnum_converter_);
+          java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(packedNestedEnum_, packedNestedEnum_converter_);
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
      * @return The count of packedNestedEnum.
      */
     @java.lang.Override
     public int getPackedNestedEnumCount() {
       return packedNestedEnum_.size();
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
      * @param index The index of the element to return.
      * @return The packedNestedEnum at the given index.
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getPackedNestedEnum(int index) {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getPackedNestedEnum(int index) {
       return packedNestedEnum_converter_.convert(packedNestedEnum_.get(index));
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
      * @return A list containing the enum numeric values on the wire for packedNestedEnum.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getPackedNestedEnumValueList() {
+    public java.util.List<java.lang.Integer>
+    getPackedNestedEnumValueList() {
       return packedNestedEnum_;
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
      * @param index The index of the value to return.
      * @return The enum numeric value on the wire of packedNestedEnum at the given index.
      */
@@ -6779,54 +5893,42 @@ public java.util.List<java.lang.Integer> getPackedNestedEnumValueList() {
     public int getPackedNestedEnumValue(int index) {
       return packedNestedEnum_.get(index);
     }
-
     private int packedNestedEnumMemoizedSerializedSize;
 
     public static final int UNPACKED_INT32_FIELD_NUMBER = 89;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList unpackedInt32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList unpackedInt32_ =
+        emptyIntList();
     /**
-     *
-     *
      * <pre>
      * Unpacked
      * </pre>
      *
      * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-     *
      * @return A list containing the unpackedInt32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getUnpackedInt32List() {
+    public java.util.List<java.lang.Integer>
+        getUnpackedInt32List() {
       return unpackedInt32_;
     }
-
     /**
-     *
-     *
      * <pre>
      * Unpacked
      * </pre>
      *
      * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-     *
      * @return The count of unpackedInt32.
      */
     public int getUnpackedInt32Count() {
       return unpackedInt32_.size();
     }
-
     /**
-     *
-     *
      * <pre>
      * Unpacked
      * </pre>
      *
      * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedInt32 at the given index.
      */
@@ -6835,32 +5937,27 @@ public int getUnpackedInt32(int index) {
     }
 
     public static final int UNPACKED_INT64_FIELD_NUMBER = 90;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList unpackedInt64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList unpackedInt64_ =
+        emptyLongList();
     /**
      * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-     *
      * @return A list containing the unpackedInt64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getUnpackedInt64List() {
+    public java.util.List<java.lang.Long>
+        getUnpackedInt64List() {
       return unpackedInt64_;
     }
-
     /**
      * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-     *
      * @return The count of unpackedInt64.
      */
     public int getUnpackedInt64Count() {
       return unpackedInt64_.size();
     }
-
     /**
      * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedInt64 at the given index.
      */
@@ -6869,32 +5966,27 @@ public long getUnpackedInt64(int index) {
     }
 
     public static final int UNPACKED_UINT32_FIELD_NUMBER = 91;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList unpackedUint32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList unpackedUint32_ =
+        emptyIntList();
     /**
      * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-     *
      * @return A list containing the unpackedUint32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getUnpackedUint32List() {
+    public java.util.List<java.lang.Integer>
+        getUnpackedUint32List() {
       return unpackedUint32_;
     }
-
     /**
      * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-     *
      * @return The count of unpackedUint32.
      */
     public int getUnpackedUint32Count() {
       return unpackedUint32_.size();
     }
-
     /**
      * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedUint32 at the given index.
      */
@@ -6903,32 +5995,27 @@ public int getUnpackedUint32(int index) {
     }
 
     public static final int UNPACKED_UINT64_FIELD_NUMBER = 92;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList unpackedUint64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList unpackedUint64_ =
+        emptyLongList();
     /**
      * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-     *
      * @return A list containing the unpackedUint64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getUnpackedUint64List() {
+    public java.util.List<java.lang.Long>
+        getUnpackedUint64List() {
       return unpackedUint64_;
     }
-
     /**
      * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-     *
      * @return The count of unpackedUint64.
      */
     public int getUnpackedUint64Count() {
       return unpackedUint64_.size();
     }
-
     /**
      * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedUint64 at the given index.
      */
@@ -6937,32 +6024,27 @@ public long getUnpackedUint64(int index) {
     }
 
     public static final int UNPACKED_SINT32_FIELD_NUMBER = 93;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList unpackedSint32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList unpackedSint32_ =
+        emptyIntList();
     /**
      * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-     *
      * @return A list containing the unpackedSint32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getUnpackedSint32List() {
+    public java.util.List<java.lang.Integer>
+        getUnpackedSint32List() {
       return unpackedSint32_;
     }
-
     /**
      * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-     *
      * @return The count of unpackedSint32.
      */
     public int getUnpackedSint32Count() {
       return unpackedSint32_.size();
     }
-
     /**
      * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedSint32 at the given index.
      */
@@ -6971,32 +6053,27 @@ public int getUnpackedSint32(int index) {
     }
 
     public static final int UNPACKED_SINT64_FIELD_NUMBER = 94;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList unpackedSint64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList unpackedSint64_ =
+        emptyLongList();
     /**
      * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-     *
      * @return A list containing the unpackedSint64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getUnpackedSint64List() {
+    public java.util.List<java.lang.Long>
+        getUnpackedSint64List() {
       return unpackedSint64_;
     }
-
     /**
      * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-     *
      * @return The count of unpackedSint64.
      */
     public int getUnpackedSint64Count() {
       return unpackedSint64_.size();
     }
-
     /**
      * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedSint64 at the given index.
      */
@@ -7005,32 +6082,27 @@ public long getUnpackedSint64(int index) {
     }
 
     public static final int UNPACKED_FIXED32_FIELD_NUMBER = 95;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList unpackedFixed32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList unpackedFixed32_ =
+        emptyIntList();
     /**
      * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-     *
      * @return A list containing the unpackedFixed32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getUnpackedFixed32List() {
+    public java.util.List<java.lang.Integer>
+        getUnpackedFixed32List() {
       return unpackedFixed32_;
     }
-
     /**
      * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-     *
      * @return The count of unpackedFixed32.
      */
     public int getUnpackedFixed32Count() {
       return unpackedFixed32_.size();
     }
-
     /**
      * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedFixed32 at the given index.
      */
@@ -7039,32 +6111,27 @@ public int getUnpackedFixed32(int index) {
     }
 
     public static final int UNPACKED_FIXED64_FIELD_NUMBER = 96;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList unpackedFixed64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList unpackedFixed64_ =
+        emptyLongList();
     /**
      * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-     *
      * @return A list containing the unpackedFixed64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getUnpackedFixed64List() {
+    public java.util.List<java.lang.Long>
+        getUnpackedFixed64List() {
       return unpackedFixed64_;
     }
-
     /**
      * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-     *
      * @return The count of unpackedFixed64.
      */
     public int getUnpackedFixed64Count() {
       return unpackedFixed64_.size();
     }
-
     /**
      * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedFixed64 at the given index.
      */
@@ -7073,32 +6140,27 @@ public long getUnpackedFixed64(int index) {
     }
 
     public static final int UNPACKED_SFIXED32_FIELD_NUMBER = 97;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList unpackedSfixed32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList unpackedSfixed32_ =
+        emptyIntList();
     /**
      * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-     *
      * @return A list containing the unpackedSfixed32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getUnpackedSfixed32List() {
+    public java.util.List<java.lang.Integer>
+        getUnpackedSfixed32List() {
       return unpackedSfixed32_;
     }
-
     /**
      * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-     *
      * @return The count of unpackedSfixed32.
      */
     public int getUnpackedSfixed32Count() {
       return unpackedSfixed32_.size();
     }
-
     /**
      * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedSfixed32 at the given index.
      */
@@ -7107,32 +6169,27 @@ public int getUnpackedSfixed32(int index) {
     }
 
     public static final int UNPACKED_SFIXED64_FIELD_NUMBER = 98;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList unpackedSfixed64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList unpackedSfixed64_ =
+        emptyLongList();
     /**
      * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-     *
      * @return A list containing the unpackedSfixed64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getUnpackedSfixed64List() {
+    public java.util.List<java.lang.Long>
+        getUnpackedSfixed64List() {
       return unpackedSfixed64_;
     }
-
     /**
      * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-     *
      * @return The count of unpackedSfixed64.
      */
     public int getUnpackedSfixed64Count() {
       return unpackedSfixed64_.size();
     }
-
     /**
      * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedSfixed64 at the given index.
      */
@@ -7141,32 +6198,27 @@ public long getUnpackedSfixed64(int index) {
     }
 
     public static final int UNPACKED_FLOAT_FIELD_NUMBER = 99;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.FloatList unpackedFloat_ = emptyFloatList();
-
+    private com.google.protobuf.Internal.FloatList unpackedFloat_ =
+        emptyFloatList();
     /**
      * <code>repeated float unpacked_float = 99 [packed = false];</code>
-     *
      * @return A list containing the unpackedFloat.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Float> getUnpackedFloatList() {
+    public java.util.List<java.lang.Float>
+        getUnpackedFloatList() {
       return unpackedFloat_;
     }
-
     /**
      * <code>repeated float unpacked_float = 99 [packed = false];</code>
-     *
      * @return The count of unpackedFloat.
      */
     public int getUnpackedFloatCount() {
       return unpackedFloat_.size();
     }
-
     /**
      * <code>repeated float unpacked_float = 99 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedFloat at the given index.
      */
@@ -7175,32 +6227,27 @@ public float getUnpackedFloat(int index) {
     }
 
     public static final int UNPACKED_DOUBLE_FIELD_NUMBER = 100;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.DoubleList unpackedDouble_ = emptyDoubleList();
-
+    private com.google.protobuf.Internal.DoubleList unpackedDouble_ =
+        emptyDoubleList();
     /**
      * <code>repeated double unpacked_double = 100 [packed = false];</code>
-     *
      * @return A list containing the unpackedDouble.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Double> getUnpackedDoubleList() {
+    public java.util.List<java.lang.Double>
+        getUnpackedDoubleList() {
       return unpackedDouble_;
     }
-
     /**
      * <code>repeated double unpacked_double = 100 [packed = false];</code>
-     *
      * @return The count of unpackedDouble.
      */
     public int getUnpackedDoubleCount() {
       return unpackedDouble_.size();
     }
-
     /**
      * <code>repeated double unpacked_double = 100 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedDouble at the given index.
      */
@@ -7209,32 +6256,27 @@ public double getUnpackedDouble(int index) {
     }
 
     public static final int UNPACKED_BOOL_FIELD_NUMBER = 101;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.BooleanList unpackedBool_ = emptyBooleanList();
-
+    private com.google.protobuf.Internal.BooleanList unpackedBool_ =
+        emptyBooleanList();
     /**
      * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-     *
      * @return A list containing the unpackedBool.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Boolean> getUnpackedBoolList() {
+    public java.util.List<java.lang.Boolean>
+        getUnpackedBoolList() {
       return unpackedBool_;
     }
-
     /**
      * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-     *
      * @return The count of unpackedBool.
      */
     public int getUnpackedBoolCount() {
       return unpackedBool_.size();
     }
-
     /**
      * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedBool at the given index.
      */
@@ -7243,92 +6285,54 @@ public boolean getUnpackedBool(int index) {
     }
 
     public static final int UNPACKED_NESTED_ENUM_FIELD_NUMBER = 102;
-
     @SuppressWarnings("serial")
     private java.util.List<java.lang.Integer> unpackedNestedEnum_;
-
     private static final com.google.protobuf.Internal.ListAdapter.Converter<
-            java.lang.Integer,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        unpackedNestedEnum_converter_ =
+        java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> unpackedNestedEnum_converter_ =
             new com.google.protobuf.Internal.ListAdapter.Converter<
-                java.lang.Integer,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .NestedEnum>() {
-              public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedEnum
-                  convert(java.lang.Integer from) {
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                    result =
-                        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                            .NestedEnum.forNumber(from);
-                return result == null
-                    ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                        .NestedEnum.UNRECOGNIZED
-                    : result;
+                java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>() {
+              public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum convert(java.lang.Integer from) {
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.forNumber(from);
+                return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.UNRECOGNIZED : result;
               }
             };
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
      * @return A list containing the unpackedNestedEnum.
      */
     @java.lang.Override
-    public java.util.List<
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        getUnpackedNestedEnumList() {
+    public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> getUnpackedNestedEnumList() {
       return new com.google.protobuf.Internal.ListAdapter<
-          java.lang.Integer,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(
-          unpackedNestedEnum_, unpackedNestedEnum_converter_);
+          java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(unpackedNestedEnum_, unpackedNestedEnum_converter_);
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
      * @return The count of unpackedNestedEnum.
      */
     @java.lang.Override
     public int getUnpackedNestedEnumCount() {
       return unpackedNestedEnum_.size();
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
      * @param index The index of the element to return.
      * @return The unpackedNestedEnum at the given index.
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getUnpackedNestedEnum(int index) {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getUnpackedNestedEnum(int index) {
       return unpackedNestedEnum_converter_.convert(unpackedNestedEnum_.get(index));
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
      * @return A list containing the enum numeric values on the wire for unpackedNestedEnum.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getUnpackedNestedEnumValueList() {
+    public java.util.List<java.lang.Integer>
+    getUnpackedNestedEnumValueList() {
       return unpackedNestedEnum_;
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
      * @param index The index of the value to return.
      * @return The enum numeric value on the wire of unpackedNestedEnum at the given index.
      */
@@ -7338,37 +6342,32 @@ public int getUnpackedNestedEnumValue(int index) {
     }
 
     public static final int MAP_INT32_INT32_FIELD_NUMBER = 56;
-
     private static final class MapInt32Int32DefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Integer, java.lang.Integer>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32Int32Entry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.INT32,
-              0,
-              com.google.protobuf.WireFormat.FieldType.INT32,
-              0);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32Int32Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.INT32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.INT32,
+                  0);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer> mapInt32Int32_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Integer> mapInt32Int32_;
     private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-        internalGetMapInt32Int32() {
+    internalGetMapInt32Int32() {
       if (mapInt32Int32_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapInt32Int32DefaultEntryHolder.defaultEntry);
       }
       return mapInt32Int32_;
     }
-
     public int getMapInt32Int32Count() {
       return internalGetMapInt32Int32().getMap().size();
     }
-
     /**
-     *
-     *
      * <pre>
      * Map
      * </pre>
@@ -7376,21 +6375,20 @@ public int getMapInt32Int32Count() {
      * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
      */
     @java.lang.Override
-    public boolean containsMapInt32Int32(int key) {
+    public boolean containsMapInt32Int32(
+        int key) {
 
       return internalGetMapInt32Int32().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapInt32Int32Map()} instead. */
+    /**
+     * Use {@link #getMapInt32Int32Map()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32() {
       return getMapInt32Int32Map();
     }
-
     /**
-     *
-     *
      * <pre>
      * Map
      * </pre>
@@ -7401,10 +6399,7 @@ public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32() {
     public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32Map() {
       return internalGetMapInt32Int32().getMap();
     }
-
     /**
-     *
-     *
      * <pre>
      * Map
      * </pre>
@@ -7412,15 +6407,15 @@ public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32Map()
      * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
      */
     @java.lang.Override
-    public int getMapInt32Int32OrDefault(int key, int defaultValue) {
+    public int getMapInt32Int32OrDefault(
+        int key,
+        int defaultValue) {
 
-      java.util.Map<java.lang.Integer, java.lang.Integer> map = internalGetMapInt32Int32().getMap();
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapInt32Int32().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
     /**
-     *
-     *
      * <pre>
      * Map
      * </pre>
@@ -7428,9 +6423,11 @@ public int getMapInt32Int32OrDefault(int key, int defaultValue) {
      * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
      */
     @java.lang.Override
-    public int getMapInt32Int32OrThrow(int key) {
+    public int getMapInt32Int32OrThrow(
+        int key) {
 
-      java.util.Map<java.lang.Integer, java.lang.Integer> map = internalGetMapInt32Int32().getMap();
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapInt32Int32().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -7438,67 +6435,76 @@ public int getMapInt32Int32OrThrow(int key) {
     }
 
     public static final int MAP_INT64_INT64_FIELD_NUMBER = 57;
-
     private static final class MapInt64Int64DefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Long, java.lang.Long>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt64Int64Entry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.INT64,
-              0L,
-              com.google.protobuf.WireFormat.FieldType.INT64,
-              0L);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Long, java.lang.Long> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Long, java.lang.Long>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt64Int64Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.INT64,
+                  0L,
+                  com.google.protobuf.WireFormat.FieldType.INT64,
+                  0L);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Long, java.lang.Long> mapInt64Int64_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Long, java.lang.Long> mapInt64Int64_;
     private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
-        internalGetMapInt64Int64() {
+    internalGetMapInt64Int64() {
       if (mapInt64Int64_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapInt64Int64DefaultEntryHolder.defaultEntry);
       }
       return mapInt64Int64_;
     }
-
     public int getMapInt64Int64Count() {
       return internalGetMapInt64Int64().getMap().size();
     }
-
-    /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
     @java.lang.Override
-    public boolean containsMapInt64Int64(long key) {
+    public boolean containsMapInt64Int64(
+        long key) {
 
       return internalGetMapInt64Int64().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapInt64Int64Map()} instead. */
+    /**
+     * Use {@link #getMapInt64Int64Map()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Long, java.lang.Long> getMapInt64Int64() {
       return getMapInt64Int64Map();
     }
-
-    /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Long, java.lang.Long> getMapInt64Int64Map() {
       return internalGetMapInt64Int64().getMap();
     }
-
-    /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
     @java.lang.Override
-    public long getMapInt64Int64OrDefault(long key, long defaultValue) {
+    public long getMapInt64Int64OrDefault(
+        long key,
+        long defaultValue) {
 
-      java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapInt64Int64().getMap();
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapInt64Int64().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
     @java.lang.Override
-    public long getMapInt64Int64OrThrow(long key) {
+    public long getMapInt64Int64OrThrow(
+        long key) {
 
-      java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapInt64Int64().getMap();
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapInt64Int64().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -7506,66 +6512,73 @@ public long getMapInt64Int64OrThrow(long key) {
     }
 
     public static final int MAP_UINT32_UINT32_FIELD_NUMBER = 58;
-
     private static final class MapUint32Uint32DefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Integer, java.lang.Integer>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint32Uint32Entry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.UINT32,
-              0,
-              com.google.protobuf.WireFormat.FieldType.UINT32,
-              0);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint32Uint32Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.UINT32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.UINT32,
+                  0);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer> mapUint32Uint32_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Integer> mapUint32Uint32_;
     private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-        internalGetMapUint32Uint32() {
+    internalGetMapUint32Uint32() {
       if (mapUint32Uint32_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapUint32Uint32DefaultEntryHolder.defaultEntry);
       }
       return mapUint32Uint32_;
     }
-
     public int getMapUint32Uint32Count() {
       return internalGetMapUint32Uint32().getMap().size();
     }
-
-    /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
     @java.lang.Override
-    public boolean containsMapUint32Uint32(int key) {
+    public boolean containsMapUint32Uint32(
+        int key) {
 
       return internalGetMapUint32Uint32().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapUint32Uint32Map()} instead. */
+    /**
+     * Use {@link #getMapUint32Uint32Map()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Integer, java.lang.Integer> getMapUint32Uint32() {
       return getMapUint32Uint32Map();
     }
-
-    /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Integer, java.lang.Integer> getMapUint32Uint32Map() {
       return internalGetMapUint32Uint32().getMap();
     }
-
-    /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
     @java.lang.Override
-    public int getMapUint32Uint32OrDefault(int key, int defaultValue) {
+    public int getMapUint32Uint32OrDefault(
+        int key,
+        int defaultValue) {
 
       java.util.Map<java.lang.Integer, java.lang.Integer> map =
           internalGetMapUint32Uint32().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
     @java.lang.Override
-    public int getMapUint32Uint32OrThrow(int key) {
+    public int getMapUint32Uint32OrThrow(
+        int key) {
 
       java.util.Map<java.lang.Integer, java.lang.Integer> map =
           internalGetMapUint32Uint32().getMap();
@@ -7576,67 +6589,76 @@ public int getMapUint32Uint32OrThrow(int key) {
     }
 
     public static final int MAP_UINT64_UINT64_FIELD_NUMBER = 59;
-
     private static final class MapUint64Uint64DefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Long, java.lang.Long>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint64Uint64Entry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.UINT64,
-              0L,
-              com.google.protobuf.WireFormat.FieldType.UINT64,
-              0L);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Long, java.lang.Long> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Long, java.lang.Long>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint64Uint64Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.UINT64,
+                  0L,
+                  com.google.protobuf.WireFormat.FieldType.UINT64,
+                  0L);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Long, java.lang.Long> mapUint64Uint64_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Long, java.lang.Long> mapUint64Uint64_;
     private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
-        internalGetMapUint64Uint64() {
+    internalGetMapUint64Uint64() {
       if (mapUint64Uint64_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapUint64Uint64DefaultEntryHolder.defaultEntry);
       }
       return mapUint64Uint64_;
     }
-
     public int getMapUint64Uint64Count() {
       return internalGetMapUint64Uint64().getMap().size();
     }
-
-    /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
     @java.lang.Override
-    public boolean containsMapUint64Uint64(long key) {
+    public boolean containsMapUint64Uint64(
+        long key) {
 
       return internalGetMapUint64Uint64().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapUint64Uint64Map()} instead. */
+    /**
+     * Use {@link #getMapUint64Uint64Map()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Long, java.lang.Long> getMapUint64Uint64() {
       return getMapUint64Uint64Map();
     }
-
-    /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Long, java.lang.Long> getMapUint64Uint64Map() {
       return internalGetMapUint64Uint64().getMap();
     }
-
-    /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
     @java.lang.Override
-    public long getMapUint64Uint64OrDefault(long key, long defaultValue) {
+    public long getMapUint64Uint64OrDefault(
+        long key,
+        long defaultValue) {
 
-      java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapUint64Uint64().getMap();
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapUint64Uint64().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
     @java.lang.Override
-    public long getMapUint64Uint64OrThrow(long key) {
+    public long getMapUint64Uint64OrThrow(
+        long key) {
 
-      java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapUint64Uint64().getMap();
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapUint64Uint64().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -7644,66 +6666,73 @@ public long getMapUint64Uint64OrThrow(long key) {
     }
 
     public static final int MAP_SINT32_SINT32_FIELD_NUMBER = 60;
-
     private static final class MapSint32Sint32DefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Integer, java.lang.Integer>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint32Sint32Entry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.SINT32,
-              0,
-              com.google.protobuf.WireFormat.FieldType.SINT32,
-              0);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint32Sint32Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.SINT32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.SINT32,
+                  0);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer> mapSint32Sint32_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Integer> mapSint32Sint32_;
     private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-        internalGetMapSint32Sint32() {
+    internalGetMapSint32Sint32() {
       if (mapSint32Sint32_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapSint32Sint32DefaultEntryHolder.defaultEntry);
       }
       return mapSint32Sint32_;
     }
-
     public int getMapSint32Sint32Count() {
       return internalGetMapSint32Sint32().getMap().size();
     }
-
-    /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
     @java.lang.Override
-    public boolean containsMapSint32Sint32(int key) {
+    public boolean containsMapSint32Sint32(
+        int key) {
 
       return internalGetMapSint32Sint32().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapSint32Sint32Map()} instead. */
+    /**
+     * Use {@link #getMapSint32Sint32Map()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSint32Sint32() {
       return getMapSint32Sint32Map();
     }
-
-    /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSint32Sint32Map() {
       return internalGetMapSint32Sint32().getMap();
     }
-
-    /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
     @java.lang.Override
-    public int getMapSint32Sint32OrDefault(int key, int defaultValue) {
+    public int getMapSint32Sint32OrDefault(
+        int key,
+        int defaultValue) {
 
       java.util.Map<java.lang.Integer, java.lang.Integer> map =
           internalGetMapSint32Sint32().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
     @java.lang.Override
-    public int getMapSint32Sint32OrThrow(int key) {
+    public int getMapSint32Sint32OrThrow(
+        int key) {
 
       java.util.Map<java.lang.Integer, java.lang.Integer> map =
           internalGetMapSint32Sint32().getMap();
@@ -7714,67 +6743,76 @@ public int getMapSint32Sint32OrThrow(int key) {
     }
 
     public static final int MAP_SINT64_SINT64_FIELD_NUMBER = 61;
-
     private static final class MapSint64Sint64DefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Long, java.lang.Long>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint64Sint64Entry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.SINT64,
-              0L,
-              com.google.protobuf.WireFormat.FieldType.SINT64,
-              0L);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Long, java.lang.Long> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Long, java.lang.Long>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint64Sint64Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.SINT64,
+                  0L,
+                  com.google.protobuf.WireFormat.FieldType.SINT64,
+                  0L);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Long, java.lang.Long> mapSint64Sint64_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Long, java.lang.Long> mapSint64Sint64_;
     private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
-        internalGetMapSint64Sint64() {
+    internalGetMapSint64Sint64() {
       if (mapSint64Sint64_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapSint64Sint64DefaultEntryHolder.defaultEntry);
       }
       return mapSint64Sint64_;
     }
-
     public int getMapSint64Sint64Count() {
       return internalGetMapSint64Sint64().getMap().size();
     }
-
-    /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
     @java.lang.Override
-    public boolean containsMapSint64Sint64(long key) {
+    public boolean containsMapSint64Sint64(
+        long key) {
 
       return internalGetMapSint64Sint64().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapSint64Sint64Map()} instead. */
+    /**
+     * Use {@link #getMapSint64Sint64Map()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Long, java.lang.Long> getMapSint64Sint64() {
       return getMapSint64Sint64Map();
     }
-
-    /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Long, java.lang.Long> getMapSint64Sint64Map() {
       return internalGetMapSint64Sint64().getMap();
     }
-
-    /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
     @java.lang.Override
-    public long getMapSint64Sint64OrDefault(long key, long defaultValue) {
+    public long getMapSint64Sint64OrDefault(
+        long key,
+        long defaultValue) {
 
-      java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapSint64Sint64().getMap();
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapSint64Sint64().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
     @java.lang.Override
-    public long getMapSint64Sint64OrThrow(long key) {
+    public long getMapSint64Sint64OrThrow(
+        long key) {
 
-      java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapSint64Sint64().getMap();
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapSint64Sint64().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -7782,66 +6820,73 @@ public long getMapSint64Sint64OrThrow(long key) {
     }
 
     public static final int MAP_FIXED32_FIXED32_FIELD_NUMBER = 62;
-
     private static final class MapFixed32Fixed32DefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Integer, java.lang.Integer>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed32Fixed32Entry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.FIXED32,
-              0,
-              com.google.protobuf.WireFormat.FieldType.FIXED32,
-              0);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed32Fixed32Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.FIXED32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.FIXED32,
+                  0);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer> mapFixed32Fixed32_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Integer> mapFixed32Fixed32_;
     private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-        internalGetMapFixed32Fixed32() {
+    internalGetMapFixed32Fixed32() {
       if (mapFixed32Fixed32_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapFixed32Fixed32DefaultEntryHolder.defaultEntry);
       }
       return mapFixed32Fixed32_;
     }
-
     public int getMapFixed32Fixed32Count() {
       return internalGetMapFixed32Fixed32().getMap().size();
     }
-
-    /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
     @java.lang.Override
-    public boolean containsMapFixed32Fixed32(int key) {
+    public boolean containsMapFixed32Fixed32(
+        int key) {
 
       return internalGetMapFixed32Fixed32().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapFixed32Fixed32Map()} instead. */
+    /**
+     * Use {@link #getMapFixed32Fixed32Map()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Integer, java.lang.Integer> getMapFixed32Fixed32() {
       return getMapFixed32Fixed32Map();
     }
-
-    /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Integer, java.lang.Integer> getMapFixed32Fixed32Map() {
       return internalGetMapFixed32Fixed32().getMap();
     }
-
-    /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
     @java.lang.Override
-    public int getMapFixed32Fixed32OrDefault(int key, int defaultValue) {
+    public int getMapFixed32Fixed32OrDefault(
+        int key,
+        int defaultValue) {
 
       java.util.Map<java.lang.Integer, java.lang.Integer> map =
           internalGetMapFixed32Fixed32().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
     @java.lang.Override
-    public int getMapFixed32Fixed32OrThrow(int key) {
+    public int getMapFixed32Fixed32OrThrow(
+        int key) {
 
       java.util.Map<java.lang.Integer, java.lang.Integer> map =
           internalGetMapFixed32Fixed32().getMap();
@@ -7852,67 +6897,76 @@ public int getMapFixed32Fixed32OrThrow(int key) {
     }
 
     public static final int MAP_FIXED64_FIXED64_FIELD_NUMBER = 63;
-
     private static final class MapFixed64Fixed64DefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Long, java.lang.Long>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed64Fixed64Entry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.FIXED64,
-              0L,
-              com.google.protobuf.WireFormat.FieldType.FIXED64,
-              0L);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Long, java.lang.Long> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Long, java.lang.Long>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed64Fixed64Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.FIXED64,
+                  0L,
+                  com.google.protobuf.WireFormat.FieldType.FIXED64,
+                  0L);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Long, java.lang.Long> mapFixed64Fixed64_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Long, java.lang.Long> mapFixed64Fixed64_;
     private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
-        internalGetMapFixed64Fixed64() {
+    internalGetMapFixed64Fixed64() {
       if (mapFixed64Fixed64_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapFixed64Fixed64DefaultEntryHolder.defaultEntry);
       }
       return mapFixed64Fixed64_;
     }
-
     public int getMapFixed64Fixed64Count() {
       return internalGetMapFixed64Fixed64().getMap().size();
     }
-
-    /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
     @java.lang.Override
-    public boolean containsMapFixed64Fixed64(long key) {
+    public boolean containsMapFixed64Fixed64(
+        long key) {
 
       return internalGetMapFixed64Fixed64().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapFixed64Fixed64Map()} instead. */
+    /**
+     * Use {@link #getMapFixed64Fixed64Map()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Long, java.lang.Long> getMapFixed64Fixed64() {
       return getMapFixed64Fixed64Map();
     }
-
-    /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Long, java.lang.Long> getMapFixed64Fixed64Map() {
       return internalGetMapFixed64Fixed64().getMap();
     }
-
-    /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
     @java.lang.Override
-    public long getMapFixed64Fixed64OrDefault(long key, long defaultValue) {
+    public long getMapFixed64Fixed64OrDefault(
+        long key,
+        long defaultValue) {
 
-      java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapFixed64Fixed64().getMap();
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapFixed64Fixed64().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
     @java.lang.Override
-    public long getMapFixed64Fixed64OrThrow(long key) {
+    public long getMapFixed64Fixed64OrThrow(
+        long key) {
 
-      java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapFixed64Fixed64().getMap();
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapFixed64Fixed64().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -7920,66 +6974,73 @@ public long getMapFixed64Fixed64OrThrow(long key) {
     }
 
     public static final int MAP_SFIXED32_SFIXED32_FIELD_NUMBER = 64;
-
     private static final class MapSfixed32Sfixed32DefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Integer, java.lang.Integer>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed32Sfixed32Entry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.SFIXED32,
-              0,
-              com.google.protobuf.WireFormat.FieldType.SFIXED32,
-              0);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed32Sfixed32Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.SFIXED32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.SFIXED32,
+                  0);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer> mapSfixed32Sfixed32_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Integer> mapSfixed32Sfixed32_;
     private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-        internalGetMapSfixed32Sfixed32() {
+    internalGetMapSfixed32Sfixed32() {
       if (mapSfixed32Sfixed32_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry);
       }
       return mapSfixed32Sfixed32_;
     }
-
     public int getMapSfixed32Sfixed32Count() {
       return internalGetMapSfixed32Sfixed32().getMap().size();
     }
-
-    /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
     @java.lang.Override
-    public boolean containsMapSfixed32Sfixed32(int key) {
+    public boolean containsMapSfixed32Sfixed32(
+        int key) {
 
       return internalGetMapSfixed32Sfixed32().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapSfixed32Sfixed32Map()} instead. */
+    /**
+     * Use {@link #getMapSfixed32Sfixed32Map()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSfixed32Sfixed32() {
       return getMapSfixed32Sfixed32Map();
     }
-
-    /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSfixed32Sfixed32Map() {
       return internalGetMapSfixed32Sfixed32().getMap();
     }
-
-    /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
     @java.lang.Override
-    public int getMapSfixed32Sfixed32OrDefault(int key, int defaultValue) {
+    public int getMapSfixed32Sfixed32OrDefault(
+        int key,
+        int defaultValue) {
 
       java.util.Map<java.lang.Integer, java.lang.Integer> map =
           internalGetMapSfixed32Sfixed32().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
     @java.lang.Override
-    public int getMapSfixed32Sfixed32OrThrow(int key) {
+    public int getMapSfixed32Sfixed32OrThrow(
+        int key) {
 
       java.util.Map<java.lang.Integer, java.lang.Integer> map =
           internalGetMapSfixed32Sfixed32().getMap();
@@ -7990,67 +7051,76 @@ public int getMapSfixed32Sfixed32OrThrow(int key) {
     }
 
     public static final int MAP_SFIXED64_SFIXED64_FIELD_NUMBER = 65;
-
     private static final class MapSfixed64Sfixed64DefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Long, java.lang.Long>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed64Sfixed64Entry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.SFIXED64,
-              0L,
-              com.google.protobuf.WireFormat.FieldType.SFIXED64,
-              0L);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Long, java.lang.Long> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Long, java.lang.Long>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed64Sfixed64Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.SFIXED64,
+                  0L,
+                  com.google.protobuf.WireFormat.FieldType.SFIXED64,
+                  0L);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Long, java.lang.Long> mapSfixed64Sfixed64_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Long, java.lang.Long> mapSfixed64Sfixed64_;
     private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
-        internalGetMapSfixed64Sfixed64() {
+    internalGetMapSfixed64Sfixed64() {
       if (mapSfixed64Sfixed64_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry);
       }
       return mapSfixed64Sfixed64_;
     }
-
     public int getMapSfixed64Sfixed64Count() {
       return internalGetMapSfixed64Sfixed64().getMap().size();
     }
-
-    /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
     @java.lang.Override
-    public boolean containsMapSfixed64Sfixed64(long key) {
+    public boolean containsMapSfixed64Sfixed64(
+        long key) {
 
       return internalGetMapSfixed64Sfixed64().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapSfixed64Sfixed64Map()} instead. */
+    /**
+     * Use {@link #getMapSfixed64Sfixed64Map()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Long, java.lang.Long> getMapSfixed64Sfixed64() {
       return getMapSfixed64Sfixed64Map();
     }
-
-    /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Long, java.lang.Long> getMapSfixed64Sfixed64Map() {
       return internalGetMapSfixed64Sfixed64().getMap();
     }
-
-    /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
     @java.lang.Override
-    public long getMapSfixed64Sfixed64OrDefault(long key, long defaultValue) {
+    public long getMapSfixed64Sfixed64OrDefault(
+        long key,
+        long defaultValue) {
 
-      java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapSfixed64Sfixed64().getMap();
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapSfixed64Sfixed64().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
     @java.lang.Override
-    public long getMapSfixed64Sfixed64OrThrow(long key) {
+    public long getMapSfixed64Sfixed64OrThrow(
+        long key) {
 
-      java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapSfixed64Sfixed64().getMap();
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapSfixed64Sfixed64().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -8058,67 +7128,76 @@ public long getMapSfixed64Sfixed64OrThrow(long key) {
     }
 
     public static final int MAP_INT32_FLOAT_FIELD_NUMBER = 66;
-
     private static final class MapInt32FloatDefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Integer, java.lang.Float>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32FloatEntry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.INT32,
-              0,
-              com.google.protobuf.WireFormat.FieldType.FLOAT,
-              0F);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Float> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Float>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32FloatEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.INT32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.FLOAT,
+                  0F);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float> mapInt32Float_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Float> mapInt32Float_;
     private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float>
-        internalGetMapInt32Float() {
+    internalGetMapInt32Float() {
       if (mapInt32Float_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapInt32FloatDefaultEntryHolder.defaultEntry);
       }
       return mapInt32Float_;
     }
-
     public int getMapInt32FloatCount() {
       return internalGetMapInt32Float().getMap().size();
     }
-
-    /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
     @java.lang.Override
-    public boolean containsMapInt32Float(int key) {
+    public boolean containsMapInt32Float(
+        int key) {
 
       return internalGetMapInt32Float().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapInt32FloatMap()} instead. */
+    /**
+     * Use {@link #getMapInt32FloatMap()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Integer, java.lang.Float> getMapInt32Float() {
       return getMapInt32FloatMap();
     }
-
-    /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Integer, java.lang.Float> getMapInt32FloatMap() {
       return internalGetMapInt32Float().getMap();
     }
-
-    /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
     @java.lang.Override
-    public float getMapInt32FloatOrDefault(int key, float defaultValue) {
+    public float getMapInt32FloatOrDefault(
+        int key,
+        float defaultValue) {
 
-      java.util.Map<java.lang.Integer, java.lang.Float> map = internalGetMapInt32Float().getMap();
+      java.util.Map<java.lang.Integer, java.lang.Float> map =
+          internalGetMapInt32Float().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
     @java.lang.Override
-    public float getMapInt32FloatOrThrow(int key) {
+    public float getMapInt32FloatOrThrow(
+        int key) {
 
-      java.util.Map<java.lang.Integer, java.lang.Float> map = internalGetMapInt32Float().getMap();
+      java.util.Map<java.lang.Integer, java.lang.Float> map =
+          internalGetMapInt32Float().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -8126,67 +7205,76 @@ public float getMapInt32FloatOrThrow(int key) {
     }
 
     public static final int MAP_INT32_DOUBLE_FIELD_NUMBER = 67;
-
     private static final class MapInt32DoubleDefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Double> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Integer, java.lang.Double>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32DoubleEntry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.INT32,
-              0,
-              com.google.protobuf.WireFormat.FieldType.DOUBLE,
-              0D);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Double> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Double>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32DoubleEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.INT32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.DOUBLE,
+                  0D);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Double> mapInt32Double_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Double> mapInt32Double_;
     private com.google.protobuf.MapField<java.lang.Integer, java.lang.Double>
-        internalGetMapInt32Double() {
+    internalGetMapInt32Double() {
       if (mapInt32Double_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapInt32DoubleDefaultEntryHolder.defaultEntry);
       }
       return mapInt32Double_;
     }
-
     public int getMapInt32DoubleCount() {
       return internalGetMapInt32Double().getMap().size();
     }
-
-    /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
     @java.lang.Override
-    public boolean containsMapInt32Double(int key) {
+    public boolean containsMapInt32Double(
+        int key) {
 
       return internalGetMapInt32Double().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapInt32DoubleMap()} instead. */
+    /**
+     * Use {@link #getMapInt32DoubleMap()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Integer, java.lang.Double> getMapInt32Double() {
       return getMapInt32DoubleMap();
     }
-
-    /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Integer, java.lang.Double> getMapInt32DoubleMap() {
       return internalGetMapInt32Double().getMap();
     }
-
-    /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
     @java.lang.Override
-    public double getMapInt32DoubleOrDefault(int key, double defaultValue) {
+    public double getMapInt32DoubleOrDefault(
+        int key,
+        double defaultValue) {
 
-      java.util.Map<java.lang.Integer, java.lang.Double> map = internalGetMapInt32Double().getMap();
+      java.util.Map<java.lang.Integer, java.lang.Double> map =
+          internalGetMapInt32Double().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
     @java.lang.Override
-    public double getMapInt32DoubleOrThrow(int key) {
+    public double getMapInt32DoubleOrThrow(
+        int key) {
 
-      java.util.Map<java.lang.Integer, java.lang.Double> map = internalGetMapInt32Double().getMap();
+      java.util.Map<java.lang.Integer, java.lang.Double> map =
+          internalGetMapInt32Double().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -8194,67 +7282,76 @@ public double getMapInt32DoubleOrThrow(int key) {
     }
 
     public static final int MAP_BOOL_BOOL_FIELD_NUMBER = 68;
-
     private static final class MapBoolBoolDefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Boolean, java.lang.Boolean> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Boolean, java.lang.Boolean>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapBoolBoolEntry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.BOOL,
-              false,
-              com.google.protobuf.WireFormat.FieldType.BOOL,
-              false);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Boolean, java.lang.Boolean> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Boolean, java.lang.Boolean>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapBoolBoolEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.BOOL,
+                  false,
+                  com.google.protobuf.WireFormat.FieldType.BOOL,
+                  false);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Boolean, java.lang.Boolean> mapBoolBool_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Boolean, java.lang.Boolean> mapBoolBool_;
     private com.google.protobuf.MapField<java.lang.Boolean, java.lang.Boolean>
-        internalGetMapBoolBool() {
+    internalGetMapBoolBool() {
       if (mapBoolBool_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapBoolBoolDefaultEntryHolder.defaultEntry);
       }
       return mapBoolBool_;
     }
-
     public int getMapBoolBoolCount() {
       return internalGetMapBoolBool().getMap().size();
     }
-
-    /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
     @java.lang.Override
-    public boolean containsMapBoolBool(boolean key) {
+    public boolean containsMapBoolBool(
+        boolean key) {
 
       return internalGetMapBoolBool().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapBoolBoolMap()} instead. */
+    /**
+     * Use {@link #getMapBoolBoolMap()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Boolean, java.lang.Boolean> getMapBoolBool() {
       return getMapBoolBoolMap();
     }
-
-    /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Boolean, java.lang.Boolean> getMapBoolBoolMap() {
       return internalGetMapBoolBool().getMap();
     }
-
-    /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
     @java.lang.Override
-    public boolean getMapBoolBoolOrDefault(boolean key, boolean defaultValue) {
+    public boolean getMapBoolBoolOrDefault(
+        boolean key,
+        boolean defaultValue) {
 
-      java.util.Map<java.lang.Boolean, java.lang.Boolean> map = internalGetMapBoolBool().getMap();
+      java.util.Map<java.lang.Boolean, java.lang.Boolean> map =
+          internalGetMapBoolBool().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
     @java.lang.Override
-    public boolean getMapBoolBoolOrThrow(boolean key) {
+    public boolean getMapBoolBoolOrThrow(
+        boolean key) {
 
-      java.util.Map<java.lang.Boolean, java.lang.Boolean> map = internalGetMapBoolBool().getMap();
+      java.util.Map<java.lang.Boolean, java.lang.Boolean> map =
+          internalGetMapBoolBool().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -8262,76 +7359,78 @@ public boolean getMapBoolBoolOrThrow(boolean key) {
     }
 
     public static final int MAP_STRING_STRING_FIELD_NUMBER = 69;
-
     private static final class MapStringStringDefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.String, java.lang.String> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.String, java.lang.String>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringStringEntry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.STRING,
-              "",
-              com.google.protobuf.WireFormat.FieldType.STRING,
-              "");
+      static final com.google.protobuf.MapEntry<
+          java.lang.String, java.lang.String> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.String, java.lang.String>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringStringEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "");
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.String, java.lang.String> mapStringString_;
-
+    private com.google.protobuf.MapField<
+        java.lang.String, java.lang.String> mapStringString_;
     private com.google.protobuf.MapField<java.lang.String, java.lang.String>
-        internalGetMapStringString() {
+    internalGetMapStringString() {
       if (mapStringString_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapStringStringDefaultEntryHolder.defaultEntry);
       }
       return mapStringString_;
     }
-
     public int getMapStringStringCount() {
       return internalGetMapStringString().getMap().size();
     }
-
-    /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
     @java.lang.Override
-    public boolean containsMapStringString(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public boolean containsMapStringString(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
       return internalGetMapStringString().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapStringStringMap()} instead. */
+    /**
+     * Use {@link #getMapStringStringMap()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, java.lang.String> getMapStringString() {
       return getMapStringStringMap();
     }
-
-    /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.String, java.lang.String> getMapStringStringMap() {
       return internalGetMapStringString().getMap();
     }
-
-    /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
     @java.lang.Override
-    public /* nullable */ java.lang.String getMapStringStringOrDefault(
+    public /* nullable */
+java.lang.String getMapStringStringOrDefault(
         java.lang.String key,
         /* nullable */
-        java.lang.String defaultValue) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
-      java.util.Map<java.lang.String, java.lang.String> map = internalGetMapStringString().getMap();
+java.lang.String defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, java.lang.String> map =
+          internalGetMapStringString().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
     @java.lang.Override
-    public java.lang.String getMapStringStringOrThrow(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
-      java.util.Map<java.lang.String, java.lang.String> map = internalGetMapStringString().getMap();
+    public java.lang.String getMapStringStringOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, java.lang.String> map =
+          internalGetMapStringString().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -8339,79 +7438,76 @@ public java.lang.String getMapStringStringOrThrow(java.lang.String key) {
     }
 
     public static final int MAP_STRING_BYTES_FIELD_NUMBER = 70;
-
     private static final class MapStringBytesDefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.String, com.google.protobuf.ByteString>
-          defaultEntry =
+      static final com.google.protobuf.MapEntry<
+          java.lang.String, com.google.protobuf.ByteString> defaultEntry =
               com.google.protobuf.MapEntry
-                  .<java.lang.String, com.google.protobuf.ByteString>newDefaultInstance(
-                      legacy_gencode_test.proto3.Proto3GencodeTestProto
-                          .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringBytesEntry_descriptor,
-                      com.google.protobuf.WireFormat.FieldType.STRING,
-                      "",
-                      com.google.protobuf.WireFormat.FieldType.BYTES,
-                      com.google.protobuf.ByteString.EMPTY);
+              .<java.lang.String, com.google.protobuf.ByteString>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringBytesEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.BYTES,
+                  com.google.protobuf.ByteString.EMPTY);
     }
-
     @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.String, com.google.protobuf.ByteString> mapStringBytes_;
     private com.google.protobuf.MapField<java.lang.String, com.google.protobuf.ByteString>
-        mapStringBytes_;
-
-    private com.google.protobuf.MapField<java.lang.String, com.google.protobuf.ByteString>
-        internalGetMapStringBytes() {
+    internalGetMapStringBytes() {
       if (mapStringBytes_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapStringBytesDefaultEntryHolder.defaultEntry);
       }
       return mapStringBytes_;
     }
-
     public int getMapStringBytesCount() {
       return internalGetMapStringBytes().getMap().size();
     }
-
-    /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
     @java.lang.Override
-    public boolean containsMapStringBytes(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public boolean containsMapStringBytes(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
       return internalGetMapStringBytes().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapStringBytesMap()} instead. */
+    /**
+     * Use {@link #getMapStringBytesMap()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, com.google.protobuf.ByteString> getMapStringBytes() {
       return getMapStringBytesMap();
     }
-
-    /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.String, com.google.protobuf.ByteString> getMapStringBytesMap() {
       return internalGetMapStringBytes().getMap();
     }
-
-    /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
     @java.lang.Override
-    public /* nullable */ com.google.protobuf.ByteString getMapStringBytesOrDefault(
+    public /* nullable */
+com.google.protobuf.ByteString getMapStringBytesOrDefault(
         java.lang.String key,
         /* nullable */
-        com.google.protobuf.ByteString defaultValue) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+com.google.protobuf.ByteString defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
       java.util.Map<java.lang.String, com.google.protobuf.ByteString> map =
           internalGetMapStringBytes().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
     @java.lang.Override
-    public com.google.protobuf.ByteString getMapStringBytesOrThrow(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public com.google.protobuf.ByteString getMapStringBytesOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
       java.util.Map<java.lang.String, com.google.protobuf.ByteString> map =
           internalGetMapStringBytes().getMap();
       if (!map.containsKey(key)) {
@@ -8421,121 +7517,78 @@ public com.google.protobuf.ByteString getMapStringBytesOrThrow(java.lang.String
     }
 
     public static final int MAP_STRING_NESTED_MESSAGE_FIELD_NUMBER = 71;
-
     private static final class MapStringNestedMessageDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-          defaultEntry =
+          java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> defaultEntry =
               com.google.protobuf.MapEntry
-                  .<java.lang.String,
-                      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                          .NestedMessage>
-                      newDefaultInstance(
-                          legacy_gencode_test.proto3.Proto3GencodeTestProto
-                              .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedMessageEntry_descriptor,
-                          com.google.protobuf.WireFormat.FieldType.STRING,
-                          "",
-                          com.google.protobuf.WireFormat.FieldType.MESSAGE,
-                          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                              .NestedMessage.getDefaultInstance());
+              .<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedMessageEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.MESSAGE,
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance());
     }
-
     @SuppressWarnings("serial")
     private com.google.protobuf.MapField<
-            java.lang.String,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-        mapStringNestedMessage_;
-
-    private com.google.protobuf.MapField<
-            java.lang.String,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-        internalGetMapStringNestedMessage() {
+        java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> mapStringNestedMessage_;
+    private com.google.protobuf.MapField<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
+    internalGetMapStringNestedMessage() {
       if (mapStringNestedMessage_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapStringNestedMessageDefaultEntryHolder.defaultEntry);
       }
       return mapStringNestedMessage_;
     }
-
     public int getMapStringNestedMessageCount() {
       return internalGetMapStringNestedMessage().getMap().size();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
      */
     @java.lang.Override
-    public boolean containsMapStringNestedMessage(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public boolean containsMapStringNestedMessage(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
       return internalGetMapStringNestedMessage().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapStringNestedMessageMap()} instead. */
+    /**
+     * Use {@link #getMapStringNestedMessageMap()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
-    public java.util.Map<
-            java.lang.String,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-        getMapStringNestedMessage() {
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> getMapStringNestedMessage() {
       return getMapStringNestedMessageMap();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
      */
     @java.lang.Override
-    public java.util.Map<
-            java.lang.String,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-        getMapStringNestedMessageMap() {
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> getMapStringNestedMessageMap() {
       return internalGetMapStringNestedMessage().getMap();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
      */
     @java.lang.Override
-    public /* nullable */ legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-            .NestedMessage
-        getMapStringNestedMessageOrDefault(
-            java.lang.String key,
-            /* nullable */
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                defaultValue) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
-      java.util.Map<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-          map = internalGetMapStringNestedMessage().getMap();
+    public /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getMapStringNestedMessageOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> map =
+          internalGetMapStringNestedMessage().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-        getMapStringNestedMessageOrThrow(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
-      java.util.Map<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-          map = internalGetMapStringNestedMessage().getMap();
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getMapStringNestedMessageOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> map =
+          internalGetMapStringNestedMessage().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -8543,111 +7596,78 @@ public boolean containsMapStringNestedMessage(java.lang.String key) {
     }
 
     public static final int MAP_STRING_FOREIGN_MESSAGE_FIELD_NUMBER = 72;
-
     private static final class MapStringForeignMessageDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
-              java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-          defaultEntry =
+          java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> defaultEntry =
               com.google.protobuf.MapEntry
-                  .<java.lang.String,
-                      legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-                      newDefaultInstance(
-                          legacy_gencode_test.proto3.Proto3GencodeTestProto
-                              .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignMessageEntry_descriptor,
-                          com.google.protobuf.WireFormat.FieldType.STRING,
-                          "",
-                          com.google.protobuf.WireFormat.FieldType.MESSAGE,
-                          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-                              .getDefaultInstance());
+              .<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignMessageEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.MESSAGE,
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance());
     }
-
     @SuppressWarnings("serial")
     private com.google.protobuf.MapField<
-            java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-        mapStringForeignMessage_;
-
-    private com.google.protobuf.MapField<
-            java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-        internalGetMapStringForeignMessage() {
+        java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> mapStringForeignMessage_;
+    private com.google.protobuf.MapField<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
+    internalGetMapStringForeignMessage() {
       if (mapStringForeignMessage_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapStringForeignMessageDefaultEntryHolder.defaultEntry);
       }
       return mapStringForeignMessage_;
     }
-
     public int getMapStringForeignMessageCount() {
       return internalGetMapStringForeignMessage().getMap().size();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
      */
     @java.lang.Override
-    public boolean containsMapStringForeignMessage(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public boolean containsMapStringForeignMessage(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
       return internalGetMapStringForeignMessage().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapStringForeignMessageMap()} instead. */
+    /**
+     * Use {@link #getMapStringForeignMessageMap()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
-    public java.util.Map<
-            java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-        getMapStringForeignMessage() {
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> getMapStringForeignMessage() {
       return getMapStringForeignMessageMap();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
      */
     @java.lang.Override
-    public java.util.Map<
-            java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-        getMapStringForeignMessageMap() {
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> getMapStringForeignMessageMap() {
       return internalGetMapStringForeignMessage().getMap();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
      */
     @java.lang.Override
-    public /* nullable */ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        getMapStringForeignMessageOrDefault(
-            java.lang.String key,
-            /* nullable */
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage defaultValue) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
-      java.util.Map<
-              java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-          map = internalGetMapStringForeignMessage().getMap();
+    public /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getMapStringForeignMessageOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> map =
+          internalGetMapStringForeignMessage().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        getMapStringForeignMessageOrThrow(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
-      java.util.Map<
-              java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-          map = internalGetMapStringForeignMessage().getMap();
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getMapStringForeignMessageOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> map =
+          internalGetMapStringForeignMessage().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -8655,126 +7675,93 @@ public boolean containsMapStringForeignMessage(java.lang.String key) {
     }
 
     public static final int MAP_STRING_NESTED_ENUM_FIELD_NUMBER = 73;
-
     private static final class MapStringNestedEnumDefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.String, java.lang.Integer>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedEnumEntry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.STRING,
-              "",
-              com.google.protobuf.WireFormat.FieldType.ENUM,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.FOO
-                  .getNumber());
+      static final com.google.protobuf.MapEntry<
+          java.lang.String, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.String, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedEnumEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.ENUM,
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.FOO.getNumber());
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.String, java.lang.Integer> mapStringNestedEnum_;
-
+    private com.google.protobuf.MapField<
+        java.lang.String, java.lang.Integer> mapStringNestedEnum_;
     private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
-        internalGetMapStringNestedEnum() {
+    internalGetMapStringNestedEnum() {
       if (mapStringNestedEnum_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapStringNestedEnumDefaultEntryHolder.defaultEntry);
       }
       return mapStringNestedEnum_;
     }
-
-    private static final com.google.protobuf.Internal.MapAdapter.Converter<
-            java.lang.Integer,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        mapStringNestedEnumValueConverter =
+    private static final
+    com.google.protobuf.Internal.MapAdapter.Converter<
+        java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> mapStringNestedEnumValueConverter =
             com.google.protobuf.Internal.MapAdapter.newEnumConverter(
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                    .internalGetValueMap(),
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                    .UNRECOGNIZED);
-
-    private static final java.util.Map<
-            java.lang.String,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        internalGetAdaptedMapStringNestedEnumMap(
-            java.util.Map<java.lang.String, java.lang.Integer> map) {
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.internalGetValueMap(),
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.UNRECOGNIZED);
+    private static final java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
+    internalGetAdaptedMapStringNestedEnumMap(
+        java.util.Map<java.lang.String, java.lang.Integer> map) {
       return new com.google.protobuf.Internal.MapAdapter<
-          java.lang.String,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum,
-          java.lang.Integer>(map, mapStringNestedEnumValueConverter);
+          java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum, java.lang.Integer>(
+              map, mapStringNestedEnumValueConverter);
     }
-
     public int getMapStringNestedEnumCount() {
       return internalGetMapStringNestedEnum().getMap().size();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
      */
     @java.lang.Override
-    public boolean containsMapStringNestedEnum(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public boolean containsMapStringNestedEnum(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
       return internalGetMapStringNestedEnum().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapStringNestedEnumMap()} instead. */
+    /**
+     * Use {@link #getMapStringNestedEnumMap()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
-    public java.util.Map<
-            java.lang.String,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        getMapStringNestedEnum() {
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
+    getMapStringNestedEnum() {
       return getMapStringNestedEnumMap();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
      */
     @java.lang.Override
-    public java.util.Map<
-            java.lang.String,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        getMapStringNestedEnumMap() {
-      return internalGetAdaptedMapStringNestedEnumMap(internalGetMapStringNestedEnum().getMap());
-    }
-
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
+    getMapStringNestedEnumMap() {
+      return internalGetAdaptedMapStringNestedEnumMap(
+          internalGetMapStringNestedEnum().getMap());}
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
      */
     @java.lang.Override
-    public /* nullable */ legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-            .NestedEnum
-        getMapStringNestedEnumOrDefault(
-            java.lang.String key,
-            /* nullable */
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                defaultValue) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getMapStringNestedEnumOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
       java.util.Map<java.lang.String, java.lang.Integer> map =
           internalGetMapStringNestedEnum().getMap();
       return map.containsKey(key)
-          ? mapStringNestedEnumValueConverter.doForward(map.get(key))
-          : defaultValue;
+             ? mapStringNestedEnumValueConverter.doForward(map.get(key))
+             : defaultValue;
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getMapStringNestedEnumOrThrow(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getMapStringNestedEnumOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
       java.util.Map<java.lang.String, java.lang.Integer> map =
           internalGetMapStringNestedEnum().getMap();
       if (!map.containsKey(key)) {
@@ -8782,49 +7769,42 @@ public boolean containsMapStringNestedEnum(java.lang.String key) {
       }
       return mapStringNestedEnumValueConverter.doForward(map.get(key));
     }
-
-    /** Use {@link #getMapStringNestedEnumValueMap()} instead. */
+    /**
+     * Use {@link #getMapStringNestedEnumValueMap()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
-    public java.util.Map<java.lang.String, java.lang.Integer> getMapStringNestedEnumValue() {
+    public java.util.Map<java.lang.String, java.lang.Integer>
+    getMapStringNestedEnumValue() {
       return getMapStringNestedEnumValueMap();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
      */
     @java.lang.Override
-    public java.util.Map<java.lang.String, java.lang.Integer> getMapStringNestedEnumValueMap() {
+    public java.util.Map<java.lang.String, java.lang.Integer>
+    getMapStringNestedEnumValueMap() {
       return internalGetMapStringNestedEnum().getMap();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
      */
     @java.lang.Override
-    public int getMapStringNestedEnumValueOrDefault(java.lang.String key, int defaultValue) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public int getMapStringNestedEnumValueOrDefault(
+        java.lang.String key,
+        int defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
       java.util.Map<java.lang.String, java.lang.Integer> map =
           internalGetMapStringNestedEnum().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
      */
     @java.lang.Override
-    public int getMapStringNestedEnumValueOrThrow(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public int getMapStringNestedEnumValueOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
       java.util.Map<java.lang.String, java.lang.Integer> map =
           internalGetMapStringNestedEnum().getMap();
       if (!map.containsKey(key)) {
@@ -8834,118 +7814,93 @@ public int getMapStringNestedEnumValueOrThrow(java.lang.String key) {
     }
 
     public static final int MAP_STRING_FOREIGN_ENUM_FIELD_NUMBER = 74;
-
     private static final class MapStringForeignEnumDefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.String, java.lang.Integer>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignEnumEntry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.STRING,
-              "",
-              com.google.protobuf.WireFormat.FieldType.ENUM,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.FOREIGN_FOO
-                  .getNumber());
+      static final com.google.protobuf.MapEntry<
+          java.lang.String, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.String, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignEnumEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.ENUM,
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.FOREIGN_FOO.getNumber());
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.String, java.lang.Integer> mapStringForeignEnum_;
-
+    private com.google.protobuf.MapField<
+        java.lang.String, java.lang.Integer> mapStringForeignEnum_;
     private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
-        internalGetMapStringForeignEnum() {
+    internalGetMapStringForeignEnum() {
       if (mapStringForeignEnum_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapStringForeignEnumDefaultEntryHolder.defaultEntry);
       }
       return mapStringForeignEnum_;
     }
-
-    private static final com.google.protobuf.Internal.MapAdapter.Converter<
-            java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-        mapStringForeignEnumValueConverter =
+    private static final
+    com.google.protobuf.Internal.MapAdapter.Converter<
+        java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum> mapStringForeignEnumValueConverter =
             com.google.protobuf.Internal.MapAdapter.newEnumConverter(
                 legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.internalGetValueMap(),
                 legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.UNRECOGNIZED);
-
-    private static final java.util.Map<
-            java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-        internalGetAdaptedMapStringForeignEnumMap(
-            java.util.Map<java.lang.String, java.lang.Integer> map) {
+    private static final java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
+    internalGetAdaptedMapStringForeignEnumMap(
+        java.util.Map<java.lang.String, java.lang.Integer> map) {
       return new com.google.protobuf.Internal.MapAdapter<
-          java.lang.String,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum,
-          java.lang.Integer>(map, mapStringForeignEnumValueConverter);
+          java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum, java.lang.Integer>(
+              map, mapStringForeignEnumValueConverter);
     }
-
     public int getMapStringForeignEnumCount() {
       return internalGetMapStringForeignEnum().getMap().size();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
      */
     @java.lang.Override
-    public boolean containsMapStringForeignEnum(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public boolean containsMapStringForeignEnum(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
       return internalGetMapStringForeignEnum().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapStringForeignEnumMap()} instead. */
+    /**
+     * Use {@link #getMapStringForeignEnumMap()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
-    public java.util.Map<
-            java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-        getMapStringForeignEnum() {
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
+    getMapStringForeignEnum() {
       return getMapStringForeignEnumMap();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
      */
     @java.lang.Override
-    public java.util.Map<
-            java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-        getMapStringForeignEnumMap() {
-      return internalGetAdaptedMapStringForeignEnumMap(internalGetMapStringForeignEnum().getMap());
-    }
-
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
+    getMapStringForeignEnumMap() {
+      return internalGetAdaptedMapStringForeignEnumMap(
+          internalGetMapStringForeignEnum().getMap());}
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
      */
     @java.lang.Override
-    public /* nullable */ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum
-        getMapStringForeignEnumOrDefault(
-            java.lang.String key,
-            /* nullable */
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum defaultValue) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getMapStringForeignEnumOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
       java.util.Map<java.lang.String, java.lang.Integer> map =
           internalGetMapStringForeignEnum().getMap();
       return map.containsKey(key)
-          ? mapStringForeignEnumValueConverter.doForward(map.get(key))
-          : defaultValue;
+             ? mapStringForeignEnumValueConverter.doForward(map.get(key))
+             : defaultValue;
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum
-        getMapStringForeignEnumOrThrow(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getMapStringForeignEnumOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
       java.util.Map<java.lang.String, java.lang.Integer> map =
           internalGetMapStringForeignEnum().getMap();
       if (!map.containsKey(key)) {
@@ -8953,49 +7908,42 @@ public boolean containsMapStringForeignEnum(java.lang.String key) {
       }
       return mapStringForeignEnumValueConverter.doForward(map.get(key));
     }
-
-    /** Use {@link #getMapStringForeignEnumValueMap()} instead. */
+    /**
+     * Use {@link #getMapStringForeignEnumValueMap()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
-    public java.util.Map<java.lang.String, java.lang.Integer> getMapStringForeignEnumValue() {
+    public java.util.Map<java.lang.String, java.lang.Integer>
+    getMapStringForeignEnumValue() {
       return getMapStringForeignEnumValueMap();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
      */
     @java.lang.Override
-    public java.util.Map<java.lang.String, java.lang.Integer> getMapStringForeignEnumValueMap() {
+    public java.util.Map<java.lang.String, java.lang.Integer>
+    getMapStringForeignEnumValueMap() {
       return internalGetMapStringForeignEnum().getMap();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
      */
     @java.lang.Override
-    public int getMapStringForeignEnumValueOrDefault(java.lang.String key, int defaultValue) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public int getMapStringForeignEnumValueOrDefault(
+        java.lang.String key,
+        int defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
       java.util.Map<java.lang.String, java.lang.Integer> map =
           internalGetMapStringForeignEnum().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
      */
     @java.lang.Override
-    public int getMapStringForeignEnumValueOrThrow(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public int getMapStringForeignEnumValueOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
       java.util.Map<java.lang.String, java.lang.Integer> map =
           internalGetMapStringForeignEnum().getMap();
       if (!map.containsKey(key)) {
@@ -9005,20 +7953,16 @@ public int getMapStringForeignEnumValueOrThrow(java.lang.String key) {
     }
 
     public static final int ONEOF_UINT32_FIELD_NUMBER = 111;
-
     /**
      * <code>uint32 oneof_uint32 = 111;</code>
-     *
      * @return Whether the oneofUint32 field is set.
      */
     @java.lang.Override
     public boolean hasOneofUint32() {
       return oneofFieldCase_ == 111;
     }
-
     /**
      * <code>uint32 oneof_uint32 = 111;</code>
-     *
      * @return The oneofUint32.
      */
     @java.lang.Override
@@ -9030,68 +7974,46 @@ public int getOneofUint32() {
     }
 
     public static final int ONEOF_NESTED_MESSAGE_FIELD_NUMBER = 112;
-
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
      * @return Whether the oneofNestedMessage field is set.
      */
     @java.lang.Override
     public boolean hasOneofNestedMessage() {
       return oneofFieldCase_ == 112;
     }
-
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
      * @return The oneofNestedMessage.
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-        getOneofNestedMessage() {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getOneofNestedMessage() {
       if (oneofFieldCase_ == 112) {
-        return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage)
-            oneofField_;
+         return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) oneofField_;
       }
-      return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-          .getDefaultInstance();
+      return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance();
     }
-
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-     * </code>
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-            .NestedMessageOrBuilder
-        getOneofNestedMessageOrBuilder() {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder getOneofNestedMessageOrBuilder() {
       if (oneofFieldCase_ == 112) {
-        return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage)
-            oneofField_;
+         return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) oneofField_;
       }
-      return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-          .getDefaultInstance();
+      return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance();
     }
 
     public static final int ONEOF_STRING_FIELD_NUMBER = 113;
-
     /**
      * <code>string oneof_string = 113;</code>
-     *
      * @return Whether the oneofString field is set.
      */
     public boolean hasOneofString() {
       return oneofFieldCase_ == 113;
     }
-
     /**
      * <code>string oneof_string = 113;</code>
-     *
      * @return The oneofString.
      */
     public java.lang.String getOneofString() {
@@ -9102,7 +8024,8 @@ public java.lang.String getOneofString() {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (oneofFieldCase_ == 113) {
           oneofField_ = s;
@@ -9110,20 +8033,20 @@ public java.lang.String getOneofString() {
         return s;
       }
     }
-
     /**
      * <code>string oneof_string = 113;</code>
-     *
      * @return The bytes for oneofString.
      */
-    public com.google.protobuf.ByteString getOneofStringBytes() {
+    public com.google.protobuf.ByteString
+        getOneofStringBytes() {
       java.lang.Object ref = "";
       if (oneofFieldCase_ == 113) {
         ref = oneofField_;
       }
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
         if (oneofFieldCase_ == 113) {
           oneofField_ = b;
         }
@@ -9134,20 +8057,16 @@ public com.google.protobuf.ByteString getOneofStringBytes() {
     }
 
     public static final int ONEOF_BYTES_FIELD_NUMBER = 114;
-
     /**
      * <code>bytes oneof_bytes = 114;</code>
-     *
      * @return Whether the oneofBytes field is set.
      */
     @java.lang.Override
     public boolean hasOneofBytes() {
       return oneofFieldCase_ == 114;
     }
-
     /**
      * <code>bytes oneof_bytes = 114;</code>
-     *
      * @return The oneofBytes.
      */
     @java.lang.Override
@@ -9159,20 +8078,16 @@ public com.google.protobuf.ByteString getOneofBytes() {
     }
 
     public static final int ONEOF_BOOL_FIELD_NUMBER = 115;
-
     /**
      * <code>bool oneof_bool = 115;</code>
-     *
      * @return Whether the oneofBool field is set.
      */
     @java.lang.Override
     public boolean hasOneofBool() {
       return oneofFieldCase_ == 115;
     }
-
     /**
      * <code>bool oneof_bool = 115;</code>
-     *
      * @return The oneofBool.
      */
     @java.lang.Override
@@ -9184,20 +8099,16 @@ public boolean getOneofBool() {
     }
 
     public static final int ONEOF_UINT64_FIELD_NUMBER = 116;
-
     /**
      * <code>uint64 oneof_uint64 = 116;</code>
-     *
      * @return Whether the oneofUint64 field is set.
      */
     @java.lang.Override
     public boolean hasOneofUint64() {
       return oneofFieldCase_ == 116;
     }
-
     /**
      * <code>uint64 oneof_uint64 = 116;</code>
-     *
      * @return The oneofUint64.
      */
     @java.lang.Override
@@ -9209,20 +8120,16 @@ public long getOneofUint64() {
     }
 
     public static final int ONEOF_FLOAT_FIELD_NUMBER = 117;
-
     /**
      * <code>float oneof_float = 117;</code>
-     *
      * @return Whether the oneofFloat field is set.
      */
     @java.lang.Override
     public boolean hasOneofFloat() {
       return oneofFieldCase_ == 117;
     }
-
     /**
      * <code>float oneof_float = 117;</code>
-     *
      * @return The oneofFloat.
      */
     @java.lang.Override
@@ -9234,20 +8141,16 @@ public float getOneofFloat() {
     }
 
     public static final int ONEOF_DOUBLE_FIELD_NUMBER = 118;
-
     /**
      * <code>double oneof_double = 118;</code>
-     *
      * @return Whether the oneofDouble field is set.
      */
     @java.lang.Override
     public boolean hasOneofDouble() {
       return oneofFieldCase_ == 118;
     }
-
     /**
      * <code>double oneof_double = 118;</code>
-     *
      * @return The oneofDouble.
      */
     @java.lang.Override
@@ -9259,19 +8162,15 @@ public double getOneofDouble() {
     }
 
     public static final int ONEOF_ENUM_FIELD_NUMBER = 119;
-
     /**
      * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-     *
      * @return Whether the oneofEnum field is set.
      */
     public boolean hasOneofEnum() {
       return oneofFieldCase_ == 119;
     }
-
     /**
      * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-     *
      * @return The enum numeric value on the wire for oneofEnum.
      */
     public int getOneofEnumValue() {
@@ -9280,28 +8179,20 @@ public int getOneofEnumValue() {
       }
       return 0;
     }
-
     /**
      * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-     *
      * @return The oneofEnum.
      */
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getOneofEnum() {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getOneofEnum() {
       if (oneofFieldCase_ == 119) {
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum result =
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                .forNumber((java.lang.Integer) oneofField_);
-        return result == null
-            ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                .UNRECOGNIZED
-            : result;
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.forNumber(
+            (java.lang.Integer) oneofField_);
+        return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.UNRECOGNIZED : result;
       }
       return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.FOO;
     }
 
     private byte memoizedIsInitialized = -1;
-
     @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
@@ -9313,7 +8204,8 @@ public final boolean isInitialized() {
     }
 
     @java.lang.Override
-    public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
       getSerializedSize();
       if (optionalInt32_ != 0) {
         output.writeInt32(1, optionalInt32_);
@@ -9366,20 +8258,13 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(19, getOptionalForeignMessage());
       }
-      if (optionalNestedEnum_
-          != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.FOO
-              .getNumber()) {
+      if (optionalNestedEnum_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.FOO.getNumber()) {
         output.writeEnum(21, optionalNestedEnum_);
       }
-      if (optionalForeignEnum_
-          != legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.FOREIGN_FOO
-              .getNumber()) {
+      if (optionalForeignEnum_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.FOREIGN_FOO.getNumber()) {
         output.writeEnum(22, optionalForeignEnum_);
       }
-      if (optionalAliasedEnum_
-          != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum
-              .ALIAS_FOO
-              .getNumber()) {
+      if (optionalAliasedEnum_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum.ALIAS_FOO.getNumber()) {
         output.writeEnum(23, optionalAliasedEnum_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
@@ -9502,64 +8387,116 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       for (int i = 0; i < repeatedForeignEnum_.size(); i++) {
         output.writeEnumNoTag(repeatedForeignEnum_.get(i));
       }
-      com.google.protobuf.GeneratedMessage.serializeIntegerMapTo(
-          output, internalGetMapInt32Int32(), MapInt32Int32DefaultEntryHolder.defaultEntry, 56);
-      com.google.protobuf.GeneratedMessage.serializeLongMapTo(
-          output, internalGetMapInt64Int64(), MapInt64Int64DefaultEntryHolder.defaultEntry, 57);
-      com.google.protobuf.GeneratedMessage.serializeIntegerMapTo(
-          output, internalGetMapUint32Uint32(), MapUint32Uint32DefaultEntryHolder.defaultEntry, 58);
-      com.google.protobuf.GeneratedMessage.serializeLongMapTo(
-          output, internalGetMapUint64Uint64(), MapUint64Uint64DefaultEntryHolder.defaultEntry, 59);
-      com.google.protobuf.GeneratedMessage.serializeIntegerMapTo(
-          output, internalGetMapSint32Sint32(), MapSint32Sint32DefaultEntryHolder.defaultEntry, 60);
-      com.google.protobuf.GeneratedMessage.serializeLongMapTo(
-          output, internalGetMapSint64Sint64(), MapSint64Sint64DefaultEntryHolder.defaultEntry, 61);
-      com.google.protobuf.GeneratedMessage.serializeIntegerMapTo(
+      com.google.protobuf.GeneratedMessage
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapInt32Int32(),
+          MapInt32Int32DefaultEntryHolder.defaultEntry,
+          56);
+      com.google.protobuf.GeneratedMessage
+        .serializeLongMapTo(
+          output,
+          internalGetMapInt64Int64(),
+          MapInt64Int64DefaultEntryHolder.defaultEntry,
+          57);
+      com.google.protobuf.GeneratedMessage
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapUint32Uint32(),
+          MapUint32Uint32DefaultEntryHolder.defaultEntry,
+          58);
+      com.google.protobuf.GeneratedMessage
+        .serializeLongMapTo(
+          output,
+          internalGetMapUint64Uint64(),
+          MapUint64Uint64DefaultEntryHolder.defaultEntry,
+          59);
+      com.google.protobuf.GeneratedMessage
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapSint32Sint32(),
+          MapSint32Sint32DefaultEntryHolder.defaultEntry,
+          60);
+      com.google.protobuf.GeneratedMessage
+        .serializeLongMapTo(
+          output,
+          internalGetMapSint64Sint64(),
+          MapSint64Sint64DefaultEntryHolder.defaultEntry,
+          61);
+      com.google.protobuf.GeneratedMessage
+        .serializeIntegerMapTo(
           output,
           internalGetMapFixed32Fixed32(),
           MapFixed32Fixed32DefaultEntryHolder.defaultEntry,
           62);
-      com.google.protobuf.GeneratedMessage.serializeLongMapTo(
+      com.google.protobuf.GeneratedMessage
+        .serializeLongMapTo(
           output,
           internalGetMapFixed64Fixed64(),
           MapFixed64Fixed64DefaultEntryHolder.defaultEntry,
           63);
-      com.google.protobuf.GeneratedMessage.serializeIntegerMapTo(
+      com.google.protobuf.GeneratedMessage
+        .serializeIntegerMapTo(
           output,
           internalGetMapSfixed32Sfixed32(),
           MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry,
           64);
-      com.google.protobuf.GeneratedMessage.serializeLongMapTo(
+      com.google.protobuf.GeneratedMessage
+        .serializeLongMapTo(
           output,
           internalGetMapSfixed64Sfixed64(),
           MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry,
           65);
-      com.google.protobuf.GeneratedMessage.serializeIntegerMapTo(
-          output, internalGetMapInt32Float(), MapInt32FloatDefaultEntryHolder.defaultEntry, 66);
-      com.google.protobuf.GeneratedMessage.serializeIntegerMapTo(
-          output, internalGetMapInt32Double(), MapInt32DoubleDefaultEntryHolder.defaultEntry, 67);
-      com.google.protobuf.GeneratedMessage.serializeBooleanMapTo(
-          output, internalGetMapBoolBool(), MapBoolBoolDefaultEntryHolder.defaultEntry, 68);
-      com.google.protobuf.GeneratedMessage.serializeStringMapTo(
-          output, internalGetMapStringString(), MapStringStringDefaultEntryHolder.defaultEntry, 69);
-      com.google.protobuf.GeneratedMessage.serializeStringMapTo(
-          output, internalGetMapStringBytes(), MapStringBytesDefaultEntryHolder.defaultEntry, 70);
-      com.google.protobuf.GeneratedMessage.serializeStringMapTo(
+      com.google.protobuf.GeneratedMessage
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapInt32Float(),
+          MapInt32FloatDefaultEntryHolder.defaultEntry,
+          66);
+      com.google.protobuf.GeneratedMessage
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapInt32Double(),
+          MapInt32DoubleDefaultEntryHolder.defaultEntry,
+          67);
+      com.google.protobuf.GeneratedMessage
+        .serializeBooleanMapTo(
+          output,
+          internalGetMapBoolBool(),
+          MapBoolBoolDefaultEntryHolder.defaultEntry,
+          68);
+      com.google.protobuf.GeneratedMessage
+        .serializeStringMapTo(
+          output,
+          internalGetMapStringString(),
+          MapStringStringDefaultEntryHolder.defaultEntry,
+          69);
+      com.google.protobuf.GeneratedMessage
+        .serializeStringMapTo(
+          output,
+          internalGetMapStringBytes(),
+          MapStringBytesDefaultEntryHolder.defaultEntry,
+          70);
+      com.google.protobuf.GeneratedMessage
+        .serializeStringMapTo(
           output,
           internalGetMapStringNestedMessage(),
           MapStringNestedMessageDefaultEntryHolder.defaultEntry,
           71);
-      com.google.protobuf.GeneratedMessage.serializeStringMapTo(
+      com.google.protobuf.GeneratedMessage
+        .serializeStringMapTo(
           output,
           internalGetMapStringForeignMessage(),
           MapStringForeignMessageDefaultEntryHolder.defaultEntry,
           72);
-      com.google.protobuf.GeneratedMessage.serializeStringMapTo(
+      com.google.protobuf.GeneratedMessage
+        .serializeStringMapTo(
           output,
           internalGetMapStringNestedEnum(),
           MapStringNestedEnumDefaultEntryHolder.defaultEntry,
           73);
-      com.google.protobuf.GeneratedMessage.serializeStringMapTo(
+      com.google.protobuf.GeneratedMessage
+        .serializeStringMapTo(
           output,
           internalGetMapStringForeignEnum(),
           MapStringForeignEnumDefaultEntryHolder.defaultEntry,
@@ -9705,31 +8642,34 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
         output.writeEnum(102, unpackedNestedEnum_.get(i));
       }
       if (oneofFieldCase_ == 111) {
-        output.writeUInt32(111, (int) ((java.lang.Integer) oneofField_));
+        output.writeUInt32(
+            111, (int)((java.lang.Integer) oneofField_));
       }
       if (oneofFieldCase_ == 112) {
-        output.writeMessage(
-            112,
-            (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage)
-                oneofField_);
+        output.writeMessage(112, (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) oneofField_);
       }
       if (oneofFieldCase_ == 113) {
         com.google.protobuf.GeneratedMessage.writeString(output, 113, oneofField_);
       }
       if (oneofFieldCase_ == 114) {
-        output.writeBytes(114, (com.google.protobuf.ByteString) oneofField_);
+        output.writeBytes(
+            114, (com.google.protobuf.ByteString) oneofField_);
       }
       if (oneofFieldCase_ == 115) {
-        output.writeBool(115, (boolean) ((java.lang.Boolean) oneofField_));
+        output.writeBool(
+            115, (boolean)((java.lang.Boolean) oneofField_));
       }
       if (oneofFieldCase_ == 116) {
-        output.writeUInt64(116, (long) ((java.lang.Long) oneofField_));
+        output.writeUInt64(
+            116, (long)((java.lang.Long) oneofField_));
       }
       if (oneofFieldCase_ == 117) {
-        output.writeFloat(117, (float) ((java.lang.Float) oneofField_));
+        output.writeFloat(
+            117, (float)((java.lang.Float) oneofField_));
       }
       if (oneofFieldCase_ == 118) {
-        output.writeDouble(118, (double) ((java.lang.Double) oneofField_));
+        output.writeDouble(
+            118, (double)((java.lang.Double) oneofField_));
       }
       if (oneofFieldCase_ == 119) {
         output.writeEnum(119, ((java.lang.Integer) oneofField_));
@@ -9744,159 +8684,169 @@ public int getSerializedSize() {
 
       size = 0;
       if (optionalInt32_ != 0) {
-        size += com.google.protobuf.CodedOutputStream.computeInt32Size(1, optionalInt32_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(1, optionalInt32_);
       }
       if (optionalInt64_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream.computeInt64Size(2, optionalInt64_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt64Size(2, optionalInt64_);
       }
       if (optionalUint32_ != 0) {
-        size += com.google.protobuf.CodedOutputStream.computeUInt32Size(3, optionalUint32_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(3, optionalUint32_);
       }
       if (optionalUint64_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream.computeUInt64Size(4, optionalUint64_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(4, optionalUint64_);
       }
       if (optionalSint32_ != 0) {
-        size += com.google.protobuf.CodedOutputStream.computeSInt32Size(5, optionalSint32_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeSInt32Size(5, optionalSint32_);
       }
       if (optionalSint64_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream.computeSInt64Size(6, optionalSint64_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeSInt64Size(6, optionalSint64_);
       }
       if (optionalFixed32_ != 0) {
-        size += com.google.protobuf.CodedOutputStream.computeFixed32Size(7, optionalFixed32_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeFixed32Size(7, optionalFixed32_);
       }
       if (optionalFixed64_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream.computeFixed64Size(8, optionalFixed64_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeFixed64Size(8, optionalFixed64_);
       }
       if (optionalSfixed32_ != 0) {
-        size += com.google.protobuf.CodedOutputStream.computeSFixed32Size(9, optionalSfixed32_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeSFixed32Size(9, optionalSfixed32_);
       }
       if (optionalSfixed64_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream.computeSFixed64Size(10, optionalSfixed64_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeSFixed64Size(10, optionalSfixed64_);
       }
       if (java.lang.Float.floatToRawIntBits(optionalFloat_) != 0) {
-        size += com.google.protobuf.CodedOutputStream.computeFloatSize(11, optionalFloat_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeFloatSize(11, optionalFloat_);
       }
       if (java.lang.Double.doubleToRawLongBits(optionalDouble_) != 0) {
-        size += com.google.protobuf.CodedOutputStream.computeDoubleSize(12, optionalDouble_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeDoubleSize(12, optionalDouble_);
       }
       if (optionalBool_ != false) {
-        size += com.google.protobuf.CodedOutputStream.computeBoolSize(13, optionalBool_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(13, optionalBool_);
       }
       if (!com.google.protobuf.GeneratedMessage.isStringEmpty(optionalString_)) {
         size += com.google.protobuf.GeneratedMessage.computeStringSize(14, optionalString_);
       }
       if (!optionalBytes_.isEmpty()) {
-        size += com.google.protobuf.CodedOutputStream.computeBytesSize(15, optionalBytes_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(15, optionalBytes_);
       }
       if (((bitField0_ & 0x00000001) != 0)) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeMessageSize(
-                18, getOptionalNestedMessage());
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(18, getOptionalNestedMessage());
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeMessageSize(
-                19, getOptionalForeignMessage());
-      }
-      if (optionalNestedEnum_
-          != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.FOO
-              .getNumber()) {
-        size += com.google.protobuf.CodedOutputStream.computeEnumSize(21, optionalNestedEnum_);
-      }
-      if (optionalForeignEnum_
-          != legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.FOREIGN_FOO
-              .getNumber()) {
-        size += com.google.protobuf.CodedOutputStream.computeEnumSize(22, optionalForeignEnum_);
-      }
-      if (optionalAliasedEnum_
-          != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum
-              .ALIAS_FOO
-              .getNumber()) {
-        size += com.google.protobuf.CodedOutputStream.computeEnumSize(23, optionalAliasedEnum_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(19, getOptionalForeignMessage());
+      }
+      if (optionalNestedEnum_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.FOO.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(21, optionalNestedEnum_);
+      }
+      if (optionalForeignEnum_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.FOREIGN_FOO.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(22, optionalForeignEnum_);
+      }
+      if (optionalAliasedEnum_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum.ALIAS_FOO.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(23, optionalAliasedEnum_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(27, getRecursiveMessage());
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(27, getRecursiveMessage());
       }
       {
         int dataSize = 0;
         for (int i = 0; i < repeatedInt32_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(repeatedInt32_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt32SizeNoTag(repeatedInt32_.getInt(i));
         }
         size += dataSize;
         if (!getRepeatedInt32List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedInt32MemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < repeatedInt64_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeInt64SizeNoTag(
-                  repeatedInt64_.getLong(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt64SizeNoTag(repeatedInt64_.getLong(i));
         }
         size += dataSize;
         if (!getRepeatedInt64List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedInt64MemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < repeatedUint32_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeUInt32SizeNoTag(
-                  repeatedUint32_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(repeatedUint32_.getInt(i));
         }
         size += dataSize;
         if (!getRepeatedUint32List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedUint32MemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < repeatedUint64_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeUInt64SizeNoTag(
-                  repeatedUint64_.getLong(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt64SizeNoTag(repeatedUint64_.getLong(i));
         }
         size += dataSize;
         if (!getRepeatedUint64List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedUint64MemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < repeatedSint32_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeSInt32SizeNoTag(
-                  repeatedSint32_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt32SizeNoTag(repeatedSint32_.getInt(i));
         }
         size += dataSize;
         if (!getRepeatedSint32List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedSint32MemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < repeatedSint64_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeSInt64SizeNoTag(
-                  repeatedSint64_.getLong(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt64SizeNoTag(repeatedSint64_.getLong(i));
         }
         size += dataSize;
         if (!getRepeatedSint64List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedSint64MemoizedSerializedSize = dataSize;
       }
@@ -9906,7 +8856,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getRepeatedFixed32List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedFixed32MemoizedSerializedSize = dataSize;
       }
@@ -9916,7 +8867,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getRepeatedFixed64List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedFixed64MemoizedSerializedSize = dataSize;
       }
@@ -9926,7 +8878,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getRepeatedSfixed32List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedSfixed32MemoizedSerializedSize = dataSize;
       }
@@ -9936,7 +8889,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getRepeatedSfixed64List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedSfixed64MemoizedSerializedSize = dataSize;
       }
@@ -9946,7 +8900,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getRepeatedFloatList().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedFloatMemoizedSerializedSize = dataSize;
       }
@@ -9956,7 +8911,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getRepeatedDoubleList().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedDoubleMemoizedSerializedSize = dataSize;
       }
@@ -9966,7 +8922,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getRepeatedBoolList().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedBoolMemoizedSerializedSize = dataSize;
       }
@@ -9981,329 +8938,315 @@ public int getSerializedSize() {
       {
         int dataSize = 0;
         for (int i = 0; i < repeatedBytes_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeBytesSizeNoTag(repeatedBytes_.get(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeBytesSizeNoTag(repeatedBytes_.get(i));
         }
         size += dataSize;
         size += 2 * getRepeatedBytesList().size();
       }
       for (int i = 0; i < repeatedNestedMessage_.size(); i++) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeMessageSize(
-                48, repeatedNestedMessage_.get(i));
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(48, repeatedNestedMessage_.get(i));
       }
       for (int i = 0; i < repeatedForeignMessage_.size(); i++) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeMessageSize(
-                49, repeatedForeignMessage_.get(i));
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(49, repeatedForeignMessage_.get(i));
       }
       {
         int dataSize = 0;
         for (int i = 0; i < repeatedNestedEnum_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeEnumSizeNoTag(
-                  repeatedNestedEnum_.get(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeEnumSizeNoTag(repeatedNestedEnum_.get(i));
         }
         size += dataSize;
-        if (!getRepeatedNestedEnumList().isEmpty()) {
-          size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeUInt32SizeNoTag(dataSize);
-        }
-        repeatedNestedEnumMemoizedSerializedSize = dataSize;
+        if (!getRepeatedNestedEnumList().isEmpty()) {  size += 2;
+          size += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(dataSize);
+        }repeatedNestedEnumMemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < repeatedForeignEnum_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeEnumSizeNoTag(
-                  repeatedForeignEnum_.get(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeEnumSizeNoTag(repeatedForeignEnum_.get(i));
         }
         size += dataSize;
-        if (!getRepeatedForeignEnumList().isEmpty()) {
-          size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeUInt32SizeNoTag(dataSize);
-        }
-        repeatedForeignEnumMemoizedSerializedSize = dataSize;
-      }
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry :
-          internalGetMapInt32Int32().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer> mapInt32Int32__ =
-            MapInt32Int32DefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(56, mapInt32Int32__);
-      }
-      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry :
-          internalGetMapInt64Int64().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> mapInt64Int64__ =
-            MapInt64Int64DefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(57, mapInt64Int64__);
-      }
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry :
-          internalGetMapUint32Uint32().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer> mapUint32Uint32__ =
-            MapUint32Uint32DefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(58, mapUint32Uint32__);
-      }
-      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry :
-          internalGetMapUint64Uint64().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> mapUint64Uint64__ =
-            MapUint64Uint64DefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(59, mapUint64Uint64__);
-      }
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry :
-          internalGetMapSint32Sint32().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer> mapSint32Sint32__ =
-            MapSint32Sint32DefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(60, mapSint32Sint32__);
-      }
-      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry :
-          internalGetMapSint64Sint64().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> mapSint64Sint64__ =
-            MapSint64Sint64DefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(61, mapSint64Sint64__);
-      }
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry :
-          internalGetMapFixed32Fixed32().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer> mapFixed32Fixed32__ =
-            MapFixed32Fixed32DefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(62, mapFixed32Fixed32__);
-      }
-      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry :
-          internalGetMapFixed64Fixed64().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> mapFixed64Fixed64__ =
-            MapFixed64Fixed64DefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(63, mapFixed64Fixed64__);
-      }
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry :
-          internalGetMapSfixed32Sfixed32().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer> mapSfixed32Sfixed32__ =
-            MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(64, mapSfixed32Sfixed32__);
-      }
-      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry :
-          internalGetMapSfixed64Sfixed64().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> mapSfixed64Sfixed64__ =
-            MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(65, mapSfixed64Sfixed64__);
-      }
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Float> entry :
-          internalGetMapInt32Float().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float> mapInt32Float__ =
-            MapInt32FloatDefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(66, mapInt32Float__);
-      }
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Double> entry :
-          internalGetMapInt32Double().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Double> mapInt32Double__ =
-            MapInt32DoubleDefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(67, mapInt32Double__);
-      }
-      for (java.util.Map.Entry<java.lang.Boolean, java.lang.Boolean> entry :
-          internalGetMapBoolBool().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Boolean, java.lang.Boolean> mapBoolBool__ =
-            MapBoolBoolDefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(68, mapBoolBool__);
-      }
-      for (java.util.Map.Entry<java.lang.String, java.lang.String> entry :
-          internalGetMapStringString().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.String, java.lang.String> mapStringString__ =
-            MapStringStringDefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(69, mapStringString__);
-      }
-      for (java.util.Map.Entry<java.lang.String, com.google.protobuf.ByteString> entry :
-          internalGetMapStringBytes().getMap().entrySet()) {
+        if (!getRepeatedForeignEnumList().isEmpty()) {  size += 2;
+          size += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(dataSize);
+        }repeatedForeignEnumMemoizedSerializedSize = dataSize;
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetMapInt32Int32().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        mapInt32Int32__ = MapInt32Int32DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(56, mapInt32Int32__);
+      }
+      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry
+           : internalGetMapInt64Int64().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+        mapInt64Int64__ = MapInt64Int64DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(57, mapInt64Int64__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetMapUint32Uint32().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        mapUint32Uint32__ = MapUint32Uint32DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(58, mapUint32Uint32__);
+      }
+      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry
+           : internalGetMapUint64Uint64().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+        mapUint64Uint64__ = MapUint64Uint64DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(59, mapUint64Uint64__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetMapSint32Sint32().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        mapSint32Sint32__ = MapSint32Sint32DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(60, mapSint32Sint32__);
+      }
+      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry
+           : internalGetMapSint64Sint64().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+        mapSint64Sint64__ = MapSint64Sint64DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(61, mapSint64Sint64__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetMapFixed32Fixed32().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        mapFixed32Fixed32__ = MapFixed32Fixed32DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(62, mapFixed32Fixed32__);
+      }
+      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry
+           : internalGetMapFixed64Fixed64().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+        mapFixed64Fixed64__ = MapFixed64Fixed64DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(63, mapFixed64Fixed64__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetMapSfixed32Sfixed32().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        mapSfixed32Sfixed32__ = MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(64, mapSfixed32Sfixed32__);
+      }
+      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry
+           : internalGetMapSfixed64Sfixed64().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+        mapSfixed64Sfixed64__ = MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(65, mapSfixed64Sfixed64__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Float> entry
+           : internalGetMapInt32Float().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float>
+        mapInt32Float__ = MapInt32FloatDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(66, mapInt32Float__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Double> entry
+           : internalGetMapInt32Double().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Double>
+        mapInt32Double__ = MapInt32DoubleDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(67, mapInt32Double__);
+      }
+      for (java.util.Map.Entry<java.lang.Boolean, java.lang.Boolean> entry
+           : internalGetMapBoolBool().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Boolean, java.lang.Boolean>
+        mapBoolBool__ = MapBoolBoolDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(68, mapBoolBool__);
+      }
+      for (java.util.Map.Entry<java.lang.String, java.lang.String> entry
+           : internalGetMapStringString().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, java.lang.String>
+        mapStringString__ = MapStringStringDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(69, mapStringString__);
+      }
+      for (java.util.Map.Entry<java.lang.String, com.google.protobuf.ByteString> entry
+           : internalGetMapStringBytes().getMap().entrySet()) {
         com.google.protobuf.MapEntry<java.lang.String, com.google.protobuf.ByteString>
-            mapStringBytes__ =
-                MapStringBytesDefaultEntryHolder.defaultEntry
-                    .newBuilderForType()
-                    .setKey(entry.getKey())
-                    .setValue(entry.getValue())
-                    .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(70, mapStringBytes__);
-      }
-      for (java.util.Map.Entry<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-          entry : internalGetMapStringNestedMessage().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<
-                java.lang.String,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-            mapStringNestedMessage__ =
-                MapStringNestedMessageDefaultEntryHolder.defaultEntry
-                    .newBuilderForType()
-                    .setKey(entry.getKey())
-                    .setValue(entry.getValue())
-                    .build();
-        size +=
-            com.google.protobuf.CodedOutputStream.computeMessageSize(71, mapStringNestedMessage__);
-      }
-      for (java.util.Map.Entry<
-              java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-          entry : internalGetMapStringForeignMessage().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<
-                java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-            mapStringForeignMessage__ =
-                MapStringForeignMessageDefaultEntryHolder.defaultEntry
-                    .newBuilderForType()
-                    .setKey(entry.getKey())
-                    .setValue(entry.getValue())
-                    .build();
-        size +=
-            com.google.protobuf.CodedOutputStream.computeMessageSize(72, mapStringForeignMessage__);
-      }
-      for (java.util.Map.Entry<java.lang.String, java.lang.Integer> entry :
-          internalGetMapStringNestedEnum().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer> mapStringNestedEnum__ =
-            MapStringNestedEnumDefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(73, mapStringNestedEnum__);
-      }
-      for (java.util.Map.Entry<java.lang.String, java.lang.Integer> entry :
-          internalGetMapStringForeignEnum().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer> mapStringForeignEnum__ =
-            MapStringForeignEnumDefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size +=
-            com.google.protobuf.CodedOutputStream.computeMessageSize(74, mapStringForeignEnum__);
+        mapStringBytes__ = MapStringBytesDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(70, mapStringBytes__);
+      }
+      for (java.util.Map.Entry<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> entry
+           : internalGetMapStringNestedMessage().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
+        mapStringNestedMessage__ = MapStringNestedMessageDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(71, mapStringNestedMessage__);
+      }
+      for (java.util.Map.Entry<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> entry
+           : internalGetMapStringForeignMessage().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
+        mapStringForeignMessage__ = MapStringForeignMessageDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(72, mapStringForeignMessage__);
+      }
+      for (java.util.Map.Entry<java.lang.String, java.lang.Integer> entry
+           : internalGetMapStringNestedEnum().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer>
+        mapStringNestedEnum__ = MapStringNestedEnumDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(73, mapStringNestedEnum__);
+      }
+      for (java.util.Map.Entry<java.lang.String, java.lang.Integer> entry
+           : internalGetMapStringForeignEnum().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer>
+        mapStringForeignEnum__ = MapStringForeignEnumDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(74, mapStringForeignEnum__);
       }
       {
         int dataSize = 0;
         for (int i = 0; i < packedInt32_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(packedInt32_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt32SizeNoTag(packedInt32_.getInt(i));
         }
         size += dataSize;
         if (!getPackedInt32List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedInt32MemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < packedInt64_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeInt64SizeNoTag(packedInt64_.getLong(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt64SizeNoTag(packedInt64_.getLong(i));
         }
         size += dataSize;
         if (!getPackedInt64List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedInt64MemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < packedUint32_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeUInt32SizeNoTag(packedUint32_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(packedUint32_.getInt(i));
         }
         size += dataSize;
         if (!getPackedUint32List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedUint32MemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < packedUint64_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeUInt64SizeNoTag(
-                  packedUint64_.getLong(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt64SizeNoTag(packedUint64_.getLong(i));
         }
         size += dataSize;
         if (!getPackedUint64List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedUint64MemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < packedSint32_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeSInt32SizeNoTag(packedSint32_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt32SizeNoTag(packedSint32_.getInt(i));
         }
         size += dataSize;
         if (!getPackedSint32List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedSint32MemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < packedSint64_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeSInt64SizeNoTag(
-                  packedSint64_.getLong(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt64SizeNoTag(packedSint64_.getLong(i));
         }
         size += dataSize;
         if (!getPackedSint64List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedSint64MemoizedSerializedSize = dataSize;
       }
@@ -10313,7 +9256,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getPackedFixed32List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedFixed32MemoizedSerializedSize = dataSize;
       }
@@ -10323,7 +9267,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getPackedFixed64List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedFixed64MemoizedSerializedSize = dataSize;
       }
@@ -10333,7 +9278,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getPackedSfixed32List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedSfixed32MemoizedSerializedSize = dataSize;
       }
@@ -10343,7 +9289,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getPackedSfixed64List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedSfixed64MemoizedSerializedSize = dataSize;
       }
@@ -10353,7 +9300,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getPackedFloatList().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedFloatMemoizedSerializedSize = dataSize;
       }
@@ -10363,7 +9311,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getPackedDoubleList().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedDoubleMemoizedSerializedSize = dataSize;
       }
@@ -10373,28 +9322,28 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getPackedBoolList().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedBoolMemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < packedNestedEnum_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeEnumSizeNoTag(packedNestedEnum_.get(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeEnumSizeNoTag(packedNestedEnum_.get(i));
         }
         size += dataSize;
-        if (!getPackedNestedEnumList().isEmpty()) {
-          size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeUInt32SizeNoTag(dataSize);
-        }
-        packedNestedEnumMemoizedSerializedSize = dataSize;
+        if (!getPackedNestedEnumList().isEmpty()) {  size += 2;
+          size += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(dataSize);
+        }packedNestedEnumMemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < unpackedInt32_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(unpackedInt32_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt32SizeNoTag(unpackedInt32_.getInt(i));
         }
         size += dataSize;
         size += 2 * getUnpackedInt32List().size();
@@ -10402,9 +9351,8 @@ public int getSerializedSize() {
       {
         int dataSize = 0;
         for (int i = 0; i < unpackedInt64_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeInt64SizeNoTag(
-                  unpackedInt64_.getLong(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt64SizeNoTag(unpackedInt64_.getLong(i));
         }
         size += dataSize;
         size += 2 * getUnpackedInt64List().size();
@@ -10412,9 +9360,8 @@ public int getSerializedSize() {
       {
         int dataSize = 0;
         for (int i = 0; i < unpackedUint32_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeUInt32SizeNoTag(
-                  unpackedUint32_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(unpackedUint32_.getInt(i));
         }
         size += dataSize;
         size += 2 * getUnpackedUint32List().size();
@@ -10422,9 +9369,8 @@ public int getSerializedSize() {
       {
         int dataSize = 0;
         for (int i = 0; i < unpackedUint64_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeUInt64SizeNoTag(
-                  unpackedUint64_.getLong(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt64SizeNoTag(unpackedUint64_.getLong(i));
         }
         size += dataSize;
         size += 2 * getUnpackedUint64List().size();
@@ -10432,9 +9378,8 @@ public int getSerializedSize() {
       {
         int dataSize = 0;
         for (int i = 0; i < unpackedSint32_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeSInt32SizeNoTag(
-                  unpackedSint32_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt32SizeNoTag(unpackedSint32_.getInt(i));
         }
         size += dataSize;
         size += 2 * getUnpackedSint32List().size();
@@ -10442,9 +9387,8 @@ public int getSerializedSize() {
       {
         int dataSize = 0;
         for (int i = 0; i < unpackedSint64_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeSInt64SizeNoTag(
-                  unpackedSint64_.getLong(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt64SizeNoTag(unpackedSint64_.getLong(i));
         }
         size += dataSize;
         size += 2 * getUnpackedSint64List().size();
@@ -10494,58 +9438,52 @@ public int getSerializedSize() {
       {
         int dataSize = 0;
         for (int i = 0; i < unpackedNestedEnum_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeEnumSizeNoTag(
-                  unpackedNestedEnum_.get(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeEnumSizeNoTag(unpackedNestedEnum_.get(i));
         }
         size += dataSize;
         size += 2 * unpackedNestedEnum_.size();
       }
       if (oneofFieldCase_ == 111) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeUInt32Size(
-                111, (int) ((java.lang.Integer) oneofField_));
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(
+              111, (int)((java.lang.Integer) oneofField_));
       }
       if (oneofFieldCase_ == 112) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeMessageSize(
-                112,
-                (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                        .NestedMessage)
-                    oneofField_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(112, (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) oneofField_);
       }
       if (oneofFieldCase_ == 113) {
         size += com.google.protobuf.GeneratedMessage.computeStringSize(113, oneofField_);
       }
       if (oneofFieldCase_ == 114) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeBytesSize(
-                114, (com.google.protobuf.ByteString) oneofField_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(
+              114, (com.google.protobuf.ByteString) oneofField_);
       }
       if (oneofFieldCase_ == 115) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeBoolSize(
-                115, (boolean) ((java.lang.Boolean) oneofField_));
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(
+              115, (boolean)((java.lang.Boolean) oneofField_));
       }
       if (oneofFieldCase_ == 116) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeUInt64Size(
-                116, (long) ((java.lang.Long) oneofField_));
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(
+              116, (long)((java.lang.Long) oneofField_));
       }
       if (oneofFieldCase_ == 117) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeFloatSize(
-                117, (float) ((java.lang.Float) oneofField_));
+        size += com.google.protobuf.CodedOutputStream
+          .computeFloatSize(
+              117, (float)((java.lang.Float) oneofField_));
       }
       if (oneofFieldCase_ == 118) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeDoubleSize(
-                118, (double) ((java.lang.Double) oneofField_));
+        size += com.google.protobuf.CodedOutputStream
+          .computeDoubleSize(
+              118, (double)((java.lang.Double) oneofField_));
       }
       if (oneofFieldCase_ == 119) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeEnumSize(
-                119, ((java.lang.Integer) oneofField_));
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(119, ((java.lang.Integer) oneofField_));
       }
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
@@ -10555,152 +9493,230 @@ public int getSerializedSize() {
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
-        return true;
+       return true;
       }
       if (!(obj instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3)) {
         return super.equals(obj);
       }
-      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 other =
-          (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3) obj;
-
-      if (getOptionalInt32() != other.getOptionalInt32()) return false;
-      if (getOptionalInt64() != other.getOptionalInt64()) return false;
-      if (getOptionalUint32() != other.getOptionalUint32()) return false;
-      if (getOptionalUint64() != other.getOptionalUint64()) return false;
-      if (getOptionalSint32() != other.getOptionalSint32()) return false;
-      if (getOptionalSint64() != other.getOptionalSint64()) return false;
-      if (getOptionalFixed32() != other.getOptionalFixed32()) return false;
-      if (getOptionalFixed64() != other.getOptionalFixed64()) return false;
-      if (getOptionalSfixed32() != other.getOptionalSfixed32()) return false;
-      if (getOptionalSfixed64() != other.getOptionalSfixed64()) return false;
+      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 other = (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3) obj;
+
+      if (getOptionalInt32()
+          != other.getOptionalInt32()) return false;
+      if (getOptionalInt64()
+          != other.getOptionalInt64()) return false;
+      if (getOptionalUint32()
+          != other.getOptionalUint32()) return false;
+      if (getOptionalUint64()
+          != other.getOptionalUint64()) return false;
+      if (getOptionalSint32()
+          != other.getOptionalSint32()) return false;
+      if (getOptionalSint64()
+          != other.getOptionalSint64()) return false;
+      if (getOptionalFixed32()
+          != other.getOptionalFixed32()) return false;
+      if (getOptionalFixed64()
+          != other.getOptionalFixed64()) return false;
+      if (getOptionalSfixed32()
+          != other.getOptionalSfixed32()) return false;
+      if (getOptionalSfixed64()
+          != other.getOptionalSfixed64()) return false;
       if (java.lang.Float.floatToIntBits(getOptionalFloat())
-          != java.lang.Float.floatToIntBits(other.getOptionalFloat())) return false;
+          != java.lang.Float.floatToIntBits(
+              other.getOptionalFloat())) return false;
       if (java.lang.Double.doubleToLongBits(getOptionalDouble())
-          != java.lang.Double.doubleToLongBits(other.getOptionalDouble())) return false;
-      if (getOptionalBool() != other.getOptionalBool()) return false;
-      if (!getOptionalString().equals(other.getOptionalString())) return false;
-      if (!getOptionalBytes().equals(other.getOptionalBytes())) return false;
+          != java.lang.Double.doubleToLongBits(
+              other.getOptionalDouble())) return false;
+      if (getOptionalBool()
+          != other.getOptionalBool()) return false;
+      if (!getOptionalString()
+          .equals(other.getOptionalString())) return false;
+      if (!getOptionalBytes()
+          .equals(other.getOptionalBytes())) return false;
       if (hasOptionalNestedMessage() != other.hasOptionalNestedMessage()) return false;
       if (hasOptionalNestedMessage()) {
-        if (!getOptionalNestedMessage().equals(other.getOptionalNestedMessage())) return false;
+        if (!getOptionalNestedMessage()
+            .equals(other.getOptionalNestedMessage())) return false;
       }
       if (hasOptionalForeignMessage() != other.hasOptionalForeignMessage()) return false;
       if (hasOptionalForeignMessage()) {
-        if (!getOptionalForeignMessage().equals(other.getOptionalForeignMessage())) return false;
+        if (!getOptionalForeignMessage()
+            .equals(other.getOptionalForeignMessage())) return false;
       }
       if (optionalNestedEnum_ != other.optionalNestedEnum_) return false;
       if (optionalForeignEnum_ != other.optionalForeignEnum_) return false;
       if (optionalAliasedEnum_ != other.optionalAliasedEnum_) return false;
       if (hasRecursiveMessage() != other.hasRecursiveMessage()) return false;
       if (hasRecursiveMessage()) {
-        if (!getRecursiveMessage().equals(other.getRecursiveMessage())) return false;
-      }
-      if (!getRepeatedInt32List().equals(other.getRepeatedInt32List())) return false;
-      if (!getRepeatedInt64List().equals(other.getRepeatedInt64List())) return false;
-      if (!getRepeatedUint32List().equals(other.getRepeatedUint32List())) return false;
-      if (!getRepeatedUint64List().equals(other.getRepeatedUint64List())) return false;
-      if (!getRepeatedSint32List().equals(other.getRepeatedSint32List())) return false;
-      if (!getRepeatedSint64List().equals(other.getRepeatedSint64List())) return false;
-      if (!getRepeatedFixed32List().equals(other.getRepeatedFixed32List())) return false;
-      if (!getRepeatedFixed64List().equals(other.getRepeatedFixed64List())) return false;
-      if (!getRepeatedSfixed32List().equals(other.getRepeatedSfixed32List())) return false;
-      if (!getRepeatedSfixed64List().equals(other.getRepeatedSfixed64List())) return false;
-      if (!getRepeatedFloatList().equals(other.getRepeatedFloatList())) return false;
-      if (!getRepeatedDoubleList().equals(other.getRepeatedDoubleList())) return false;
-      if (!getRepeatedBoolList().equals(other.getRepeatedBoolList())) return false;
-      if (!getRepeatedStringList().equals(other.getRepeatedStringList())) return false;
-      if (!getRepeatedBytesList().equals(other.getRepeatedBytesList())) return false;
-      if (!getRepeatedNestedMessageList().equals(other.getRepeatedNestedMessageList()))
-        return false;
-      if (!getRepeatedForeignMessageList().equals(other.getRepeatedForeignMessageList()))
-        return false;
+        if (!getRecursiveMessage()
+            .equals(other.getRecursiveMessage())) return false;
+      }
+      if (!getRepeatedInt32List()
+          .equals(other.getRepeatedInt32List())) return false;
+      if (!getRepeatedInt64List()
+          .equals(other.getRepeatedInt64List())) return false;
+      if (!getRepeatedUint32List()
+          .equals(other.getRepeatedUint32List())) return false;
+      if (!getRepeatedUint64List()
+          .equals(other.getRepeatedUint64List())) return false;
+      if (!getRepeatedSint32List()
+          .equals(other.getRepeatedSint32List())) return false;
+      if (!getRepeatedSint64List()
+          .equals(other.getRepeatedSint64List())) return false;
+      if (!getRepeatedFixed32List()
+          .equals(other.getRepeatedFixed32List())) return false;
+      if (!getRepeatedFixed64List()
+          .equals(other.getRepeatedFixed64List())) return false;
+      if (!getRepeatedSfixed32List()
+          .equals(other.getRepeatedSfixed32List())) return false;
+      if (!getRepeatedSfixed64List()
+          .equals(other.getRepeatedSfixed64List())) return false;
+      if (!getRepeatedFloatList()
+          .equals(other.getRepeatedFloatList())) return false;
+      if (!getRepeatedDoubleList()
+          .equals(other.getRepeatedDoubleList())) return false;
+      if (!getRepeatedBoolList()
+          .equals(other.getRepeatedBoolList())) return false;
+      if (!getRepeatedStringList()
+          .equals(other.getRepeatedStringList())) return false;
+      if (!getRepeatedBytesList()
+          .equals(other.getRepeatedBytesList())) return false;
+      if (!getRepeatedNestedMessageList()
+          .equals(other.getRepeatedNestedMessageList())) return false;
+      if (!getRepeatedForeignMessageList()
+          .equals(other.getRepeatedForeignMessageList())) return false;
       if (!repeatedNestedEnum_.equals(other.repeatedNestedEnum_)) return false;
       if (!repeatedForeignEnum_.equals(other.repeatedForeignEnum_)) return false;
-      if (!getPackedInt32List().equals(other.getPackedInt32List())) return false;
-      if (!getPackedInt64List().equals(other.getPackedInt64List())) return false;
-      if (!getPackedUint32List().equals(other.getPackedUint32List())) return false;
-      if (!getPackedUint64List().equals(other.getPackedUint64List())) return false;
-      if (!getPackedSint32List().equals(other.getPackedSint32List())) return false;
-      if (!getPackedSint64List().equals(other.getPackedSint64List())) return false;
-      if (!getPackedFixed32List().equals(other.getPackedFixed32List())) return false;
-      if (!getPackedFixed64List().equals(other.getPackedFixed64List())) return false;
-      if (!getPackedSfixed32List().equals(other.getPackedSfixed32List())) return false;
-      if (!getPackedSfixed64List().equals(other.getPackedSfixed64List())) return false;
-      if (!getPackedFloatList().equals(other.getPackedFloatList())) return false;
-      if (!getPackedDoubleList().equals(other.getPackedDoubleList())) return false;
-      if (!getPackedBoolList().equals(other.getPackedBoolList())) return false;
+      if (!getPackedInt32List()
+          .equals(other.getPackedInt32List())) return false;
+      if (!getPackedInt64List()
+          .equals(other.getPackedInt64List())) return false;
+      if (!getPackedUint32List()
+          .equals(other.getPackedUint32List())) return false;
+      if (!getPackedUint64List()
+          .equals(other.getPackedUint64List())) return false;
+      if (!getPackedSint32List()
+          .equals(other.getPackedSint32List())) return false;
+      if (!getPackedSint64List()
+          .equals(other.getPackedSint64List())) return false;
+      if (!getPackedFixed32List()
+          .equals(other.getPackedFixed32List())) return false;
+      if (!getPackedFixed64List()
+          .equals(other.getPackedFixed64List())) return false;
+      if (!getPackedSfixed32List()
+          .equals(other.getPackedSfixed32List())) return false;
+      if (!getPackedSfixed64List()
+          .equals(other.getPackedSfixed64List())) return false;
+      if (!getPackedFloatList()
+          .equals(other.getPackedFloatList())) return false;
+      if (!getPackedDoubleList()
+          .equals(other.getPackedDoubleList())) return false;
+      if (!getPackedBoolList()
+          .equals(other.getPackedBoolList())) return false;
       if (!packedNestedEnum_.equals(other.packedNestedEnum_)) return false;
-      if (!getUnpackedInt32List().equals(other.getUnpackedInt32List())) return false;
-      if (!getUnpackedInt64List().equals(other.getUnpackedInt64List())) return false;
-      if (!getUnpackedUint32List().equals(other.getUnpackedUint32List())) return false;
-      if (!getUnpackedUint64List().equals(other.getUnpackedUint64List())) return false;
-      if (!getUnpackedSint32List().equals(other.getUnpackedSint32List())) return false;
-      if (!getUnpackedSint64List().equals(other.getUnpackedSint64List())) return false;
-      if (!getUnpackedFixed32List().equals(other.getUnpackedFixed32List())) return false;
-      if (!getUnpackedFixed64List().equals(other.getUnpackedFixed64List())) return false;
-      if (!getUnpackedSfixed32List().equals(other.getUnpackedSfixed32List())) return false;
-      if (!getUnpackedSfixed64List().equals(other.getUnpackedSfixed64List())) return false;
-      if (!getUnpackedFloatList().equals(other.getUnpackedFloatList())) return false;
-      if (!getUnpackedDoubleList().equals(other.getUnpackedDoubleList())) return false;
-      if (!getUnpackedBoolList().equals(other.getUnpackedBoolList())) return false;
+      if (!getUnpackedInt32List()
+          .equals(other.getUnpackedInt32List())) return false;
+      if (!getUnpackedInt64List()
+          .equals(other.getUnpackedInt64List())) return false;
+      if (!getUnpackedUint32List()
+          .equals(other.getUnpackedUint32List())) return false;
+      if (!getUnpackedUint64List()
+          .equals(other.getUnpackedUint64List())) return false;
+      if (!getUnpackedSint32List()
+          .equals(other.getUnpackedSint32List())) return false;
+      if (!getUnpackedSint64List()
+          .equals(other.getUnpackedSint64List())) return false;
+      if (!getUnpackedFixed32List()
+          .equals(other.getUnpackedFixed32List())) return false;
+      if (!getUnpackedFixed64List()
+          .equals(other.getUnpackedFixed64List())) return false;
+      if (!getUnpackedSfixed32List()
+          .equals(other.getUnpackedSfixed32List())) return false;
+      if (!getUnpackedSfixed64List()
+          .equals(other.getUnpackedSfixed64List())) return false;
+      if (!getUnpackedFloatList()
+          .equals(other.getUnpackedFloatList())) return false;
+      if (!getUnpackedDoubleList()
+          .equals(other.getUnpackedDoubleList())) return false;
+      if (!getUnpackedBoolList()
+          .equals(other.getUnpackedBoolList())) return false;
       if (!unpackedNestedEnum_.equals(other.unpackedNestedEnum_)) return false;
-      if (!internalGetMapInt32Int32().equals(other.internalGetMapInt32Int32())) return false;
-      if (!internalGetMapInt64Int64().equals(other.internalGetMapInt64Int64())) return false;
-      if (!internalGetMapUint32Uint32().equals(other.internalGetMapUint32Uint32())) return false;
-      if (!internalGetMapUint64Uint64().equals(other.internalGetMapUint64Uint64())) return false;
-      if (!internalGetMapSint32Sint32().equals(other.internalGetMapSint32Sint32())) return false;
-      if (!internalGetMapSint64Sint64().equals(other.internalGetMapSint64Sint64())) return false;
-      if (!internalGetMapFixed32Fixed32().equals(other.internalGetMapFixed32Fixed32()))
-        return false;
-      if (!internalGetMapFixed64Fixed64().equals(other.internalGetMapFixed64Fixed64()))
-        return false;
-      if (!internalGetMapSfixed32Sfixed32().equals(other.internalGetMapSfixed32Sfixed32()))
-        return false;
-      if (!internalGetMapSfixed64Sfixed64().equals(other.internalGetMapSfixed64Sfixed64()))
-        return false;
-      if (!internalGetMapInt32Float().equals(other.internalGetMapInt32Float())) return false;
-      if (!internalGetMapInt32Double().equals(other.internalGetMapInt32Double())) return false;
-      if (!internalGetMapBoolBool().equals(other.internalGetMapBoolBool())) return false;
-      if (!internalGetMapStringString().equals(other.internalGetMapStringString())) return false;
-      if (!internalGetMapStringBytes().equals(other.internalGetMapStringBytes())) return false;
-      if (!internalGetMapStringNestedMessage().equals(other.internalGetMapStringNestedMessage()))
-        return false;
-      if (!internalGetMapStringForeignMessage().equals(other.internalGetMapStringForeignMessage()))
-        return false;
-      if (!internalGetMapStringNestedEnum().equals(other.internalGetMapStringNestedEnum()))
-        return false;
-      if (!internalGetMapStringForeignEnum().equals(other.internalGetMapStringForeignEnum()))
-        return false;
+      if (!internalGetMapInt32Int32().equals(
+          other.internalGetMapInt32Int32())) return false;
+      if (!internalGetMapInt64Int64().equals(
+          other.internalGetMapInt64Int64())) return false;
+      if (!internalGetMapUint32Uint32().equals(
+          other.internalGetMapUint32Uint32())) return false;
+      if (!internalGetMapUint64Uint64().equals(
+          other.internalGetMapUint64Uint64())) return false;
+      if (!internalGetMapSint32Sint32().equals(
+          other.internalGetMapSint32Sint32())) return false;
+      if (!internalGetMapSint64Sint64().equals(
+          other.internalGetMapSint64Sint64())) return false;
+      if (!internalGetMapFixed32Fixed32().equals(
+          other.internalGetMapFixed32Fixed32())) return false;
+      if (!internalGetMapFixed64Fixed64().equals(
+          other.internalGetMapFixed64Fixed64())) return false;
+      if (!internalGetMapSfixed32Sfixed32().equals(
+          other.internalGetMapSfixed32Sfixed32())) return false;
+      if (!internalGetMapSfixed64Sfixed64().equals(
+          other.internalGetMapSfixed64Sfixed64())) return false;
+      if (!internalGetMapInt32Float().equals(
+          other.internalGetMapInt32Float())) return false;
+      if (!internalGetMapInt32Double().equals(
+          other.internalGetMapInt32Double())) return false;
+      if (!internalGetMapBoolBool().equals(
+          other.internalGetMapBoolBool())) return false;
+      if (!internalGetMapStringString().equals(
+          other.internalGetMapStringString())) return false;
+      if (!internalGetMapStringBytes().equals(
+          other.internalGetMapStringBytes())) return false;
+      if (!internalGetMapStringNestedMessage().equals(
+          other.internalGetMapStringNestedMessage())) return false;
+      if (!internalGetMapStringForeignMessage().equals(
+          other.internalGetMapStringForeignMessage())) return false;
+      if (!internalGetMapStringNestedEnum().equals(
+          other.internalGetMapStringNestedEnum())) return false;
+      if (!internalGetMapStringForeignEnum().equals(
+          other.internalGetMapStringForeignEnum())) return false;
       if (!getOneofFieldCase().equals(other.getOneofFieldCase())) return false;
       switch (oneofFieldCase_) {
         case 111:
-          if (getOneofUint32() != other.getOneofUint32()) return false;
+          if (getOneofUint32()
+              != other.getOneofUint32()) return false;
           break;
         case 112:
-          if (!getOneofNestedMessage().equals(other.getOneofNestedMessage())) return false;
+          if (!getOneofNestedMessage()
+              .equals(other.getOneofNestedMessage())) return false;
           break;
         case 113:
-          if (!getOneofString().equals(other.getOneofString())) return false;
+          if (!getOneofString()
+              .equals(other.getOneofString())) return false;
           break;
         case 114:
-          if (!getOneofBytes().equals(other.getOneofBytes())) return false;
+          if (!getOneofBytes()
+              .equals(other.getOneofBytes())) return false;
           break;
         case 115:
-          if (getOneofBool() != other.getOneofBool()) return false;
+          if (getOneofBool()
+              != other.getOneofBool()) return false;
           break;
         case 116:
-          if (getOneofUint64() != other.getOneofUint64()) return false;
+          if (getOneofUint64()
+              != other.getOneofUint64()) return false;
           break;
         case 117:
           if (java.lang.Float.floatToIntBits(getOneofFloat())
-              != java.lang.Float.floatToIntBits(other.getOneofFloat())) return false;
+              != java.lang.Float.floatToIntBits(
+                  other.getOneofFloat())) return false;
           break;
         case 118:
           if (java.lang.Double.doubleToLongBits(getOneofDouble())
-              != java.lang.Double.doubleToLongBits(other.getOneofDouble())) return false;
+              != java.lang.Double.doubleToLongBits(
+                  other.getOneofDouble())) return false;
           break;
         case 119:
-          if (getOneofEnumValue() != other.getOneofEnumValue()) return false;
+          if (getOneofEnumValue()
+              != other.getOneofEnumValue()) return false;
           break;
         case 0:
         default:
@@ -10719,32 +9735,37 @@ public int hashCode() {
       hash = (37 * hash) + OPTIONAL_INT32_FIELD_NUMBER;
       hash = (53 * hash) + getOptionalInt32();
       hash = (37 * hash) + OPTIONAL_INT64_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getOptionalInt64());
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getOptionalInt64());
       hash = (37 * hash) + OPTIONAL_UINT32_FIELD_NUMBER;
       hash = (53 * hash) + getOptionalUint32();
       hash = (37 * hash) + OPTIONAL_UINT64_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getOptionalUint64());
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getOptionalUint64());
       hash = (37 * hash) + OPTIONAL_SINT32_FIELD_NUMBER;
       hash = (53 * hash) + getOptionalSint32();
       hash = (37 * hash) + OPTIONAL_SINT64_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getOptionalSint64());
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getOptionalSint64());
       hash = (37 * hash) + OPTIONAL_FIXED32_FIELD_NUMBER;
       hash = (53 * hash) + getOptionalFixed32();
       hash = (37 * hash) + OPTIONAL_FIXED64_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getOptionalFixed64());
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getOptionalFixed64());
       hash = (37 * hash) + OPTIONAL_SFIXED32_FIELD_NUMBER;
       hash = (53 * hash) + getOptionalSfixed32();
       hash = (37 * hash) + OPTIONAL_SFIXED64_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getOptionalSfixed64());
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getOptionalSfixed64());
       hash = (37 * hash) + OPTIONAL_FLOAT_FIELD_NUMBER;
-      hash = (53 * hash) + java.lang.Float.floatToIntBits(getOptionalFloat());
+      hash = (53 * hash) + java.lang.Float.floatToIntBits(
+          getOptionalFloat());
       hash = (37 * hash) + OPTIONAL_DOUBLE_FIELD_NUMBER;
-      hash =
-          (53 * hash)
-              + com.google.protobuf.Internal.hashLong(
-                  java.lang.Double.doubleToLongBits(getOptionalDouble()));
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          java.lang.Double.doubleToLongBits(getOptionalDouble()));
       hash = (37 * hash) + OPTIONAL_BOOL_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getOptionalBool());
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getOptionalBool());
       hash = (37 * hash) + OPTIONAL_STRING_FIELD_NUMBER;
       hash = (53 * hash) + getOptionalString().hashCode();
       hash = (37 * hash) + OPTIONAL_BYTES_FIELD_NUMBER;
@@ -11050,22 +10071,23 @@ public int hashCode() {
           break;
         case 115:
           hash = (37 * hash) + ONEOF_BOOL_FIELD_NUMBER;
-          hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getOneofBool());
+          hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+              getOneofBool());
           break;
         case 116:
           hash = (37 * hash) + ONEOF_UINT64_FIELD_NUMBER;
-          hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getOneofUint64());
+          hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+              getOneofUint64());
           break;
         case 117:
           hash = (37 * hash) + ONEOF_FLOAT_FIELD_NUMBER;
-          hash = (53 * hash) + java.lang.Float.floatToIntBits(getOneofFloat());
+          hash = (53 * hash) + java.lang.Float.floatToIntBits(
+              getOneofFloat());
           break;
         case 118:
           hash = (37 * hash) + ONEOF_DOUBLE_FIELD_NUMBER;
-          hash =
-              (53 * hash)
-                  + com.google.protobuf.Internal.hashLong(
-                      java.lang.Double.doubleToLongBits(getOneofDouble()));
+          hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+              java.lang.Double.doubleToLongBits(getOneofDouble()));
           break;
         case 119:
           hash = (37 * hash) + ONEOF_ENUM_FIELD_NUMBER;
@@ -11080,106 +10102,98 @@ public int hashCode() {
     }
 
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(
-        java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(
-        java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(
-        byte[] data) throws com.google.protobuf.InvalidProtocolBufferException {
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(
-        byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(
-        java.io.InputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input);
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(
-        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseDelimitedWithIOException(PARSER, input);
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-        parseDelimitedFrom(
-            java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseDelimitedWithIOException(
-          PARSER, input, extensionRegistry);
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(
-        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input);
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
     @java.lang.Override
-    public Builder newBuilderForType() {
-      return newBuilder();
-    }
-
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-
-    public static Builder newBuilder(
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 prototype) {
+    public static Builder newBuilder(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-
     @java.lang.Override
     public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
 
     @java.lang.Override
-    protected Builder newBuilderForType(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
-
     /**
-     *
-     *
      * <pre>
      * This is a slightly trimmed-down version of TestAllTypesProto3 from
      * google/protobuf/test_messages_proto3.proto but without imports/ctypes.
@@ -11187,13 +10201,13 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessage.Builder
      *
      * Protobuf type {@code legacy_gencode_test.proto3.TestMostTypesProto3}
      */
-    public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder<Builder>
-        implements
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:legacy_gencode_test.proto3.TestMostTypesProto3)
         legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor;
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor;
       }
 
       @SuppressWarnings({"rawtypes"})
@@ -11239,10 +10253,10 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
           case 74:
             return internalGetMapStringForeignEnum();
           default:
-            throw new RuntimeException("Invalid map field number: " + number);
+            throw new RuntimeException(
+                "Invalid map field number: " + number);
         }
       }
-
       @SuppressWarnings({"rawtypes"})
       protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
           int number) {
@@ -11286,34 +10300,31 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFi
           case 74:
             return internalGetMutableMapStringForeignEnum();
           default:
-            throw new RuntimeException("Invalid map field number: " + number);
+            throw new RuntimeException(
+                "Invalid map field number: " + number);
         }
       }
-
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_fieldAccessorTable
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.class,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder
-                    .class);
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.class, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder.class);
       }
 
-      // Construct using
-      // legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.newBuilder()
+      // Construct using legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
-
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessage
+                .alwaysUseFieldBuilders) {
           getOptionalNestedMessageFieldBuilder();
           getOptionalForeignMessageFieldBuilder();
           getRecursiveMessageFieldBuilder();
@@ -11321,7 +10332,6 @@ private void maybeForceBuilderInitialization() {
           getRepeatedForeignMessageFieldBuilder();
         }
       }
-
       @java.lang.Override
       public Builder clear() {
         super.clear();
@@ -11374,7 +10384,8 @@ public Builder clear() {
         repeatedFloat_ = emptyFloatList();
         repeatedDouble_ = emptyDoubleList();
         repeatedBool_ = emptyBooleanList();
-        repeatedString_ = com.google.protobuf.LazyStringArrayList.emptyList();
+        repeatedString_ =
+            com.google.protobuf.LazyStringArrayList.emptyList();
         repeatedBytes_ = emptyList(com.google.protobuf.ByteString.class);
         if (repeatedNestedMessageBuilder_ == null) {
           repeatedNestedMessage_ = java.util.Collections.emptyList();
@@ -11452,22 +10463,19 @@ public Builder clear() {
       }
 
       @java.lang.Override
-      public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor;
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor;
       }
 
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-          getDefaultInstanceForType() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-            .getDefaultInstance();
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 getDefaultInstanceForType() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance();
       }
 
       @java.lang.Override
       public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 build() {
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result =
-            buildPartial();
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -11476,25 +10484,17 @@ public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 bui
 
       @java.lang.Override
       public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 buildPartial() {
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result =
-            new legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3(this);
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result = new legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3(this);
         buildPartialRepeatedFields(result);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
-        if (bitField1_ != 0) {
-          buildPartial1(result);
-        }
-        if (bitField2_ != 0) {
-          buildPartial2(result);
-        }
+        if (bitField0_ != 0) { buildPartial0(result); }
+        if (bitField1_ != 0) { buildPartial1(result); }
+        if (bitField2_ != 0) { buildPartial2(result); }
         buildPartialOneofs(result);
         onBuilt();
         return result;
       }
 
-      private void buildPartialRepeatedFields(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result) {
+      private void buildPartialRepeatedFields(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result) {
         if (repeatedNestedMessageBuilder_ == null) {
           if (((bitField1_ & 0x00000010) != 0)) {
             repeatedNestedMessage_ = java.util.Collections.unmodifiableList(repeatedNestedMessage_);
@@ -11506,8 +10506,7 @@ private void buildPartialRepeatedFields(
         }
         if (repeatedForeignMessageBuilder_ == null) {
           if (((bitField1_ & 0x00000020) != 0)) {
-            repeatedForeignMessage_ =
-                java.util.Collections.unmodifiableList(repeatedForeignMessage_);
+            repeatedForeignMessage_ = java.util.Collections.unmodifiableList(repeatedForeignMessage_);
             bitField1_ = (bitField1_ & ~0x00000020);
           }
           result.repeatedForeignMessage_ = repeatedForeignMessage_;
@@ -11536,8 +10535,7 @@ private void buildPartialRepeatedFields(
         result.unpackedNestedEnum_ = unpackedNestedEnum_;
       }
 
-      private void buildPartial0(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result) {
+      private void buildPartial0(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.optionalInt32_ = optionalInt32_;
@@ -11586,17 +10584,15 @@ private void buildPartial0(
         }
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00008000) != 0)) {
-          result.optionalNestedMessage_ =
-              optionalNestedMessageBuilder_ == null
-                  ? optionalNestedMessage_
-                  : optionalNestedMessageBuilder_.build();
+          result.optionalNestedMessage_ = optionalNestedMessageBuilder_ == null
+              ? optionalNestedMessage_
+              : optionalNestedMessageBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00010000) != 0)) {
-          result.optionalForeignMessage_ =
-              optionalForeignMessageBuilder_ == null
-                  ? optionalForeignMessage_
-                  : optionalForeignMessageBuilder_.build();
+          result.optionalForeignMessage_ = optionalForeignMessageBuilder_ == null
+              ? optionalForeignMessage_
+              : optionalForeignMessageBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
         if (((from_bitField0_ & 0x00020000) != 0)) {
@@ -11609,10 +10605,9 @@ private void buildPartial0(
           result.optionalAliasedEnum_ = optionalAliasedEnum_;
         }
         if (((from_bitField0_ & 0x00100000) != 0)) {
-          result.recursiveMessage_ =
-              recursiveMessageBuilder_ == null
-                  ? recursiveMessage_
-                  : recursiveMessageBuilder_.build();
+          result.recursiveMessage_ = recursiveMessageBuilder_ == null
+              ? recursiveMessage_
+              : recursiveMessageBuilder_.build();
           to_bitField0_ |= 0x00000004;
         }
         if (((from_bitField0_ & 0x00200000) != 0)) {
@@ -11662,8 +10657,7 @@ private void buildPartial0(
         result.bitField0_ |= to_bitField0_;
       }
 
-      private void buildPartial1(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result) {
+      private void buildPartial1(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result) {
         int from_bitField1_ = bitField1_;
         if (((from_bitField1_ & 0x00000001) != 0)) {
           repeatedDouble_.makeImmutable();
@@ -11775,8 +10769,7 @@ private void buildPartial1(
         }
       }
 
-      private void buildPartial2(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result) {
+      private void buildPartial2(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result) {
         int from_bitField2_ = bitField2_;
         if (((from_bitField2_ & 0x00000001) != 0)) {
           unpackedFloat_.makeImmutable();
@@ -11851,14 +10844,10 @@ private void buildPartial2(
           result.mapStringBytes_.makeImmutable();
         }
         if (((from_bitField2_ & 0x00080000) != 0)) {
-          result.mapStringNestedMessage_ =
-              internalGetMapStringNestedMessage()
-                  .build(MapStringNestedMessageDefaultEntryHolder.defaultEntry);
+          result.mapStringNestedMessage_ = internalGetMapStringNestedMessage().build(MapStringNestedMessageDefaultEntryHolder.defaultEntry);
         }
         if (((from_bitField2_ & 0x00100000) != 0)) {
-          result.mapStringForeignMessage_ =
-              internalGetMapStringForeignMessage()
-                  .build(MapStringForeignMessageDefaultEntryHolder.defaultEntry);
+          result.mapStringForeignMessage_ = internalGetMapStringForeignMessage().build(MapStringForeignMessageDefaultEntryHolder.defaultEntry);
         }
         if (((from_bitField2_ & 0x00200000) != 0)) {
           result.mapStringNestedEnum_ = internalGetMapStringNestedEnum();
@@ -11870,32 +10859,27 @@ private void buildPartial2(
         }
       }
 
-      private void buildPartialOneofs(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result) {
+      private void buildPartialOneofs(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result) {
         result.oneofFieldCase_ = oneofFieldCase_;
         result.oneofField_ = this.oneofField_;
-        if (oneofFieldCase_ == 112 && oneofNestedMessageBuilder_ != null) {
+        if (oneofFieldCase_ == 112 &&
+            oneofNestedMessageBuilder_ != null) {
           result.oneofField_ = oneofNestedMessageBuilder_.build();
         }
       }
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other
-            instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3) {
-          return mergeFrom(
-              (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3) other);
+        if (other instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3) {
+          return mergeFrom((legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 other) {
-        if (other
-            == legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                .getDefaultInstance()) return this;
+      public Builder mergeFrom(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 other) {
+        if (other == legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance()) return this;
         if (other.getOptionalInt32() != 0) {
           setOptionalInt32(other.getOptionalInt32());
         }
@@ -12143,10 +11127,9 @@ public Builder mergeFrom(
               repeatedNestedMessageBuilder_ = null;
               repeatedNestedMessage_ = other.repeatedNestedMessage_;
               bitField1_ = (bitField1_ & ~0x00000010);
-              repeatedNestedMessageBuilder_ =
-                  com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders
-                      ? getRepeatedNestedMessageFieldBuilder()
-                      : null;
+              repeatedNestedMessageBuilder_ = 
+                com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                   getRepeatedNestedMessageFieldBuilder() : null;
             } else {
               repeatedNestedMessageBuilder_.addAllMessages(other.repeatedNestedMessage_);
             }
@@ -12170,10 +11153,9 @@ public Builder mergeFrom(
               repeatedForeignMessageBuilder_ = null;
               repeatedForeignMessage_ = other.repeatedForeignMessage_;
               bitField1_ = (bitField1_ & ~0x00000020);
-              repeatedForeignMessageBuilder_ =
-                  com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders
-                      ? getRepeatedForeignMessageFieldBuilder()
-                      : null;
+              repeatedForeignMessageBuilder_ = 
+                com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                   getRepeatedForeignMessageFieldBuilder() : null;
             } else {
               repeatedForeignMessageBuilder_.addAllMessages(other.repeatedForeignMessage_);
             }
@@ -12505,98 +11487,105 @@ public Builder mergeFrom(
           }
           onChanged();
         }
-        internalGetMutableMapInt32Int32().mergeFrom(other.internalGetMapInt32Int32());
+        internalGetMutableMapInt32Int32().mergeFrom(
+            other.internalGetMapInt32Int32());
         bitField2_ |= 0x00000010;
-        internalGetMutableMapInt64Int64().mergeFrom(other.internalGetMapInt64Int64());
+        internalGetMutableMapInt64Int64().mergeFrom(
+            other.internalGetMapInt64Int64());
         bitField2_ |= 0x00000020;
-        internalGetMutableMapUint32Uint32().mergeFrom(other.internalGetMapUint32Uint32());
+        internalGetMutableMapUint32Uint32().mergeFrom(
+            other.internalGetMapUint32Uint32());
         bitField2_ |= 0x00000040;
-        internalGetMutableMapUint64Uint64().mergeFrom(other.internalGetMapUint64Uint64());
+        internalGetMutableMapUint64Uint64().mergeFrom(
+            other.internalGetMapUint64Uint64());
         bitField2_ |= 0x00000080;
-        internalGetMutableMapSint32Sint32().mergeFrom(other.internalGetMapSint32Sint32());
+        internalGetMutableMapSint32Sint32().mergeFrom(
+            other.internalGetMapSint32Sint32());
         bitField2_ |= 0x00000100;
-        internalGetMutableMapSint64Sint64().mergeFrom(other.internalGetMapSint64Sint64());
+        internalGetMutableMapSint64Sint64().mergeFrom(
+            other.internalGetMapSint64Sint64());
         bitField2_ |= 0x00000200;
-        internalGetMutableMapFixed32Fixed32().mergeFrom(other.internalGetMapFixed32Fixed32());
+        internalGetMutableMapFixed32Fixed32().mergeFrom(
+            other.internalGetMapFixed32Fixed32());
         bitField2_ |= 0x00000400;
-        internalGetMutableMapFixed64Fixed64().mergeFrom(other.internalGetMapFixed64Fixed64());
+        internalGetMutableMapFixed64Fixed64().mergeFrom(
+            other.internalGetMapFixed64Fixed64());
         bitField2_ |= 0x00000800;
-        internalGetMutableMapSfixed32Sfixed32().mergeFrom(other.internalGetMapSfixed32Sfixed32());
+        internalGetMutableMapSfixed32Sfixed32().mergeFrom(
+            other.internalGetMapSfixed32Sfixed32());
         bitField2_ |= 0x00001000;
-        internalGetMutableMapSfixed64Sfixed64().mergeFrom(other.internalGetMapSfixed64Sfixed64());
+        internalGetMutableMapSfixed64Sfixed64().mergeFrom(
+            other.internalGetMapSfixed64Sfixed64());
         bitField2_ |= 0x00002000;
-        internalGetMutableMapInt32Float().mergeFrom(other.internalGetMapInt32Float());
+        internalGetMutableMapInt32Float().mergeFrom(
+            other.internalGetMapInt32Float());
         bitField2_ |= 0x00004000;
-        internalGetMutableMapInt32Double().mergeFrom(other.internalGetMapInt32Double());
+        internalGetMutableMapInt32Double().mergeFrom(
+            other.internalGetMapInt32Double());
         bitField2_ |= 0x00008000;
-        internalGetMutableMapBoolBool().mergeFrom(other.internalGetMapBoolBool());
+        internalGetMutableMapBoolBool().mergeFrom(
+            other.internalGetMapBoolBool());
         bitField2_ |= 0x00010000;
-        internalGetMutableMapStringString().mergeFrom(other.internalGetMapStringString());
+        internalGetMutableMapStringString().mergeFrom(
+            other.internalGetMapStringString());
         bitField2_ |= 0x00020000;
-        internalGetMutableMapStringBytes().mergeFrom(other.internalGetMapStringBytes());
+        internalGetMutableMapStringBytes().mergeFrom(
+            other.internalGetMapStringBytes());
         bitField2_ |= 0x00040000;
-        internalGetMutableMapStringNestedMessage()
-            .mergeFrom(other.internalGetMapStringNestedMessage());
+        internalGetMutableMapStringNestedMessage().mergeFrom(
+            other.internalGetMapStringNestedMessage());
         bitField2_ |= 0x00080000;
-        internalGetMutableMapStringForeignMessage()
-            .mergeFrom(other.internalGetMapStringForeignMessage());
+        internalGetMutableMapStringForeignMessage().mergeFrom(
+            other.internalGetMapStringForeignMessage());
         bitField2_ |= 0x00100000;
-        internalGetMutableMapStringNestedEnum().mergeFrom(other.internalGetMapStringNestedEnum());
+        internalGetMutableMapStringNestedEnum().mergeFrom(
+            other.internalGetMapStringNestedEnum());
         bitField2_ |= 0x00200000;
-        internalGetMutableMapStringForeignEnum().mergeFrom(other.internalGetMapStringForeignEnum());
+        internalGetMutableMapStringForeignEnum().mergeFrom(
+            other.internalGetMapStringForeignEnum());
         bitField2_ |= 0x00400000;
         switch (other.getOneofFieldCase()) {
-          case ONEOF_UINT32:
-            {
-              setOneofUint32(other.getOneofUint32());
-              break;
-            }
-          case ONEOF_NESTED_MESSAGE:
-            {
-              mergeOneofNestedMessage(other.getOneofNestedMessage());
-              break;
-            }
-          case ONEOF_STRING:
-            {
-              oneofFieldCase_ = 113;
-              oneofField_ = other.oneofField_;
-              onChanged();
-              break;
-            }
-          case ONEOF_BYTES:
-            {
-              setOneofBytes(other.getOneofBytes());
-              break;
-            }
-          case ONEOF_BOOL:
-            {
-              setOneofBool(other.getOneofBool());
-              break;
-            }
-          case ONEOF_UINT64:
-            {
-              setOneofUint64(other.getOneofUint64());
-              break;
-            }
-          case ONEOF_FLOAT:
-            {
-              setOneofFloat(other.getOneofFloat());
-              break;
-            }
-          case ONEOF_DOUBLE:
-            {
-              setOneofDouble(other.getOneofDouble());
-              break;
-            }
-          case ONEOF_ENUM:
-            {
-              setOneofEnumValue(other.getOneofEnumValue());
-              break;
-            }
-          case ONEOFFIELD_NOT_SET:
-            {
-              break;
-            }
+          case ONEOF_UINT32: {
+            setOneofUint32(other.getOneofUint32());
+            break;
+          }
+          case ONEOF_NESTED_MESSAGE: {
+            mergeOneofNestedMessage(other.getOneofNestedMessage());
+            break;
+          }
+          case ONEOF_STRING: {
+            oneofFieldCase_ = 113;
+            oneofField_ = other.oneofField_;
+            onChanged();
+            break;
+          }
+          case ONEOF_BYTES: {
+            setOneofBytes(other.getOneofBytes());
+            break;
+          }
+          case ONEOF_BOOL: {
+            setOneofBool(other.getOneofBool());
+            break;
+          }
+          case ONEOF_UINT64: {
+            setOneofUint64(other.getOneofUint64());
+            break;
+          }
+          case ONEOF_FLOAT: {
+            setOneofFloat(other.getOneofFloat());
+            break;
+          }
+          case ONEOF_DOUBLE: {
+            setOneofDouble(other.getOneofDouble());
+            break;
+          }
+          case ONEOF_ENUM: {
+            setOneofEnumValue(other.getOneofEnumValue());
+            break;
+          }
+          case ONEOFFIELD_NOT_SET: {
+            break;
+          }
         }
         this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
@@ -12624,1293 +11613,1094 @@ public Builder mergeFrom(
               case 0:
                 done = true;
                 break;
-              case 8:
-                {
-                  optionalInt32_ = input.readInt32();
-                  bitField0_ |= 0x00000001;
-                  break;
-                } // case 8
-              case 16:
-                {
-                  optionalInt64_ = input.readInt64();
-                  bitField0_ |= 0x00000002;
-                  break;
-                } // case 16
-              case 24:
-                {
-                  optionalUint32_ = input.readUInt32();
-                  bitField0_ |= 0x00000004;
-                  break;
-                } // case 24
-              case 32:
-                {
-                  optionalUint64_ = input.readUInt64();
-                  bitField0_ |= 0x00000008;
-                  break;
-                } // case 32
-              case 40:
-                {
-                  optionalSint32_ = input.readSInt32();
-                  bitField0_ |= 0x00000010;
-                  break;
-                } // case 40
-              case 48:
-                {
-                  optionalSint64_ = input.readSInt64();
-                  bitField0_ |= 0x00000020;
-                  break;
-                } // case 48
-              case 61:
-                {
-                  optionalFixed32_ = input.readFixed32();
-                  bitField0_ |= 0x00000040;
-                  break;
-                } // case 61
-              case 65:
-                {
-                  optionalFixed64_ = input.readFixed64();
-                  bitField0_ |= 0x00000080;
-                  break;
-                } // case 65
-              case 77:
-                {
-                  optionalSfixed32_ = input.readSFixed32();
-                  bitField0_ |= 0x00000100;
-                  break;
-                } // case 77
-              case 81:
-                {
-                  optionalSfixed64_ = input.readSFixed64();
-                  bitField0_ |= 0x00000200;
-                  break;
-                } // case 81
-              case 93:
-                {
-                  optionalFloat_ = input.readFloat();
-                  bitField0_ |= 0x00000400;
-                  break;
-                } // case 93
-              case 97:
-                {
-                  optionalDouble_ = input.readDouble();
-                  bitField0_ |= 0x00000800;
-                  break;
-                } // case 97
-              case 104:
-                {
-                  optionalBool_ = input.readBool();
-                  bitField0_ |= 0x00001000;
-                  break;
-                } // case 104
-              case 114:
-                {
-                  optionalString_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00002000;
-                  break;
-                } // case 114
-              case 122:
-                {
-                  optionalBytes_ = input.readBytes();
-                  bitField0_ |= 0x00004000;
-                  break;
-                } // case 122
-              case 146:
-                {
-                  input.readMessage(
-                      getOptionalNestedMessageFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00008000;
-                  break;
-                } // case 146
-              case 154:
-                {
-                  input.readMessage(
-                      getOptionalForeignMessageFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00010000;
-                  break;
-                } // case 154
-              case 168:
-                {
-                  optionalNestedEnum_ = input.readEnum();
-                  bitField0_ |= 0x00020000;
-                  break;
-                } // case 168
-              case 176:
-                {
-                  optionalForeignEnum_ = input.readEnum();
-                  bitField0_ |= 0x00040000;
-                  break;
-                } // case 176
-              case 184:
-                {
-                  optionalAliasedEnum_ = input.readEnum();
-                  bitField0_ |= 0x00080000;
-                  break;
-                } // case 184
-              case 218:
-                {
-                  input.readMessage(
-                      getRecursiveMessageFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00100000;
-                  break;
-                } // case 218
-              case 248:
-                {
-                  int v = input.readInt32();
-                  ensureRepeatedInt32IsMutable();
-                  repeatedInt32_.addInt(v);
-                  break;
-                } // case 248
-              case 250:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureRepeatedInt32IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedInt32_.addInt(input.readInt32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 250
-              case 256:
-                {
-                  long v = input.readInt64();
-                  ensureRepeatedInt64IsMutable();
-                  repeatedInt64_.addLong(v);
-                  break;
-                } // case 256
-              case 258:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureRepeatedInt64IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedInt64_.addLong(input.readInt64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 258
-              case 264:
-                {
-                  int v = input.readUInt32();
-                  ensureRepeatedUint32IsMutable();
-                  repeatedUint32_.addInt(v);
-                  break;
-                } // case 264
-              case 266:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureRepeatedUint32IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedUint32_.addInt(input.readUInt32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 266
-              case 272:
-                {
-                  long v = input.readUInt64();
-                  ensureRepeatedUint64IsMutable();
-                  repeatedUint64_.addLong(v);
-                  break;
-                } // case 272
-              case 274:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureRepeatedUint64IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedUint64_.addLong(input.readUInt64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 274
-              case 280:
-                {
-                  int v = input.readSInt32();
-                  ensureRepeatedSint32IsMutable();
-                  repeatedSint32_.addInt(v);
-                  break;
-                } // case 280
-              case 282:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureRepeatedSint32IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedSint32_.addInt(input.readSInt32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 282
-              case 288:
-                {
-                  long v = input.readSInt64();
-                  ensureRepeatedSint64IsMutable();
-                  repeatedSint64_.addLong(v);
-                  break;
-                } // case 288
-              case 290:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureRepeatedSint64IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedSint64_.addLong(input.readSInt64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 290
-              case 301:
-                {
-                  int v = input.readFixed32();
-                  ensureRepeatedFixed32IsMutable();
-                  repeatedFixed32_.addInt(v);
-                  break;
-                } // case 301
-              case 298:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureRepeatedFixed32IsMutable(alloc / 4);
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedFixed32_.addInt(input.readFixed32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 298
-              case 305:
-                {
-                  long v = input.readFixed64();
-                  ensureRepeatedFixed64IsMutable();
-                  repeatedFixed64_.addLong(v);
-                  break;
-                } // case 305
-              case 306:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureRepeatedFixed64IsMutable(alloc / 8);
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedFixed64_.addLong(input.readFixed64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 306
-              case 317:
-                {
-                  int v = input.readSFixed32();
-                  ensureRepeatedSfixed32IsMutable();
-                  repeatedSfixed32_.addInt(v);
-                  break;
-                } // case 317
-              case 314:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureRepeatedSfixed32IsMutable(alloc / 4);
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedSfixed32_.addInt(input.readSFixed32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 314
-              case 321:
-                {
-                  long v = input.readSFixed64();
-                  ensureRepeatedSfixed64IsMutable();
-                  repeatedSfixed64_.addLong(v);
-                  break;
-                } // case 321
-              case 322:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureRepeatedSfixed64IsMutable(alloc / 8);
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedSfixed64_.addLong(input.readSFixed64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 322
-              case 333:
-                {
-                  float v = input.readFloat();
-                  ensureRepeatedFloatIsMutable();
-                  repeatedFloat_.addFloat(v);
-                  break;
-                } // case 333
-              case 330:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureRepeatedFloatIsMutable(alloc / 4);
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedFloat_.addFloat(input.readFloat());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 330
-              case 337:
-                {
-                  double v = input.readDouble();
-                  ensureRepeatedDoubleIsMutable();
-                  repeatedDouble_.addDouble(v);
-                  break;
-                } // case 337
-              case 338:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureRepeatedDoubleIsMutable(alloc / 8);
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedDouble_.addDouble(input.readDouble());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 338
-              case 344:
-                {
-                  boolean v = input.readBool();
-                  ensureRepeatedBoolIsMutable();
-                  repeatedBool_.addBoolean(v);
-                  break;
-                } // case 344
-              case 346:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureRepeatedBoolIsMutable(alloc / 1);
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedBool_.addBoolean(input.readBool());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 346
-              case 354:
-                {
-                  java.lang.String s = input.readStringRequireUtf8();
-                  ensureRepeatedStringIsMutable();
-                  repeatedString_.add(s);
-                  break;
-                } // case 354
-              case 362:
-                {
-                  com.google.protobuf.ByteString v = input.readBytes();
-                  ensureRepeatedBytesIsMutable();
-                  repeatedBytes_.add(v);
-                  break;
-                } // case 362
-              case 386:
-                {
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                          .NestedMessage
-                      m =
-                          input.readMessage(
-                              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                                  .NestedMessage.parser(),
-                              extensionRegistry);
-                  if (repeatedNestedMessageBuilder_ == null) {
-                    ensureRepeatedNestedMessageIsMutable();
-                    repeatedNestedMessage_.add(m);
-                  } else {
-                    repeatedNestedMessageBuilder_.addMessage(m);
-                  }
-                  break;
-                } // case 386
-              case 394:
-                {
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage m =
-                      input.readMessage(
-                          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.parser(),
-                          extensionRegistry);
-                  if (repeatedForeignMessageBuilder_ == null) {
-                    ensureRepeatedForeignMessageIsMutable();
-                    repeatedForeignMessage_.add(m);
-                  } else {
-                    repeatedForeignMessageBuilder_.addMessage(m);
-                  }
-                  break;
-                } // case 394
-              case 408:
-                {
+              case 8: {
+                optionalInt32_ = input.readInt32();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 16: {
+                optionalInt64_ = input.readInt64();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 24: {
+                optionalUint32_ = input.readUInt32();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              case 32: {
+                optionalUint64_ = input.readUInt64();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 32
+              case 40: {
+                optionalSint32_ = input.readSInt32();
+                bitField0_ |= 0x00000010;
+                break;
+              } // case 40
+              case 48: {
+                optionalSint64_ = input.readSInt64();
+                bitField0_ |= 0x00000020;
+                break;
+              } // case 48
+              case 61: {
+                optionalFixed32_ = input.readFixed32();
+                bitField0_ |= 0x00000040;
+                break;
+              } // case 61
+              case 65: {
+                optionalFixed64_ = input.readFixed64();
+                bitField0_ |= 0x00000080;
+                break;
+              } // case 65
+              case 77: {
+                optionalSfixed32_ = input.readSFixed32();
+                bitField0_ |= 0x00000100;
+                break;
+              } // case 77
+              case 81: {
+                optionalSfixed64_ = input.readSFixed64();
+                bitField0_ |= 0x00000200;
+                break;
+              } // case 81
+              case 93: {
+                optionalFloat_ = input.readFloat();
+                bitField0_ |= 0x00000400;
+                break;
+              } // case 93
+              case 97: {
+                optionalDouble_ = input.readDouble();
+                bitField0_ |= 0x00000800;
+                break;
+              } // case 97
+              case 104: {
+                optionalBool_ = input.readBool();
+                bitField0_ |= 0x00001000;
+                break;
+              } // case 104
+              case 114: {
+                optionalString_ = input.readStringRequireUtf8();
+                bitField0_ |= 0x00002000;
+                break;
+              } // case 114
+              case 122: {
+                optionalBytes_ = input.readBytes();
+                bitField0_ |= 0x00004000;
+                break;
+              } // case 122
+              case 146: {
+                input.readMessage(
+                    getOptionalNestedMessageFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00008000;
+                break;
+              } // case 146
+              case 154: {
+                input.readMessage(
+                    getOptionalForeignMessageFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00010000;
+                break;
+              } // case 154
+              case 168: {
+                optionalNestedEnum_ = input.readEnum();
+                bitField0_ |= 0x00020000;
+                break;
+              } // case 168
+              case 176: {
+                optionalForeignEnum_ = input.readEnum();
+                bitField0_ |= 0x00040000;
+                break;
+              } // case 176
+              case 184: {
+                optionalAliasedEnum_ = input.readEnum();
+                bitField0_ |= 0x00080000;
+                break;
+              } // case 184
+              case 218: {
+                input.readMessage(
+                    getRecursiveMessageFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00100000;
+                break;
+              } // case 218
+              case 248: {
+                int v = input.readInt32();
+                ensureRepeatedInt32IsMutable();
+                repeatedInt32_.addInt(v);
+                break;
+              } // case 248
+              case 250: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedInt32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedInt32_.addInt(input.readInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 250
+              case 256: {
+                long v = input.readInt64();
+                ensureRepeatedInt64IsMutable();
+                repeatedInt64_.addLong(v);
+                break;
+              } // case 256
+              case 258: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedInt64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedInt64_.addLong(input.readInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 258
+              case 264: {
+                int v = input.readUInt32();
+                ensureRepeatedUint32IsMutable();
+                repeatedUint32_.addInt(v);
+                break;
+              } // case 264
+              case 266: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedUint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedUint32_.addInt(input.readUInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 266
+              case 272: {
+                long v = input.readUInt64();
+                ensureRepeatedUint64IsMutable();
+                repeatedUint64_.addLong(v);
+                break;
+              } // case 272
+              case 274: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedUint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedUint64_.addLong(input.readUInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 274
+              case 280: {
+                int v = input.readSInt32();
+                ensureRepeatedSint32IsMutable();
+                repeatedSint32_.addInt(v);
+                break;
+              } // case 280
+              case 282: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedSint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedSint32_.addInt(input.readSInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 282
+              case 288: {
+                long v = input.readSInt64();
+                ensureRepeatedSint64IsMutable();
+                repeatedSint64_.addLong(v);
+                break;
+              } // case 288
+              case 290: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedSint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedSint64_.addLong(input.readSInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 290
+              case 301: {
+                int v = input.readFixed32();
+                ensureRepeatedFixed32IsMutable();
+                repeatedFixed32_.addInt(v);
+                break;
+              } // case 301
+              case 298: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedFixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedFixed32_.addInt(input.readFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 298
+              case 305: {
+                long v = input.readFixed64();
+                ensureRepeatedFixed64IsMutable();
+                repeatedFixed64_.addLong(v);
+                break;
+              } // case 305
+              case 306: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedFixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedFixed64_.addLong(input.readFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 306
+              case 317: {
+                int v = input.readSFixed32();
+                ensureRepeatedSfixed32IsMutable();
+                repeatedSfixed32_.addInt(v);
+                break;
+              } // case 317
+              case 314: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedSfixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedSfixed32_.addInt(input.readSFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 314
+              case 321: {
+                long v = input.readSFixed64();
+                ensureRepeatedSfixed64IsMutable();
+                repeatedSfixed64_.addLong(v);
+                break;
+              } // case 321
+              case 322: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedSfixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedSfixed64_.addLong(input.readSFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 322
+              case 333: {
+                float v = input.readFloat();
+                ensureRepeatedFloatIsMutable();
+                repeatedFloat_.addFloat(v);
+                break;
+              } // case 333
+              case 330: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedFloatIsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedFloat_.addFloat(input.readFloat());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 330
+              case 337: {
+                double v = input.readDouble();
+                ensureRepeatedDoubleIsMutable();
+                repeatedDouble_.addDouble(v);
+                break;
+              } // case 337
+              case 338: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedDoubleIsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedDouble_.addDouble(input.readDouble());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 338
+              case 344: {
+                boolean v = input.readBool();
+                ensureRepeatedBoolIsMutable();
+                repeatedBool_.addBoolean(v);
+                break;
+              } // case 344
+              case 346: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedBoolIsMutable(alloc / 1);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedBool_.addBoolean(input.readBool());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 346
+              case 354: {
+                java.lang.String s = input.readStringRequireUtf8();
+                ensureRepeatedStringIsMutable();
+                repeatedString_.add(s);
+                break;
+              } // case 354
+              case 362: {
+                com.google.protobuf.ByteString v = input.readBytes();
+                ensureRepeatedBytesIsMutable();
+                repeatedBytes_.add(v);
+                break;
+              } // case 362
+              case 386: {
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage m =
+                    input.readMessage(
+                        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.parser(),
+                        extensionRegistry);
+                if (repeatedNestedMessageBuilder_ == null) {
+                  ensureRepeatedNestedMessageIsMutable();
+                  repeatedNestedMessage_.add(m);
+                } else {
+                  repeatedNestedMessageBuilder_.addMessage(m);
+                }
+                break;
+              } // case 386
+              case 394: {
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage m =
+                    input.readMessage(
+                        legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.parser(),
+                        extensionRegistry);
+                if (repeatedForeignMessageBuilder_ == null) {
+                  ensureRepeatedForeignMessageIsMutable();
+                  repeatedForeignMessage_.add(m);
+                } else {
+                  repeatedForeignMessageBuilder_.addMessage(m);
+                }
+                break;
+              } // case 394
+              case 408: {
+                int tmpRaw = input.readEnum();
+                ensureRepeatedNestedEnumIsMutable();
+                repeatedNestedEnum_.add(tmpRaw);
+                break;
+              } // case 408
+              case 410: {
+                int length = input.readRawVarint32();
+                int oldLimit = input.pushLimit(length);
+                while(input.getBytesUntilLimit() > 0) {
                   int tmpRaw = input.readEnum();
                   ensureRepeatedNestedEnumIsMutable();
                   repeatedNestedEnum_.add(tmpRaw);
-                  break;
-                } // case 408
-              case 410:
-                {
-                  int length = input.readRawVarint32();
-                  int oldLimit = input.pushLimit(length);
-                  while (input.getBytesUntilLimit() > 0) {
-                    int tmpRaw = input.readEnum();
-                    ensureRepeatedNestedEnumIsMutable();
-                    repeatedNestedEnum_.add(tmpRaw);
-                  }
-                  input.popLimit(oldLimit);
-                  break;
-                } // case 410
-              case 416:
-                {
+                }
+                input.popLimit(oldLimit);
+                break;
+              } // case 410
+              case 416: {
+                int tmpRaw = input.readEnum();
+                ensureRepeatedForeignEnumIsMutable();
+                repeatedForeignEnum_.add(tmpRaw);
+                break;
+              } // case 416
+              case 418: {
+                int length = input.readRawVarint32();
+                int oldLimit = input.pushLimit(length);
+                while(input.getBytesUntilLimit() > 0) {
                   int tmpRaw = input.readEnum();
                   ensureRepeatedForeignEnumIsMutable();
                   repeatedForeignEnum_.add(tmpRaw);
-                  break;
-                } // case 416
-              case 418:
-                {
-                  int length = input.readRawVarint32();
-                  int oldLimit = input.pushLimit(length);
-                  while (input.getBytesUntilLimit() > 0) {
-                    int tmpRaw = input.readEnum();
-                    ensureRepeatedForeignEnumIsMutable();
-                    repeatedForeignEnum_.add(tmpRaw);
-                  }
-                  input.popLimit(oldLimit);
-                  break;
-                } // case 418
-              case 450:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-                      mapInt32Int32__ =
-                          input.readMessage(
-                              MapInt32Int32DefaultEntryHolder.defaultEntry.getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapInt32Int32()
-                      .getMutableMap()
-                      .put(mapInt32Int32__.getKey(), mapInt32Int32__.getValue());
-                  bitField2_ |= 0x00000010;
-                  break;
-                } // case 450
-              case 458:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> mapInt64Int64__ =
-                      input.readMessage(
-                          MapInt64Int64DefaultEntryHolder.defaultEntry.getParserForType(),
-                          extensionRegistry);
-                  internalGetMutableMapInt64Int64()
-                      .getMutableMap()
-                      .put(mapInt64Int64__.getKey(), mapInt64Int64__.getValue());
-                  bitField2_ |= 0x00000020;
-                  break;
-                } // case 458
-              case 466:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-                      mapUint32Uint32__ =
-                          input.readMessage(
-                              MapUint32Uint32DefaultEntryHolder.defaultEntry.getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapUint32Uint32()
-                      .getMutableMap()
-                      .put(mapUint32Uint32__.getKey(), mapUint32Uint32__.getValue());
-                  bitField2_ |= 0x00000040;
-                  break;
-                } // case 466
-              case 474:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> mapUint64Uint64__ =
-                      input.readMessage(
-                          MapUint64Uint64DefaultEntryHolder.defaultEntry.getParserForType(),
-                          extensionRegistry);
-                  internalGetMutableMapUint64Uint64()
-                      .getMutableMap()
-                      .put(mapUint64Uint64__.getKey(), mapUint64Uint64__.getValue());
-                  bitField2_ |= 0x00000080;
-                  break;
-                } // case 474
-              case 482:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-                      mapSint32Sint32__ =
-                          input.readMessage(
-                              MapSint32Sint32DefaultEntryHolder.defaultEntry.getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapSint32Sint32()
-                      .getMutableMap()
-                      .put(mapSint32Sint32__.getKey(), mapSint32Sint32__.getValue());
-                  bitField2_ |= 0x00000100;
-                  break;
-                } // case 482
-              case 490:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> mapSint64Sint64__ =
-                      input.readMessage(
-                          MapSint64Sint64DefaultEntryHolder.defaultEntry.getParserForType(),
-                          extensionRegistry);
-                  internalGetMutableMapSint64Sint64()
-                      .getMutableMap()
-                      .put(mapSint64Sint64__.getKey(), mapSint64Sint64__.getValue());
-                  bitField2_ |= 0x00000200;
-                  break;
-                } // case 490
-              case 498:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-                      mapFixed32Fixed32__ =
-                          input.readMessage(
-                              MapFixed32Fixed32DefaultEntryHolder.defaultEntry.getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapFixed32Fixed32()
-                      .getMutableMap()
-                      .put(mapFixed32Fixed32__.getKey(), mapFixed32Fixed32__.getValue());
-                  bitField2_ |= 0x00000400;
-                  break;
-                } // case 498
-              case 506:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> mapFixed64Fixed64__ =
-                      input.readMessage(
-                          MapFixed64Fixed64DefaultEntryHolder.defaultEntry.getParserForType(),
-                          extensionRegistry);
-                  internalGetMutableMapFixed64Fixed64()
-                      .getMutableMap()
-                      .put(mapFixed64Fixed64__.getKey(), mapFixed64Fixed64__.getValue());
-                  bitField2_ |= 0x00000800;
-                  break;
-                } // case 506
-              case 514:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-                      mapSfixed32Sfixed32__ =
-                          input.readMessage(
-                              MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry.getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapSfixed32Sfixed32()
-                      .getMutableMap()
-                      .put(mapSfixed32Sfixed32__.getKey(), mapSfixed32Sfixed32__.getValue());
-                  bitField2_ |= 0x00001000;
-                  break;
-                } // case 514
-              case 522:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
-                      mapSfixed64Sfixed64__ =
-                          input.readMessage(
-                              MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry.getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapSfixed64Sfixed64()
-                      .getMutableMap()
-                      .put(mapSfixed64Sfixed64__.getKey(), mapSfixed64Sfixed64__.getValue());
-                  bitField2_ |= 0x00002000;
-                  break;
-                } // case 522
-              case 530:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float> mapInt32Float__ =
-                      input.readMessage(
-                          MapInt32FloatDefaultEntryHolder.defaultEntry.getParserForType(),
-                          extensionRegistry);
-                  internalGetMutableMapInt32Float()
-                      .getMutableMap()
-                      .put(mapInt32Float__.getKey(), mapInt32Float__.getValue());
-                  bitField2_ |= 0x00004000;
-                  break;
-                } // case 530
-              case 538:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Double>
-                      mapInt32Double__ =
-                          input.readMessage(
-                              MapInt32DoubleDefaultEntryHolder.defaultEntry.getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapInt32Double()
-                      .getMutableMap()
-                      .put(mapInt32Double__.getKey(), mapInt32Double__.getValue());
-                  bitField2_ |= 0x00008000;
-                  break;
-                } // case 538
-              case 546:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Boolean, java.lang.Boolean> mapBoolBool__ =
-                      input.readMessage(
-                          MapBoolBoolDefaultEntryHolder.defaultEntry.getParserForType(),
-                          extensionRegistry);
-                  internalGetMutableMapBoolBool()
-                      .getMutableMap()
-                      .put(mapBoolBool__.getKey(), mapBoolBool__.getValue());
-                  bitField2_ |= 0x00010000;
-                  break;
-                } // case 546
-              case 554:
-                {
-                  com.google.protobuf.MapEntry<java.lang.String, java.lang.String>
-                      mapStringString__ =
-                          input.readMessage(
-                              MapStringStringDefaultEntryHolder.defaultEntry.getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapStringString()
-                      .getMutableMap()
-                      .put(mapStringString__.getKey(), mapStringString__.getValue());
-                  bitField2_ |= 0x00020000;
-                  break;
-                } // case 554
-              case 562:
-                {
-                  com.google.protobuf.MapEntry<java.lang.String, com.google.protobuf.ByteString>
-                      mapStringBytes__ =
-                          input.readMessage(
-                              MapStringBytesDefaultEntryHolder.defaultEntry.getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapStringBytes()
-                      .getMutableMap()
-                      .put(mapStringBytes__.getKey(), mapStringBytes__.getValue());
-                  bitField2_ |= 0x00040000;
-                  break;
-                } // case 562
-              case 570:
-                {
-                  com.google.protobuf.MapEntry<
-                          java.lang.String,
-                          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                              .NestedMessage>
-                      mapStringNestedMessage__ =
-                          input.readMessage(
-                              MapStringNestedMessageDefaultEntryHolder.defaultEntry
-                                  .getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapStringNestedMessage()
-                      .ensureBuilderMap()
-                      .put(mapStringNestedMessage__.getKey(), mapStringNestedMessage__.getValue());
-                  bitField2_ |= 0x00080000;
-                  break;
-                } // case 570
-              case 578:
-                {
-                  com.google.protobuf.MapEntry<
-                          java.lang.String,
-                          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-                      mapStringForeignMessage__ =
-                          input.readMessage(
-                              MapStringForeignMessageDefaultEntryHolder.defaultEntry
-                                  .getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapStringForeignMessage()
-                      .ensureBuilderMap()
-                      .put(
-                          mapStringForeignMessage__.getKey(), mapStringForeignMessage__.getValue());
-                  bitField2_ |= 0x00100000;
-                  break;
-                } // case 578
-              case 586:
-                {
-                  com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer>
-                      mapStringNestedEnum__ =
-                          input.readMessage(
-                              MapStringNestedEnumDefaultEntryHolder.defaultEntry.getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapStringNestedEnum()
-                      .getMutableMap()
-                      .put(mapStringNestedEnum__.getKey(), mapStringNestedEnum__.getValue());
-                  bitField2_ |= 0x00200000;
-                  break;
-                } // case 586
-              case 594:
-                {
-                  com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer>
-                      mapStringForeignEnum__ =
-                          input.readMessage(
-                              MapStringForeignEnumDefaultEntryHolder.defaultEntry
-                                  .getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapStringForeignEnum()
-                      .getMutableMap()
-                      .put(mapStringForeignEnum__.getKey(), mapStringForeignEnum__.getValue());
-                  bitField2_ |= 0x00400000;
-                  break;
-                } // case 594
-              case 600:
-                {
-                  int v = input.readInt32();
-                  ensurePackedInt32IsMutable();
-                  packedInt32_.addInt(v);
-                  break;
-                } // case 600
-              case 602:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensurePackedInt32IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedInt32_.addInt(input.readInt32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 602
-              case 608:
-                {
-                  long v = input.readInt64();
-                  ensurePackedInt64IsMutable();
-                  packedInt64_.addLong(v);
-                  break;
-                } // case 608
-              case 610:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensurePackedInt64IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedInt64_.addLong(input.readInt64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 610
-              case 616:
-                {
-                  int v = input.readUInt32();
-                  ensurePackedUint32IsMutable();
-                  packedUint32_.addInt(v);
-                  break;
-                } // case 616
-              case 618:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensurePackedUint32IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedUint32_.addInt(input.readUInt32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 618
-              case 624:
-                {
-                  long v = input.readUInt64();
-                  ensurePackedUint64IsMutable();
-                  packedUint64_.addLong(v);
-                  break;
-                } // case 624
-              case 626:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensurePackedUint64IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedUint64_.addLong(input.readUInt64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 626
-              case 632:
-                {
-                  int v = input.readSInt32();
-                  ensurePackedSint32IsMutable();
-                  packedSint32_.addInt(v);
-                  break;
-                } // case 632
-              case 634:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensurePackedSint32IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedSint32_.addInt(input.readSInt32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 634
-              case 640:
-                {
-                  long v = input.readSInt64();
-                  ensurePackedSint64IsMutable();
-                  packedSint64_.addLong(v);
-                  break;
-                } // case 640
-              case 642:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensurePackedSint64IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedSint64_.addLong(input.readSInt64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 642
-              case 653:
-                {
-                  int v = input.readFixed32();
-                  ensurePackedFixed32IsMutable();
-                  packedFixed32_.addInt(v);
-                  break;
-                } // case 653
-              case 650:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensurePackedFixed32IsMutable(alloc / 4);
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedFixed32_.addInt(input.readFixed32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 650
-              case 657:
-                {
-                  long v = input.readFixed64();
-                  ensurePackedFixed64IsMutable();
-                  packedFixed64_.addLong(v);
-                  break;
-                } // case 657
-              case 658:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensurePackedFixed64IsMutable(alloc / 8);
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedFixed64_.addLong(input.readFixed64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 658
-              case 669:
-                {
-                  int v = input.readSFixed32();
-                  ensurePackedSfixed32IsMutable();
-                  packedSfixed32_.addInt(v);
-                  break;
-                } // case 669
-              case 666:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensurePackedSfixed32IsMutable(alloc / 4);
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedSfixed32_.addInt(input.readSFixed32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 666
-              case 673:
-                {
-                  long v = input.readSFixed64();
-                  ensurePackedSfixed64IsMutable();
-                  packedSfixed64_.addLong(v);
-                  break;
-                } // case 673
-              case 674:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensurePackedSfixed64IsMutable(alloc / 8);
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedSfixed64_.addLong(input.readSFixed64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 674
-              case 685:
-                {
-                  float v = input.readFloat();
-                  ensurePackedFloatIsMutable();
-                  packedFloat_.addFloat(v);
-                  break;
-                } // case 685
-              case 682:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensurePackedFloatIsMutable(alloc / 4);
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedFloat_.addFloat(input.readFloat());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 682
-              case 689:
-                {
-                  double v = input.readDouble();
-                  ensurePackedDoubleIsMutable();
-                  packedDouble_.addDouble(v);
-                  break;
-                } // case 689
-              case 690:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensurePackedDoubleIsMutable(alloc / 8);
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedDouble_.addDouble(input.readDouble());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 690
-              case 696:
-                {
-                  boolean v = input.readBool();
-                  ensurePackedBoolIsMutable();
-                  packedBool_.addBoolean(v);
-                  break;
-                } // case 696
-              case 698:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensurePackedBoolIsMutable(alloc / 1);
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedBool_.addBoolean(input.readBool());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 698
-              case 704:
-                {
-                  int tmpRaw = input.readEnum();
-                  ensurePackedNestedEnumIsMutable();
-                  packedNestedEnum_.add(tmpRaw);
-                  break;
-                } // case 704
-              case 706:
-                {
-                  int length = input.readRawVarint32();
-                  int oldLimit = input.pushLimit(length);
-                  while (input.getBytesUntilLimit() > 0) {
-                    int tmpRaw = input.readEnum();
-                    ensurePackedNestedEnumIsMutable();
-                    packedNestedEnum_.add(tmpRaw);
-                  }
-                  input.popLimit(oldLimit);
-                  break;
-                } // case 706
-              case 712:
-                {
-                  int v = input.readInt32();
-                  ensureUnpackedInt32IsMutable();
-                  unpackedInt32_.addInt(v);
-                  break;
-                } // case 712
-              case 714:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureUnpackedInt32IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedInt32_.addInt(input.readInt32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 714
-              case 720:
-                {
-                  long v = input.readInt64();
-                  ensureUnpackedInt64IsMutable();
-                  unpackedInt64_.addLong(v);
-                  break;
-                } // case 720
-              case 722:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureUnpackedInt64IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedInt64_.addLong(input.readInt64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 722
-              case 728:
-                {
-                  int v = input.readUInt32();
-                  ensureUnpackedUint32IsMutable();
-                  unpackedUint32_.addInt(v);
-                  break;
-                } // case 728
-              case 730:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureUnpackedUint32IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedUint32_.addInt(input.readUInt32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 730
-              case 736:
-                {
-                  long v = input.readUInt64();
-                  ensureUnpackedUint64IsMutable();
-                  unpackedUint64_.addLong(v);
-                  break;
-                } // case 736
-              case 738:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureUnpackedUint64IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedUint64_.addLong(input.readUInt64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 738
-              case 744:
-                {
-                  int v = input.readSInt32();
-                  ensureUnpackedSint32IsMutable();
-                  unpackedSint32_.addInt(v);
-                  break;
-                } // case 744
-              case 746:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureUnpackedSint32IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedSint32_.addInt(input.readSInt32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 746
-              case 752:
-                {
-                  long v = input.readSInt64();
-                  ensureUnpackedSint64IsMutable();
-                  unpackedSint64_.addLong(v);
-                  break;
-                } // case 752
-              case 754:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureUnpackedSint64IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedSint64_.addLong(input.readSInt64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 754
-              case 765:
-                {
-                  int v = input.readFixed32();
-                  ensureUnpackedFixed32IsMutable();
-                  unpackedFixed32_.addInt(v);
-                  break;
-                } // case 765
-              case 762:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureUnpackedFixed32IsMutable(alloc / 4);
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedFixed32_.addInt(input.readFixed32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 762
-              case 769:
-                {
-                  long v = input.readFixed64();
-                  ensureUnpackedFixed64IsMutable();
-                  unpackedFixed64_.addLong(v);
-                  break;
-                } // case 769
-              case 770:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureUnpackedFixed64IsMutable(alloc / 8);
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedFixed64_.addLong(input.readFixed64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 770
-              case 781:
-                {
-                  int v = input.readSFixed32();
-                  ensureUnpackedSfixed32IsMutable();
-                  unpackedSfixed32_.addInt(v);
-                  break;
-                } // case 781
-              case 778:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureUnpackedSfixed32IsMutable(alloc / 4);
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedSfixed32_.addInt(input.readSFixed32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 778
-              case 785:
-                {
-                  long v = input.readSFixed64();
-                  ensureUnpackedSfixed64IsMutable();
-                  unpackedSfixed64_.addLong(v);
-                  break;
-                } // case 785
-              case 786:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureUnpackedSfixed64IsMutable(alloc / 8);
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedSfixed64_.addLong(input.readSFixed64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 786
-              case 797:
-                {
-                  float v = input.readFloat();
-                  ensureUnpackedFloatIsMutable();
-                  unpackedFloat_.addFloat(v);
-                  break;
-                } // case 797
-              case 794:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureUnpackedFloatIsMutable(alloc / 4);
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedFloat_.addFloat(input.readFloat());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 794
-              case 801:
-                {
-                  double v = input.readDouble();
-                  ensureUnpackedDoubleIsMutable();
-                  unpackedDouble_.addDouble(v);
-                  break;
-                } // case 801
-              case 802:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureUnpackedDoubleIsMutable(alloc / 8);
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedDouble_.addDouble(input.readDouble());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 802
-              case 808:
-                {
-                  boolean v = input.readBool();
-                  ensureUnpackedBoolIsMutable();
-                  unpackedBool_.addBoolean(v);
-                  break;
-                } // case 808
-              case 810:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureUnpackedBoolIsMutable(alloc / 1);
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedBool_.addBoolean(input.readBool());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 810
-              case 816:
-                {
+                }
+                input.popLimit(oldLimit);
+                break;
+              } // case 418
+              case 450: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+                mapInt32Int32__ = input.readMessage(
+                    MapInt32Int32DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapInt32Int32().getMutableMap().put(
+                    mapInt32Int32__.getKey(), mapInt32Int32__.getValue());
+                bitField2_ |= 0x00000010;
+                break;
+              } // case 450
+              case 458: {
+                com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+                mapInt64Int64__ = input.readMessage(
+                    MapInt64Int64DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapInt64Int64().getMutableMap().put(
+                    mapInt64Int64__.getKey(), mapInt64Int64__.getValue());
+                bitField2_ |= 0x00000020;
+                break;
+              } // case 458
+              case 466: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+                mapUint32Uint32__ = input.readMessage(
+                    MapUint32Uint32DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapUint32Uint32().getMutableMap().put(
+                    mapUint32Uint32__.getKey(), mapUint32Uint32__.getValue());
+                bitField2_ |= 0x00000040;
+                break;
+              } // case 466
+              case 474: {
+                com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+                mapUint64Uint64__ = input.readMessage(
+                    MapUint64Uint64DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapUint64Uint64().getMutableMap().put(
+                    mapUint64Uint64__.getKey(), mapUint64Uint64__.getValue());
+                bitField2_ |= 0x00000080;
+                break;
+              } // case 474
+              case 482: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+                mapSint32Sint32__ = input.readMessage(
+                    MapSint32Sint32DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapSint32Sint32().getMutableMap().put(
+                    mapSint32Sint32__.getKey(), mapSint32Sint32__.getValue());
+                bitField2_ |= 0x00000100;
+                break;
+              } // case 482
+              case 490: {
+                com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+                mapSint64Sint64__ = input.readMessage(
+                    MapSint64Sint64DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapSint64Sint64().getMutableMap().put(
+                    mapSint64Sint64__.getKey(), mapSint64Sint64__.getValue());
+                bitField2_ |= 0x00000200;
+                break;
+              } // case 490
+              case 498: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+                mapFixed32Fixed32__ = input.readMessage(
+                    MapFixed32Fixed32DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapFixed32Fixed32().getMutableMap().put(
+                    mapFixed32Fixed32__.getKey(), mapFixed32Fixed32__.getValue());
+                bitField2_ |= 0x00000400;
+                break;
+              } // case 498
+              case 506: {
+                com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+                mapFixed64Fixed64__ = input.readMessage(
+                    MapFixed64Fixed64DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapFixed64Fixed64().getMutableMap().put(
+                    mapFixed64Fixed64__.getKey(), mapFixed64Fixed64__.getValue());
+                bitField2_ |= 0x00000800;
+                break;
+              } // case 506
+              case 514: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+                mapSfixed32Sfixed32__ = input.readMessage(
+                    MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapSfixed32Sfixed32().getMutableMap().put(
+                    mapSfixed32Sfixed32__.getKey(), mapSfixed32Sfixed32__.getValue());
+                bitField2_ |= 0x00001000;
+                break;
+              } // case 514
+              case 522: {
+                com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+                mapSfixed64Sfixed64__ = input.readMessage(
+                    MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapSfixed64Sfixed64().getMutableMap().put(
+                    mapSfixed64Sfixed64__.getKey(), mapSfixed64Sfixed64__.getValue());
+                bitField2_ |= 0x00002000;
+                break;
+              } // case 522
+              case 530: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float>
+                mapInt32Float__ = input.readMessage(
+                    MapInt32FloatDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapInt32Float().getMutableMap().put(
+                    mapInt32Float__.getKey(), mapInt32Float__.getValue());
+                bitField2_ |= 0x00004000;
+                break;
+              } // case 530
+              case 538: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Double>
+                mapInt32Double__ = input.readMessage(
+                    MapInt32DoubleDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapInt32Double().getMutableMap().put(
+                    mapInt32Double__.getKey(), mapInt32Double__.getValue());
+                bitField2_ |= 0x00008000;
+                break;
+              } // case 538
+              case 546: {
+                com.google.protobuf.MapEntry<java.lang.Boolean, java.lang.Boolean>
+                mapBoolBool__ = input.readMessage(
+                    MapBoolBoolDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapBoolBool().getMutableMap().put(
+                    mapBoolBool__.getKey(), mapBoolBool__.getValue());
+                bitField2_ |= 0x00010000;
+                break;
+              } // case 546
+              case 554: {
+                com.google.protobuf.MapEntry<java.lang.String, java.lang.String>
+                mapStringString__ = input.readMessage(
+                    MapStringStringDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapStringString().getMutableMap().put(
+                    mapStringString__.getKey(), mapStringString__.getValue());
+                bitField2_ |= 0x00020000;
+                break;
+              } // case 554
+              case 562: {
+                com.google.protobuf.MapEntry<java.lang.String, com.google.protobuf.ByteString>
+                mapStringBytes__ = input.readMessage(
+                    MapStringBytesDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapStringBytes().getMutableMap().put(
+                    mapStringBytes__.getKey(), mapStringBytes__.getValue());
+                bitField2_ |= 0x00040000;
+                break;
+              } // case 562
+              case 570: {
+                com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
+                mapStringNestedMessage__ = input.readMessage(
+                    MapStringNestedMessageDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapStringNestedMessage().ensureBuilderMap().put(
+                    mapStringNestedMessage__.getKey(), mapStringNestedMessage__.getValue());
+                bitField2_ |= 0x00080000;
+                break;
+              } // case 570
+              case 578: {
+                com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
+                mapStringForeignMessage__ = input.readMessage(
+                    MapStringForeignMessageDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapStringForeignMessage().ensureBuilderMap().put(
+                    mapStringForeignMessage__.getKey(), mapStringForeignMessage__.getValue());
+                bitField2_ |= 0x00100000;
+                break;
+              } // case 578
+              case 586: {
+                com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer>
+                mapStringNestedEnum__ = input.readMessage(
+                    MapStringNestedEnumDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapStringNestedEnum().getMutableMap().put(
+                    mapStringNestedEnum__.getKey(), mapStringNestedEnum__.getValue());
+                bitField2_ |= 0x00200000;
+                break;
+              } // case 586
+              case 594: {
+                com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer>
+                mapStringForeignEnum__ = input.readMessage(
+                    MapStringForeignEnumDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapStringForeignEnum().getMutableMap().put(
+                    mapStringForeignEnum__.getKey(), mapStringForeignEnum__.getValue());
+                bitField2_ |= 0x00400000;
+                break;
+              } // case 594
+              case 600: {
+                int v = input.readInt32();
+                ensurePackedInt32IsMutable();
+                packedInt32_.addInt(v);
+                break;
+              } // case 600
+              case 602: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedInt32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedInt32_.addInt(input.readInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 602
+              case 608: {
+                long v = input.readInt64();
+                ensurePackedInt64IsMutable();
+                packedInt64_.addLong(v);
+                break;
+              } // case 608
+              case 610: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedInt64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedInt64_.addLong(input.readInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 610
+              case 616: {
+                int v = input.readUInt32();
+                ensurePackedUint32IsMutable();
+                packedUint32_.addInt(v);
+                break;
+              } // case 616
+              case 618: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedUint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedUint32_.addInt(input.readUInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 618
+              case 624: {
+                long v = input.readUInt64();
+                ensurePackedUint64IsMutable();
+                packedUint64_.addLong(v);
+                break;
+              } // case 624
+              case 626: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedUint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedUint64_.addLong(input.readUInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 626
+              case 632: {
+                int v = input.readSInt32();
+                ensurePackedSint32IsMutable();
+                packedSint32_.addInt(v);
+                break;
+              } // case 632
+              case 634: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedSint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedSint32_.addInt(input.readSInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 634
+              case 640: {
+                long v = input.readSInt64();
+                ensurePackedSint64IsMutable();
+                packedSint64_.addLong(v);
+                break;
+              } // case 640
+              case 642: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedSint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedSint64_.addLong(input.readSInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 642
+              case 653: {
+                int v = input.readFixed32();
+                ensurePackedFixed32IsMutable();
+                packedFixed32_.addInt(v);
+                break;
+              } // case 653
+              case 650: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedFixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedFixed32_.addInt(input.readFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 650
+              case 657: {
+                long v = input.readFixed64();
+                ensurePackedFixed64IsMutable();
+                packedFixed64_.addLong(v);
+                break;
+              } // case 657
+              case 658: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedFixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedFixed64_.addLong(input.readFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 658
+              case 669: {
+                int v = input.readSFixed32();
+                ensurePackedSfixed32IsMutable();
+                packedSfixed32_.addInt(v);
+                break;
+              } // case 669
+              case 666: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedSfixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedSfixed32_.addInt(input.readSFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 666
+              case 673: {
+                long v = input.readSFixed64();
+                ensurePackedSfixed64IsMutable();
+                packedSfixed64_.addLong(v);
+                break;
+              } // case 673
+              case 674: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedSfixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedSfixed64_.addLong(input.readSFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 674
+              case 685: {
+                float v = input.readFloat();
+                ensurePackedFloatIsMutable();
+                packedFloat_.addFloat(v);
+                break;
+              } // case 685
+              case 682: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedFloatIsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedFloat_.addFloat(input.readFloat());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 682
+              case 689: {
+                double v = input.readDouble();
+                ensurePackedDoubleIsMutable();
+                packedDouble_.addDouble(v);
+                break;
+              } // case 689
+              case 690: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedDoubleIsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedDouble_.addDouble(input.readDouble());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 690
+              case 696: {
+                boolean v = input.readBool();
+                ensurePackedBoolIsMutable();
+                packedBool_.addBoolean(v);
+                break;
+              } // case 696
+              case 698: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedBoolIsMutable(alloc / 1);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedBool_.addBoolean(input.readBool());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 698
+              case 704: {
+                int tmpRaw = input.readEnum();
+                ensurePackedNestedEnumIsMutable();
+                packedNestedEnum_.add(tmpRaw);
+                break;
+              } // case 704
+              case 706: {
+                int length = input.readRawVarint32();
+                int oldLimit = input.pushLimit(length);
+                while(input.getBytesUntilLimit() > 0) {
+                  int tmpRaw = input.readEnum();
+                  ensurePackedNestedEnumIsMutable();
+                  packedNestedEnum_.add(tmpRaw);
+                }
+                input.popLimit(oldLimit);
+                break;
+              } // case 706
+              case 712: {
+                int v = input.readInt32();
+                ensureUnpackedInt32IsMutable();
+                unpackedInt32_.addInt(v);
+                break;
+              } // case 712
+              case 714: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedInt32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedInt32_.addInt(input.readInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 714
+              case 720: {
+                long v = input.readInt64();
+                ensureUnpackedInt64IsMutable();
+                unpackedInt64_.addLong(v);
+                break;
+              } // case 720
+              case 722: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedInt64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedInt64_.addLong(input.readInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 722
+              case 728: {
+                int v = input.readUInt32();
+                ensureUnpackedUint32IsMutable();
+                unpackedUint32_.addInt(v);
+                break;
+              } // case 728
+              case 730: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedUint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedUint32_.addInt(input.readUInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 730
+              case 736: {
+                long v = input.readUInt64();
+                ensureUnpackedUint64IsMutable();
+                unpackedUint64_.addLong(v);
+                break;
+              } // case 736
+              case 738: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedUint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedUint64_.addLong(input.readUInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 738
+              case 744: {
+                int v = input.readSInt32();
+                ensureUnpackedSint32IsMutable();
+                unpackedSint32_.addInt(v);
+                break;
+              } // case 744
+              case 746: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedSint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedSint32_.addInt(input.readSInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 746
+              case 752: {
+                long v = input.readSInt64();
+                ensureUnpackedSint64IsMutable();
+                unpackedSint64_.addLong(v);
+                break;
+              } // case 752
+              case 754: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedSint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedSint64_.addLong(input.readSInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 754
+              case 765: {
+                int v = input.readFixed32();
+                ensureUnpackedFixed32IsMutable();
+                unpackedFixed32_.addInt(v);
+                break;
+              } // case 765
+              case 762: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedFixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedFixed32_.addInt(input.readFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 762
+              case 769: {
+                long v = input.readFixed64();
+                ensureUnpackedFixed64IsMutable();
+                unpackedFixed64_.addLong(v);
+                break;
+              } // case 769
+              case 770: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedFixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedFixed64_.addLong(input.readFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 770
+              case 781: {
+                int v = input.readSFixed32();
+                ensureUnpackedSfixed32IsMutable();
+                unpackedSfixed32_.addInt(v);
+                break;
+              } // case 781
+              case 778: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedSfixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedSfixed32_.addInt(input.readSFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 778
+              case 785: {
+                long v = input.readSFixed64();
+                ensureUnpackedSfixed64IsMutable();
+                unpackedSfixed64_.addLong(v);
+                break;
+              } // case 785
+              case 786: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedSfixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedSfixed64_.addLong(input.readSFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 786
+              case 797: {
+                float v = input.readFloat();
+                ensureUnpackedFloatIsMutable();
+                unpackedFloat_.addFloat(v);
+                break;
+              } // case 797
+              case 794: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedFloatIsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedFloat_.addFloat(input.readFloat());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 794
+              case 801: {
+                double v = input.readDouble();
+                ensureUnpackedDoubleIsMutable();
+                unpackedDouble_.addDouble(v);
+                break;
+              } // case 801
+              case 802: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedDoubleIsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedDouble_.addDouble(input.readDouble());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 802
+              case 808: {
+                boolean v = input.readBool();
+                ensureUnpackedBoolIsMutable();
+                unpackedBool_.addBoolean(v);
+                break;
+              } // case 808
+              case 810: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedBoolIsMutable(alloc / 1);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedBool_.addBoolean(input.readBool());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 810
+              case 816: {
+                int tmpRaw = input.readEnum();
+                ensureUnpackedNestedEnumIsMutable();
+                unpackedNestedEnum_.add(tmpRaw);
+                break;
+              } // case 816
+              case 818: {
+                int length = input.readRawVarint32();
+                int oldLimit = input.pushLimit(length);
+                while(input.getBytesUntilLimit() > 0) {
                   int tmpRaw = input.readEnum();
                   ensureUnpackedNestedEnumIsMutable();
                   unpackedNestedEnum_.add(tmpRaw);
-                  break;
-                } // case 816
-              case 818:
-                {
-                  int length = input.readRawVarint32();
-                  int oldLimit = input.pushLimit(length);
-                  while (input.getBytesUntilLimit() > 0) {
-                    int tmpRaw = input.readEnum();
-                    ensureUnpackedNestedEnumIsMutable();
-                    unpackedNestedEnum_.add(tmpRaw);
-                  }
-                  input.popLimit(oldLimit);
-                  break;
-                } // case 818
-              case 888:
-                {
-                  oneofField_ = input.readUInt32();
-                  oneofFieldCase_ = 111;
-                  break;
-                } // case 888
-              case 898:
-                {
-                  input.readMessage(
-                      getOneofNestedMessageFieldBuilder().getBuilder(), extensionRegistry);
-                  oneofFieldCase_ = 112;
-                  break;
-                } // case 898
-              case 906:
-                {
-                  java.lang.String s = input.readStringRequireUtf8();
-                  oneofFieldCase_ = 113;
-                  oneofField_ = s;
-                  break;
-                } // case 906
-              case 914:
-                {
-                  oneofField_ = input.readBytes();
-                  oneofFieldCase_ = 114;
-                  break;
-                } // case 914
-              case 920:
-                {
-                  oneofField_ = input.readBool();
-                  oneofFieldCase_ = 115;
-                  break;
-                } // case 920
-              case 928:
-                {
-                  oneofField_ = input.readUInt64();
-                  oneofFieldCase_ = 116;
-                  break;
-                } // case 928
-              case 941:
-                {
-                  oneofField_ = input.readFloat();
-                  oneofFieldCase_ = 117;
-                  break;
-                } // case 941
-              case 945:
-                {
-                  oneofField_ = input.readDouble();
-                  oneofFieldCase_ = 118;
-                  break;
-                } // case 945
-              case 952:
-                {
-                  int rawValue = input.readEnum();
-                  oneofFieldCase_ = 119;
-                  oneofField_ = rawValue;
-                  break;
-                } // case 952
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
+                }
+                input.popLimit(oldLimit);
+                break;
+              } // case 818
+              case 888: {
+                oneofField_ = input.readUInt32();
+                oneofFieldCase_ = 111;
+                break;
+              } // case 888
+              case 898: {
+                input.readMessage(
+                    getOneofNestedMessageFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                oneofFieldCase_ = 112;
+                break;
+              } // case 898
+              case 906: {
+                java.lang.String s = input.readStringRequireUtf8();
+                oneofFieldCase_ = 113;
+                oneofField_ = s;
+                break;
+              } // case 906
+              case 914: {
+                oneofField_ = input.readBytes();
+                oneofFieldCase_ = 114;
+                break;
+              } // case 914
+              case 920: {
+                oneofField_ = input.readBool();
+                oneofFieldCase_ = 115;
+                break;
+              } // case 920
+              case 928: {
+                oneofField_ = input.readUInt64();
+                oneofFieldCase_ = 116;
+                break;
+              } // case 928
+              case 941: {
+                oneofField_ = input.readFloat();
+                oneofFieldCase_ = 117;
+                break;
+              } // case 941
+              case 945: {
+                oneofField_ = input.readDouble();
+                oneofFieldCase_ = 118;
+                break;
+              } // case 945
+              case 952: {
+                int rawValue = input.readEnum();
+                oneofFieldCase_ = 119;
+                oneofField_ = rawValue;
+                break;
+              } // case 952
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
             } // switch (tag)
           } // while (!done)
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -13920,12 +12710,12 @@ public Builder mergeFrom(
         } // finally
         return this;
       }
-
       private int oneofFieldCase_ = 0;
       private java.lang.Object oneofField_;
-
-      public OneofFieldCase getOneofFieldCase() {
-        return OneofFieldCase.forNumber(oneofFieldCase_);
+      public OneofFieldCase
+          getOneofFieldCase() {
+        return OneofFieldCase.forNumber(
+            oneofFieldCase_);
       }
 
       public Builder clearOneofField() {
@@ -13939,21 +12729,17 @@ public Builder clearOneofField() {
       private int bitField1_;
       private int bitField2_;
 
-      private int optionalInt32_;
-
+      private int optionalInt32_ ;
       /**
        * <code>int32 optional_int32 = 1;</code>
-       *
        * @return The optionalInt32.
        */
       @java.lang.Override
       public int getOptionalInt32() {
         return optionalInt32_;
       }
-
       /**
        * <code>int32 optional_int32 = 1;</code>
-       *
        * @param value The optionalInt32 to set.
        * @return This builder for chaining.
        */
@@ -13964,10 +12750,8 @@ public Builder setOptionalInt32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>int32 optional_int32 = 1;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalInt32() {
@@ -13977,21 +12761,17 @@ public Builder clearOptionalInt32() {
         return this;
       }
 
-      private long optionalInt64_;
-
+      private long optionalInt64_ ;
       /**
        * <code>int64 optional_int64 = 2;</code>
-       *
        * @return The optionalInt64.
        */
       @java.lang.Override
       public long getOptionalInt64() {
         return optionalInt64_;
       }
-
       /**
        * <code>int64 optional_int64 = 2;</code>
-       *
        * @param value The optionalInt64 to set.
        * @return This builder for chaining.
        */
@@ -14002,10 +12782,8 @@ public Builder setOptionalInt64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>int64 optional_int64 = 2;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalInt64() {
@@ -14015,21 +12793,17 @@ public Builder clearOptionalInt64() {
         return this;
       }
 
-      private int optionalUint32_;
-
+      private int optionalUint32_ ;
       /**
        * <code>uint32 optional_uint32 = 3;</code>
-       *
        * @return The optionalUint32.
        */
       @java.lang.Override
       public int getOptionalUint32() {
         return optionalUint32_;
       }
-
       /**
        * <code>uint32 optional_uint32 = 3;</code>
-       *
        * @param value The optionalUint32 to set.
        * @return This builder for chaining.
        */
@@ -14040,10 +12814,8 @@ public Builder setOptionalUint32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>uint32 optional_uint32 = 3;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalUint32() {
@@ -14053,21 +12825,17 @@ public Builder clearOptionalUint32() {
         return this;
       }
 
-      private long optionalUint64_;
-
+      private long optionalUint64_ ;
       /**
        * <code>uint64 optional_uint64 = 4;</code>
-       *
        * @return The optionalUint64.
        */
       @java.lang.Override
       public long getOptionalUint64() {
         return optionalUint64_;
       }
-
       /**
        * <code>uint64 optional_uint64 = 4;</code>
-       *
        * @param value The optionalUint64 to set.
        * @return This builder for chaining.
        */
@@ -14078,10 +12846,8 @@ public Builder setOptionalUint64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>uint64 optional_uint64 = 4;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalUint64() {
@@ -14091,21 +12857,17 @@ public Builder clearOptionalUint64() {
         return this;
       }
 
-      private int optionalSint32_;
-
+      private int optionalSint32_ ;
       /**
        * <code>sint32 optional_sint32 = 5;</code>
-       *
        * @return The optionalSint32.
        */
       @java.lang.Override
       public int getOptionalSint32() {
         return optionalSint32_;
       }
-
       /**
        * <code>sint32 optional_sint32 = 5;</code>
-       *
        * @param value The optionalSint32 to set.
        * @return This builder for chaining.
        */
@@ -14116,10 +12878,8 @@ public Builder setOptionalSint32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>sint32 optional_sint32 = 5;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalSint32() {
@@ -14129,21 +12889,17 @@ public Builder clearOptionalSint32() {
         return this;
       }
 
-      private long optionalSint64_;
-
+      private long optionalSint64_ ;
       /**
        * <code>sint64 optional_sint64 = 6;</code>
-       *
        * @return The optionalSint64.
        */
       @java.lang.Override
       public long getOptionalSint64() {
         return optionalSint64_;
       }
-
       /**
        * <code>sint64 optional_sint64 = 6;</code>
-       *
        * @param value The optionalSint64 to set.
        * @return This builder for chaining.
        */
@@ -14154,10 +12910,8 @@ public Builder setOptionalSint64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>sint64 optional_sint64 = 6;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalSint64() {
@@ -14167,21 +12921,17 @@ public Builder clearOptionalSint64() {
         return this;
       }
 
-      private int optionalFixed32_;
-
+      private int optionalFixed32_ ;
       /**
        * <code>fixed32 optional_fixed32 = 7;</code>
-       *
        * @return The optionalFixed32.
        */
       @java.lang.Override
       public int getOptionalFixed32() {
         return optionalFixed32_;
       }
-
       /**
        * <code>fixed32 optional_fixed32 = 7;</code>
-       *
        * @param value The optionalFixed32 to set.
        * @return This builder for chaining.
        */
@@ -14192,10 +12942,8 @@ public Builder setOptionalFixed32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>fixed32 optional_fixed32 = 7;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalFixed32() {
@@ -14205,21 +12953,17 @@ public Builder clearOptionalFixed32() {
         return this;
       }
 
-      private long optionalFixed64_;
-
+      private long optionalFixed64_ ;
       /**
        * <code>fixed64 optional_fixed64 = 8;</code>
-       *
        * @return The optionalFixed64.
        */
       @java.lang.Override
       public long getOptionalFixed64() {
         return optionalFixed64_;
       }
-
       /**
        * <code>fixed64 optional_fixed64 = 8;</code>
-       *
        * @param value The optionalFixed64 to set.
        * @return This builder for chaining.
        */
@@ -14230,10 +12974,8 @@ public Builder setOptionalFixed64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>fixed64 optional_fixed64 = 8;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalFixed64() {
@@ -14243,21 +12985,17 @@ public Builder clearOptionalFixed64() {
         return this;
       }
 
-      private int optionalSfixed32_;
-
+      private int optionalSfixed32_ ;
       /**
        * <code>sfixed32 optional_sfixed32 = 9;</code>
-       *
        * @return The optionalSfixed32.
        */
       @java.lang.Override
       public int getOptionalSfixed32() {
         return optionalSfixed32_;
       }
-
       /**
        * <code>sfixed32 optional_sfixed32 = 9;</code>
-       *
        * @param value The optionalSfixed32 to set.
        * @return This builder for chaining.
        */
@@ -14268,10 +13006,8 @@ public Builder setOptionalSfixed32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>sfixed32 optional_sfixed32 = 9;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalSfixed32() {
@@ -14281,21 +13017,17 @@ public Builder clearOptionalSfixed32() {
         return this;
       }
 
-      private long optionalSfixed64_;
-
+      private long optionalSfixed64_ ;
       /**
        * <code>sfixed64 optional_sfixed64 = 10;</code>
-       *
        * @return The optionalSfixed64.
        */
       @java.lang.Override
       public long getOptionalSfixed64() {
         return optionalSfixed64_;
       }
-
       /**
        * <code>sfixed64 optional_sfixed64 = 10;</code>
-       *
        * @param value The optionalSfixed64 to set.
        * @return This builder for chaining.
        */
@@ -14306,10 +13038,8 @@ public Builder setOptionalSfixed64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>sfixed64 optional_sfixed64 = 10;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalSfixed64() {
@@ -14319,21 +13049,17 @@ public Builder clearOptionalSfixed64() {
         return this;
       }
 
-      private float optionalFloat_;
-
+      private float optionalFloat_ ;
       /**
        * <code>float optional_float = 11;</code>
-       *
        * @return The optionalFloat.
        */
       @java.lang.Override
       public float getOptionalFloat() {
         return optionalFloat_;
       }
-
       /**
        * <code>float optional_float = 11;</code>
-       *
        * @param value The optionalFloat to set.
        * @return This builder for chaining.
        */
@@ -14344,10 +13070,8 @@ public Builder setOptionalFloat(float value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>float optional_float = 11;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalFloat() {
@@ -14357,21 +13081,17 @@ public Builder clearOptionalFloat() {
         return this;
       }
 
-      private double optionalDouble_;
-
+      private double optionalDouble_ ;
       /**
        * <code>double optional_double = 12;</code>
-       *
        * @return The optionalDouble.
        */
       @java.lang.Override
       public double getOptionalDouble() {
         return optionalDouble_;
       }
-
       /**
        * <code>double optional_double = 12;</code>
-       *
        * @param value The optionalDouble to set.
        * @return This builder for chaining.
        */
@@ -14382,10 +13102,8 @@ public Builder setOptionalDouble(double value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>double optional_double = 12;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalDouble() {
@@ -14395,21 +13113,17 @@ public Builder clearOptionalDouble() {
         return this;
       }
 
-      private boolean optionalBool_;
-
+      private boolean optionalBool_ ;
       /**
        * <code>bool optional_bool = 13;</code>
-       *
        * @return The optionalBool.
        */
       @java.lang.Override
       public boolean getOptionalBool() {
         return optionalBool_;
       }
-
       /**
        * <code>bool optional_bool = 13;</code>
-       *
        * @param value The optionalBool to set.
        * @return This builder for chaining.
        */
@@ -14420,10 +13134,8 @@ public Builder setOptionalBool(boolean value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>bool optional_bool = 13;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalBool() {
@@ -14434,16 +13146,15 @@ public Builder clearOptionalBool() {
       }
 
       private java.lang.Object optionalString_ = "";
-
       /**
        * <code>string optional_string = 14;</code>
-       *
        * @return The optionalString.
        */
       public java.lang.String getOptionalString() {
         java.lang.Object ref = optionalString_;
         if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           optionalString_ = s;
           return s;
@@ -14451,43 +13162,38 @@ public java.lang.String getOptionalString() {
           return (java.lang.String) ref;
         }
       }
-
       /**
        * <code>string optional_string = 14;</code>
-       *
        * @return The bytes for optionalString.
        */
-      public com.google.protobuf.ByteString getOptionalStringBytes() {
+      public com.google.protobuf.ByteString
+          getOptionalStringBytes() {
         java.lang.Object ref = optionalString_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
-              com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
           optionalString_ = b;
           return b;
         } else {
           return (com.google.protobuf.ByteString) ref;
         }
       }
-
       /**
        * <code>string optional_string = 14;</code>
-       *
        * @param value The optionalString to set.
        * @return This builder for chaining.
        */
-      public Builder setOptionalString(java.lang.String value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setOptionalString(
+          java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
         optionalString_ = value;
         bitField0_ |= 0x00002000;
         onChanged();
         return this;
       }
-
       /**
        * <code>string optional_string = 14;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalString() {
@@ -14496,17 +13202,14 @@ public Builder clearOptionalString() {
         onChanged();
         return this;
       }
-
       /**
        * <code>string optional_string = 14;</code>
-       *
        * @param value The bytes for optionalString to set.
        * @return This builder for chaining.
        */
-      public Builder setOptionalStringBytes(com.google.protobuf.ByteString value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setOptionalStringBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
         checkByteStringIsUtf8(value);
         optionalString_ = value;
         bitField0_ |= 0x00002000;
@@ -14515,36 +13218,28 @@ public Builder setOptionalStringBytes(com.google.protobuf.ByteString value) {
       }
 
       private com.google.protobuf.ByteString optionalBytes_ = com.google.protobuf.ByteString.EMPTY;
-
       /**
        * <code>bytes optional_bytes = 15;</code>
-       *
        * @return The optionalBytes.
        */
       @java.lang.Override
       public com.google.protobuf.ByteString getOptionalBytes() {
         return optionalBytes_;
       }
-
       /**
        * <code>bytes optional_bytes = 15;</code>
-       *
        * @param value The optionalBytes to set.
        * @return This builder for chaining.
        */
       public Builder setOptionalBytes(com.google.protobuf.ByteString value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         optionalBytes_ = value;
         bitField0_ |= 0x00004000;
         onChanged();
         return this;
       }
-
       /**
        * <code>bytes optional_bytes = 15;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalBytes() {
@@ -14554,54 +13249,31 @@ public Builder clearOptionalBytes() {
         return this;
       }
 
-      private legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-          optionalNestedMessage_;
+      private legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage optionalNestedMessage_;
       private com.google.protobuf.SingleFieldBuilder<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .NestedMessageOrBuilder>
-          optionalNestedMessageBuilder_;
-
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> optionalNestedMessageBuilder_;
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
        * @return Whether the optionalNestedMessage field is set.
        */
       public boolean hasOptionalNestedMessage() {
         return ((bitField0_ & 0x00008000) != 0);
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
        * @return The optionalNestedMessage.
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-          getOptionalNestedMessage() {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getOptionalNestedMessage() {
         if (optionalNestedMessageBuilder_ == null) {
-          return optionalNestedMessage_ == null
-              ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .getDefaultInstance()
-              : optionalNestedMessage_;
+          return optionalNestedMessage_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance() : optionalNestedMessage_;
         } else {
           return optionalNestedMessageBuilder_.getMessage();
         }
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
        */
-      public Builder setOptionalNestedMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              value) {
+      public Builder setOptionalNestedMessage(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage value) {
         if (optionalNestedMessageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -14614,16 +13286,11 @@ public Builder setOptionalNestedMessage(
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
        */
       public Builder setOptionalNestedMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder
-              builderForValue) {
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder builderForValue) {
         if (optionalNestedMessageBuilder_ == null) {
           optionalNestedMessage_ = builderForValue.build();
         } else {
@@ -14633,21 +13300,14 @@ public Builder setOptionalNestedMessage(
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
        */
-      public Builder mergeOptionalNestedMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              value) {
+      public Builder mergeOptionalNestedMessage(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage value) {
         if (optionalNestedMessageBuilder_ == null) {
-          if (((bitField0_ & 0x00008000) != 0)
-              && optionalNestedMessage_ != null
-              && optionalNestedMessage_
-                  != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage.getDefaultInstance()) {
+          if (((bitField0_ & 0x00008000) != 0) &&
+            optionalNestedMessage_ != null &&
+            optionalNestedMessage_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance()) {
             getOptionalNestedMessageBuilder().mergeFrom(value);
           } else {
             optionalNestedMessage_ = value;
@@ -14661,11 +13321,8 @@ public Builder mergeOptionalNestedMessage(
         }
         return this;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
        */
       public Builder clearOptionalNestedMessage() {
         bitField0_ = (bitField0_ & ~0x00008000);
@@ -14677,102 +13334,67 @@ public Builder clearOptionalNestedMessage() {
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .Builder
-          getOptionalNestedMessageBuilder() {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder getOptionalNestedMessageBuilder() {
         bitField0_ |= 0x00008000;
         onChanged();
         return getOptionalNestedMessageFieldBuilder().getBuilder();
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessageOrBuilder
-          getOptionalNestedMessageOrBuilder() {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder getOptionalNestedMessageOrBuilder() {
         if (optionalNestedMessageBuilder_ != null) {
           return optionalNestedMessageBuilder_.getMessageOrBuilder();
         } else {
-          return optionalNestedMessage_ == null
-              ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .getDefaultInstance()
-              : optionalNestedMessage_;
+          return optionalNestedMessage_ == null ?
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance() : optionalNestedMessage_;
         }
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .NestedMessageOrBuilder>
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> 
           getOptionalNestedMessageFieldBuilder() {
         if (optionalNestedMessageBuilder_ == null) {
-          optionalNestedMessageBuilder_ =
-              new com.google.protobuf.SingleFieldBuilder<
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage.Builder,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessageOrBuilder>(
-                  getOptionalNestedMessage(), getParentForChildren(), isClean());
+          optionalNestedMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder>(
+                  getOptionalNestedMessage(),
+                  getParentForChildren(),
+                  isClean());
           optionalNestedMessage_ = null;
         }
         return optionalNestedMessageBuilder_;
       }
 
-      private legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-          optionalForeignMessage_;
+      private legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage optionalForeignMessage_;
       private com.google.protobuf.SingleFieldBuilder<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>
-          optionalForeignMessageBuilder_;
-
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder> optionalForeignMessageBuilder_;
       /**
        * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
-       *
        * @return Whether the optionalForeignMessage field is set.
        */
       public boolean hasOptionalForeignMessage() {
         return ((bitField0_ & 0x00010000) != 0);
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
-       *
        * @return The optionalForeignMessage.
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-          getOptionalForeignMessage() {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getOptionalForeignMessage() {
         if (optionalForeignMessageBuilder_ == null) {
-          return optionalForeignMessage_ == null
-              ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-                  .getDefaultInstance()
-              : optionalForeignMessage_;
+          return optionalForeignMessage_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance() : optionalForeignMessage_;
         } else {
           return optionalForeignMessageBuilder_.getMessage();
         }
       }
-
-      /** <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code> */
-      public Builder setOptionalForeignMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage value) {
+      /**
+       * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
+       */
+      public Builder setOptionalForeignMessage(legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage value) {
         if (optionalForeignMessageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -14785,11 +13407,11 @@ public Builder setOptionalForeignMessage(
         onChanged();
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code> */
+      /**
+       * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
+       */
       public Builder setOptionalForeignMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder
-              builderForValue) {
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder builderForValue) {
         if (optionalForeignMessageBuilder_ == null) {
           optionalForeignMessage_ = builderForValue.build();
         } else {
@@ -14799,16 +13421,14 @@ public Builder setOptionalForeignMessage(
         onChanged();
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code> */
-      public Builder mergeOptionalForeignMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage value) {
+      /**
+       * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
+       */
+      public Builder mergeOptionalForeignMessage(legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage value) {
         if (optionalForeignMessageBuilder_ == null) {
-          if (((bitField0_ & 0x00010000) != 0)
-              && optionalForeignMessage_ != null
-              && optionalForeignMessage_
-                  != legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-                      .getDefaultInstance()) {
+          if (((bitField0_ & 0x00010000) != 0) &&
+            optionalForeignMessage_ != null &&
+            optionalForeignMessage_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance()) {
             getOptionalForeignMessageBuilder().mergeFrom(value);
           } else {
             optionalForeignMessage_ = value;
@@ -14822,8 +13442,9 @@ public Builder mergeOptionalForeignMessage(
         }
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code> */
+      /**
+       * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
+       */
       public Builder clearOptionalForeignMessage() {
         bitField0_ = (bitField0_ & ~0x00010000);
         optionalForeignMessage_ = null;
@@ -14834,63 +13455,52 @@ public Builder clearOptionalForeignMessage() {
         onChanged();
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code> */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder
-          getOptionalForeignMessageBuilder() {
+      /**
+       * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
+       */
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder getOptionalForeignMessageBuilder() {
         bitField0_ |= 0x00010000;
         onChanged();
         return getOptionalForeignMessageFieldBuilder().getBuilder();
       }
-
-      /** <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code> */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder
-          getOptionalForeignMessageOrBuilder() {
+      /**
+       * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
+       */
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder getOptionalForeignMessageOrBuilder() {
         if (optionalForeignMessageBuilder_ != null) {
           return optionalForeignMessageBuilder_.getMessageOrBuilder();
         } else {
-          return optionalForeignMessage_ == null
-              ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-                  .getDefaultInstance()
-              : optionalForeignMessage_;
+          return optionalForeignMessage_ == null ?
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance() : optionalForeignMessage_;
         }
       }
-
-      /** <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code> */
+      /**
+       * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
+       */
       private com.google.protobuf.SingleFieldBuilder<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder> 
           getOptionalForeignMessageFieldBuilder() {
         if (optionalForeignMessageBuilder_ == null) {
-          optionalForeignMessageBuilder_ =
-              new com.google.protobuf.SingleFieldBuilder<
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>(
-                  getOptionalForeignMessage(), getParentForChildren(), isClean());
+          optionalForeignMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>(
+                  getOptionalForeignMessage(),
+                  getParentForChildren(),
+                  isClean());
           optionalForeignMessage_ = null;
         }
         return optionalForeignMessageBuilder_;
       }
 
       private int optionalNestedEnum_ = 0;
-
       /**
-       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;</code>
        * @return The enum numeric value on the wire for optionalNestedEnum.
        */
-      @java.lang.Override
-      public int getOptionalNestedEnumValue() {
+      @java.lang.Override public int getOptionalNestedEnumValue() {
         return optionalNestedEnum_;
       }
-
       /**
-       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;</code>
        * @param value The enum numeric value on the wire for optionalNestedEnum to set.
        * @return This builder for chaining.
        */
@@ -14900,34 +13510,21 @@ public Builder setOptionalNestedEnumValue(int value) {
         onChanged();
         return this;
       }
-
       /**
-       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;</code>
        * @return The optionalNestedEnum.
        */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-          getOptionalNestedEnum() {
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum result =
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                .forNumber(optionalNestedEnum_);
-        return result == null
-            ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                .UNRECOGNIZED
-            : result;
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getOptionalNestedEnum() {
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.forNumber(optionalNestedEnum_);
+        return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.UNRECOGNIZED : result;
       }
-
       /**
-       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;</code>
        * @param value The optionalNestedEnum to set.
        * @return This builder for chaining.
        */
-      public Builder setOptionalNestedEnum(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
+      public Builder setOptionalNestedEnum(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -14936,11 +13533,8 @@ public Builder setOptionalNestedEnum(
         onChanged();
         return this;
       }
-
       /**
-       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;</code>
        * @return This builder for chaining.
        */
       public Builder clearOptionalNestedEnum() {
@@ -14951,20 +13545,15 @@ public Builder clearOptionalNestedEnum() {
       }
 
       private int optionalForeignEnum_ = 0;
-
       /**
        * <code>.legacy_gencode_test.proto3.ForeignEnum optional_foreign_enum = 22;</code>
-       *
        * @return The enum numeric value on the wire for optionalForeignEnum.
        */
-      @java.lang.Override
-      public int getOptionalForeignEnumValue() {
+      @java.lang.Override public int getOptionalForeignEnumValue() {
         return optionalForeignEnum_;
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.ForeignEnum optional_foreign_enum = 22;</code>
-       *
        * @param value The enum numeric value on the wire for optionalForeignEnum to set.
        * @return This builder for chaining.
        */
@@ -14974,31 +13563,21 @@ public Builder setOptionalForeignEnumValue(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.ForeignEnum optional_foreign_enum = 22;</code>
-       *
        * @return The optionalForeignEnum.
        */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum
-          getOptionalForeignEnum() {
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum result =
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.forNumber(
-                optionalForeignEnum_);
-        return result == null
-            ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.UNRECOGNIZED
-            : result;
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getOptionalForeignEnum() {
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.forNumber(optionalForeignEnum_);
+        return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.UNRECOGNIZED : result;
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.ForeignEnum optional_foreign_enum = 22;</code>
-       *
        * @param value The optionalForeignEnum to set.
        * @return This builder for chaining.
        */
-      public Builder setOptionalForeignEnum(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum value) {
+      public Builder setOptionalForeignEnum(legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -15007,10 +13586,8 @@ public Builder setOptionalForeignEnum(
         onChanged();
         return this;
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.ForeignEnum optional_foreign_enum = 22;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalForeignEnum() {
@@ -15021,24 +13598,15 @@ public Builder clearOptionalForeignEnum() {
       }
 
       private int optionalAliasedEnum_ = 0;
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;</code>
        * @return The enum numeric value on the wire for optionalAliasedEnum.
        */
-      @java.lang.Override
-      public int getOptionalAliasedEnumValue() {
+      @java.lang.Override public int getOptionalAliasedEnumValue() {
         return optionalAliasedEnum_;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;</code>
        * @param value The enum numeric value on the wire for optionalAliasedEnum to set.
        * @return This builder for chaining.
        */
@@ -15048,36 +13616,21 @@ public Builder setOptionalAliasedEnumValue(int value) {
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;</code>
        * @return The optionalAliasedEnum.
        */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum
-          getOptionalAliasedEnum() {
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum result =
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum
-                .forNumber(optionalAliasedEnum_);
-        return result == null
-            ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum
-                .UNRECOGNIZED
-            : result;
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum getOptionalAliasedEnum() {
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum.forNumber(optionalAliasedEnum_);
+        return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum.UNRECOGNIZED : result;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;</code>
        * @param value The optionalAliasedEnum to set.
        * @return This builder for chaining.
        */
-      public Builder setOptionalAliasedEnum(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum value) {
+      public Builder setOptionalAliasedEnum(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -15086,12 +13639,8 @@ public Builder setOptionalAliasedEnum(
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;</code>
        * @return This builder for chaining.
        */
       public Builder clearOptionalAliasedEnum() {
@@ -15101,43 +13650,31 @@ public Builder clearOptionalAliasedEnum() {
         return this;
       }
 
-      private legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-          recursiveMessage_;
+      private legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 recursiveMessage_;
       private com.google.protobuf.SingleFieldBuilder<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder>
-          recursiveMessageBuilder_;
-
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder> recursiveMessageBuilder_;
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
-       *
        * @return Whether the recursiveMessage field is set.
        */
       public boolean hasRecursiveMessage() {
         return ((bitField0_ & 0x00100000) != 0);
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
-       *
        * @return The recursiveMessage.
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-          getRecursiveMessage() {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 getRecursiveMessage() {
         if (recursiveMessageBuilder_ == null) {
-          return recursiveMessage_ == null
-              ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .getDefaultInstance()
-              : recursiveMessage_;
+          return recursiveMessage_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance() : recursiveMessage_;
         } else {
           return recursiveMessageBuilder_.getMessage();
         }
       }
-
-      /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code> */
-      public Builder setRecursiveMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 value) {
+      /**
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
+       */
+      public Builder setRecursiveMessage(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 value) {
         if (recursiveMessageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -15150,11 +13687,11 @@ public Builder setRecursiveMessage(
         onChanged();
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code> */
+      /**
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
+       */
       public Builder setRecursiveMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder
-              builderForValue) {
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder builderForValue) {
         if (recursiveMessageBuilder_ == null) {
           recursiveMessage_ = builderForValue.build();
         } else {
@@ -15164,16 +13701,14 @@ public Builder setRecursiveMessage(
         onChanged();
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code> */
-      public Builder mergeRecursiveMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 value) {
+      /**
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
+       */
+      public Builder mergeRecursiveMessage(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 value) {
         if (recursiveMessageBuilder_ == null) {
-          if (((bitField0_ & 0x00100000) != 0)
-              && recursiveMessage_ != null
-              && recursiveMessage_
-                  != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .getDefaultInstance()) {
+          if (((bitField0_ & 0x00100000) != 0) &&
+            recursiveMessage_ != null &&
+            recursiveMessage_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance()) {
             getRecursiveMessageBuilder().mergeFrom(value);
           } else {
             recursiveMessage_ = value;
@@ -15187,8 +13722,9 @@ public Builder mergeRecursiveMessage(
         }
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code> */
+      /**
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
+       */
       public Builder clearRecursiveMessage() {
         bitField0_ = (bitField0_ & ~0x00100000);
         recursiveMessage_ = null;
@@ -15199,116 +13735,97 @@ public Builder clearRecursiveMessage() {
         onChanged();
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code> */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder
-          getRecursiveMessageBuilder() {
+      /**
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
+       */
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder getRecursiveMessageBuilder() {
         bitField0_ |= 0x00100000;
         onChanged();
         return getRecursiveMessageFieldBuilder().getBuilder();
       }
-
-      /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code> */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder
-          getRecursiveMessageOrBuilder() {
+      /**
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
+       */
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder getRecursiveMessageOrBuilder() {
         if (recursiveMessageBuilder_ != null) {
           return recursiveMessageBuilder_.getMessageOrBuilder();
         } else {
-          return recursiveMessage_ == null
-              ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .getDefaultInstance()
-              : recursiveMessage_;
+          return recursiveMessage_ == null ?
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance() : recursiveMessage_;
         }
       }
-
-      /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code> */
+      /**
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
+       */
       private com.google.protobuf.SingleFieldBuilder<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder>
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder> 
           getRecursiveMessageFieldBuilder() {
         if (recursiveMessageBuilder_ == null) {
-          recursiveMessageBuilder_ =
-              new com.google.protobuf.SingleFieldBuilder<
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder>(
-                  getRecursiveMessage(), getParentForChildren(), isClean());
+          recursiveMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder>(
+                  getRecursiveMessage(),
+                  getParentForChildren(),
+                  isClean());
           recursiveMessage_ = null;
         }
         return recursiveMessageBuilder_;
       }
 
       private com.google.protobuf.Internal.IntList repeatedInt32_ = emptyIntList();
-
       private void ensureRepeatedInt32IsMutable() {
         if (!repeatedInt32_.isModifiable()) {
           repeatedInt32_ = makeMutableCopy(repeatedInt32_);
         }
         bitField0_ |= 0x00200000;
       }
-
       /**
-       *
-       *
        * <pre>
        * Repeated
        * </pre>
        *
        * <code>repeated int32 repeated_int32 = 31;</code>
-       *
        * @return A list containing the repeatedInt32.
        */
-      public java.util.List<java.lang.Integer> getRepeatedInt32List() {
+      public java.util.List<java.lang.Integer>
+          getRepeatedInt32List() {
         repeatedInt32_.makeImmutable();
         return repeatedInt32_;
       }
-
       /**
-       *
-       *
        * <pre>
        * Repeated
        * </pre>
        *
        * <code>repeated int32 repeated_int32 = 31;</code>
-       *
        * @return The count of repeatedInt32.
        */
       public int getRepeatedInt32Count() {
         return repeatedInt32_.size();
       }
-
       /**
-       *
-       *
        * <pre>
        * Repeated
        * </pre>
        *
        * <code>repeated int32 repeated_int32 = 31;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedInt32 at the given index.
        */
       public int getRepeatedInt32(int index) {
         return repeatedInt32_.getInt(index);
       }
-
       /**
-       *
-       *
        * <pre>
        * Repeated
        * </pre>
        *
        * <code>repeated int32 repeated_int32 = 31;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedInt32 to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedInt32(int index, int value) {
+      public Builder setRepeatedInt32(
+          int index, int value) {
 
         ensureRepeatedInt32IsMutable();
         repeatedInt32_.setInt(index, value);
@@ -15316,16 +13833,12 @@ public Builder setRepeatedInt32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
-       *
-       *
        * <pre>
        * Repeated
        * </pre>
        *
        * <code>repeated int32 repeated_int32 = 31;</code>
-       *
        * @param value The repeatedInt32 to add.
        * @return This builder for chaining.
        */
@@ -15337,36 +13850,30 @@ public Builder addRepeatedInt32(int value) {
         onChanged();
         return this;
       }
-
       /**
-       *
-       *
        * <pre>
        * Repeated
        * </pre>
        *
        * <code>repeated int32 repeated_int32 = 31;</code>
-       *
        * @param values The repeatedInt32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedInt32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllRepeatedInt32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureRepeatedInt32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedInt32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedInt32_);
         bitField0_ |= 0x00200000;
         onChanged();
         return this;
       }
-
       /**
-       *
-       *
        * <pre>
        * Repeated
        * </pre>
        *
        * <code>repeated int32 repeated_int32 = 31;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedInt32() {
@@ -15377,51 +13884,44 @@ public Builder clearRepeatedInt32() {
       }
 
       private com.google.protobuf.Internal.LongList repeatedInt64_ = emptyLongList();
-
       private void ensureRepeatedInt64IsMutable() {
         if (!repeatedInt64_.isModifiable()) {
           repeatedInt64_ = makeMutableCopy(repeatedInt64_);
         }
         bitField0_ |= 0x00400000;
       }
-
       /**
        * <code>repeated int64 repeated_int64 = 32;</code>
-       *
        * @return A list containing the repeatedInt64.
        */
-      public java.util.List<java.lang.Long> getRepeatedInt64List() {
+      public java.util.List<java.lang.Long>
+          getRepeatedInt64List() {
         repeatedInt64_.makeImmutable();
         return repeatedInt64_;
       }
-
       /**
        * <code>repeated int64 repeated_int64 = 32;</code>
-       *
        * @return The count of repeatedInt64.
        */
       public int getRepeatedInt64Count() {
         return repeatedInt64_.size();
       }
-
       /**
        * <code>repeated int64 repeated_int64 = 32;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedInt64 at the given index.
        */
       public long getRepeatedInt64(int index) {
         return repeatedInt64_.getLong(index);
       }
-
       /**
        * <code>repeated int64 repeated_int64 = 32;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedInt64 to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedInt64(int index, long value) {
+      public Builder setRepeatedInt64(
+          int index, long value) {
 
         ensureRepeatedInt64IsMutable();
         repeatedInt64_.setLong(index, value);
@@ -15429,10 +13929,8 @@ public Builder setRepeatedInt64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated int64 repeated_int64 = 32;</code>
-       *
        * @param value The repeatedInt64 to add.
        * @return This builder for chaining.
        */
@@ -15444,24 +13942,22 @@ public Builder addRepeatedInt64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated int64 repeated_int64 = 32;</code>
-       *
        * @param values The repeatedInt64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedInt64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllRepeatedInt64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensureRepeatedInt64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedInt64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedInt64_);
         bitField0_ |= 0x00400000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated int64 repeated_int64 = 32;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedInt64() {
@@ -15472,51 +13968,44 @@ public Builder clearRepeatedInt64() {
       }
 
       private com.google.protobuf.Internal.IntList repeatedUint32_ = emptyIntList();
-
       private void ensureRepeatedUint32IsMutable() {
         if (!repeatedUint32_.isModifiable()) {
           repeatedUint32_ = makeMutableCopy(repeatedUint32_);
         }
         bitField0_ |= 0x00800000;
       }
-
       /**
        * <code>repeated uint32 repeated_uint32 = 33;</code>
-       *
        * @return A list containing the repeatedUint32.
        */
-      public java.util.List<java.lang.Integer> getRepeatedUint32List() {
+      public java.util.List<java.lang.Integer>
+          getRepeatedUint32List() {
         repeatedUint32_.makeImmutable();
         return repeatedUint32_;
       }
-
       /**
        * <code>repeated uint32 repeated_uint32 = 33;</code>
-       *
        * @return The count of repeatedUint32.
        */
       public int getRepeatedUint32Count() {
         return repeatedUint32_.size();
       }
-
       /**
        * <code>repeated uint32 repeated_uint32 = 33;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedUint32 at the given index.
        */
       public int getRepeatedUint32(int index) {
         return repeatedUint32_.getInt(index);
       }
-
       /**
        * <code>repeated uint32 repeated_uint32 = 33;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedUint32 to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedUint32(int index, int value) {
+      public Builder setRepeatedUint32(
+          int index, int value) {
 
         ensureRepeatedUint32IsMutable();
         repeatedUint32_.setInt(index, value);
@@ -15524,10 +14013,8 @@ public Builder setRepeatedUint32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint32 repeated_uint32 = 33;</code>
-       *
        * @param value The repeatedUint32 to add.
        * @return This builder for chaining.
        */
@@ -15539,24 +14026,22 @@ public Builder addRepeatedUint32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint32 repeated_uint32 = 33;</code>
-       *
        * @param values The repeatedUint32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedUint32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllRepeatedUint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureRepeatedUint32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedUint32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedUint32_);
         bitField0_ |= 0x00800000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint32 repeated_uint32 = 33;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedUint32() {
@@ -15567,51 +14052,44 @@ public Builder clearRepeatedUint32() {
       }
 
       private com.google.protobuf.Internal.LongList repeatedUint64_ = emptyLongList();
-
       private void ensureRepeatedUint64IsMutable() {
         if (!repeatedUint64_.isModifiable()) {
           repeatedUint64_ = makeMutableCopy(repeatedUint64_);
         }
         bitField0_ |= 0x01000000;
       }
-
       /**
        * <code>repeated uint64 repeated_uint64 = 34;</code>
-       *
        * @return A list containing the repeatedUint64.
        */
-      public java.util.List<java.lang.Long> getRepeatedUint64List() {
+      public java.util.List<java.lang.Long>
+          getRepeatedUint64List() {
         repeatedUint64_.makeImmutable();
         return repeatedUint64_;
       }
-
       /**
        * <code>repeated uint64 repeated_uint64 = 34;</code>
-       *
        * @return The count of repeatedUint64.
        */
       public int getRepeatedUint64Count() {
         return repeatedUint64_.size();
       }
-
       /**
        * <code>repeated uint64 repeated_uint64 = 34;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedUint64 at the given index.
        */
       public long getRepeatedUint64(int index) {
         return repeatedUint64_.getLong(index);
       }
-
       /**
        * <code>repeated uint64 repeated_uint64 = 34;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedUint64 to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedUint64(int index, long value) {
+      public Builder setRepeatedUint64(
+          int index, long value) {
 
         ensureRepeatedUint64IsMutable();
         repeatedUint64_.setLong(index, value);
@@ -15619,10 +14097,8 @@ public Builder setRepeatedUint64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint64 repeated_uint64 = 34;</code>
-       *
        * @param value The repeatedUint64 to add.
        * @return This builder for chaining.
        */
@@ -15634,24 +14110,22 @@ public Builder addRepeatedUint64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint64 repeated_uint64 = 34;</code>
-       *
        * @param values The repeatedUint64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedUint64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllRepeatedUint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensureRepeatedUint64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedUint64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedUint64_);
         bitField0_ |= 0x01000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint64 repeated_uint64 = 34;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedUint64() {
@@ -15662,51 +14136,44 @@ public Builder clearRepeatedUint64() {
       }
 
       private com.google.protobuf.Internal.IntList repeatedSint32_ = emptyIntList();
-
       private void ensureRepeatedSint32IsMutable() {
         if (!repeatedSint32_.isModifiable()) {
           repeatedSint32_ = makeMutableCopy(repeatedSint32_);
         }
         bitField0_ |= 0x02000000;
       }
-
       /**
        * <code>repeated sint32 repeated_sint32 = 35;</code>
-       *
        * @return A list containing the repeatedSint32.
        */
-      public java.util.List<java.lang.Integer> getRepeatedSint32List() {
+      public java.util.List<java.lang.Integer>
+          getRepeatedSint32List() {
         repeatedSint32_.makeImmutable();
         return repeatedSint32_;
       }
-
       /**
        * <code>repeated sint32 repeated_sint32 = 35;</code>
-       *
        * @return The count of repeatedSint32.
        */
       public int getRepeatedSint32Count() {
         return repeatedSint32_.size();
       }
-
       /**
        * <code>repeated sint32 repeated_sint32 = 35;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedSint32 at the given index.
        */
       public int getRepeatedSint32(int index) {
         return repeatedSint32_.getInt(index);
       }
-
       /**
        * <code>repeated sint32 repeated_sint32 = 35;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedSint32 to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedSint32(int index, int value) {
+      public Builder setRepeatedSint32(
+          int index, int value) {
 
         ensureRepeatedSint32IsMutable();
         repeatedSint32_.setInt(index, value);
@@ -15714,10 +14181,8 @@ public Builder setRepeatedSint32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint32 repeated_sint32 = 35;</code>
-       *
        * @param value The repeatedSint32 to add.
        * @return This builder for chaining.
        */
@@ -15729,24 +14194,22 @@ public Builder addRepeatedSint32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint32 repeated_sint32 = 35;</code>
-       *
        * @param values The repeatedSint32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedSint32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllRepeatedSint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureRepeatedSint32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedSint32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedSint32_);
         bitField0_ |= 0x02000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint32 repeated_sint32 = 35;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedSint32() {
@@ -15757,51 +14220,44 @@ public Builder clearRepeatedSint32() {
       }
 
       private com.google.protobuf.Internal.LongList repeatedSint64_ = emptyLongList();
-
       private void ensureRepeatedSint64IsMutable() {
         if (!repeatedSint64_.isModifiable()) {
           repeatedSint64_ = makeMutableCopy(repeatedSint64_);
         }
         bitField0_ |= 0x04000000;
       }
-
       /**
        * <code>repeated sint64 repeated_sint64 = 36;</code>
-       *
        * @return A list containing the repeatedSint64.
        */
-      public java.util.List<java.lang.Long> getRepeatedSint64List() {
+      public java.util.List<java.lang.Long>
+          getRepeatedSint64List() {
         repeatedSint64_.makeImmutable();
         return repeatedSint64_;
       }
-
       /**
        * <code>repeated sint64 repeated_sint64 = 36;</code>
-       *
        * @return The count of repeatedSint64.
        */
       public int getRepeatedSint64Count() {
         return repeatedSint64_.size();
       }
-
       /**
        * <code>repeated sint64 repeated_sint64 = 36;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedSint64 at the given index.
        */
       public long getRepeatedSint64(int index) {
         return repeatedSint64_.getLong(index);
       }
-
       /**
        * <code>repeated sint64 repeated_sint64 = 36;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedSint64 to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedSint64(int index, long value) {
+      public Builder setRepeatedSint64(
+          int index, long value) {
 
         ensureRepeatedSint64IsMutable();
         repeatedSint64_.setLong(index, value);
@@ -15809,10 +14265,8 @@ public Builder setRepeatedSint64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint64 repeated_sint64 = 36;</code>
-       *
        * @param value The repeatedSint64 to add.
        * @return This builder for chaining.
        */
@@ -15824,24 +14278,22 @@ public Builder addRepeatedSint64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint64 repeated_sint64 = 36;</code>
-       *
        * @param values The repeatedSint64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedSint64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllRepeatedSint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensureRepeatedSint64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedSint64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedSint64_);
         bitField0_ |= 0x04000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint64 repeated_sint64 = 36;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedSint64() {
@@ -15852,58 +14304,50 @@ public Builder clearRepeatedSint64() {
       }
 
       private com.google.protobuf.Internal.IntList repeatedFixed32_ = emptyIntList();
-
       private void ensureRepeatedFixed32IsMutable() {
         if (!repeatedFixed32_.isModifiable()) {
           repeatedFixed32_ = makeMutableCopy(repeatedFixed32_);
         }
         bitField0_ |= 0x08000000;
       }
-
       private void ensureRepeatedFixed32IsMutable(int capacity) {
         if (!repeatedFixed32_.isModifiable()) {
           repeatedFixed32_ = makeMutableCopy(repeatedFixed32_, capacity);
         }
         bitField0_ |= 0x08000000;
       }
-
       /**
        * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-       *
        * @return A list containing the repeatedFixed32.
        */
-      public java.util.List<java.lang.Integer> getRepeatedFixed32List() {
+      public java.util.List<java.lang.Integer>
+          getRepeatedFixed32List() {
         repeatedFixed32_.makeImmutable();
         return repeatedFixed32_;
       }
-
       /**
        * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-       *
        * @return The count of repeatedFixed32.
        */
       public int getRepeatedFixed32Count() {
         return repeatedFixed32_.size();
       }
-
       /**
        * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedFixed32 at the given index.
        */
       public int getRepeatedFixed32(int index) {
         return repeatedFixed32_.getInt(index);
       }
-
       /**
        * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedFixed32 to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedFixed32(int index, int value) {
+      public Builder setRepeatedFixed32(
+          int index, int value) {
 
         ensureRepeatedFixed32IsMutable();
         repeatedFixed32_.setInt(index, value);
@@ -15911,10 +14355,8 @@ public Builder setRepeatedFixed32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-       *
        * @param value The repeatedFixed32 to add.
        * @return This builder for chaining.
        */
@@ -15926,24 +14368,22 @@ public Builder addRepeatedFixed32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-       *
        * @param values The repeatedFixed32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedFixed32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllRepeatedFixed32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureRepeatedFixed32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedFixed32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedFixed32_);
         bitField0_ |= 0x08000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedFixed32() {
@@ -15954,58 +14394,50 @@ public Builder clearRepeatedFixed32() {
       }
 
       private com.google.protobuf.Internal.LongList repeatedFixed64_ = emptyLongList();
-
       private void ensureRepeatedFixed64IsMutable() {
         if (!repeatedFixed64_.isModifiable()) {
           repeatedFixed64_ = makeMutableCopy(repeatedFixed64_);
         }
         bitField0_ |= 0x10000000;
       }
-
       private void ensureRepeatedFixed64IsMutable(int capacity) {
         if (!repeatedFixed64_.isModifiable()) {
           repeatedFixed64_ = makeMutableCopy(repeatedFixed64_, capacity);
         }
         bitField0_ |= 0x10000000;
       }
-
       /**
        * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-       *
        * @return A list containing the repeatedFixed64.
        */
-      public java.util.List<java.lang.Long> getRepeatedFixed64List() {
+      public java.util.List<java.lang.Long>
+          getRepeatedFixed64List() {
         repeatedFixed64_.makeImmutable();
         return repeatedFixed64_;
       }
-
       /**
        * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-       *
        * @return The count of repeatedFixed64.
        */
       public int getRepeatedFixed64Count() {
         return repeatedFixed64_.size();
       }
-
       /**
        * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedFixed64 at the given index.
        */
       public long getRepeatedFixed64(int index) {
         return repeatedFixed64_.getLong(index);
       }
-
       /**
        * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedFixed64 to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedFixed64(int index, long value) {
+      public Builder setRepeatedFixed64(
+          int index, long value) {
 
         ensureRepeatedFixed64IsMutable();
         repeatedFixed64_.setLong(index, value);
@@ -16013,10 +14445,8 @@ public Builder setRepeatedFixed64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-       *
        * @param value The repeatedFixed64 to add.
        * @return This builder for chaining.
        */
@@ -16028,24 +14458,22 @@ public Builder addRepeatedFixed64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-       *
        * @param values The repeatedFixed64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedFixed64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllRepeatedFixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensureRepeatedFixed64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedFixed64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedFixed64_);
         bitField0_ |= 0x10000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedFixed64() {
@@ -16056,58 +14484,50 @@ public Builder clearRepeatedFixed64() {
       }
 
       private com.google.protobuf.Internal.IntList repeatedSfixed32_ = emptyIntList();
-
       private void ensureRepeatedSfixed32IsMutable() {
         if (!repeatedSfixed32_.isModifiable()) {
           repeatedSfixed32_ = makeMutableCopy(repeatedSfixed32_);
         }
         bitField0_ |= 0x20000000;
       }
-
       private void ensureRepeatedSfixed32IsMutable(int capacity) {
         if (!repeatedSfixed32_.isModifiable()) {
           repeatedSfixed32_ = makeMutableCopy(repeatedSfixed32_, capacity);
         }
         bitField0_ |= 0x20000000;
       }
-
       /**
        * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-       *
        * @return A list containing the repeatedSfixed32.
        */
-      public java.util.List<java.lang.Integer> getRepeatedSfixed32List() {
+      public java.util.List<java.lang.Integer>
+          getRepeatedSfixed32List() {
         repeatedSfixed32_.makeImmutable();
         return repeatedSfixed32_;
       }
-
       /**
        * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-       *
        * @return The count of repeatedSfixed32.
        */
       public int getRepeatedSfixed32Count() {
         return repeatedSfixed32_.size();
       }
-
       /**
        * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedSfixed32 at the given index.
        */
       public int getRepeatedSfixed32(int index) {
         return repeatedSfixed32_.getInt(index);
       }
-
       /**
        * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedSfixed32 to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedSfixed32(int index, int value) {
+      public Builder setRepeatedSfixed32(
+          int index, int value) {
 
         ensureRepeatedSfixed32IsMutable();
         repeatedSfixed32_.setInt(index, value);
@@ -16115,10 +14535,8 @@ public Builder setRepeatedSfixed32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-       *
        * @param value The repeatedSfixed32 to add.
        * @return This builder for chaining.
        */
@@ -16130,25 +14548,22 @@ public Builder addRepeatedSfixed32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-       *
        * @param values The repeatedSfixed32 to add.
        * @return This builder for chaining.
        */
       public Builder addAllRepeatedSfixed32(
           java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureRepeatedSfixed32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedSfixed32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedSfixed32_);
         bitField0_ |= 0x20000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedSfixed32() {
@@ -16159,58 +14574,50 @@ public Builder clearRepeatedSfixed32() {
       }
 
       private com.google.protobuf.Internal.LongList repeatedSfixed64_ = emptyLongList();
-
       private void ensureRepeatedSfixed64IsMutable() {
         if (!repeatedSfixed64_.isModifiable()) {
           repeatedSfixed64_ = makeMutableCopy(repeatedSfixed64_);
         }
         bitField0_ |= 0x40000000;
       }
-
       private void ensureRepeatedSfixed64IsMutable(int capacity) {
         if (!repeatedSfixed64_.isModifiable()) {
           repeatedSfixed64_ = makeMutableCopy(repeatedSfixed64_, capacity);
         }
         bitField0_ |= 0x40000000;
       }
-
       /**
        * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-       *
        * @return A list containing the repeatedSfixed64.
        */
-      public java.util.List<java.lang.Long> getRepeatedSfixed64List() {
+      public java.util.List<java.lang.Long>
+          getRepeatedSfixed64List() {
         repeatedSfixed64_.makeImmutable();
         return repeatedSfixed64_;
       }
-
       /**
        * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-       *
        * @return The count of repeatedSfixed64.
        */
       public int getRepeatedSfixed64Count() {
         return repeatedSfixed64_.size();
       }
-
       /**
        * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedSfixed64 at the given index.
        */
       public long getRepeatedSfixed64(int index) {
         return repeatedSfixed64_.getLong(index);
       }
-
       /**
        * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedSfixed64 to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedSfixed64(int index, long value) {
+      public Builder setRepeatedSfixed64(
+          int index, long value) {
 
         ensureRepeatedSfixed64IsMutable();
         repeatedSfixed64_.setLong(index, value);
@@ -16218,10 +14625,8 @@ public Builder setRepeatedSfixed64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-       *
        * @param value The repeatedSfixed64 to add.
        * @return This builder for chaining.
        */
@@ -16233,24 +14638,22 @@ public Builder addRepeatedSfixed64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-       *
        * @param values The repeatedSfixed64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedSfixed64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllRepeatedSfixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensureRepeatedSfixed64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedSfixed64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedSfixed64_);
         bitField0_ |= 0x40000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedSfixed64() {
@@ -16261,58 +14664,50 @@ public Builder clearRepeatedSfixed64() {
       }
 
       private com.google.protobuf.Internal.FloatList repeatedFloat_ = emptyFloatList();
-
       private void ensureRepeatedFloatIsMutable() {
         if (!repeatedFloat_.isModifiable()) {
           repeatedFloat_ = makeMutableCopy(repeatedFloat_);
         }
         bitField0_ |= 0x80000000;
       }
-
       private void ensureRepeatedFloatIsMutable(int capacity) {
         if (!repeatedFloat_.isModifiable()) {
           repeatedFloat_ = makeMutableCopy(repeatedFloat_, capacity);
         }
         bitField0_ |= 0x80000000;
       }
-
       /**
        * <code>repeated float repeated_float = 41;</code>
-       *
        * @return A list containing the repeatedFloat.
        */
-      public java.util.List<java.lang.Float> getRepeatedFloatList() {
+      public java.util.List<java.lang.Float>
+          getRepeatedFloatList() {
         repeatedFloat_.makeImmutable();
         return repeatedFloat_;
       }
-
       /**
        * <code>repeated float repeated_float = 41;</code>
-       *
        * @return The count of repeatedFloat.
        */
       public int getRepeatedFloatCount() {
         return repeatedFloat_.size();
       }
-
       /**
        * <code>repeated float repeated_float = 41;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedFloat at the given index.
        */
       public float getRepeatedFloat(int index) {
         return repeatedFloat_.getFloat(index);
       }
-
       /**
        * <code>repeated float repeated_float = 41;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedFloat to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedFloat(int index, float value) {
+      public Builder setRepeatedFloat(
+          int index, float value) {
 
         ensureRepeatedFloatIsMutable();
         repeatedFloat_.setFloat(index, value);
@@ -16320,10 +14715,8 @@ public Builder setRepeatedFloat(int index, float value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated float repeated_float = 41;</code>
-       *
        * @param value The repeatedFloat to add.
        * @return This builder for chaining.
        */
@@ -16335,24 +14728,22 @@ public Builder addRepeatedFloat(float value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated float repeated_float = 41;</code>
-       *
        * @param values The repeatedFloat to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedFloat(java.lang.Iterable<? extends java.lang.Float> values) {
+      public Builder addAllRepeatedFloat(
+          java.lang.Iterable<? extends java.lang.Float> values) {
         ensureRepeatedFloatIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedFloat_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedFloat_);
         bitField0_ |= 0x80000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated float repeated_float = 41;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedFloat() {
@@ -16363,58 +14754,50 @@ public Builder clearRepeatedFloat() {
       }
 
       private com.google.protobuf.Internal.DoubleList repeatedDouble_ = emptyDoubleList();
-
       private void ensureRepeatedDoubleIsMutable() {
         if (!repeatedDouble_.isModifiable()) {
           repeatedDouble_ = makeMutableCopy(repeatedDouble_);
         }
         bitField1_ |= 0x00000001;
       }
-
       private void ensureRepeatedDoubleIsMutable(int capacity) {
         if (!repeatedDouble_.isModifiable()) {
           repeatedDouble_ = makeMutableCopy(repeatedDouble_, capacity);
         }
         bitField1_ |= 0x00000001;
       }
-
       /**
        * <code>repeated double repeated_double = 42;</code>
-       *
        * @return A list containing the repeatedDouble.
        */
-      public java.util.List<java.lang.Double> getRepeatedDoubleList() {
+      public java.util.List<java.lang.Double>
+          getRepeatedDoubleList() {
         repeatedDouble_.makeImmutable();
         return repeatedDouble_;
       }
-
       /**
        * <code>repeated double repeated_double = 42;</code>
-       *
        * @return The count of repeatedDouble.
        */
       public int getRepeatedDoubleCount() {
         return repeatedDouble_.size();
       }
-
       /**
        * <code>repeated double repeated_double = 42;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedDouble at the given index.
        */
       public double getRepeatedDouble(int index) {
         return repeatedDouble_.getDouble(index);
       }
-
       /**
        * <code>repeated double repeated_double = 42;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedDouble to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedDouble(int index, double value) {
+      public Builder setRepeatedDouble(
+          int index, double value) {
 
         ensureRepeatedDoubleIsMutable();
         repeatedDouble_.setDouble(index, value);
@@ -16422,10 +14805,8 @@ public Builder setRepeatedDouble(int index, double value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated double repeated_double = 42;</code>
-       *
        * @param value The repeatedDouble to add.
        * @return This builder for chaining.
        */
@@ -16437,24 +14818,22 @@ public Builder addRepeatedDouble(double value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated double repeated_double = 42;</code>
-       *
        * @param values The repeatedDouble to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedDouble(java.lang.Iterable<? extends java.lang.Double> values) {
+      public Builder addAllRepeatedDouble(
+          java.lang.Iterable<? extends java.lang.Double> values) {
         ensureRepeatedDoubleIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedDouble_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedDouble_);
         bitField1_ |= 0x00000001;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated double repeated_double = 42;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedDouble() {
@@ -16465,58 +14844,50 @@ public Builder clearRepeatedDouble() {
       }
 
       private com.google.protobuf.Internal.BooleanList repeatedBool_ = emptyBooleanList();
-
       private void ensureRepeatedBoolIsMutable() {
         if (!repeatedBool_.isModifiable()) {
           repeatedBool_ = makeMutableCopy(repeatedBool_);
         }
         bitField1_ |= 0x00000002;
       }
-
       private void ensureRepeatedBoolIsMutable(int capacity) {
         if (!repeatedBool_.isModifiable()) {
           repeatedBool_ = makeMutableCopy(repeatedBool_, capacity);
         }
         bitField1_ |= 0x00000002;
       }
-
       /**
        * <code>repeated bool repeated_bool = 43;</code>
-       *
        * @return A list containing the repeatedBool.
        */
-      public java.util.List<java.lang.Boolean> getRepeatedBoolList() {
+      public java.util.List<java.lang.Boolean>
+          getRepeatedBoolList() {
         repeatedBool_.makeImmutable();
         return repeatedBool_;
       }
-
       /**
        * <code>repeated bool repeated_bool = 43;</code>
-       *
        * @return The count of repeatedBool.
        */
       public int getRepeatedBoolCount() {
         return repeatedBool_.size();
       }
-
       /**
        * <code>repeated bool repeated_bool = 43;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedBool at the given index.
        */
       public boolean getRepeatedBool(int index) {
         return repeatedBool_.getBoolean(index);
       }
-
       /**
        * <code>repeated bool repeated_bool = 43;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedBool to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedBool(int index, boolean value) {
+      public Builder setRepeatedBool(
+          int index, boolean value) {
 
         ensureRepeatedBoolIsMutable();
         repeatedBool_.setBoolean(index, value);
@@ -16524,10 +14895,8 @@ public Builder setRepeatedBool(int index, boolean value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bool repeated_bool = 43;</code>
-       *
        * @param value The repeatedBool to add.
        * @return This builder for chaining.
        */
@@ -16539,24 +14908,22 @@ public Builder addRepeatedBool(boolean value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bool repeated_bool = 43;</code>
-       *
        * @param values The repeatedBool to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedBool(java.lang.Iterable<? extends java.lang.Boolean> values) {
+      public Builder addAllRepeatedBool(
+          java.lang.Iterable<? extends java.lang.Boolean> values) {
         ensureRepeatedBoolIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedBool_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedBool_);
         bitField1_ |= 0x00000002;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bool repeated_bool = 43;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedBool() {
@@ -16568,125 +14935,107 @@ public Builder clearRepeatedBool() {
 
       private com.google.protobuf.LazyStringArrayList repeatedString_ =
           com.google.protobuf.LazyStringArrayList.emptyList();
-
       private void ensureRepeatedStringIsMutable() {
         if (!repeatedString_.isModifiable()) {
           repeatedString_ = new com.google.protobuf.LazyStringArrayList(repeatedString_);
         }
         bitField1_ |= 0x00000004;
       }
-
       /**
        * <code>repeated string repeated_string = 44;</code>
-       *
        * @return A list containing the repeatedString.
        */
-      public com.google.protobuf.ProtocolStringList getRepeatedStringList() {
+      public com.google.protobuf.ProtocolStringList
+          getRepeatedStringList() {
         repeatedString_.makeImmutable();
         return repeatedString_;
       }
-
       /**
        * <code>repeated string repeated_string = 44;</code>
-       *
        * @return The count of repeatedString.
        */
       public int getRepeatedStringCount() {
         return repeatedString_.size();
       }
-
       /**
        * <code>repeated string repeated_string = 44;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedString at the given index.
        */
       public java.lang.String getRepeatedString(int index) {
         return repeatedString_.get(index);
       }
-
       /**
        * <code>repeated string repeated_string = 44;</code>
-       *
        * @param index The index of the value to return.
        * @return The bytes of the repeatedString at the given index.
        */
-      public com.google.protobuf.ByteString getRepeatedStringBytes(int index) {
+      public com.google.protobuf.ByteString
+          getRepeatedStringBytes(int index) {
         return repeatedString_.getByteString(index);
       }
-
       /**
        * <code>repeated string repeated_string = 44;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedString to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedString(int index, java.lang.String value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setRepeatedString(
+          int index, java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
         ensureRepeatedStringIsMutable();
         repeatedString_.set(index, value);
         bitField1_ |= 0x00000004;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated string repeated_string = 44;</code>
-       *
        * @param value The repeatedString to add.
        * @return This builder for chaining.
        */
-      public Builder addRepeatedString(java.lang.String value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder addRepeatedString(
+          java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
         ensureRepeatedStringIsMutable();
         repeatedString_.add(value);
         bitField1_ |= 0x00000004;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated string repeated_string = 44;</code>
-       *
        * @param values The repeatedString to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedString(java.lang.Iterable<java.lang.String> values) {
+      public Builder addAllRepeatedString(
+          java.lang.Iterable<java.lang.String> values) {
         ensureRepeatedStringIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedString_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedString_);
         bitField1_ |= 0x00000004;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated string repeated_string = 44;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedString() {
-        repeatedString_ = com.google.protobuf.LazyStringArrayList.emptyList();
-        bitField1_ = (bitField1_ & ~0x00000004);
-        ;
+        repeatedString_ =
+          com.google.protobuf.LazyStringArrayList.emptyList();
+        bitField1_ = (bitField1_ & ~0x00000004);;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated string repeated_string = 44;</code>
-       *
        * @param value The bytes of the repeatedString to add.
        * @return This builder for chaining.
        */
-      public Builder addRepeatedStringBytes(com.google.protobuf.ByteString value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder addRepeatedStringBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
         checkByteStringIsUtf8(value);
         ensureRepeatedStringIsMutable();
         repeatedString_.add(value);
@@ -16695,98 +15044,81 @@ public Builder addRepeatedStringBytes(com.google.protobuf.ByteString value) {
         return this;
       }
 
-      private com.google.protobuf.Internal.ProtobufList<com.google.protobuf.ByteString>
-          repeatedBytes_ = emptyList(com.google.protobuf.ByteString.class);
-
+      private com.google.protobuf.Internal.ProtobufList<com.google.protobuf.ByteString> repeatedBytes_ = emptyList(com.google.protobuf.ByteString.class);
       private void ensureRepeatedBytesIsMutable() {
         if (!repeatedBytes_.isModifiable()) {
           repeatedBytes_ = makeMutableCopy(repeatedBytes_);
         }
         bitField1_ |= 0x00000008;
       }
-
       /**
        * <code>repeated bytes repeated_bytes = 45;</code>
-       *
        * @return A list containing the repeatedBytes.
        */
-      public java.util.List<com.google.protobuf.ByteString> getRepeatedBytesList() {
+      public java.util.List<com.google.protobuf.ByteString>
+          getRepeatedBytesList() {
         repeatedBytes_.makeImmutable();
         return repeatedBytes_;
       }
-
       /**
        * <code>repeated bytes repeated_bytes = 45;</code>
-       *
        * @return The count of repeatedBytes.
        */
       public int getRepeatedBytesCount() {
         return repeatedBytes_.size();
       }
-
       /**
        * <code>repeated bytes repeated_bytes = 45;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedBytes at the given index.
        */
       public com.google.protobuf.ByteString getRepeatedBytes(int index) {
         return repeatedBytes_.get(index);
       }
-
       /**
        * <code>repeated bytes repeated_bytes = 45;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedBytes to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedBytes(int index, com.google.protobuf.ByteString value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setRepeatedBytes(
+          int index, com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
         ensureRepeatedBytesIsMutable();
         repeatedBytes_.set(index, value);
         bitField1_ |= 0x00000008;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bytes repeated_bytes = 45;</code>
-       *
        * @param value The repeatedBytes to add.
        * @return This builder for chaining.
        */
       public Builder addRepeatedBytes(com.google.protobuf.ByteString value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         ensureRepeatedBytesIsMutable();
         repeatedBytes_.add(value);
         bitField1_ |= 0x00000008;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bytes repeated_bytes = 45;</code>
-       *
        * @param values The repeatedBytes to add.
        * @return This builder for chaining.
        */
       public Builder addAllRepeatedBytes(
           java.lang.Iterable<? extends com.google.protobuf.ByteString> values) {
         ensureRepeatedBytesIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedBytes_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedBytes_);
         bitField1_ |= 0x00000008;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bytes repeated_bytes = 45;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedBytes() {
@@ -16796,47 +15128,30 @@ public Builder clearRepeatedBytes() {
         return this;
       }
 
-      private java.util.List<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-          repeatedNestedMessage_ = java.util.Collections.emptyList();
-
+      private java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> repeatedNestedMessage_ =
+        java.util.Collections.emptyList();
       private void ensureRepeatedNestedMessageIsMutable() {
         if (!((bitField1_ & 0x00000010) != 0)) {
-          repeatedNestedMessage_ =
-              new java.util.ArrayList<
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage>(repeatedNestedMessage_);
+          repeatedNestedMessage_ = new java.util.ArrayList<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>(repeatedNestedMessage_);
           bitField1_ |= 0x00000010;
-        }
+         }
       }
 
       private com.google.protobuf.RepeatedFieldBuilder<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .NestedMessageOrBuilder>
-          repeatedNestedMessageBuilder_;
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> repeatedNestedMessageBuilder_;
 
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
-      public java.util.List<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-          getRepeatedNestedMessageList() {
+      public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> getRepeatedNestedMessageList() {
         if (repeatedNestedMessageBuilder_ == null) {
           return java.util.Collections.unmodifiableList(repeatedNestedMessage_);
         } else {
           return repeatedNestedMessageBuilder_.getMessageList();
         }
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
       public int getRepeatedNestedMessageCount() {
         if (repeatedNestedMessageBuilder_ == null) {
@@ -16845,30 +15160,21 @@ public int getRepeatedNestedMessageCount() {
           return repeatedNestedMessageBuilder_.getCount();
         }
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-          getRepeatedNestedMessage(int index) {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getRepeatedNestedMessage(int index) {
         if (repeatedNestedMessageBuilder_ == null) {
           return repeatedNestedMessage_.get(index);
         } else {
           return repeatedNestedMessageBuilder_.getMessage(index);
         }
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
       public Builder setRepeatedNestedMessage(
-          int index,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              value) {
+          int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage value) {
         if (repeatedNestedMessageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -16881,17 +15187,11 @@ public Builder setRepeatedNestedMessage(
         }
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
       public Builder setRepeatedNestedMessage(
-          int index,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder
-              builderForValue) {
+          int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder builderForValue) {
         if (repeatedNestedMessageBuilder_ == null) {
           ensureRepeatedNestedMessageIsMutable();
           repeatedNestedMessage_.set(index, builderForValue.build());
@@ -16901,15 +15201,10 @@ public Builder setRepeatedNestedMessage(
         }
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
-      public Builder addRepeatedNestedMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              value) {
+      public Builder addRepeatedNestedMessage(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage value) {
         if (repeatedNestedMessageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -16922,16 +15217,11 @@ public Builder addRepeatedNestedMessage(
         }
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
       public Builder addRepeatedNestedMessage(
-          int index,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              value) {
+          int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage value) {
         if (repeatedNestedMessageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -16944,16 +15234,11 @@ public Builder addRepeatedNestedMessage(
         }
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
       public Builder addRepeatedNestedMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder
-              builderForValue) {
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder builderForValue) {
         if (repeatedNestedMessageBuilder_ == null) {
           ensureRepeatedNestedMessageIsMutable();
           repeatedNestedMessage_.add(builderForValue.build());
@@ -16963,17 +15248,11 @@ public Builder addRepeatedNestedMessage(
         }
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
       public Builder addRepeatedNestedMessage(
-          int index,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder
-              builderForValue) {
+          int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder builderForValue) {
         if (repeatedNestedMessageBuilder_ == null) {
           ensureRepeatedNestedMessageIsMutable();
           repeatedNestedMessage_.add(index, builderForValue.build());
@@ -16983,32 +15262,23 @@ public Builder addRepeatedNestedMessage(
         }
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
       public Builder addAllRepeatedNestedMessage(
-          java.lang.Iterable<
-                  ? extends
-                      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                          .NestedMessage>
-              values) {
+          java.lang.Iterable<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> values) {
         if (repeatedNestedMessageBuilder_ == null) {
           ensureRepeatedNestedMessageIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedNestedMessage_);
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, repeatedNestedMessage_);
           onChanged();
         } else {
           repeatedNestedMessageBuilder_.addAllMessages(values);
         }
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
       public Builder clearRepeatedNestedMessage() {
         if (repeatedNestedMessageBuilder_ == null) {
@@ -17020,11 +15290,8 @@ public Builder clearRepeatedNestedMessage() {
         }
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
       public Builder removeRepeatedNestedMessage(int index) {
         if (repeatedNestedMessageBuilder_ == null) {
@@ -17036,107 +15303,62 @@ public Builder removeRepeatedNestedMessage(int index) {
         }
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .Builder
-          getRepeatedNestedMessageBuilder(int index) {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder getRepeatedNestedMessageBuilder(
+          int index) {
         return getRepeatedNestedMessageFieldBuilder().getBuilder(index);
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessageOrBuilder
-          getRepeatedNestedMessageOrBuilder(int index) {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder getRepeatedNestedMessageOrBuilder(
+          int index) {
         if (repeatedNestedMessageBuilder_ == null) {
-          return repeatedNestedMessage_.get(index);
-        } else {
+          return repeatedNestedMessage_.get(index);  } else {
           return repeatedNestedMessageBuilder_.getMessageOrBuilder(index);
         }
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
-      public java.util.List<
-              ? extends
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessageOrBuilder>
-          getRepeatedNestedMessageOrBuilderList() {
+      public java.util.List<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> 
+           getRepeatedNestedMessageOrBuilderList() {
         if (repeatedNestedMessageBuilder_ != null) {
           return repeatedNestedMessageBuilder_.getMessageOrBuilderList();
         } else {
           return java.util.Collections.unmodifiableList(repeatedNestedMessage_);
         }
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .Builder
-          addRepeatedNestedMessageBuilder() {
-        return getRepeatedNestedMessageFieldBuilder()
-            .addBuilder(
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                    .getDefaultInstance());
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder addRepeatedNestedMessageBuilder() {
+        return getRepeatedNestedMessageFieldBuilder().addBuilder(
+            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance());
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .Builder
-          addRepeatedNestedMessageBuilder(int index) {
-        return getRepeatedNestedMessageFieldBuilder()
-            .addBuilder(
-                index,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                    .getDefaultInstance());
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder addRepeatedNestedMessageBuilder(
+          int index) {
+        return getRepeatedNestedMessageFieldBuilder().addBuilder(
+            index, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance());
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
-      public java.util.List<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder>
-          getRepeatedNestedMessageBuilderList() {
+      public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder> 
+           getRepeatedNestedMessageBuilderList() {
         return getRepeatedNestedMessageFieldBuilder().getBuilderList();
       }
-
       private com.google.protobuf.RepeatedFieldBuilder<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .NestedMessageOrBuilder>
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> 
           getRepeatedNestedMessageFieldBuilder() {
         if (repeatedNestedMessageBuilder_ == null) {
-          repeatedNestedMessageBuilder_ =
-              new com.google.protobuf.RepeatedFieldBuilder<
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage.Builder,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessageOrBuilder>(
+          repeatedNestedMessageBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder>(
                   repeatedNestedMessage_,
                   ((bitField1_ & 0x00000010) != 0),
                   getParentForChildren(),
@@ -17146,41 +15368,30 @@ public Builder removeRepeatedNestedMessage(int index) {
         return repeatedNestedMessageBuilder_;
       }
 
-      private java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-          repeatedForeignMessage_ = java.util.Collections.emptyList();
-
+      private java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> repeatedForeignMessage_ =
+        java.util.Collections.emptyList();
       private void ensureRepeatedForeignMessageIsMutable() {
         if (!((bitField1_ & 0x00000020) != 0)) {
-          repeatedForeignMessage_ =
-              new java.util.ArrayList<
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>(
-                  repeatedForeignMessage_);
+          repeatedForeignMessage_ = new java.util.ArrayList<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>(repeatedForeignMessage_);
           bitField1_ |= 0x00000020;
-        }
+         }
       }
 
       private com.google.protobuf.RepeatedFieldBuilder<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>
-          repeatedForeignMessageBuilder_;
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder> repeatedForeignMessageBuilder_;
 
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
-      public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-          getRepeatedForeignMessageList() {
+      public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> getRepeatedForeignMessageList() {
         if (repeatedForeignMessageBuilder_ == null) {
           return java.util.Collections.unmodifiableList(repeatedForeignMessage_);
         } else {
           return repeatedForeignMessageBuilder_.getMessageList();
         }
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
       public int getRepeatedForeignMessageCount() {
         if (repeatedForeignMessageBuilder_ == null) {
@@ -17189,23 +15400,18 @@ public int getRepeatedForeignMessageCount() {
           return repeatedForeignMessageBuilder_.getCount();
         }
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-          getRepeatedForeignMessage(int index) {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedForeignMessage(int index) {
         if (repeatedForeignMessageBuilder_ == null) {
           return repeatedForeignMessage_.get(index);
         } else {
           return repeatedForeignMessageBuilder_.getMessage(index);
         }
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
       public Builder setRepeatedForeignMessage(
           int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage value) {
@@ -17221,15 +15427,11 @@ public Builder setRepeatedForeignMessage(
         }
         return this;
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
       public Builder setRepeatedForeignMessage(
-          int index,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder
-              builderForValue) {
+          int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder builderForValue) {
         if (repeatedForeignMessageBuilder_ == null) {
           ensureRepeatedForeignMessageIsMutable();
           repeatedForeignMessage_.set(index, builderForValue.build());
@@ -17239,13 +15441,10 @@ public Builder setRepeatedForeignMessage(
         }
         return this;
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
-      public Builder addRepeatedForeignMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage value) {
+      public Builder addRepeatedForeignMessage(legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage value) {
         if (repeatedForeignMessageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -17258,10 +15457,8 @@ public Builder addRepeatedForeignMessage(
         }
         return this;
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
       public Builder addRepeatedForeignMessage(
           int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage value) {
@@ -17277,14 +15474,11 @@ public Builder addRepeatedForeignMessage(
         }
         return this;
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
       public Builder addRepeatedForeignMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder
-              builderForValue) {
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder builderForValue) {
         if (repeatedForeignMessageBuilder_ == null) {
           ensureRepeatedForeignMessageIsMutable();
           repeatedForeignMessage_.add(builderForValue.build());
@@ -17294,15 +15488,11 @@ public Builder addRepeatedForeignMessage(
         }
         return this;
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
       public Builder addRepeatedForeignMessage(
-          int index,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder
-              builderForValue) {
+          int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder builderForValue) {
         if (repeatedForeignMessageBuilder_ == null) {
           ensureRepeatedForeignMessageIsMutable();
           repeatedForeignMessage_.add(index, builderForValue.build());
@@ -17312,28 +15502,23 @@ public Builder addRepeatedForeignMessage(
         }
         return this;
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
       public Builder addAllRepeatedForeignMessage(
-          java.lang.Iterable<
-                  ? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-              values) {
+          java.lang.Iterable<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> values) {
         if (repeatedForeignMessageBuilder_ == null) {
           ensureRepeatedForeignMessageIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedForeignMessage_);
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, repeatedForeignMessage_);
           onChanged();
         } else {
           repeatedForeignMessageBuilder_.addAllMessages(values);
         }
         return this;
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
       public Builder clearRepeatedForeignMessage() {
         if (repeatedForeignMessageBuilder_ == null) {
@@ -17345,10 +15530,8 @@ public Builder clearRepeatedForeignMessage() {
         }
         return this;
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
       public Builder removeRepeatedForeignMessage(int index) {
         if (repeatedForeignMessageBuilder_ == null) {
@@ -17360,89 +15543,62 @@ public Builder removeRepeatedForeignMessage(int index) {
         }
         return this;
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder
-          getRepeatedForeignMessageBuilder(int index) {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder getRepeatedForeignMessageBuilder(
+          int index) {
         return getRepeatedForeignMessageFieldBuilder().getBuilder(index);
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder
-          getRepeatedForeignMessageOrBuilder(int index) {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder getRepeatedForeignMessageOrBuilder(
+          int index) {
         if (repeatedForeignMessageBuilder_ == null) {
-          return repeatedForeignMessage_.get(index);
-        } else {
+          return repeatedForeignMessage_.get(index);  } else {
           return repeatedForeignMessageBuilder_.getMessageOrBuilder(index);
         }
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
-      public java.util.List<
-              ? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>
-          getRepeatedForeignMessageOrBuilderList() {
+      public java.util.List<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder> 
+           getRepeatedForeignMessageOrBuilderList() {
         if (repeatedForeignMessageBuilder_ != null) {
           return repeatedForeignMessageBuilder_.getMessageOrBuilderList();
         } else {
           return java.util.Collections.unmodifiableList(repeatedForeignMessage_);
         }
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder
-          addRepeatedForeignMessageBuilder() {
-        return getRepeatedForeignMessageFieldBuilder()
-            .addBuilder(
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-                    .getDefaultInstance());
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder addRepeatedForeignMessageBuilder() {
+        return getRepeatedForeignMessageFieldBuilder().addBuilder(
+            legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance());
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder
-          addRepeatedForeignMessageBuilder(int index) {
-        return getRepeatedForeignMessageFieldBuilder()
-            .addBuilder(
-                index,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-                    .getDefaultInstance());
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder addRepeatedForeignMessageBuilder(
+          int index) {
+        return getRepeatedForeignMessageFieldBuilder().addBuilder(
+            index, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance());
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
-      public java.util.List<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder>
-          getRepeatedForeignMessageBuilderList() {
+      public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder> 
+           getRepeatedForeignMessageBuilderList() {
         return getRepeatedForeignMessageFieldBuilder().getBuilderList();
       }
-
       private com.google.protobuf.RepeatedFieldBuilder<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder> 
           getRepeatedForeignMessageFieldBuilder() {
         if (repeatedForeignMessageBuilder_ == null) {
-          repeatedForeignMessageBuilder_ =
-              new com.google.protobuf.RepeatedFieldBuilder<
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>(
+          repeatedForeignMessageBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>(
                   repeatedForeignMessage_,
                   ((bitField1_ & 0x00000020) != 0),
                   getParentForChildren(),
@@ -17453,67 +15609,44 @@ public Builder removeRepeatedForeignMessage(int index) {
       }
 
       private java.util.List<java.lang.Integer> repeatedNestedEnum_ =
-          java.util.Collections.emptyList();
-
+        java.util.Collections.emptyList();
       private void ensureRepeatedNestedEnumIsMutable() {
         if (!((bitField1_ & 0x00000040) != 0)) {
           repeatedNestedEnum_ = new java.util.ArrayList<java.lang.Integer>(repeatedNestedEnum_);
           bitField1_ |= 0x00000040;
         }
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @return A list containing the repeatedNestedEnum.
        */
-      public java.util.List<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-          getRepeatedNestedEnumList() {
+      public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> getRepeatedNestedEnumList() {
         return new com.google.protobuf.Internal.ListAdapter<
-            java.lang.Integer,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(
-            repeatedNestedEnum_, repeatedNestedEnum_converter_);
+            java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(repeatedNestedEnum_, repeatedNestedEnum_converter_);
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @return The count of repeatedNestedEnum.
        */
       public int getRepeatedNestedEnumCount() {
         return repeatedNestedEnum_.size();
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @param index The index of the element to return.
        * @return The repeatedNestedEnum at the given index.
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-          getRepeatedNestedEnum(int index) {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getRepeatedNestedEnum(int index) {
         return repeatedNestedEnum_converter_.convert(repeatedNestedEnum_.get(index));
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @param index The index to set the value at.
        * @param value The repeatedNestedEnum to set.
        * @return This builder for chaining.
        */
       public Builder setRepeatedNestedEnum(
-          int index,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
+          int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -17522,17 +15655,12 @@ public Builder setRepeatedNestedEnum(
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @param value The repeatedNestedEnum to add.
        * @return This builder for chaining.
        */
-      public Builder addRepeatedNestedEnum(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
+      public Builder addRepeatedNestedEnum(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -17541,35 +15669,22 @@ public Builder addRepeatedNestedEnum(
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @param values The repeatedNestedEnum to add.
        * @return This builder for chaining.
        */
       public Builder addAllRepeatedNestedEnum(
-          java.lang.Iterable<
-                  ? extends
-                      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                          .NestedEnum>
-              values) {
+          java.lang.Iterable<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> values) {
         ensureRepeatedNestedEnumIsMutable();
-        for (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-            value : values) {
+        for (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value : values) {
           repeatedNestedEnum_.add(value.getNumber());
         }
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @return This builder for chaining.
        */
       public Builder clearRepeatedNestedEnum() {
@@ -17578,51 +15693,37 @@ public Builder clearRepeatedNestedEnum() {
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @return A list containing the enum numeric values on the wire for repeatedNestedEnum.
        */
-      public java.util.List<java.lang.Integer> getRepeatedNestedEnumValueList() {
+      public java.util.List<java.lang.Integer>
+      getRepeatedNestedEnumValueList() {
         return java.util.Collections.unmodifiableList(repeatedNestedEnum_);
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @param index The index of the value to return.
        * @return The enum numeric value on the wire of repeatedNestedEnum at the given index.
        */
       public int getRepeatedNestedEnumValue(int index) {
         return repeatedNestedEnum_.get(index);
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @param index The index to set the value at.
        * @param value The enum numeric value on the wire for repeatedNestedEnum to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedNestedEnumValue(int index, int value) {
+      public Builder setRepeatedNestedEnumValue(
+          int index, int value) {
         ensureRepeatedNestedEnumIsMutable();
         repeatedNestedEnum_.set(index, value);
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @param value The enum numeric value on the wire for repeatedNestedEnum to add.
        * @return This builder for chaining.
        */
@@ -17632,16 +15733,13 @@ public Builder addRepeatedNestedEnumValue(int value) {
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @param values The enum numeric values on the wire for repeatedNestedEnum to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedNestedEnumValue(java.lang.Iterable<java.lang.Integer> values) {
+      public Builder addAllRepeatedNestedEnumValue(
+          java.lang.Iterable<java.lang.Integer> values) {
         ensureRepeatedNestedEnumIsMutable();
         for (int value : values) {
           repeatedNestedEnum_.add(value);
@@ -17651,50 +15749,38 @@ public Builder addAllRepeatedNestedEnumValue(java.lang.Iterable<java.lang.Intege
       }
 
       private java.util.List<java.lang.Integer> repeatedForeignEnum_ =
-          java.util.Collections.emptyList();
-
+        java.util.Collections.emptyList();
       private void ensureRepeatedForeignEnumIsMutable() {
         if (!((bitField1_ & 0x00000080) != 0)) {
           repeatedForeignEnum_ = new java.util.ArrayList<java.lang.Integer>(repeatedForeignEnum_);
           bitField1_ |= 0x00000080;
         }
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @return A list containing the repeatedForeignEnum.
        */
-      public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-          getRepeatedForeignEnumList() {
+      public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum> getRepeatedForeignEnumList() {
         return new com.google.protobuf.Internal.ListAdapter<
-            java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>(
-            repeatedForeignEnum_, repeatedForeignEnum_converter_);
+            java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>(repeatedForeignEnum_, repeatedForeignEnum_converter_);
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @return The count of repeatedForeignEnum.
        */
       public int getRepeatedForeignEnumCount() {
         return repeatedForeignEnum_.size();
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedForeignEnum at the given index.
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getRepeatedForeignEnum(
-          int index) {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getRepeatedForeignEnum(int index) {
         return repeatedForeignEnum_converter_.convert(repeatedForeignEnum_.get(index));
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedForeignEnum to set.
        * @return This builder for chaining.
@@ -17709,15 +15795,12 @@ public Builder setRepeatedForeignEnum(
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @param value The repeatedForeignEnum to add.
        * @return This builder for chaining.
        */
-      public Builder addRepeatedForeignEnum(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum value) {
+      public Builder addRepeatedForeignEnum(legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -17726,17 +15809,13 @@ public Builder addRepeatedForeignEnum(
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @param values The repeatedForeignEnum to add.
        * @return This builder for chaining.
        */
       public Builder addAllRepeatedForeignEnum(
-          java.lang.Iterable<
-                  ? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-              values) {
+          java.lang.Iterable<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum> values) {
         ensureRepeatedForeignEnumIsMutable();
         for (legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum value : values) {
           repeatedForeignEnum_.add(value.getNumber());
@@ -17744,10 +15823,8 @@ public Builder addAllRepeatedForeignEnum(
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedForeignEnum() {
@@ -17756,43 +15833,37 @@ public Builder clearRepeatedForeignEnum() {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @return A list containing the enum numeric values on the wire for repeatedForeignEnum.
        */
-      public java.util.List<java.lang.Integer> getRepeatedForeignEnumValueList() {
+      public java.util.List<java.lang.Integer>
+      getRepeatedForeignEnumValueList() {
         return java.util.Collections.unmodifiableList(repeatedForeignEnum_);
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @param index The index of the value to return.
        * @return The enum numeric value on the wire of repeatedForeignEnum at the given index.
        */
       public int getRepeatedForeignEnumValue(int index) {
         return repeatedForeignEnum_.get(index);
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @param index The index to set the value at.
        * @param value The enum numeric value on the wire for repeatedForeignEnum to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedForeignEnumValue(int index, int value) {
+      public Builder setRepeatedForeignEnumValue(
+          int index, int value) {
         ensureRepeatedForeignEnumIsMutable();
         repeatedForeignEnum_.set(index, value);
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @param value The enum numeric value on the wire for repeatedForeignEnum to add.
        * @return This builder for chaining.
        */
@@ -17802,14 +15873,13 @@ public Builder addRepeatedForeignEnumValue(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @param values The enum numeric values on the wire for repeatedForeignEnum to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedForeignEnumValue(java.lang.Iterable<java.lang.Integer> values) {
+      public Builder addAllRepeatedForeignEnumValue(
+          java.lang.Iterable<java.lang.Integer> values) {
         ensureRepeatedForeignEnumIsMutable();
         for (int value : values) {
           repeatedForeignEnum_.add(value);
@@ -17819,75 +15889,60 @@ public Builder addAllRepeatedForeignEnumValue(java.lang.Iterable<java.lang.Integ
       }
 
       private com.google.protobuf.Internal.IntList packedInt32_ = emptyIntList();
-
       private void ensurePackedInt32IsMutable() {
         if (!packedInt32_.isModifiable()) {
           packedInt32_ = makeMutableCopy(packedInt32_);
         }
         bitField1_ |= 0x00000100;
       }
-
       /**
-       *
-       *
        * <pre>
        * Packed
        * </pre>
        *
        * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-       *
        * @return A list containing the packedInt32.
        */
-      public java.util.List<java.lang.Integer> getPackedInt32List() {
+      public java.util.List<java.lang.Integer>
+          getPackedInt32List() {
         packedInt32_.makeImmutable();
         return packedInt32_;
       }
-
       /**
-       *
-       *
        * <pre>
        * Packed
        * </pre>
        *
        * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-       *
        * @return The count of packedInt32.
        */
       public int getPackedInt32Count() {
         return packedInt32_.size();
       }
-
       /**
-       *
-       *
        * <pre>
        * Packed
        * </pre>
        *
        * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedInt32 at the given index.
        */
       public int getPackedInt32(int index) {
         return packedInt32_.getInt(index);
       }
-
       /**
-       *
-       *
        * <pre>
        * Packed
        * </pre>
        *
        * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedInt32 to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedInt32(int index, int value) {
+      public Builder setPackedInt32(
+          int index, int value) {
 
         ensurePackedInt32IsMutable();
         packedInt32_.setInt(index, value);
@@ -17895,16 +15950,12 @@ public Builder setPackedInt32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
-       *
-       *
        * <pre>
        * Packed
        * </pre>
        *
        * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-       *
        * @param value The packedInt32 to add.
        * @return This builder for chaining.
        */
@@ -17916,36 +15967,30 @@ public Builder addPackedInt32(int value) {
         onChanged();
         return this;
       }
-
       /**
-       *
-       *
        * <pre>
        * Packed
        * </pre>
        *
        * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-       *
        * @param values The packedInt32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedInt32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllPackedInt32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensurePackedInt32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedInt32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedInt32_);
         bitField1_ |= 0x00000100;
         onChanged();
         return this;
       }
-
       /**
-       *
-       *
        * <pre>
        * Packed
        * </pre>
        *
        * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedInt32() {
@@ -17956,51 +16001,44 @@ public Builder clearPackedInt32() {
       }
 
       private com.google.protobuf.Internal.LongList packedInt64_ = emptyLongList();
-
       private void ensurePackedInt64IsMutable() {
         if (!packedInt64_.isModifiable()) {
           packedInt64_ = makeMutableCopy(packedInt64_);
         }
         bitField1_ |= 0x00000200;
       }
-
       /**
        * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-       *
        * @return A list containing the packedInt64.
        */
-      public java.util.List<java.lang.Long> getPackedInt64List() {
+      public java.util.List<java.lang.Long>
+          getPackedInt64List() {
         packedInt64_.makeImmutable();
         return packedInt64_;
       }
-
       /**
        * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-       *
        * @return The count of packedInt64.
        */
       public int getPackedInt64Count() {
         return packedInt64_.size();
       }
-
       /**
        * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedInt64 at the given index.
        */
       public long getPackedInt64(int index) {
         return packedInt64_.getLong(index);
       }
-
       /**
        * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedInt64 to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedInt64(int index, long value) {
+      public Builder setPackedInt64(
+          int index, long value) {
 
         ensurePackedInt64IsMutable();
         packedInt64_.setLong(index, value);
@@ -18008,10 +16046,8 @@ public Builder setPackedInt64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-       *
        * @param value The packedInt64 to add.
        * @return This builder for chaining.
        */
@@ -18023,24 +16059,22 @@ public Builder addPackedInt64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-       *
        * @param values The packedInt64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedInt64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllPackedInt64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensurePackedInt64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedInt64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedInt64_);
         bitField1_ |= 0x00000200;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedInt64() {
@@ -18051,51 +16085,44 @@ public Builder clearPackedInt64() {
       }
 
       private com.google.protobuf.Internal.IntList packedUint32_ = emptyIntList();
-
       private void ensurePackedUint32IsMutable() {
         if (!packedUint32_.isModifiable()) {
           packedUint32_ = makeMutableCopy(packedUint32_);
         }
         bitField1_ |= 0x00000400;
       }
-
       /**
        * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-       *
        * @return A list containing the packedUint32.
        */
-      public java.util.List<java.lang.Integer> getPackedUint32List() {
+      public java.util.List<java.lang.Integer>
+          getPackedUint32List() {
         packedUint32_.makeImmutable();
         return packedUint32_;
       }
-
       /**
        * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-       *
        * @return The count of packedUint32.
        */
       public int getPackedUint32Count() {
         return packedUint32_.size();
       }
-
       /**
        * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedUint32 at the given index.
        */
       public int getPackedUint32(int index) {
         return packedUint32_.getInt(index);
       }
-
       /**
        * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedUint32 to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedUint32(int index, int value) {
+      public Builder setPackedUint32(
+          int index, int value) {
 
         ensurePackedUint32IsMutable();
         packedUint32_.setInt(index, value);
@@ -18103,10 +16130,8 @@ public Builder setPackedUint32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-       *
        * @param value The packedUint32 to add.
        * @return This builder for chaining.
        */
@@ -18118,24 +16143,22 @@ public Builder addPackedUint32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-       *
        * @param values The packedUint32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedUint32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllPackedUint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensurePackedUint32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedUint32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedUint32_);
         bitField1_ |= 0x00000400;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedUint32() {
@@ -18146,51 +16169,44 @@ public Builder clearPackedUint32() {
       }
 
       private com.google.protobuf.Internal.LongList packedUint64_ = emptyLongList();
-
       private void ensurePackedUint64IsMutable() {
         if (!packedUint64_.isModifiable()) {
           packedUint64_ = makeMutableCopy(packedUint64_);
         }
         bitField1_ |= 0x00000800;
       }
-
       /**
        * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-       *
        * @return A list containing the packedUint64.
        */
-      public java.util.List<java.lang.Long> getPackedUint64List() {
+      public java.util.List<java.lang.Long>
+          getPackedUint64List() {
         packedUint64_.makeImmutable();
         return packedUint64_;
       }
-
       /**
        * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-       *
        * @return The count of packedUint64.
        */
       public int getPackedUint64Count() {
         return packedUint64_.size();
       }
-
       /**
        * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedUint64 at the given index.
        */
       public long getPackedUint64(int index) {
         return packedUint64_.getLong(index);
       }
-
       /**
        * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedUint64 to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedUint64(int index, long value) {
+      public Builder setPackedUint64(
+          int index, long value) {
 
         ensurePackedUint64IsMutable();
         packedUint64_.setLong(index, value);
@@ -18198,10 +16214,8 @@ public Builder setPackedUint64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-       *
        * @param value The packedUint64 to add.
        * @return This builder for chaining.
        */
@@ -18213,24 +16227,22 @@ public Builder addPackedUint64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-       *
        * @param values The packedUint64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedUint64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllPackedUint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensurePackedUint64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedUint64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedUint64_);
         bitField1_ |= 0x00000800;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedUint64() {
@@ -18241,51 +16253,44 @@ public Builder clearPackedUint64() {
       }
 
       private com.google.protobuf.Internal.IntList packedSint32_ = emptyIntList();
-
       private void ensurePackedSint32IsMutable() {
         if (!packedSint32_.isModifiable()) {
           packedSint32_ = makeMutableCopy(packedSint32_);
         }
         bitField1_ |= 0x00001000;
       }
-
       /**
        * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-       *
        * @return A list containing the packedSint32.
        */
-      public java.util.List<java.lang.Integer> getPackedSint32List() {
+      public java.util.List<java.lang.Integer>
+          getPackedSint32List() {
         packedSint32_.makeImmutable();
         return packedSint32_;
       }
-
       /**
        * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-       *
        * @return The count of packedSint32.
        */
       public int getPackedSint32Count() {
         return packedSint32_.size();
       }
-
       /**
        * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedSint32 at the given index.
        */
       public int getPackedSint32(int index) {
         return packedSint32_.getInt(index);
       }
-
       /**
        * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedSint32 to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedSint32(int index, int value) {
+      public Builder setPackedSint32(
+          int index, int value) {
 
         ensurePackedSint32IsMutable();
         packedSint32_.setInt(index, value);
@@ -18293,10 +16298,8 @@ public Builder setPackedSint32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-       *
        * @param value The packedSint32 to add.
        * @return This builder for chaining.
        */
@@ -18308,24 +16311,22 @@ public Builder addPackedSint32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-       *
        * @param values The packedSint32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedSint32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllPackedSint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensurePackedSint32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedSint32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedSint32_);
         bitField1_ |= 0x00001000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedSint32() {
@@ -18336,51 +16337,44 @@ public Builder clearPackedSint32() {
       }
 
       private com.google.protobuf.Internal.LongList packedSint64_ = emptyLongList();
-
       private void ensurePackedSint64IsMutable() {
         if (!packedSint64_.isModifiable()) {
           packedSint64_ = makeMutableCopy(packedSint64_);
         }
         bitField1_ |= 0x00002000;
       }
-
       /**
        * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-       *
        * @return A list containing the packedSint64.
        */
-      public java.util.List<java.lang.Long> getPackedSint64List() {
+      public java.util.List<java.lang.Long>
+          getPackedSint64List() {
         packedSint64_.makeImmutable();
         return packedSint64_;
       }
-
       /**
        * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-       *
        * @return The count of packedSint64.
        */
       public int getPackedSint64Count() {
         return packedSint64_.size();
       }
-
       /**
        * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedSint64 at the given index.
        */
       public long getPackedSint64(int index) {
         return packedSint64_.getLong(index);
       }
-
       /**
        * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedSint64 to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedSint64(int index, long value) {
+      public Builder setPackedSint64(
+          int index, long value) {
 
         ensurePackedSint64IsMutable();
         packedSint64_.setLong(index, value);
@@ -18388,10 +16382,8 @@ public Builder setPackedSint64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-       *
        * @param value The packedSint64 to add.
        * @return This builder for chaining.
        */
@@ -18403,24 +16395,22 @@ public Builder addPackedSint64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-       *
        * @param values The packedSint64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedSint64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllPackedSint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensurePackedSint64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedSint64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedSint64_);
         bitField1_ |= 0x00002000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedSint64() {
@@ -18431,58 +16421,50 @@ public Builder clearPackedSint64() {
       }
 
       private com.google.protobuf.Internal.IntList packedFixed32_ = emptyIntList();
-
       private void ensurePackedFixed32IsMutable() {
         if (!packedFixed32_.isModifiable()) {
           packedFixed32_ = makeMutableCopy(packedFixed32_);
         }
         bitField1_ |= 0x00004000;
       }
-
       private void ensurePackedFixed32IsMutable(int capacity) {
         if (!packedFixed32_.isModifiable()) {
           packedFixed32_ = makeMutableCopy(packedFixed32_, capacity);
         }
         bitField1_ |= 0x00004000;
       }
-
       /**
        * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-       *
        * @return A list containing the packedFixed32.
        */
-      public java.util.List<java.lang.Integer> getPackedFixed32List() {
+      public java.util.List<java.lang.Integer>
+          getPackedFixed32List() {
         packedFixed32_.makeImmutable();
         return packedFixed32_;
       }
-
       /**
        * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-       *
        * @return The count of packedFixed32.
        */
       public int getPackedFixed32Count() {
         return packedFixed32_.size();
       }
-
       /**
        * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedFixed32 at the given index.
        */
       public int getPackedFixed32(int index) {
         return packedFixed32_.getInt(index);
       }
-
       /**
        * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedFixed32 to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedFixed32(int index, int value) {
+      public Builder setPackedFixed32(
+          int index, int value) {
 
         ensurePackedFixed32IsMutable();
         packedFixed32_.setInt(index, value);
@@ -18490,10 +16472,8 @@ public Builder setPackedFixed32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-       *
        * @param value The packedFixed32 to add.
        * @return This builder for chaining.
        */
@@ -18505,24 +16485,22 @@ public Builder addPackedFixed32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-       *
        * @param values The packedFixed32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedFixed32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllPackedFixed32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensurePackedFixed32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedFixed32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedFixed32_);
         bitField1_ |= 0x00004000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedFixed32() {
@@ -18533,58 +16511,50 @@ public Builder clearPackedFixed32() {
       }
 
       private com.google.protobuf.Internal.LongList packedFixed64_ = emptyLongList();
-
       private void ensurePackedFixed64IsMutable() {
         if (!packedFixed64_.isModifiable()) {
           packedFixed64_ = makeMutableCopy(packedFixed64_);
         }
         bitField1_ |= 0x00008000;
       }
-
       private void ensurePackedFixed64IsMutable(int capacity) {
         if (!packedFixed64_.isModifiable()) {
           packedFixed64_ = makeMutableCopy(packedFixed64_, capacity);
         }
         bitField1_ |= 0x00008000;
       }
-
       /**
        * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-       *
        * @return A list containing the packedFixed64.
        */
-      public java.util.List<java.lang.Long> getPackedFixed64List() {
+      public java.util.List<java.lang.Long>
+          getPackedFixed64List() {
         packedFixed64_.makeImmutable();
         return packedFixed64_;
       }
-
       /**
        * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-       *
        * @return The count of packedFixed64.
        */
       public int getPackedFixed64Count() {
         return packedFixed64_.size();
       }
-
       /**
        * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedFixed64 at the given index.
        */
       public long getPackedFixed64(int index) {
         return packedFixed64_.getLong(index);
       }
-
       /**
        * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedFixed64 to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedFixed64(int index, long value) {
+      public Builder setPackedFixed64(
+          int index, long value) {
 
         ensurePackedFixed64IsMutable();
         packedFixed64_.setLong(index, value);
@@ -18592,10 +16562,8 @@ public Builder setPackedFixed64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-       *
        * @param value The packedFixed64 to add.
        * @return This builder for chaining.
        */
@@ -18607,24 +16575,22 @@ public Builder addPackedFixed64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-       *
        * @param values The packedFixed64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedFixed64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllPackedFixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensurePackedFixed64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedFixed64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedFixed64_);
         bitField1_ |= 0x00008000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedFixed64() {
@@ -18635,58 +16601,50 @@ public Builder clearPackedFixed64() {
       }
 
       private com.google.protobuf.Internal.IntList packedSfixed32_ = emptyIntList();
-
       private void ensurePackedSfixed32IsMutable() {
         if (!packedSfixed32_.isModifiable()) {
           packedSfixed32_ = makeMutableCopy(packedSfixed32_);
         }
         bitField1_ |= 0x00010000;
       }
-
       private void ensurePackedSfixed32IsMutable(int capacity) {
         if (!packedSfixed32_.isModifiable()) {
           packedSfixed32_ = makeMutableCopy(packedSfixed32_, capacity);
         }
         bitField1_ |= 0x00010000;
       }
-
       /**
        * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-       *
        * @return A list containing the packedSfixed32.
        */
-      public java.util.List<java.lang.Integer> getPackedSfixed32List() {
+      public java.util.List<java.lang.Integer>
+          getPackedSfixed32List() {
         packedSfixed32_.makeImmutable();
         return packedSfixed32_;
       }
-
       /**
        * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-       *
        * @return The count of packedSfixed32.
        */
       public int getPackedSfixed32Count() {
         return packedSfixed32_.size();
       }
-
       /**
        * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedSfixed32 at the given index.
        */
       public int getPackedSfixed32(int index) {
         return packedSfixed32_.getInt(index);
       }
-
       /**
        * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedSfixed32 to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedSfixed32(int index, int value) {
+      public Builder setPackedSfixed32(
+          int index, int value) {
 
         ensurePackedSfixed32IsMutable();
         packedSfixed32_.setInt(index, value);
@@ -18694,10 +16652,8 @@ public Builder setPackedSfixed32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-       *
        * @param value The packedSfixed32 to add.
        * @return This builder for chaining.
        */
@@ -18709,24 +16665,22 @@ public Builder addPackedSfixed32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-       *
        * @param values The packedSfixed32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedSfixed32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllPackedSfixed32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensurePackedSfixed32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedSfixed32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedSfixed32_);
         bitField1_ |= 0x00010000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedSfixed32() {
@@ -18737,58 +16691,50 @@ public Builder clearPackedSfixed32() {
       }
 
       private com.google.protobuf.Internal.LongList packedSfixed64_ = emptyLongList();
-
       private void ensurePackedSfixed64IsMutable() {
         if (!packedSfixed64_.isModifiable()) {
           packedSfixed64_ = makeMutableCopy(packedSfixed64_);
         }
         bitField1_ |= 0x00020000;
       }
-
       private void ensurePackedSfixed64IsMutable(int capacity) {
         if (!packedSfixed64_.isModifiable()) {
           packedSfixed64_ = makeMutableCopy(packedSfixed64_, capacity);
         }
         bitField1_ |= 0x00020000;
       }
-
       /**
        * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-       *
        * @return A list containing the packedSfixed64.
        */
-      public java.util.List<java.lang.Long> getPackedSfixed64List() {
+      public java.util.List<java.lang.Long>
+          getPackedSfixed64List() {
         packedSfixed64_.makeImmutable();
         return packedSfixed64_;
       }
-
       /**
        * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-       *
        * @return The count of packedSfixed64.
        */
       public int getPackedSfixed64Count() {
         return packedSfixed64_.size();
       }
-
       /**
        * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedSfixed64 at the given index.
        */
       public long getPackedSfixed64(int index) {
         return packedSfixed64_.getLong(index);
       }
-
       /**
        * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedSfixed64 to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedSfixed64(int index, long value) {
+      public Builder setPackedSfixed64(
+          int index, long value) {
 
         ensurePackedSfixed64IsMutable();
         packedSfixed64_.setLong(index, value);
@@ -18796,10 +16742,8 @@ public Builder setPackedSfixed64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-       *
        * @param value The packedSfixed64 to add.
        * @return This builder for chaining.
        */
@@ -18811,24 +16755,22 @@ public Builder addPackedSfixed64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-       *
        * @param values The packedSfixed64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedSfixed64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllPackedSfixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensurePackedSfixed64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedSfixed64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedSfixed64_);
         bitField1_ |= 0x00020000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedSfixed64() {
@@ -18839,58 +16781,50 @@ public Builder clearPackedSfixed64() {
       }
 
       private com.google.protobuf.Internal.FloatList packedFloat_ = emptyFloatList();
-
       private void ensurePackedFloatIsMutable() {
         if (!packedFloat_.isModifiable()) {
           packedFloat_ = makeMutableCopy(packedFloat_);
         }
         bitField1_ |= 0x00040000;
       }
-
       private void ensurePackedFloatIsMutable(int capacity) {
         if (!packedFloat_.isModifiable()) {
           packedFloat_ = makeMutableCopy(packedFloat_, capacity);
         }
         bitField1_ |= 0x00040000;
       }
-
       /**
        * <code>repeated float packed_float = 85 [packed = true];</code>
-       *
        * @return A list containing the packedFloat.
        */
-      public java.util.List<java.lang.Float> getPackedFloatList() {
+      public java.util.List<java.lang.Float>
+          getPackedFloatList() {
         packedFloat_.makeImmutable();
         return packedFloat_;
       }
-
       /**
        * <code>repeated float packed_float = 85 [packed = true];</code>
-       *
        * @return The count of packedFloat.
        */
       public int getPackedFloatCount() {
         return packedFloat_.size();
       }
-
       /**
        * <code>repeated float packed_float = 85 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedFloat at the given index.
        */
       public float getPackedFloat(int index) {
         return packedFloat_.getFloat(index);
       }
-
       /**
        * <code>repeated float packed_float = 85 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedFloat to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedFloat(int index, float value) {
+      public Builder setPackedFloat(
+          int index, float value) {
 
         ensurePackedFloatIsMutable();
         packedFloat_.setFloat(index, value);
@@ -18898,10 +16832,8 @@ public Builder setPackedFloat(int index, float value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated float packed_float = 85 [packed = true];</code>
-       *
        * @param value The packedFloat to add.
        * @return This builder for chaining.
        */
@@ -18913,24 +16845,22 @@ public Builder addPackedFloat(float value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated float packed_float = 85 [packed = true];</code>
-       *
        * @param values The packedFloat to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedFloat(java.lang.Iterable<? extends java.lang.Float> values) {
+      public Builder addAllPackedFloat(
+          java.lang.Iterable<? extends java.lang.Float> values) {
         ensurePackedFloatIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedFloat_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedFloat_);
         bitField1_ |= 0x00040000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated float packed_float = 85 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedFloat() {
@@ -18941,58 +16871,50 @@ public Builder clearPackedFloat() {
       }
 
       private com.google.protobuf.Internal.DoubleList packedDouble_ = emptyDoubleList();
-
       private void ensurePackedDoubleIsMutable() {
         if (!packedDouble_.isModifiable()) {
           packedDouble_ = makeMutableCopy(packedDouble_);
         }
         bitField1_ |= 0x00080000;
       }
-
       private void ensurePackedDoubleIsMutable(int capacity) {
         if (!packedDouble_.isModifiable()) {
           packedDouble_ = makeMutableCopy(packedDouble_, capacity);
         }
         bitField1_ |= 0x00080000;
       }
-
       /**
        * <code>repeated double packed_double = 86 [packed = true];</code>
-       *
        * @return A list containing the packedDouble.
        */
-      public java.util.List<java.lang.Double> getPackedDoubleList() {
+      public java.util.List<java.lang.Double>
+          getPackedDoubleList() {
         packedDouble_.makeImmutable();
         return packedDouble_;
       }
-
       /**
        * <code>repeated double packed_double = 86 [packed = true];</code>
-       *
        * @return The count of packedDouble.
        */
       public int getPackedDoubleCount() {
         return packedDouble_.size();
       }
-
       /**
        * <code>repeated double packed_double = 86 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedDouble at the given index.
        */
       public double getPackedDouble(int index) {
         return packedDouble_.getDouble(index);
       }
-
       /**
        * <code>repeated double packed_double = 86 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedDouble to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedDouble(int index, double value) {
+      public Builder setPackedDouble(
+          int index, double value) {
 
         ensurePackedDoubleIsMutable();
         packedDouble_.setDouble(index, value);
@@ -19000,10 +16922,8 @@ public Builder setPackedDouble(int index, double value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated double packed_double = 86 [packed = true];</code>
-       *
        * @param value The packedDouble to add.
        * @return This builder for chaining.
        */
@@ -19015,24 +16935,22 @@ public Builder addPackedDouble(double value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated double packed_double = 86 [packed = true];</code>
-       *
        * @param values The packedDouble to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedDouble(java.lang.Iterable<? extends java.lang.Double> values) {
+      public Builder addAllPackedDouble(
+          java.lang.Iterable<? extends java.lang.Double> values) {
         ensurePackedDoubleIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedDouble_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedDouble_);
         bitField1_ |= 0x00080000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated double packed_double = 86 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedDouble() {
@@ -19043,58 +16961,50 @@ public Builder clearPackedDouble() {
       }
 
       private com.google.protobuf.Internal.BooleanList packedBool_ = emptyBooleanList();
-
       private void ensurePackedBoolIsMutable() {
         if (!packedBool_.isModifiable()) {
           packedBool_ = makeMutableCopy(packedBool_);
         }
         bitField1_ |= 0x00100000;
       }
-
       private void ensurePackedBoolIsMutable(int capacity) {
         if (!packedBool_.isModifiable()) {
           packedBool_ = makeMutableCopy(packedBool_, capacity);
         }
         bitField1_ |= 0x00100000;
       }
-
       /**
        * <code>repeated bool packed_bool = 87 [packed = true];</code>
-       *
        * @return A list containing the packedBool.
        */
-      public java.util.List<java.lang.Boolean> getPackedBoolList() {
+      public java.util.List<java.lang.Boolean>
+          getPackedBoolList() {
         packedBool_.makeImmutable();
         return packedBool_;
       }
-
       /**
        * <code>repeated bool packed_bool = 87 [packed = true];</code>
-       *
        * @return The count of packedBool.
        */
       public int getPackedBoolCount() {
         return packedBool_.size();
       }
-
       /**
        * <code>repeated bool packed_bool = 87 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedBool at the given index.
        */
       public boolean getPackedBool(int index) {
         return packedBool_.getBoolean(index);
       }
-
       /**
        * <code>repeated bool packed_bool = 87 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedBool to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedBool(int index, boolean value) {
+      public Builder setPackedBool(
+          int index, boolean value) {
 
         ensurePackedBoolIsMutable();
         packedBool_.setBoolean(index, value);
@@ -19102,10 +17012,8 @@ public Builder setPackedBool(int index, boolean value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bool packed_bool = 87 [packed = true];</code>
-       *
        * @param value The packedBool to add.
        * @return This builder for chaining.
        */
@@ -19117,24 +17025,22 @@ public Builder addPackedBool(boolean value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bool packed_bool = 87 [packed = true];</code>
-       *
        * @param values The packedBool to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedBool(java.lang.Iterable<? extends java.lang.Boolean> values) {
+      public Builder addAllPackedBool(
+          java.lang.Iterable<? extends java.lang.Boolean> values) {
         ensurePackedBoolIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedBool_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedBool_);
         bitField1_ |= 0x00100000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bool packed_bool = 87 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedBool() {
@@ -19145,67 +17051,44 @@ public Builder clearPackedBool() {
       }
 
       private java.util.List<java.lang.Integer> packedNestedEnum_ =
-          java.util.Collections.emptyList();
-
+        java.util.Collections.emptyList();
       private void ensurePackedNestedEnumIsMutable() {
         if (!((bitField1_ & 0x00200000) != 0)) {
           packedNestedEnum_ = new java.util.ArrayList<java.lang.Integer>(packedNestedEnum_);
           bitField1_ |= 0x00200000;
         }
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @return A list containing the packedNestedEnum.
        */
-      public java.util.List<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-          getPackedNestedEnumList() {
+      public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> getPackedNestedEnumList() {
         return new com.google.protobuf.Internal.ListAdapter<
-            java.lang.Integer,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(
-            packedNestedEnum_, packedNestedEnum_converter_);
+            java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(packedNestedEnum_, packedNestedEnum_converter_);
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @return The count of packedNestedEnum.
        */
       public int getPackedNestedEnumCount() {
         return packedNestedEnum_.size();
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @param index The index of the element to return.
        * @return The packedNestedEnum at the given index.
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-          getPackedNestedEnum(int index) {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getPackedNestedEnum(int index) {
         return packedNestedEnum_converter_.convert(packedNestedEnum_.get(index));
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @param index The index to set the value at.
        * @param value The packedNestedEnum to set.
        * @return This builder for chaining.
        */
       public Builder setPackedNestedEnum(
-          int index,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
+          int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -19214,17 +17097,12 @@ public Builder setPackedNestedEnum(
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @param value The packedNestedEnum to add.
        * @return This builder for chaining.
        */
-      public Builder addPackedNestedEnum(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
+      public Builder addPackedNestedEnum(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -19233,35 +17111,22 @@ public Builder addPackedNestedEnum(
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @param values The packedNestedEnum to add.
        * @return This builder for chaining.
        */
       public Builder addAllPackedNestedEnum(
-          java.lang.Iterable<
-                  ? extends
-                      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                          .NestedEnum>
-              values) {
+          java.lang.Iterable<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> values) {
         ensurePackedNestedEnumIsMutable();
-        for (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-            value : values) {
+        for (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value : values) {
           packedNestedEnum_.add(value.getNumber());
         }
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @return This builder for chaining.
        */
       public Builder clearPackedNestedEnum() {
@@ -19270,51 +17135,37 @@ public Builder clearPackedNestedEnum() {
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @return A list containing the enum numeric values on the wire for packedNestedEnum.
        */
-      public java.util.List<java.lang.Integer> getPackedNestedEnumValueList() {
+      public java.util.List<java.lang.Integer>
+      getPackedNestedEnumValueList() {
         return java.util.Collections.unmodifiableList(packedNestedEnum_);
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @param index The index of the value to return.
        * @return The enum numeric value on the wire of packedNestedEnum at the given index.
        */
       public int getPackedNestedEnumValue(int index) {
         return packedNestedEnum_.get(index);
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @param index The index to set the value at.
        * @param value The enum numeric value on the wire for packedNestedEnum to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedNestedEnumValue(int index, int value) {
+      public Builder setPackedNestedEnumValue(
+          int index, int value) {
         ensurePackedNestedEnumIsMutable();
         packedNestedEnum_.set(index, value);
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @param value The enum numeric value on the wire for packedNestedEnum to add.
        * @return This builder for chaining.
        */
@@ -19324,16 +17175,13 @@ public Builder addPackedNestedEnumValue(int value) {
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @param values The enum numeric values on the wire for packedNestedEnum to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedNestedEnumValue(java.lang.Iterable<java.lang.Integer> values) {
+      public Builder addAllPackedNestedEnumValue(
+          java.lang.Iterable<java.lang.Integer> values) {
         ensurePackedNestedEnumIsMutable();
         for (int value : values) {
           packedNestedEnum_.add(value);
@@ -19343,75 +17191,60 @@ public Builder addAllPackedNestedEnumValue(java.lang.Iterable<java.lang.Integer>
       }
 
       private com.google.protobuf.Internal.IntList unpackedInt32_ = emptyIntList();
-
       private void ensureUnpackedInt32IsMutable() {
         if (!unpackedInt32_.isModifiable()) {
           unpackedInt32_ = makeMutableCopy(unpackedInt32_);
         }
         bitField1_ |= 0x00400000;
       }
-
       /**
-       *
-       *
        * <pre>
        * Unpacked
        * </pre>
        *
        * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-       *
        * @return A list containing the unpackedInt32.
        */
-      public java.util.List<java.lang.Integer> getUnpackedInt32List() {
+      public java.util.List<java.lang.Integer>
+          getUnpackedInt32List() {
         unpackedInt32_.makeImmutable();
         return unpackedInt32_;
       }
-
       /**
-       *
-       *
        * <pre>
        * Unpacked
        * </pre>
        *
        * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-       *
        * @return The count of unpackedInt32.
        */
       public int getUnpackedInt32Count() {
         return unpackedInt32_.size();
       }
-
       /**
-       *
-       *
        * <pre>
        * Unpacked
        * </pre>
        *
        * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedInt32 at the given index.
        */
       public int getUnpackedInt32(int index) {
         return unpackedInt32_.getInt(index);
       }
-
       /**
-       *
-       *
        * <pre>
        * Unpacked
        * </pre>
        *
        * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedInt32 to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedInt32(int index, int value) {
+      public Builder setUnpackedInt32(
+          int index, int value) {
 
         ensureUnpackedInt32IsMutable();
         unpackedInt32_.setInt(index, value);
@@ -19419,16 +17252,12 @@ public Builder setUnpackedInt32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
-       *
-       *
        * <pre>
        * Unpacked
        * </pre>
        *
        * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-       *
        * @param value The unpackedInt32 to add.
        * @return This builder for chaining.
        */
@@ -19440,36 +17269,30 @@ public Builder addUnpackedInt32(int value) {
         onChanged();
         return this;
       }
-
       /**
-       *
-       *
        * <pre>
        * Unpacked
        * </pre>
        *
        * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-       *
        * @param values The unpackedInt32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedInt32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllUnpackedInt32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureUnpackedInt32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedInt32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedInt32_);
         bitField1_ |= 0x00400000;
         onChanged();
         return this;
       }
-
       /**
-       *
-       *
        * <pre>
        * Unpacked
        * </pre>
        *
        * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedInt32() {
@@ -19480,51 +17303,44 @@ public Builder clearUnpackedInt32() {
       }
 
       private com.google.protobuf.Internal.LongList unpackedInt64_ = emptyLongList();
-
       private void ensureUnpackedInt64IsMutable() {
         if (!unpackedInt64_.isModifiable()) {
           unpackedInt64_ = makeMutableCopy(unpackedInt64_);
         }
         bitField1_ |= 0x00800000;
       }
-
       /**
        * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-       *
        * @return A list containing the unpackedInt64.
        */
-      public java.util.List<java.lang.Long> getUnpackedInt64List() {
+      public java.util.List<java.lang.Long>
+          getUnpackedInt64List() {
         unpackedInt64_.makeImmutable();
         return unpackedInt64_;
       }
-
       /**
        * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-       *
        * @return The count of unpackedInt64.
        */
       public int getUnpackedInt64Count() {
         return unpackedInt64_.size();
       }
-
       /**
        * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedInt64 at the given index.
        */
       public long getUnpackedInt64(int index) {
         return unpackedInt64_.getLong(index);
       }
-
       /**
        * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedInt64 to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedInt64(int index, long value) {
+      public Builder setUnpackedInt64(
+          int index, long value) {
 
         ensureUnpackedInt64IsMutable();
         unpackedInt64_.setLong(index, value);
@@ -19532,10 +17348,8 @@ public Builder setUnpackedInt64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-       *
        * @param value The unpackedInt64 to add.
        * @return This builder for chaining.
        */
@@ -19547,24 +17361,22 @@ public Builder addUnpackedInt64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-       *
        * @param values The unpackedInt64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedInt64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllUnpackedInt64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensureUnpackedInt64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedInt64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedInt64_);
         bitField1_ |= 0x00800000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedInt64() {
@@ -19575,51 +17387,44 @@ public Builder clearUnpackedInt64() {
       }
 
       private com.google.protobuf.Internal.IntList unpackedUint32_ = emptyIntList();
-
       private void ensureUnpackedUint32IsMutable() {
         if (!unpackedUint32_.isModifiable()) {
           unpackedUint32_ = makeMutableCopy(unpackedUint32_);
         }
         bitField1_ |= 0x01000000;
       }
-
       /**
        * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-       *
        * @return A list containing the unpackedUint32.
        */
-      public java.util.List<java.lang.Integer> getUnpackedUint32List() {
+      public java.util.List<java.lang.Integer>
+          getUnpackedUint32List() {
         unpackedUint32_.makeImmutable();
         return unpackedUint32_;
       }
-
       /**
        * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-       *
        * @return The count of unpackedUint32.
        */
       public int getUnpackedUint32Count() {
         return unpackedUint32_.size();
       }
-
       /**
        * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedUint32 at the given index.
        */
       public int getUnpackedUint32(int index) {
         return unpackedUint32_.getInt(index);
       }
-
       /**
        * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedUint32 to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedUint32(int index, int value) {
+      public Builder setUnpackedUint32(
+          int index, int value) {
 
         ensureUnpackedUint32IsMutable();
         unpackedUint32_.setInt(index, value);
@@ -19627,10 +17432,8 @@ public Builder setUnpackedUint32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-       *
        * @param value The unpackedUint32 to add.
        * @return This builder for chaining.
        */
@@ -19642,24 +17445,22 @@ public Builder addUnpackedUint32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-       *
        * @param values The unpackedUint32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedUint32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllUnpackedUint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureUnpackedUint32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedUint32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedUint32_);
         bitField1_ |= 0x01000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedUint32() {
@@ -19670,51 +17471,44 @@ public Builder clearUnpackedUint32() {
       }
 
       private com.google.protobuf.Internal.LongList unpackedUint64_ = emptyLongList();
-
       private void ensureUnpackedUint64IsMutable() {
         if (!unpackedUint64_.isModifiable()) {
           unpackedUint64_ = makeMutableCopy(unpackedUint64_);
         }
         bitField1_ |= 0x02000000;
       }
-
       /**
        * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-       *
        * @return A list containing the unpackedUint64.
        */
-      public java.util.List<java.lang.Long> getUnpackedUint64List() {
+      public java.util.List<java.lang.Long>
+          getUnpackedUint64List() {
         unpackedUint64_.makeImmutable();
         return unpackedUint64_;
       }
-
       /**
        * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-       *
        * @return The count of unpackedUint64.
        */
       public int getUnpackedUint64Count() {
         return unpackedUint64_.size();
       }
-
       /**
        * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedUint64 at the given index.
        */
       public long getUnpackedUint64(int index) {
         return unpackedUint64_.getLong(index);
       }
-
       /**
        * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedUint64 to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedUint64(int index, long value) {
+      public Builder setUnpackedUint64(
+          int index, long value) {
 
         ensureUnpackedUint64IsMutable();
         unpackedUint64_.setLong(index, value);
@@ -19722,10 +17516,8 @@ public Builder setUnpackedUint64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-       *
        * @param value The unpackedUint64 to add.
        * @return This builder for chaining.
        */
@@ -19737,24 +17529,22 @@ public Builder addUnpackedUint64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-       *
        * @param values The unpackedUint64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedUint64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllUnpackedUint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensureUnpackedUint64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedUint64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedUint64_);
         bitField1_ |= 0x02000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedUint64() {
@@ -19765,51 +17555,44 @@ public Builder clearUnpackedUint64() {
       }
 
       private com.google.protobuf.Internal.IntList unpackedSint32_ = emptyIntList();
-
       private void ensureUnpackedSint32IsMutable() {
         if (!unpackedSint32_.isModifiable()) {
           unpackedSint32_ = makeMutableCopy(unpackedSint32_);
         }
         bitField1_ |= 0x04000000;
       }
-
       /**
        * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-       *
        * @return A list containing the unpackedSint32.
        */
-      public java.util.List<java.lang.Integer> getUnpackedSint32List() {
+      public java.util.List<java.lang.Integer>
+          getUnpackedSint32List() {
         unpackedSint32_.makeImmutable();
         return unpackedSint32_;
       }
-
       /**
        * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-       *
        * @return The count of unpackedSint32.
        */
       public int getUnpackedSint32Count() {
         return unpackedSint32_.size();
       }
-
       /**
        * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedSint32 at the given index.
        */
       public int getUnpackedSint32(int index) {
         return unpackedSint32_.getInt(index);
       }
-
       /**
        * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedSint32 to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedSint32(int index, int value) {
+      public Builder setUnpackedSint32(
+          int index, int value) {
 
         ensureUnpackedSint32IsMutable();
         unpackedSint32_.setInt(index, value);
@@ -19817,10 +17600,8 @@ public Builder setUnpackedSint32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-       *
        * @param value The unpackedSint32 to add.
        * @return This builder for chaining.
        */
@@ -19832,24 +17613,22 @@ public Builder addUnpackedSint32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-       *
        * @param values The unpackedSint32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedSint32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllUnpackedSint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureUnpackedSint32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedSint32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedSint32_);
         bitField1_ |= 0x04000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedSint32() {
@@ -19860,51 +17639,44 @@ public Builder clearUnpackedSint32() {
       }
 
       private com.google.protobuf.Internal.LongList unpackedSint64_ = emptyLongList();
-
       private void ensureUnpackedSint64IsMutable() {
         if (!unpackedSint64_.isModifiable()) {
           unpackedSint64_ = makeMutableCopy(unpackedSint64_);
         }
         bitField1_ |= 0x08000000;
       }
-
       /**
        * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-       *
        * @return A list containing the unpackedSint64.
        */
-      public java.util.List<java.lang.Long> getUnpackedSint64List() {
+      public java.util.List<java.lang.Long>
+          getUnpackedSint64List() {
         unpackedSint64_.makeImmutable();
         return unpackedSint64_;
       }
-
       /**
        * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-       *
        * @return The count of unpackedSint64.
        */
       public int getUnpackedSint64Count() {
         return unpackedSint64_.size();
       }
-
       /**
        * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedSint64 at the given index.
        */
       public long getUnpackedSint64(int index) {
         return unpackedSint64_.getLong(index);
       }
-
       /**
        * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedSint64 to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedSint64(int index, long value) {
+      public Builder setUnpackedSint64(
+          int index, long value) {
 
         ensureUnpackedSint64IsMutable();
         unpackedSint64_.setLong(index, value);
@@ -19912,10 +17684,8 @@ public Builder setUnpackedSint64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-       *
        * @param value The unpackedSint64 to add.
        * @return This builder for chaining.
        */
@@ -19927,24 +17697,22 @@ public Builder addUnpackedSint64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-       *
        * @param values The unpackedSint64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedSint64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllUnpackedSint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensureUnpackedSint64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedSint64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedSint64_);
         bitField1_ |= 0x08000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedSint64() {
@@ -19955,58 +17723,50 @@ public Builder clearUnpackedSint64() {
       }
 
       private com.google.protobuf.Internal.IntList unpackedFixed32_ = emptyIntList();
-
       private void ensureUnpackedFixed32IsMutable() {
         if (!unpackedFixed32_.isModifiable()) {
           unpackedFixed32_ = makeMutableCopy(unpackedFixed32_);
         }
         bitField1_ |= 0x10000000;
       }
-
       private void ensureUnpackedFixed32IsMutable(int capacity) {
         if (!unpackedFixed32_.isModifiable()) {
           unpackedFixed32_ = makeMutableCopy(unpackedFixed32_, capacity);
         }
         bitField1_ |= 0x10000000;
       }
-
       /**
        * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-       *
        * @return A list containing the unpackedFixed32.
        */
-      public java.util.List<java.lang.Integer> getUnpackedFixed32List() {
+      public java.util.List<java.lang.Integer>
+          getUnpackedFixed32List() {
         unpackedFixed32_.makeImmutable();
         return unpackedFixed32_;
       }
-
       /**
        * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-       *
        * @return The count of unpackedFixed32.
        */
       public int getUnpackedFixed32Count() {
         return unpackedFixed32_.size();
       }
-
       /**
        * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedFixed32 at the given index.
        */
       public int getUnpackedFixed32(int index) {
         return unpackedFixed32_.getInt(index);
       }
-
       /**
        * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedFixed32 to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedFixed32(int index, int value) {
+      public Builder setUnpackedFixed32(
+          int index, int value) {
 
         ensureUnpackedFixed32IsMutable();
         unpackedFixed32_.setInt(index, value);
@@ -20014,10 +17774,8 @@ public Builder setUnpackedFixed32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-       *
        * @param value The unpackedFixed32 to add.
        * @return This builder for chaining.
        */
@@ -20029,24 +17787,22 @@ public Builder addUnpackedFixed32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-       *
        * @param values The unpackedFixed32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedFixed32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllUnpackedFixed32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureUnpackedFixed32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedFixed32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedFixed32_);
         bitField1_ |= 0x10000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedFixed32() {
@@ -20057,58 +17813,50 @@ public Builder clearUnpackedFixed32() {
       }
 
       private com.google.protobuf.Internal.LongList unpackedFixed64_ = emptyLongList();
-
       private void ensureUnpackedFixed64IsMutable() {
         if (!unpackedFixed64_.isModifiable()) {
           unpackedFixed64_ = makeMutableCopy(unpackedFixed64_);
         }
         bitField1_ |= 0x20000000;
       }
-
       private void ensureUnpackedFixed64IsMutable(int capacity) {
         if (!unpackedFixed64_.isModifiable()) {
           unpackedFixed64_ = makeMutableCopy(unpackedFixed64_, capacity);
         }
         bitField1_ |= 0x20000000;
       }
-
       /**
        * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-       *
        * @return A list containing the unpackedFixed64.
        */
-      public java.util.List<java.lang.Long> getUnpackedFixed64List() {
+      public java.util.List<java.lang.Long>
+          getUnpackedFixed64List() {
         unpackedFixed64_.makeImmutable();
         return unpackedFixed64_;
       }
-
       /**
        * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-       *
        * @return The count of unpackedFixed64.
        */
       public int getUnpackedFixed64Count() {
         return unpackedFixed64_.size();
       }
-
       /**
        * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedFixed64 at the given index.
        */
       public long getUnpackedFixed64(int index) {
         return unpackedFixed64_.getLong(index);
       }
-
       /**
        * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedFixed64 to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedFixed64(int index, long value) {
+      public Builder setUnpackedFixed64(
+          int index, long value) {
 
         ensureUnpackedFixed64IsMutable();
         unpackedFixed64_.setLong(index, value);
@@ -20116,10 +17864,8 @@ public Builder setUnpackedFixed64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-       *
        * @param value The unpackedFixed64 to add.
        * @return This builder for chaining.
        */
@@ -20131,24 +17877,22 @@ public Builder addUnpackedFixed64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-       *
        * @param values The unpackedFixed64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedFixed64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllUnpackedFixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensureUnpackedFixed64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedFixed64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedFixed64_);
         bitField1_ |= 0x20000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedFixed64() {
@@ -20159,58 +17903,50 @@ public Builder clearUnpackedFixed64() {
       }
 
       private com.google.protobuf.Internal.IntList unpackedSfixed32_ = emptyIntList();
-
       private void ensureUnpackedSfixed32IsMutable() {
         if (!unpackedSfixed32_.isModifiable()) {
           unpackedSfixed32_ = makeMutableCopy(unpackedSfixed32_);
         }
         bitField1_ |= 0x40000000;
       }
-
       private void ensureUnpackedSfixed32IsMutable(int capacity) {
         if (!unpackedSfixed32_.isModifiable()) {
           unpackedSfixed32_ = makeMutableCopy(unpackedSfixed32_, capacity);
         }
         bitField1_ |= 0x40000000;
       }
-
       /**
        * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-       *
        * @return A list containing the unpackedSfixed32.
        */
-      public java.util.List<java.lang.Integer> getUnpackedSfixed32List() {
+      public java.util.List<java.lang.Integer>
+          getUnpackedSfixed32List() {
         unpackedSfixed32_.makeImmutable();
         return unpackedSfixed32_;
       }
-
       /**
        * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-       *
        * @return The count of unpackedSfixed32.
        */
       public int getUnpackedSfixed32Count() {
         return unpackedSfixed32_.size();
       }
-
       /**
        * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedSfixed32 at the given index.
        */
       public int getUnpackedSfixed32(int index) {
         return unpackedSfixed32_.getInt(index);
       }
-
       /**
        * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedSfixed32 to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedSfixed32(int index, int value) {
+      public Builder setUnpackedSfixed32(
+          int index, int value) {
 
         ensureUnpackedSfixed32IsMutable();
         unpackedSfixed32_.setInt(index, value);
@@ -20218,10 +17954,8 @@ public Builder setUnpackedSfixed32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-       *
        * @param value The unpackedSfixed32 to add.
        * @return This builder for chaining.
        */
@@ -20233,25 +17967,22 @@ public Builder addUnpackedSfixed32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-       *
        * @param values The unpackedSfixed32 to add.
        * @return This builder for chaining.
        */
       public Builder addAllUnpackedSfixed32(
           java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureUnpackedSfixed32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedSfixed32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedSfixed32_);
         bitField1_ |= 0x40000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedSfixed32() {
@@ -20262,58 +17993,50 @@ public Builder clearUnpackedSfixed32() {
       }
 
       private com.google.protobuf.Internal.LongList unpackedSfixed64_ = emptyLongList();
-
       private void ensureUnpackedSfixed64IsMutable() {
         if (!unpackedSfixed64_.isModifiable()) {
           unpackedSfixed64_ = makeMutableCopy(unpackedSfixed64_);
         }
         bitField1_ |= 0x80000000;
       }
-
       private void ensureUnpackedSfixed64IsMutable(int capacity) {
         if (!unpackedSfixed64_.isModifiable()) {
           unpackedSfixed64_ = makeMutableCopy(unpackedSfixed64_, capacity);
         }
         bitField1_ |= 0x80000000;
       }
-
       /**
        * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-       *
        * @return A list containing the unpackedSfixed64.
        */
-      public java.util.List<java.lang.Long> getUnpackedSfixed64List() {
+      public java.util.List<java.lang.Long>
+          getUnpackedSfixed64List() {
         unpackedSfixed64_.makeImmutable();
         return unpackedSfixed64_;
       }
-
       /**
        * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-       *
        * @return The count of unpackedSfixed64.
        */
       public int getUnpackedSfixed64Count() {
         return unpackedSfixed64_.size();
       }
-
       /**
        * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedSfixed64 at the given index.
        */
       public long getUnpackedSfixed64(int index) {
         return unpackedSfixed64_.getLong(index);
       }
-
       /**
        * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedSfixed64 to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedSfixed64(int index, long value) {
+      public Builder setUnpackedSfixed64(
+          int index, long value) {
 
         ensureUnpackedSfixed64IsMutable();
         unpackedSfixed64_.setLong(index, value);
@@ -20321,10 +18044,8 @@ public Builder setUnpackedSfixed64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-       *
        * @param value The unpackedSfixed64 to add.
        * @return This builder for chaining.
        */
@@ -20336,24 +18057,22 @@ public Builder addUnpackedSfixed64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-       *
        * @param values The unpackedSfixed64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedSfixed64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllUnpackedSfixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensureUnpackedSfixed64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedSfixed64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedSfixed64_);
         bitField1_ |= 0x80000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedSfixed64() {
@@ -20364,58 +18083,50 @@ public Builder clearUnpackedSfixed64() {
       }
 
       private com.google.protobuf.Internal.FloatList unpackedFloat_ = emptyFloatList();
-
       private void ensureUnpackedFloatIsMutable() {
         if (!unpackedFloat_.isModifiable()) {
           unpackedFloat_ = makeMutableCopy(unpackedFloat_);
         }
         bitField2_ |= 0x00000001;
       }
-
       private void ensureUnpackedFloatIsMutable(int capacity) {
         if (!unpackedFloat_.isModifiable()) {
           unpackedFloat_ = makeMutableCopy(unpackedFloat_, capacity);
         }
         bitField2_ |= 0x00000001;
       }
-
       /**
        * <code>repeated float unpacked_float = 99 [packed = false];</code>
-       *
        * @return A list containing the unpackedFloat.
        */
-      public java.util.List<java.lang.Float> getUnpackedFloatList() {
+      public java.util.List<java.lang.Float>
+          getUnpackedFloatList() {
         unpackedFloat_.makeImmutable();
         return unpackedFloat_;
       }
-
       /**
        * <code>repeated float unpacked_float = 99 [packed = false];</code>
-       *
        * @return The count of unpackedFloat.
        */
       public int getUnpackedFloatCount() {
         return unpackedFloat_.size();
       }
-
       /**
        * <code>repeated float unpacked_float = 99 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedFloat at the given index.
        */
       public float getUnpackedFloat(int index) {
         return unpackedFloat_.getFloat(index);
       }
-
       /**
        * <code>repeated float unpacked_float = 99 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedFloat to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedFloat(int index, float value) {
+      public Builder setUnpackedFloat(
+          int index, float value) {
 
         ensureUnpackedFloatIsMutable();
         unpackedFloat_.setFloat(index, value);
@@ -20423,10 +18134,8 @@ public Builder setUnpackedFloat(int index, float value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated float unpacked_float = 99 [packed = false];</code>
-       *
        * @param value The unpackedFloat to add.
        * @return This builder for chaining.
        */
@@ -20438,24 +18147,22 @@ public Builder addUnpackedFloat(float value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated float unpacked_float = 99 [packed = false];</code>
-       *
        * @param values The unpackedFloat to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedFloat(java.lang.Iterable<? extends java.lang.Float> values) {
+      public Builder addAllUnpackedFloat(
+          java.lang.Iterable<? extends java.lang.Float> values) {
         ensureUnpackedFloatIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedFloat_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedFloat_);
         bitField2_ |= 0x00000001;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated float unpacked_float = 99 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedFloat() {
@@ -20466,58 +18173,50 @@ public Builder clearUnpackedFloat() {
       }
 
       private com.google.protobuf.Internal.DoubleList unpackedDouble_ = emptyDoubleList();
-
       private void ensureUnpackedDoubleIsMutable() {
         if (!unpackedDouble_.isModifiable()) {
           unpackedDouble_ = makeMutableCopy(unpackedDouble_);
         }
         bitField2_ |= 0x00000002;
       }
-
       private void ensureUnpackedDoubleIsMutable(int capacity) {
         if (!unpackedDouble_.isModifiable()) {
           unpackedDouble_ = makeMutableCopy(unpackedDouble_, capacity);
         }
         bitField2_ |= 0x00000002;
       }
-
       /**
        * <code>repeated double unpacked_double = 100 [packed = false];</code>
-       *
        * @return A list containing the unpackedDouble.
        */
-      public java.util.List<java.lang.Double> getUnpackedDoubleList() {
+      public java.util.List<java.lang.Double>
+          getUnpackedDoubleList() {
         unpackedDouble_.makeImmutable();
         return unpackedDouble_;
       }
-
       /**
        * <code>repeated double unpacked_double = 100 [packed = false];</code>
-       *
        * @return The count of unpackedDouble.
        */
       public int getUnpackedDoubleCount() {
         return unpackedDouble_.size();
       }
-
       /**
        * <code>repeated double unpacked_double = 100 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedDouble at the given index.
        */
       public double getUnpackedDouble(int index) {
         return unpackedDouble_.getDouble(index);
       }
-
       /**
        * <code>repeated double unpacked_double = 100 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedDouble to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedDouble(int index, double value) {
+      public Builder setUnpackedDouble(
+          int index, double value) {
 
         ensureUnpackedDoubleIsMutable();
         unpackedDouble_.setDouble(index, value);
@@ -20525,10 +18224,8 @@ public Builder setUnpackedDouble(int index, double value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated double unpacked_double = 100 [packed = false];</code>
-       *
        * @param value The unpackedDouble to add.
        * @return This builder for chaining.
        */
@@ -20540,24 +18237,22 @@ public Builder addUnpackedDouble(double value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated double unpacked_double = 100 [packed = false];</code>
-       *
        * @param values The unpackedDouble to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedDouble(java.lang.Iterable<? extends java.lang.Double> values) {
+      public Builder addAllUnpackedDouble(
+          java.lang.Iterable<? extends java.lang.Double> values) {
         ensureUnpackedDoubleIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedDouble_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedDouble_);
         bitField2_ |= 0x00000002;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated double unpacked_double = 100 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedDouble() {
@@ -20568,58 +18263,50 @@ public Builder clearUnpackedDouble() {
       }
 
       private com.google.protobuf.Internal.BooleanList unpackedBool_ = emptyBooleanList();
-
       private void ensureUnpackedBoolIsMutable() {
         if (!unpackedBool_.isModifiable()) {
           unpackedBool_ = makeMutableCopy(unpackedBool_);
         }
         bitField2_ |= 0x00000004;
       }
-
       private void ensureUnpackedBoolIsMutable(int capacity) {
         if (!unpackedBool_.isModifiable()) {
           unpackedBool_ = makeMutableCopy(unpackedBool_, capacity);
         }
         bitField2_ |= 0x00000004;
       }
-
       /**
        * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-       *
        * @return A list containing the unpackedBool.
        */
-      public java.util.List<java.lang.Boolean> getUnpackedBoolList() {
+      public java.util.List<java.lang.Boolean>
+          getUnpackedBoolList() {
         unpackedBool_.makeImmutable();
         return unpackedBool_;
       }
-
       /**
        * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-       *
        * @return The count of unpackedBool.
        */
       public int getUnpackedBoolCount() {
         return unpackedBool_.size();
       }
-
       /**
        * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedBool at the given index.
        */
       public boolean getUnpackedBool(int index) {
         return unpackedBool_.getBoolean(index);
       }
-
       /**
        * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedBool to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedBool(int index, boolean value) {
+      public Builder setUnpackedBool(
+          int index, boolean value) {
 
         ensureUnpackedBoolIsMutable();
         unpackedBool_.setBoolean(index, value);
@@ -20627,10 +18314,8 @@ public Builder setUnpackedBool(int index, boolean value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-       *
        * @param value The unpackedBool to add.
        * @return This builder for chaining.
        */
@@ -20642,24 +18327,22 @@ public Builder addUnpackedBool(boolean value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-       *
        * @param values The unpackedBool to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedBool(java.lang.Iterable<? extends java.lang.Boolean> values) {
+      public Builder addAllUnpackedBool(
+          java.lang.Iterable<? extends java.lang.Boolean> values) {
         ensureUnpackedBoolIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedBool_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedBool_);
         bitField2_ |= 0x00000004;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedBool() {
@@ -20670,67 +18353,44 @@ public Builder clearUnpackedBool() {
       }
 
       private java.util.List<java.lang.Integer> unpackedNestedEnum_ =
-          java.util.Collections.emptyList();
-
+        java.util.Collections.emptyList();
       private void ensureUnpackedNestedEnumIsMutable() {
         if (!((bitField2_ & 0x00000008) != 0)) {
           unpackedNestedEnum_ = new java.util.ArrayList<java.lang.Integer>(unpackedNestedEnum_);
           bitField2_ |= 0x00000008;
         }
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @return A list containing the unpackedNestedEnum.
        */
-      public java.util.List<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-          getUnpackedNestedEnumList() {
+      public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> getUnpackedNestedEnumList() {
         return new com.google.protobuf.Internal.ListAdapter<
-            java.lang.Integer,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(
-            unpackedNestedEnum_, unpackedNestedEnum_converter_);
+            java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(unpackedNestedEnum_, unpackedNestedEnum_converter_);
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @return The count of unpackedNestedEnum.
        */
       public int getUnpackedNestedEnumCount() {
         return unpackedNestedEnum_.size();
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @param index The index of the element to return.
        * @return The unpackedNestedEnum at the given index.
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-          getUnpackedNestedEnum(int index) {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getUnpackedNestedEnum(int index) {
         return unpackedNestedEnum_converter_.convert(unpackedNestedEnum_.get(index));
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @param index The index to set the value at.
        * @param value The unpackedNestedEnum to set.
        * @return This builder for chaining.
        */
       public Builder setUnpackedNestedEnum(
-          int index,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
+          int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -20739,17 +18399,12 @@ public Builder setUnpackedNestedEnum(
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @param value The unpackedNestedEnum to add.
        * @return This builder for chaining.
        */
-      public Builder addUnpackedNestedEnum(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
+      public Builder addUnpackedNestedEnum(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -20758,35 +18413,22 @@ public Builder addUnpackedNestedEnum(
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @param values The unpackedNestedEnum to add.
        * @return This builder for chaining.
        */
       public Builder addAllUnpackedNestedEnum(
-          java.lang.Iterable<
-                  ? extends
-                      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                          .NestedEnum>
-              values) {
+          java.lang.Iterable<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> values) {
         ensureUnpackedNestedEnumIsMutable();
-        for (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-            value : values) {
+        for (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value : values) {
           unpackedNestedEnum_.add(value.getNumber());
         }
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @return This builder for chaining.
        */
       public Builder clearUnpackedNestedEnum() {
@@ -20795,51 +18437,37 @@ public Builder clearUnpackedNestedEnum() {
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @return A list containing the enum numeric values on the wire for unpackedNestedEnum.
        */
-      public java.util.List<java.lang.Integer> getUnpackedNestedEnumValueList() {
+      public java.util.List<java.lang.Integer>
+      getUnpackedNestedEnumValueList() {
         return java.util.Collections.unmodifiableList(unpackedNestedEnum_);
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @param index The index of the value to return.
        * @return The enum numeric value on the wire of unpackedNestedEnum at the given index.
        */
       public int getUnpackedNestedEnumValue(int index) {
         return unpackedNestedEnum_.get(index);
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @param index The index to set the value at.
        * @param value The enum numeric value on the wire for unpackedNestedEnum to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedNestedEnumValue(int index, int value) {
+      public Builder setUnpackedNestedEnumValue(
+          int index, int value) {
         ensureUnpackedNestedEnumIsMutable();
         unpackedNestedEnum_.set(index, value);
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @param value The enum numeric value on the wire for unpackedNestedEnum to add.
        * @return This builder for chaining.
        */
@@ -20849,16 +18477,13 @@ public Builder addUnpackedNestedEnumValue(int value) {
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @param values The enum numeric values on the wire for unpackedNestedEnum to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedNestedEnumValue(java.lang.Iterable<java.lang.Integer> values) {
+      public Builder addAllUnpackedNestedEnumValue(
+          java.lang.Iterable<java.lang.Integer> values) {
         ensureUnpackedNestedEnumIsMutable();
         for (int value : values) {
           unpackedNestedEnum_.add(value);
@@ -20867,8 +18492,8 @@ public Builder addAllUnpackedNestedEnumValue(java.lang.Iterable<java.lang.Intege
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer> mapInt32Int32_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> mapInt32Int32_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
           internalGetMapInt32Int32() {
         if (mapInt32Int32_ == null) {
@@ -20877,13 +18502,11 @@ public Builder addAllUnpackedNestedEnumValue(java.lang.Iterable<java.lang.Intege
         }
         return mapInt32Int32_;
       }
-
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
           internalGetMutableMapInt32Int32() {
         if (mapInt32Int32_ == null) {
-          mapInt32Int32_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapInt32Int32DefaultEntryHolder.defaultEntry);
+          mapInt32Int32_ = com.google.protobuf.MapField.newMapField(
+              MapInt32Int32DefaultEntryHolder.defaultEntry);
         }
         if (!mapInt32Int32_.isMutable()) {
           mapInt32Int32_ = mapInt32Int32_.copy();
@@ -20892,14 +18515,10 @@ public Builder addAllUnpackedNestedEnumValue(java.lang.Iterable<java.lang.Intege
         onChanged();
         return mapInt32Int32_;
       }
-
       public int getMapInt32Int32Count() {
         return internalGetMapInt32Int32().getMap().size();
       }
-
       /**
-       *
-       *
        * <pre>
        * Map
        * </pre>
@@ -20907,21 +18526,20 @@ public int getMapInt32Int32Count() {
        * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
        */
       @java.lang.Override
-      public boolean containsMapInt32Int32(int key) {
+      public boolean containsMapInt32Int32(
+          int key) {
 
         return internalGetMapInt32Int32().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapInt32Int32Map()} instead. */
+      /**
+       * Use {@link #getMapInt32Int32Map()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32() {
         return getMapInt32Int32Map();
       }
-
       /**
-       *
-       *
        * <pre>
        * Map
        * </pre>
@@ -20932,10 +18550,7 @@ public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32() {
       public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32Map() {
         return internalGetMapInt32Int32().getMap();
       }
-
       /**
-       *
-       *
        * <pre>
        * Map
        * </pre>
@@ -20943,16 +18558,15 @@ public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32Map()
        * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
        */
       @java.lang.Override
-      public int getMapInt32Int32OrDefault(int key, int defaultValue) {
+      public int getMapInt32Int32OrDefault(
+          int key,
+          int defaultValue) {
 
         java.util.Map<java.lang.Integer, java.lang.Integer> map =
             internalGetMapInt32Int32().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
       /**
-       *
-       *
        * <pre>
        * Map
        * </pre>
@@ -20960,7 +18574,8 @@ public int getMapInt32Int32OrDefault(int key, int defaultValue) {
        * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
        */
       @java.lang.Override
-      public int getMapInt32Int32OrThrow(int key) {
+      public int getMapInt32Int32OrThrow(
+          int key) {
 
         java.util.Map<java.lang.Integer, java.lang.Integer> map =
             internalGetMapInt32Int32().getMap();
@@ -20969,54 +18584,53 @@ public int getMapInt32Int32OrThrow(int key) {
         }
         return map.get(key);
       }
-
       public Builder clearMapInt32Int32() {
         bitField2_ = (bitField2_ & ~0x00000010);
-        internalGetMutableMapInt32Int32().getMutableMap().clear();
+        internalGetMutableMapInt32Int32().getMutableMap()
+            .clear();
         return this;
       }
-
       /**
-       *
-       *
        * <pre>
        * Map
        * </pre>
        *
        * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
        */
-      public Builder removeMapInt32Int32(int key) {
+      public Builder removeMapInt32Int32(
+          int key) {
 
-        internalGetMutableMapInt32Int32().getMutableMap().remove(key);
+        internalGetMutableMapInt32Int32().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getMutableMapInt32Int32() {
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+          getMutableMapInt32Int32() {
         bitField2_ |= 0x00000010;
         return internalGetMutableMapInt32Int32().getMutableMap();
       }
-
       /**
-       *
-       *
        * <pre>
        * Map
        * </pre>
        *
        * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
        */
-      public Builder putMapInt32Int32(int key, int value) {
+      public Builder putMapInt32Int32(
+          int key,
+          int value) {
 
-        internalGetMutableMapInt32Int32().getMutableMap().put(key, value);
+
+        internalGetMutableMapInt32Int32().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00000010;
         return this;
       }
-
       /**
-       *
-       *
        * <pre>
        * Map
        * </pre>
@@ -21025,13 +18639,14 @@ public Builder putMapInt32Int32(int key, int value) {
        */
       public Builder putAllMapInt32Int32(
           java.util.Map<java.lang.Integer, java.lang.Integer> values) {
-        internalGetMutableMapInt32Int32().getMutableMap().putAll(values);
+        internalGetMutableMapInt32Int32().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00000010;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long> mapInt64Int64_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Long, java.lang.Long> mapInt64Int64_;
       private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
           internalGetMapInt64Int64() {
         if (mapInt64Int64_ == null) {
@@ -21040,13 +18655,11 @@ public Builder putAllMapInt32Int32(
         }
         return mapInt64Int64_;
       }
-
       private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
           internalGetMutableMapInt64Int64() {
         if (mapInt64Int64_ == null) {
-          mapInt64Int64_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapInt64Int64DefaultEntryHolder.defaultEntry);
+          mapInt64Int64_ = com.google.protobuf.MapField.newMapField(
+              MapInt64Int64DefaultEntryHolder.defaultEntry);
         }
         if (!mapInt64Int64_.isMutable()) {
           mapInt64Int64_ = mapInt64Int64_.copy();
@@ -21055,87 +18668,110 @@ public Builder putAllMapInt32Int32(
         onChanged();
         return mapInt64Int64_;
       }
-
       public int getMapInt64Int64Count() {
         return internalGetMapInt64Int64().getMap().size();
       }
-
-      /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
       @java.lang.Override
-      public boolean containsMapInt64Int64(long key) {
+      public boolean containsMapInt64Int64(
+          long key) {
 
         return internalGetMapInt64Int64().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapInt64Int64Map()} instead. */
+      /**
+       * Use {@link #getMapInt64Int64Map()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Long, java.lang.Long> getMapInt64Int64() {
         return getMapInt64Int64Map();
       }
-
-      /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Long, java.lang.Long> getMapInt64Int64Map() {
         return internalGetMapInt64Int64().getMap();
       }
-
-      /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
       @java.lang.Override
-      public long getMapInt64Int64OrDefault(long key, long defaultValue) {
+      public long getMapInt64Int64OrDefault(
+          long key,
+          long defaultValue) {
 
-        java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapInt64Int64().getMap();
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapInt64Int64().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
       @java.lang.Override
-      public long getMapInt64Int64OrThrow(long key) {
+      public long getMapInt64Int64OrThrow(
+          long key) {
 
-        java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapInt64Int64().getMap();
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapInt64Int64().getMap();
         if (!map.containsKey(key)) {
           throw new java.lang.IllegalArgumentException();
         }
         return map.get(key);
       }
-
       public Builder clearMapInt64Int64() {
         bitField2_ = (bitField2_ & ~0x00000020);
-        internalGetMutableMapInt64Int64().getMutableMap().clear();
+        internalGetMutableMapInt64Int64().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
+      public Builder removeMapInt64Int64(
+          long key) {
 
-      /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
-      public Builder removeMapInt64Int64(long key) {
-
-        internalGetMutableMapInt64Int64().getMutableMap().remove(key);
+        internalGetMutableMapInt64Int64().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Long, java.lang.Long> getMutableMapInt64Int64() {
+      public java.util.Map<java.lang.Long, java.lang.Long>
+          getMutableMapInt64Int64() {
         bitField2_ |= 0x00000020;
         return internalGetMutableMapInt64Int64().getMutableMap();
       }
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
+      public Builder putMapInt64Int64(
+          long key,
+          long value) {
 
-      /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
-      public Builder putMapInt64Int64(long key, long value) {
 
-        internalGetMutableMapInt64Int64().getMutableMap().put(key, value);
+        internalGetMutableMapInt64Int64().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00000020;
         return this;
       }
-
-      /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
-      public Builder putAllMapInt64Int64(java.util.Map<java.lang.Long, java.lang.Long> values) {
-        internalGetMutableMapInt64Int64().getMutableMap().putAll(values);
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
+      public Builder putAllMapInt64Int64(
+          java.util.Map<java.lang.Long, java.lang.Long> values) {
+        internalGetMutableMapInt64Int64().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00000020;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer> mapUint32Uint32_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> mapUint32Uint32_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
           internalGetMapUint32Uint32() {
         if (mapUint32Uint32_ == null) {
@@ -21144,13 +18780,11 @@ public Builder putAllMapInt64Int64(java.util.Map<java.lang.Long, java.lang.Long>
         }
         return mapUint32Uint32_;
       }
-
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
           internalGetMutableMapUint32Uint32() {
         if (mapUint32Uint32_ == null) {
-          mapUint32Uint32_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapUint32Uint32DefaultEntryHolder.defaultEntry);
+          mapUint32Uint32_ = com.google.protobuf.MapField.newMapField(
+              MapUint32Uint32DefaultEntryHolder.defaultEntry);
         }
         if (!mapUint32Uint32_.isMutable()) {
           mapUint32Uint32_ = mapUint32Uint32_.copy();
@@ -21159,43 +18793,51 @@ public Builder putAllMapInt64Int64(java.util.Map<java.lang.Long, java.lang.Long>
         onChanged();
         return mapUint32Uint32_;
       }
-
       public int getMapUint32Uint32Count() {
         return internalGetMapUint32Uint32().getMap().size();
       }
-
-      /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
       @java.lang.Override
-      public boolean containsMapUint32Uint32(int key) {
+      public boolean containsMapUint32Uint32(
+          int key) {
 
         return internalGetMapUint32Uint32().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapUint32Uint32Map()} instead. */
+      /**
+       * Use {@link #getMapUint32Uint32Map()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Integer, java.lang.Integer> getMapUint32Uint32() {
         return getMapUint32Uint32Map();
       }
-
-      /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Integer, java.lang.Integer> getMapUint32Uint32Map() {
         return internalGetMapUint32Uint32().getMap();
       }
-
-      /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
       @java.lang.Override
-      public int getMapUint32Uint32OrDefault(int key, int defaultValue) {
+      public int getMapUint32Uint32OrDefault(
+          int key,
+          int defaultValue) {
 
         java.util.Map<java.lang.Integer, java.lang.Integer> map =
             internalGetMapUint32Uint32().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
       @java.lang.Override
-      public int getMapUint32Uint32OrThrow(int key) {
+      public int getMapUint32Uint32OrThrow(
+          int key) {
 
         java.util.Map<java.lang.Integer, java.lang.Integer> map =
             internalGetMapUint32Uint32().getMap();
@@ -21204,45 +18846,57 @@ public int getMapUint32Uint32OrThrow(int key) {
         }
         return map.get(key);
       }
-
       public Builder clearMapUint32Uint32() {
         bitField2_ = (bitField2_ & ~0x00000040);
-        internalGetMutableMapUint32Uint32().getMutableMap().clear();
+        internalGetMutableMapUint32Uint32().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
+      public Builder removeMapUint32Uint32(
+          int key) {
 
-      /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
-      public Builder removeMapUint32Uint32(int key) {
-
-        internalGetMutableMapUint32Uint32().getMutableMap().remove(key);
+        internalGetMutableMapUint32Uint32().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getMutableMapUint32Uint32() {
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+          getMutableMapUint32Uint32() {
         bitField2_ |= 0x00000040;
         return internalGetMutableMapUint32Uint32().getMutableMap();
       }
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
+      public Builder putMapUint32Uint32(
+          int key,
+          int value) {
 
-      /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
-      public Builder putMapUint32Uint32(int key, int value) {
 
-        internalGetMutableMapUint32Uint32().getMutableMap().put(key, value);
+        internalGetMutableMapUint32Uint32().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00000040;
         return this;
       }
-
-      /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
       public Builder putAllMapUint32Uint32(
           java.util.Map<java.lang.Integer, java.lang.Integer> values) {
-        internalGetMutableMapUint32Uint32().getMutableMap().putAll(values);
+        internalGetMutableMapUint32Uint32().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00000040;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long> mapUint64Uint64_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Long, java.lang.Long> mapUint64Uint64_;
       private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
           internalGetMapUint64Uint64() {
         if (mapUint64Uint64_ == null) {
@@ -21251,13 +18905,11 @@ public Builder putAllMapUint32Uint32(
         }
         return mapUint64Uint64_;
       }
-
       private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
           internalGetMutableMapUint64Uint64() {
         if (mapUint64Uint64_ == null) {
-          mapUint64Uint64_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapUint64Uint64DefaultEntryHolder.defaultEntry);
+          mapUint64Uint64_ = com.google.protobuf.MapField.newMapField(
+              MapUint64Uint64DefaultEntryHolder.defaultEntry);
         }
         if (!mapUint64Uint64_.isMutable()) {
           mapUint64Uint64_ = mapUint64Uint64_.copy();
@@ -21266,87 +18918,110 @@ public Builder putAllMapUint32Uint32(
         onChanged();
         return mapUint64Uint64_;
       }
-
       public int getMapUint64Uint64Count() {
         return internalGetMapUint64Uint64().getMap().size();
       }
-
-      /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
       @java.lang.Override
-      public boolean containsMapUint64Uint64(long key) {
+      public boolean containsMapUint64Uint64(
+          long key) {
 
         return internalGetMapUint64Uint64().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapUint64Uint64Map()} instead. */
+      /**
+       * Use {@link #getMapUint64Uint64Map()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Long, java.lang.Long> getMapUint64Uint64() {
         return getMapUint64Uint64Map();
       }
-
-      /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Long, java.lang.Long> getMapUint64Uint64Map() {
         return internalGetMapUint64Uint64().getMap();
       }
-
-      /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
       @java.lang.Override
-      public long getMapUint64Uint64OrDefault(long key, long defaultValue) {
+      public long getMapUint64Uint64OrDefault(
+          long key,
+          long defaultValue) {
 
-        java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapUint64Uint64().getMap();
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapUint64Uint64().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
       @java.lang.Override
-      public long getMapUint64Uint64OrThrow(long key) {
+      public long getMapUint64Uint64OrThrow(
+          long key) {
 
-        java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapUint64Uint64().getMap();
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapUint64Uint64().getMap();
         if (!map.containsKey(key)) {
           throw new java.lang.IllegalArgumentException();
         }
         return map.get(key);
       }
-
       public Builder clearMapUint64Uint64() {
         bitField2_ = (bitField2_ & ~0x00000080);
-        internalGetMutableMapUint64Uint64().getMutableMap().clear();
+        internalGetMutableMapUint64Uint64().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
+      public Builder removeMapUint64Uint64(
+          long key) {
 
-      /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
-      public Builder removeMapUint64Uint64(long key) {
-
-        internalGetMutableMapUint64Uint64().getMutableMap().remove(key);
+        internalGetMutableMapUint64Uint64().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Long, java.lang.Long> getMutableMapUint64Uint64() {
+      public java.util.Map<java.lang.Long, java.lang.Long>
+          getMutableMapUint64Uint64() {
         bitField2_ |= 0x00000080;
         return internalGetMutableMapUint64Uint64().getMutableMap();
       }
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
+      public Builder putMapUint64Uint64(
+          long key,
+          long value) {
 
-      /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
-      public Builder putMapUint64Uint64(long key, long value) {
 
-        internalGetMutableMapUint64Uint64().getMutableMap().put(key, value);
+        internalGetMutableMapUint64Uint64().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00000080;
         return this;
       }
-
-      /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
-      public Builder putAllMapUint64Uint64(java.util.Map<java.lang.Long, java.lang.Long> values) {
-        internalGetMutableMapUint64Uint64().getMutableMap().putAll(values);
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
+      public Builder putAllMapUint64Uint64(
+          java.util.Map<java.lang.Long, java.lang.Long> values) {
+        internalGetMutableMapUint64Uint64().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00000080;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer> mapSint32Sint32_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> mapSint32Sint32_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
           internalGetMapSint32Sint32() {
         if (mapSint32Sint32_ == null) {
@@ -21355,13 +19030,11 @@ public Builder putAllMapUint64Uint64(java.util.Map<java.lang.Long, java.lang.Lon
         }
         return mapSint32Sint32_;
       }
-
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
           internalGetMutableMapSint32Sint32() {
         if (mapSint32Sint32_ == null) {
-          mapSint32Sint32_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapSint32Sint32DefaultEntryHolder.defaultEntry);
+          mapSint32Sint32_ = com.google.protobuf.MapField.newMapField(
+              MapSint32Sint32DefaultEntryHolder.defaultEntry);
         }
         if (!mapSint32Sint32_.isMutable()) {
           mapSint32Sint32_ = mapSint32Sint32_.copy();
@@ -21370,43 +19043,51 @@ public Builder putAllMapUint64Uint64(java.util.Map<java.lang.Long, java.lang.Lon
         onChanged();
         return mapSint32Sint32_;
       }
-
       public int getMapSint32Sint32Count() {
         return internalGetMapSint32Sint32().getMap().size();
       }
-
-      /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
       @java.lang.Override
-      public boolean containsMapSint32Sint32(int key) {
+      public boolean containsMapSint32Sint32(
+          int key) {
 
         return internalGetMapSint32Sint32().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapSint32Sint32Map()} instead. */
+      /**
+       * Use {@link #getMapSint32Sint32Map()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSint32Sint32() {
         return getMapSint32Sint32Map();
       }
-
-      /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSint32Sint32Map() {
         return internalGetMapSint32Sint32().getMap();
       }
-
-      /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
       @java.lang.Override
-      public int getMapSint32Sint32OrDefault(int key, int defaultValue) {
+      public int getMapSint32Sint32OrDefault(
+          int key,
+          int defaultValue) {
 
         java.util.Map<java.lang.Integer, java.lang.Integer> map =
             internalGetMapSint32Sint32().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
       @java.lang.Override
-      public int getMapSint32Sint32OrThrow(int key) {
+      public int getMapSint32Sint32OrThrow(
+          int key) {
 
         java.util.Map<java.lang.Integer, java.lang.Integer> map =
             internalGetMapSint32Sint32().getMap();
@@ -21415,45 +19096,57 @@ public int getMapSint32Sint32OrThrow(int key) {
         }
         return map.get(key);
       }
-
       public Builder clearMapSint32Sint32() {
         bitField2_ = (bitField2_ & ~0x00000100);
-        internalGetMutableMapSint32Sint32().getMutableMap().clear();
+        internalGetMutableMapSint32Sint32().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
+      public Builder removeMapSint32Sint32(
+          int key) {
 
-      /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
-      public Builder removeMapSint32Sint32(int key) {
-
-        internalGetMutableMapSint32Sint32().getMutableMap().remove(key);
+        internalGetMutableMapSint32Sint32().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getMutableMapSint32Sint32() {
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+          getMutableMapSint32Sint32() {
         bitField2_ |= 0x00000100;
         return internalGetMutableMapSint32Sint32().getMutableMap();
       }
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
+      public Builder putMapSint32Sint32(
+          int key,
+          int value) {
 
-      /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
-      public Builder putMapSint32Sint32(int key, int value) {
 
-        internalGetMutableMapSint32Sint32().getMutableMap().put(key, value);
+        internalGetMutableMapSint32Sint32().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00000100;
         return this;
       }
-
-      /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
       public Builder putAllMapSint32Sint32(
           java.util.Map<java.lang.Integer, java.lang.Integer> values) {
-        internalGetMutableMapSint32Sint32().getMutableMap().putAll(values);
+        internalGetMutableMapSint32Sint32().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00000100;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long> mapSint64Sint64_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Long, java.lang.Long> mapSint64Sint64_;
       private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
           internalGetMapSint64Sint64() {
         if (mapSint64Sint64_ == null) {
@@ -21462,13 +19155,11 @@ public Builder putAllMapSint32Sint32(
         }
         return mapSint64Sint64_;
       }
-
       private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
           internalGetMutableMapSint64Sint64() {
         if (mapSint64Sint64_ == null) {
-          mapSint64Sint64_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapSint64Sint64DefaultEntryHolder.defaultEntry);
+          mapSint64Sint64_ = com.google.protobuf.MapField.newMapField(
+              MapSint64Sint64DefaultEntryHolder.defaultEntry);
         }
         if (!mapSint64Sint64_.isMutable()) {
           mapSint64Sint64_ = mapSint64Sint64_.copy();
@@ -21477,87 +19168,110 @@ public Builder putAllMapSint32Sint32(
         onChanged();
         return mapSint64Sint64_;
       }
-
       public int getMapSint64Sint64Count() {
         return internalGetMapSint64Sint64().getMap().size();
       }
-
-      /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
       @java.lang.Override
-      public boolean containsMapSint64Sint64(long key) {
+      public boolean containsMapSint64Sint64(
+          long key) {
 
         return internalGetMapSint64Sint64().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapSint64Sint64Map()} instead. */
+      /**
+       * Use {@link #getMapSint64Sint64Map()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Long, java.lang.Long> getMapSint64Sint64() {
         return getMapSint64Sint64Map();
       }
-
-      /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Long, java.lang.Long> getMapSint64Sint64Map() {
         return internalGetMapSint64Sint64().getMap();
       }
-
-      /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
       @java.lang.Override
-      public long getMapSint64Sint64OrDefault(long key, long defaultValue) {
+      public long getMapSint64Sint64OrDefault(
+          long key,
+          long defaultValue) {
 
-        java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapSint64Sint64().getMap();
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapSint64Sint64().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
       @java.lang.Override
-      public long getMapSint64Sint64OrThrow(long key) {
+      public long getMapSint64Sint64OrThrow(
+          long key) {
 
-        java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapSint64Sint64().getMap();
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapSint64Sint64().getMap();
         if (!map.containsKey(key)) {
           throw new java.lang.IllegalArgumentException();
         }
         return map.get(key);
       }
-
       public Builder clearMapSint64Sint64() {
         bitField2_ = (bitField2_ & ~0x00000200);
-        internalGetMutableMapSint64Sint64().getMutableMap().clear();
+        internalGetMutableMapSint64Sint64().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
+      public Builder removeMapSint64Sint64(
+          long key) {
 
-      /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
-      public Builder removeMapSint64Sint64(long key) {
-
-        internalGetMutableMapSint64Sint64().getMutableMap().remove(key);
+        internalGetMutableMapSint64Sint64().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Long, java.lang.Long> getMutableMapSint64Sint64() {
+      public java.util.Map<java.lang.Long, java.lang.Long>
+          getMutableMapSint64Sint64() {
         bitField2_ |= 0x00000200;
         return internalGetMutableMapSint64Sint64().getMutableMap();
       }
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
+      public Builder putMapSint64Sint64(
+          long key,
+          long value) {
 
-      /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
-      public Builder putMapSint64Sint64(long key, long value) {
 
-        internalGetMutableMapSint64Sint64().getMutableMap().put(key, value);
+        internalGetMutableMapSint64Sint64().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00000200;
         return this;
       }
-
-      /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
-      public Builder putAllMapSint64Sint64(java.util.Map<java.lang.Long, java.lang.Long> values) {
-        internalGetMutableMapSint64Sint64().getMutableMap().putAll(values);
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
+      public Builder putAllMapSint64Sint64(
+          java.util.Map<java.lang.Long, java.lang.Long> values) {
+        internalGetMutableMapSint64Sint64().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00000200;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer> mapFixed32Fixed32_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> mapFixed32Fixed32_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
           internalGetMapFixed32Fixed32() {
         if (mapFixed32Fixed32_ == null) {
@@ -21566,13 +19280,11 @@ public Builder putAllMapSint64Sint64(java.util.Map<java.lang.Long, java.lang.Lon
         }
         return mapFixed32Fixed32_;
       }
-
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
           internalGetMutableMapFixed32Fixed32() {
         if (mapFixed32Fixed32_ == null) {
-          mapFixed32Fixed32_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapFixed32Fixed32DefaultEntryHolder.defaultEntry);
+          mapFixed32Fixed32_ = com.google.protobuf.MapField.newMapField(
+              MapFixed32Fixed32DefaultEntryHolder.defaultEntry);
         }
         if (!mapFixed32Fixed32_.isMutable()) {
           mapFixed32Fixed32_ = mapFixed32Fixed32_.copy();
@@ -21581,43 +19293,51 @@ public Builder putAllMapSint64Sint64(java.util.Map<java.lang.Long, java.lang.Lon
         onChanged();
         return mapFixed32Fixed32_;
       }
-
       public int getMapFixed32Fixed32Count() {
         return internalGetMapFixed32Fixed32().getMap().size();
       }
-
-      /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
       @java.lang.Override
-      public boolean containsMapFixed32Fixed32(int key) {
+      public boolean containsMapFixed32Fixed32(
+          int key) {
 
         return internalGetMapFixed32Fixed32().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapFixed32Fixed32Map()} instead. */
+      /**
+       * Use {@link #getMapFixed32Fixed32Map()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Integer, java.lang.Integer> getMapFixed32Fixed32() {
         return getMapFixed32Fixed32Map();
       }
-
-      /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Integer, java.lang.Integer> getMapFixed32Fixed32Map() {
         return internalGetMapFixed32Fixed32().getMap();
       }
-
-      /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
       @java.lang.Override
-      public int getMapFixed32Fixed32OrDefault(int key, int defaultValue) {
+      public int getMapFixed32Fixed32OrDefault(
+          int key,
+          int defaultValue) {
 
         java.util.Map<java.lang.Integer, java.lang.Integer> map =
             internalGetMapFixed32Fixed32().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
       @java.lang.Override
-      public int getMapFixed32Fixed32OrThrow(int key) {
+      public int getMapFixed32Fixed32OrThrow(
+          int key) {
 
         java.util.Map<java.lang.Integer, java.lang.Integer> map =
             internalGetMapFixed32Fixed32().getMap();
@@ -21626,45 +19346,57 @@ public int getMapFixed32Fixed32OrThrow(int key) {
         }
         return map.get(key);
       }
-
       public Builder clearMapFixed32Fixed32() {
         bitField2_ = (bitField2_ & ~0x00000400);
-        internalGetMutableMapFixed32Fixed32().getMutableMap().clear();
+        internalGetMutableMapFixed32Fixed32().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
+      public Builder removeMapFixed32Fixed32(
+          int key) {
 
-      /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
-      public Builder removeMapFixed32Fixed32(int key) {
-
-        internalGetMutableMapFixed32Fixed32().getMutableMap().remove(key);
+        internalGetMutableMapFixed32Fixed32().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getMutableMapFixed32Fixed32() {
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+          getMutableMapFixed32Fixed32() {
         bitField2_ |= 0x00000400;
         return internalGetMutableMapFixed32Fixed32().getMutableMap();
       }
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
+      public Builder putMapFixed32Fixed32(
+          int key,
+          int value) {
 
-      /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
-      public Builder putMapFixed32Fixed32(int key, int value) {
 
-        internalGetMutableMapFixed32Fixed32().getMutableMap().put(key, value);
+        internalGetMutableMapFixed32Fixed32().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00000400;
         return this;
       }
-
-      /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
       public Builder putAllMapFixed32Fixed32(
           java.util.Map<java.lang.Integer, java.lang.Integer> values) {
-        internalGetMutableMapFixed32Fixed32().getMutableMap().putAll(values);
+        internalGetMutableMapFixed32Fixed32().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00000400;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long> mapFixed64Fixed64_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Long, java.lang.Long> mapFixed64Fixed64_;
       private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
           internalGetMapFixed64Fixed64() {
         if (mapFixed64Fixed64_ == null) {
@@ -21673,13 +19405,11 @@ public Builder putAllMapFixed32Fixed32(
         }
         return mapFixed64Fixed64_;
       }
-
       private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
           internalGetMutableMapFixed64Fixed64() {
         if (mapFixed64Fixed64_ == null) {
-          mapFixed64Fixed64_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapFixed64Fixed64DefaultEntryHolder.defaultEntry);
+          mapFixed64Fixed64_ = com.google.protobuf.MapField.newMapField(
+              MapFixed64Fixed64DefaultEntryHolder.defaultEntry);
         }
         if (!mapFixed64Fixed64_.isMutable()) {
           mapFixed64Fixed64_ = mapFixed64Fixed64_.copy();
@@ -21688,88 +19418,110 @@ public Builder putAllMapFixed32Fixed32(
         onChanged();
         return mapFixed64Fixed64_;
       }
-
       public int getMapFixed64Fixed64Count() {
         return internalGetMapFixed64Fixed64().getMap().size();
       }
-
-      /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
       @java.lang.Override
-      public boolean containsMapFixed64Fixed64(long key) {
+      public boolean containsMapFixed64Fixed64(
+          long key) {
 
         return internalGetMapFixed64Fixed64().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapFixed64Fixed64Map()} instead. */
+      /**
+       * Use {@link #getMapFixed64Fixed64Map()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Long, java.lang.Long> getMapFixed64Fixed64() {
         return getMapFixed64Fixed64Map();
       }
-
-      /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Long, java.lang.Long> getMapFixed64Fixed64Map() {
         return internalGetMapFixed64Fixed64().getMap();
       }
-
-      /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
       @java.lang.Override
-      public long getMapFixed64Fixed64OrDefault(long key, long defaultValue) {
+      public long getMapFixed64Fixed64OrDefault(
+          long key,
+          long defaultValue) {
 
-        java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapFixed64Fixed64().getMap();
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapFixed64Fixed64().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
       @java.lang.Override
-      public long getMapFixed64Fixed64OrThrow(long key) {
+      public long getMapFixed64Fixed64OrThrow(
+          long key) {
 
-        java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapFixed64Fixed64().getMap();
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapFixed64Fixed64().getMap();
         if (!map.containsKey(key)) {
           throw new java.lang.IllegalArgumentException();
         }
         return map.get(key);
       }
-
       public Builder clearMapFixed64Fixed64() {
         bitField2_ = (bitField2_ & ~0x00000800);
-        internalGetMutableMapFixed64Fixed64().getMutableMap().clear();
+        internalGetMutableMapFixed64Fixed64().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
+      public Builder removeMapFixed64Fixed64(
+          long key) {
 
-      /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
-      public Builder removeMapFixed64Fixed64(long key) {
-
-        internalGetMutableMapFixed64Fixed64().getMutableMap().remove(key);
+        internalGetMutableMapFixed64Fixed64().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Long, java.lang.Long> getMutableMapFixed64Fixed64() {
+      public java.util.Map<java.lang.Long, java.lang.Long>
+          getMutableMapFixed64Fixed64() {
         bitField2_ |= 0x00000800;
         return internalGetMutableMapFixed64Fixed64().getMutableMap();
       }
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
+      public Builder putMapFixed64Fixed64(
+          long key,
+          long value) {
 
-      /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
-      public Builder putMapFixed64Fixed64(long key, long value) {
 
-        internalGetMutableMapFixed64Fixed64().getMutableMap().put(key, value);
+        internalGetMutableMapFixed64Fixed64().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00000800;
         return this;
       }
-
-      /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
-      public Builder putAllMapFixed64Fixed64(java.util.Map<java.lang.Long, java.lang.Long> values) {
-        internalGetMutableMapFixed64Fixed64().getMutableMap().putAll(values);
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
+      public Builder putAllMapFixed64Fixed64(
+          java.util.Map<java.lang.Long, java.lang.Long> values) {
+        internalGetMutableMapFixed64Fixed64().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00000800;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-          mapSfixed32Sfixed32_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> mapSfixed32Sfixed32_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
           internalGetMapSfixed32Sfixed32() {
         if (mapSfixed32Sfixed32_ == null) {
@@ -21778,13 +19530,11 @@ public Builder putAllMapFixed64Fixed64(java.util.Map<java.lang.Long, java.lang.L
         }
         return mapSfixed32Sfixed32_;
       }
-
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
           internalGetMutableMapSfixed32Sfixed32() {
         if (mapSfixed32Sfixed32_ == null) {
-          mapSfixed32Sfixed32_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry);
+          mapSfixed32Sfixed32_ = com.google.protobuf.MapField.newMapField(
+              MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry);
         }
         if (!mapSfixed32Sfixed32_.isMutable()) {
           mapSfixed32Sfixed32_ = mapSfixed32Sfixed32_.copy();
@@ -21793,43 +19543,51 @@ public Builder putAllMapFixed64Fixed64(java.util.Map<java.lang.Long, java.lang.L
         onChanged();
         return mapSfixed32Sfixed32_;
       }
-
       public int getMapSfixed32Sfixed32Count() {
         return internalGetMapSfixed32Sfixed32().getMap().size();
       }
-
-      /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
       @java.lang.Override
-      public boolean containsMapSfixed32Sfixed32(int key) {
+      public boolean containsMapSfixed32Sfixed32(
+          int key) {
 
         return internalGetMapSfixed32Sfixed32().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapSfixed32Sfixed32Map()} instead. */
+      /**
+       * Use {@link #getMapSfixed32Sfixed32Map()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSfixed32Sfixed32() {
         return getMapSfixed32Sfixed32Map();
       }
-
-      /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSfixed32Sfixed32Map() {
         return internalGetMapSfixed32Sfixed32().getMap();
       }
-
-      /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
       @java.lang.Override
-      public int getMapSfixed32Sfixed32OrDefault(int key, int defaultValue) {
+      public int getMapSfixed32Sfixed32OrDefault(
+          int key,
+          int defaultValue) {
 
         java.util.Map<java.lang.Integer, java.lang.Integer> map =
             internalGetMapSfixed32Sfixed32().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
       @java.lang.Override
-      public int getMapSfixed32Sfixed32OrThrow(int key) {
+      public int getMapSfixed32Sfixed32OrThrow(
+          int key) {
 
         java.util.Map<java.lang.Integer, java.lang.Integer> map =
             internalGetMapSfixed32Sfixed32().getMap();
@@ -21838,45 +19596,57 @@ public int getMapSfixed32Sfixed32OrThrow(int key) {
         }
         return map.get(key);
       }
-
       public Builder clearMapSfixed32Sfixed32() {
         bitField2_ = (bitField2_ & ~0x00001000);
-        internalGetMutableMapSfixed32Sfixed32().getMutableMap().clear();
+        internalGetMutableMapSfixed32Sfixed32().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
+      public Builder removeMapSfixed32Sfixed32(
+          int key) {
 
-      /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
-      public Builder removeMapSfixed32Sfixed32(int key) {
-
-        internalGetMutableMapSfixed32Sfixed32().getMutableMap().remove(key);
+        internalGetMutableMapSfixed32Sfixed32().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getMutableMapSfixed32Sfixed32() {
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+          getMutableMapSfixed32Sfixed32() {
         bitField2_ |= 0x00001000;
         return internalGetMutableMapSfixed32Sfixed32().getMutableMap();
       }
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
+      public Builder putMapSfixed32Sfixed32(
+          int key,
+          int value) {
 
-      /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
-      public Builder putMapSfixed32Sfixed32(int key, int value) {
 
-        internalGetMutableMapSfixed32Sfixed32().getMutableMap().put(key, value);
+        internalGetMutableMapSfixed32Sfixed32().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00001000;
         return this;
       }
-
-      /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
       public Builder putAllMapSfixed32Sfixed32(
           java.util.Map<java.lang.Integer, java.lang.Integer> values) {
-        internalGetMutableMapSfixed32Sfixed32().getMutableMap().putAll(values);
+        internalGetMutableMapSfixed32Sfixed32().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00001000;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long> mapSfixed64Sfixed64_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Long, java.lang.Long> mapSfixed64Sfixed64_;
       private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
           internalGetMapSfixed64Sfixed64() {
         if (mapSfixed64Sfixed64_ == null) {
@@ -21885,13 +19655,11 @@ public Builder putAllMapSfixed32Sfixed32(
         }
         return mapSfixed64Sfixed64_;
       }
-
       private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
           internalGetMutableMapSfixed64Sfixed64() {
         if (mapSfixed64Sfixed64_ == null) {
-          mapSfixed64Sfixed64_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry);
+          mapSfixed64Sfixed64_ = com.google.protobuf.MapField.newMapField(
+              MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry);
         }
         if (!mapSfixed64Sfixed64_.isMutable()) {
           mapSfixed64Sfixed64_ = mapSfixed64Sfixed64_.copy();
@@ -21900,43 +19668,51 @@ public Builder putAllMapSfixed32Sfixed32(
         onChanged();
         return mapSfixed64Sfixed64_;
       }
-
       public int getMapSfixed64Sfixed64Count() {
         return internalGetMapSfixed64Sfixed64().getMap().size();
       }
-
-      /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
       @java.lang.Override
-      public boolean containsMapSfixed64Sfixed64(long key) {
+      public boolean containsMapSfixed64Sfixed64(
+          long key) {
 
         return internalGetMapSfixed64Sfixed64().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapSfixed64Sfixed64Map()} instead. */
+      /**
+       * Use {@link #getMapSfixed64Sfixed64Map()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Long, java.lang.Long> getMapSfixed64Sfixed64() {
         return getMapSfixed64Sfixed64Map();
       }
-
-      /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Long, java.lang.Long> getMapSfixed64Sfixed64Map() {
         return internalGetMapSfixed64Sfixed64().getMap();
       }
-
-      /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
       @java.lang.Override
-      public long getMapSfixed64Sfixed64OrDefault(long key, long defaultValue) {
+      public long getMapSfixed64Sfixed64OrDefault(
+          long key,
+          long defaultValue) {
 
         java.util.Map<java.lang.Long, java.lang.Long> map =
             internalGetMapSfixed64Sfixed64().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
       @java.lang.Override
-      public long getMapSfixed64Sfixed64OrThrow(long key) {
+      public long getMapSfixed64Sfixed64OrThrow(
+          long key) {
 
         java.util.Map<java.lang.Long, java.lang.Long> map =
             internalGetMapSfixed64Sfixed64().getMap();
@@ -21945,45 +19721,57 @@ public long getMapSfixed64Sfixed64OrThrow(long key) {
         }
         return map.get(key);
       }
-
       public Builder clearMapSfixed64Sfixed64() {
         bitField2_ = (bitField2_ & ~0x00002000);
-        internalGetMutableMapSfixed64Sfixed64().getMutableMap().clear();
+        internalGetMutableMapSfixed64Sfixed64().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
+      public Builder removeMapSfixed64Sfixed64(
+          long key) {
 
-      /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
-      public Builder removeMapSfixed64Sfixed64(long key) {
-
-        internalGetMutableMapSfixed64Sfixed64().getMutableMap().remove(key);
+        internalGetMutableMapSfixed64Sfixed64().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Long, java.lang.Long> getMutableMapSfixed64Sfixed64() {
+      public java.util.Map<java.lang.Long, java.lang.Long>
+          getMutableMapSfixed64Sfixed64() {
         bitField2_ |= 0x00002000;
         return internalGetMutableMapSfixed64Sfixed64().getMutableMap();
       }
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
+      public Builder putMapSfixed64Sfixed64(
+          long key,
+          long value) {
 
-      /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
-      public Builder putMapSfixed64Sfixed64(long key, long value) {
 
-        internalGetMutableMapSfixed64Sfixed64().getMutableMap().put(key, value);
+        internalGetMutableMapSfixed64Sfixed64().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00002000;
         return this;
       }
-
-      /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
       public Builder putAllMapSfixed64Sfixed64(
           java.util.Map<java.lang.Long, java.lang.Long> values) {
-        internalGetMutableMapSfixed64Sfixed64().getMutableMap().putAll(values);
+        internalGetMutableMapSfixed64Sfixed64().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00002000;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float> mapInt32Float_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Float> mapInt32Float_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float>
           internalGetMapInt32Float() {
         if (mapInt32Float_ == null) {
@@ -21992,13 +19780,11 @@ public Builder putAllMapSfixed64Sfixed64(
         }
         return mapInt32Float_;
       }
-
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float>
           internalGetMutableMapInt32Float() {
         if (mapInt32Float_ == null) {
-          mapInt32Float_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapInt32FloatDefaultEntryHolder.defaultEntry);
+          mapInt32Float_ = com.google.protobuf.MapField.newMapField(
+              MapInt32FloatDefaultEntryHolder.defaultEntry);
         }
         if (!mapInt32Float_.isMutable()) {
           mapInt32Float_ = mapInt32Float_.copy();
@@ -22007,87 +19793,110 @@ public Builder putAllMapSfixed64Sfixed64(
         onChanged();
         return mapInt32Float_;
       }
-
       public int getMapInt32FloatCount() {
         return internalGetMapInt32Float().getMap().size();
       }
-
-      /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
       @java.lang.Override
-      public boolean containsMapInt32Float(int key) {
+      public boolean containsMapInt32Float(
+          int key) {
 
         return internalGetMapInt32Float().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapInt32FloatMap()} instead. */
+      /**
+       * Use {@link #getMapInt32FloatMap()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Integer, java.lang.Float> getMapInt32Float() {
         return getMapInt32FloatMap();
       }
-
-      /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Integer, java.lang.Float> getMapInt32FloatMap() {
         return internalGetMapInt32Float().getMap();
       }
-
-      /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
       @java.lang.Override
-      public float getMapInt32FloatOrDefault(int key, float defaultValue) {
+      public float getMapInt32FloatOrDefault(
+          int key,
+          float defaultValue) {
 
-        java.util.Map<java.lang.Integer, java.lang.Float> map = internalGetMapInt32Float().getMap();
+        java.util.Map<java.lang.Integer, java.lang.Float> map =
+            internalGetMapInt32Float().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
       @java.lang.Override
-      public float getMapInt32FloatOrThrow(int key) {
+      public float getMapInt32FloatOrThrow(
+          int key) {
 
-        java.util.Map<java.lang.Integer, java.lang.Float> map = internalGetMapInt32Float().getMap();
+        java.util.Map<java.lang.Integer, java.lang.Float> map =
+            internalGetMapInt32Float().getMap();
         if (!map.containsKey(key)) {
           throw new java.lang.IllegalArgumentException();
         }
         return map.get(key);
       }
-
       public Builder clearMapInt32Float() {
         bitField2_ = (bitField2_ & ~0x00004000);
-        internalGetMutableMapInt32Float().getMutableMap().clear();
+        internalGetMutableMapInt32Float().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
+      public Builder removeMapInt32Float(
+          int key) {
 
-      /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
-      public Builder removeMapInt32Float(int key) {
-
-        internalGetMutableMapInt32Float().getMutableMap().remove(key);
+        internalGetMutableMapInt32Float().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Float> getMutableMapInt32Float() {
+      public java.util.Map<java.lang.Integer, java.lang.Float>
+          getMutableMapInt32Float() {
         bitField2_ |= 0x00004000;
         return internalGetMutableMapInt32Float().getMutableMap();
       }
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
+      public Builder putMapInt32Float(
+          int key,
+          float value) {
 
-      /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
-      public Builder putMapInt32Float(int key, float value) {
 
-        internalGetMutableMapInt32Float().getMutableMap().put(key, value);
+        internalGetMutableMapInt32Float().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00004000;
         return this;
       }
-
-      /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
-      public Builder putAllMapInt32Float(java.util.Map<java.lang.Integer, java.lang.Float> values) {
-        internalGetMutableMapInt32Float().getMutableMap().putAll(values);
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
+      public Builder putAllMapInt32Float(
+          java.util.Map<java.lang.Integer, java.lang.Float> values) {
+        internalGetMutableMapInt32Float().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00004000;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Double> mapInt32Double_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Double> mapInt32Double_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Double>
           internalGetMapInt32Double() {
         if (mapInt32Double_ == null) {
@@ -22096,13 +19905,11 @@ public Builder putAllMapInt32Float(java.util.Map<java.lang.Integer, java.lang.Fl
         }
         return mapInt32Double_;
       }
-
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Double>
           internalGetMutableMapInt32Double() {
         if (mapInt32Double_ == null) {
-          mapInt32Double_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapInt32DoubleDefaultEntryHolder.defaultEntry);
+          mapInt32Double_ = com.google.protobuf.MapField.newMapField(
+              MapInt32DoubleDefaultEntryHolder.defaultEntry);
         }
         if (!mapInt32Double_.isMutable()) {
           mapInt32Double_ = mapInt32Double_.copy();
@@ -22111,43 +19918,51 @@ public Builder putAllMapInt32Float(java.util.Map<java.lang.Integer, java.lang.Fl
         onChanged();
         return mapInt32Double_;
       }
-
       public int getMapInt32DoubleCount() {
         return internalGetMapInt32Double().getMap().size();
       }
-
-      /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
       @java.lang.Override
-      public boolean containsMapInt32Double(int key) {
+      public boolean containsMapInt32Double(
+          int key) {
 
         return internalGetMapInt32Double().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapInt32DoubleMap()} instead. */
+      /**
+       * Use {@link #getMapInt32DoubleMap()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Integer, java.lang.Double> getMapInt32Double() {
         return getMapInt32DoubleMap();
       }
-
-      /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Integer, java.lang.Double> getMapInt32DoubleMap() {
         return internalGetMapInt32Double().getMap();
       }
-
-      /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
       @java.lang.Override
-      public double getMapInt32DoubleOrDefault(int key, double defaultValue) {
+      public double getMapInt32DoubleOrDefault(
+          int key,
+          double defaultValue) {
 
         java.util.Map<java.lang.Integer, java.lang.Double> map =
             internalGetMapInt32Double().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
       @java.lang.Override
-      public double getMapInt32DoubleOrThrow(int key) {
+      public double getMapInt32DoubleOrThrow(
+          int key) {
 
         java.util.Map<java.lang.Integer, java.lang.Double> map =
             internalGetMapInt32Double().getMap();
@@ -22156,45 +19971,57 @@ public double getMapInt32DoubleOrThrow(int key) {
         }
         return map.get(key);
       }
-
       public Builder clearMapInt32Double() {
         bitField2_ = (bitField2_ & ~0x00008000);
-        internalGetMutableMapInt32Double().getMutableMap().clear();
+        internalGetMutableMapInt32Double().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
+      public Builder removeMapInt32Double(
+          int key) {
 
-      /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
-      public Builder removeMapInt32Double(int key) {
-
-        internalGetMutableMapInt32Double().getMutableMap().remove(key);
+        internalGetMutableMapInt32Double().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Double> getMutableMapInt32Double() {
+      public java.util.Map<java.lang.Integer, java.lang.Double>
+          getMutableMapInt32Double() {
         bitField2_ |= 0x00008000;
         return internalGetMutableMapInt32Double().getMutableMap();
       }
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
+      public Builder putMapInt32Double(
+          int key,
+          double value) {
 
-      /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
-      public Builder putMapInt32Double(int key, double value) {
 
-        internalGetMutableMapInt32Double().getMutableMap().put(key, value);
+        internalGetMutableMapInt32Double().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00008000;
         return this;
       }
-
-      /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
       public Builder putAllMapInt32Double(
           java.util.Map<java.lang.Integer, java.lang.Double> values) {
-        internalGetMutableMapInt32Double().getMutableMap().putAll(values);
+        internalGetMutableMapInt32Double().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00008000;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Boolean, java.lang.Boolean> mapBoolBool_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Boolean, java.lang.Boolean> mapBoolBool_;
       private com.google.protobuf.MapField<java.lang.Boolean, java.lang.Boolean>
           internalGetMapBoolBool() {
         if (mapBoolBool_ == null) {
@@ -22203,12 +20030,11 @@ public Builder putAllMapInt32Double(
         }
         return mapBoolBool_;
       }
-
       private com.google.protobuf.MapField<java.lang.Boolean, java.lang.Boolean>
           internalGetMutableMapBoolBool() {
         if (mapBoolBool_ == null) {
-          mapBoolBool_ =
-              com.google.protobuf.MapField.newMapField(MapBoolBoolDefaultEntryHolder.defaultEntry);
+          mapBoolBool_ = com.google.protobuf.MapField.newMapField(
+              MapBoolBoolDefaultEntryHolder.defaultEntry);
         }
         if (!mapBoolBool_.isMutable()) {
           mapBoolBool_ = mapBoolBool_.copy();
@@ -22217,87 +20043,110 @@ public Builder putAllMapInt32Double(
         onChanged();
         return mapBoolBool_;
       }
-
       public int getMapBoolBoolCount() {
         return internalGetMapBoolBool().getMap().size();
       }
-
-      /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
       @java.lang.Override
-      public boolean containsMapBoolBool(boolean key) {
+      public boolean containsMapBoolBool(
+          boolean key) {
 
         return internalGetMapBoolBool().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapBoolBoolMap()} instead. */
+      /**
+       * Use {@link #getMapBoolBoolMap()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Boolean, java.lang.Boolean> getMapBoolBool() {
         return getMapBoolBoolMap();
       }
-
-      /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Boolean, java.lang.Boolean> getMapBoolBoolMap() {
         return internalGetMapBoolBool().getMap();
       }
-
-      /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
       @java.lang.Override
-      public boolean getMapBoolBoolOrDefault(boolean key, boolean defaultValue) {
+      public boolean getMapBoolBoolOrDefault(
+          boolean key,
+          boolean defaultValue) {
 
-        java.util.Map<java.lang.Boolean, java.lang.Boolean> map = internalGetMapBoolBool().getMap();
+        java.util.Map<java.lang.Boolean, java.lang.Boolean> map =
+            internalGetMapBoolBool().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
       @java.lang.Override
-      public boolean getMapBoolBoolOrThrow(boolean key) {
+      public boolean getMapBoolBoolOrThrow(
+          boolean key) {
 
-        java.util.Map<java.lang.Boolean, java.lang.Boolean> map = internalGetMapBoolBool().getMap();
+        java.util.Map<java.lang.Boolean, java.lang.Boolean> map =
+            internalGetMapBoolBool().getMap();
         if (!map.containsKey(key)) {
           throw new java.lang.IllegalArgumentException();
         }
         return map.get(key);
       }
-
       public Builder clearMapBoolBool() {
         bitField2_ = (bitField2_ & ~0x00010000);
-        internalGetMutableMapBoolBool().getMutableMap().clear();
+        internalGetMutableMapBoolBool().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
+      public Builder removeMapBoolBool(
+          boolean key) {
 
-      /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
-      public Builder removeMapBoolBool(boolean key) {
-
-        internalGetMutableMapBoolBool().getMutableMap().remove(key);
+        internalGetMutableMapBoolBool().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Boolean, java.lang.Boolean> getMutableMapBoolBool() {
+      public java.util.Map<java.lang.Boolean, java.lang.Boolean>
+          getMutableMapBoolBool() {
         bitField2_ |= 0x00010000;
         return internalGetMutableMapBoolBool().getMutableMap();
       }
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
+      public Builder putMapBoolBool(
+          boolean key,
+          boolean value) {
 
-      /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
-      public Builder putMapBoolBool(boolean key, boolean value) {
 
-        internalGetMutableMapBoolBool().getMutableMap().put(key, value);
+        internalGetMutableMapBoolBool().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00010000;
         return this;
       }
-
-      /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
-      public Builder putAllMapBoolBool(java.util.Map<java.lang.Boolean, java.lang.Boolean> values) {
-        internalGetMutableMapBoolBool().getMutableMap().putAll(values);
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
+      public Builder putAllMapBoolBool(
+          java.util.Map<java.lang.Boolean, java.lang.Boolean> values) {
+        internalGetMutableMapBoolBool().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00010000;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.String, java.lang.String> mapStringString_;
-
+      private com.google.protobuf.MapField<
+          java.lang.String, java.lang.String> mapStringString_;
       private com.google.protobuf.MapField<java.lang.String, java.lang.String>
           internalGetMapStringString() {
         if (mapStringString_ == null) {
@@ -22306,13 +20155,11 @@ public Builder putAllMapBoolBool(java.util.Map<java.lang.Boolean, java.lang.Bool
         }
         return mapStringString_;
       }
-
       private com.google.protobuf.MapField<java.lang.String, java.lang.String>
           internalGetMutableMapStringString() {
         if (mapStringString_ == null) {
-          mapStringString_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapStringStringDefaultEntryHolder.defaultEntry);
+          mapStringString_ = com.google.protobuf.MapField.newMapField(
+              MapStringStringDefaultEntryHolder.defaultEntry);
         }
         if (!mapStringString_.isMutable()) {
           mapStringString_ = mapStringString_.copy();
@@ -22321,53 +20168,54 @@ public Builder putAllMapBoolBool(java.util.Map<java.lang.Boolean, java.lang.Bool
         onChanged();
         return mapStringString_;
       }
-
       public int getMapStringStringCount() {
         return internalGetMapStringString().getMap().size();
       }
-
-      /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
       @java.lang.Override
-      public boolean containsMapStringString(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public boolean containsMapStringString(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         return internalGetMapStringString().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapStringStringMap()} instead. */
+      /**
+       * Use {@link #getMapStringStringMap()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.String, java.lang.String> getMapStringString() {
         return getMapStringStringMap();
       }
-
-      /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.String, java.lang.String> getMapStringStringMap() {
         return internalGetMapStringString().getMap();
       }
-
-      /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
       @java.lang.Override
-      public /* nullable */ java.lang.String getMapStringStringOrDefault(
+      public /* nullable */
+java.lang.String getMapStringStringOrDefault(
           java.lang.String key,
           /* nullable */
-          java.lang.String defaultValue) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+java.lang.String defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, java.lang.String> map =
             internalGetMapStringString().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
       @java.lang.Override
-      public java.lang.String getMapStringStringOrThrow(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public java.lang.String getMapStringStringOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, java.lang.String> map =
             internalGetMapStringString().getMap();
         if (!map.containsKey(key)) {
@@ -22375,53 +20223,57 @@ public java.lang.String getMapStringStringOrThrow(java.lang.String key) {
         }
         return map.get(key);
       }
-
       public Builder clearMapStringString() {
         bitField2_ = (bitField2_ & ~0x00020000);
-        internalGetMutableMapStringString().getMutableMap().clear();
+        internalGetMutableMapStringString().getMutableMap()
+            .clear();
         return this;
       }
-
-      /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
-      public Builder removeMapStringString(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        internalGetMutableMapStringString().getMutableMap().remove(key);
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
+      public Builder removeMapStringString(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringString().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.String, java.lang.String> getMutableMapStringString() {
+      public java.util.Map<java.lang.String, java.lang.String>
+          getMutableMapStringString() {
         bitField2_ |= 0x00020000;
         return internalGetMutableMapStringString().getMutableMap();
       }
-
-      /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
-      public Builder putMapStringString(java.lang.String key, java.lang.String value) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        if (value == null) {
-          throw new NullPointerException("map value");
-        }
-        internalGetMutableMapStringString().getMutableMap().put(key, value);
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
+      public Builder putMapStringString(
+          java.lang.String key,
+          java.lang.String value) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        if (value == null) { throw new NullPointerException("map value"); }
+        internalGetMutableMapStringString().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00020000;
         return this;
       }
-
-      /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
       public Builder putAllMapStringString(
           java.util.Map<java.lang.String, java.lang.String> values) {
-        internalGetMutableMapStringString().getMutableMap().putAll(values);
+        internalGetMutableMapStringString().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00020000;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.String, com.google.protobuf.ByteString>
-          mapStringBytes_;
-
+      private com.google.protobuf.MapField<
+          java.lang.String, com.google.protobuf.ByteString> mapStringBytes_;
       private com.google.protobuf.MapField<java.lang.String, com.google.protobuf.ByteString>
           internalGetMapStringBytes() {
         if (mapStringBytes_ == null) {
@@ -22430,13 +20282,11 @@ public Builder putAllMapStringString(
         }
         return mapStringBytes_;
       }
-
       private com.google.protobuf.MapField<java.lang.String, com.google.protobuf.ByteString>
           internalGetMutableMapStringBytes() {
         if (mapStringBytes_ == null) {
-          mapStringBytes_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapStringBytesDefaultEntryHolder.defaultEntry);
+          mapStringBytes_ = com.google.protobuf.MapField.newMapField(
+              MapStringBytesDefaultEntryHolder.defaultEntry);
         }
         if (!mapStringBytes_.isMutable()) {
           mapStringBytes_ = mapStringBytes_.copy();
@@ -22445,54 +20295,54 @@ public Builder putAllMapStringString(
         onChanged();
         return mapStringBytes_;
       }
-
       public int getMapStringBytesCount() {
         return internalGetMapStringBytes().getMap().size();
       }
-
-      /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
       @java.lang.Override
-      public boolean containsMapStringBytes(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public boolean containsMapStringBytes(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         return internalGetMapStringBytes().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapStringBytesMap()} instead. */
+      /**
+       * Use {@link #getMapStringBytesMap()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.String, com.google.protobuf.ByteString> getMapStringBytes() {
         return getMapStringBytesMap();
       }
-
-      /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
       @java.lang.Override
-      public java.util.Map<java.lang.String, com.google.protobuf.ByteString>
-          getMapStringBytesMap() {
+      public java.util.Map<java.lang.String, com.google.protobuf.ByteString> getMapStringBytesMap() {
         return internalGetMapStringBytes().getMap();
       }
-
-      /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
       @java.lang.Override
-      public /* nullable */ com.google.protobuf.ByteString getMapStringBytesOrDefault(
+      public /* nullable */
+com.google.protobuf.ByteString getMapStringBytesOrDefault(
           java.lang.String key,
           /* nullable */
-          com.google.protobuf.ByteString defaultValue) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+com.google.protobuf.ByteString defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, com.google.protobuf.ByteString> map =
             internalGetMapStringBytes().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
       @java.lang.Override
-      public com.google.protobuf.ByteString getMapStringBytesOrThrow(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public com.google.protobuf.ByteString getMapStringBytesOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, com.google.protobuf.ByteString> map =
             internalGetMapStringBytes().getMap();
         if (!map.containsKey(key)) {
@@ -22500,566 +20350,367 @@ public com.google.protobuf.ByteString getMapStringBytesOrThrow(java.lang.String
         }
         return map.get(key);
       }
-
       public Builder clearMapStringBytes() {
         bitField2_ = (bitField2_ & ~0x00040000);
-        internalGetMutableMapStringBytes().getMutableMap().clear();
+        internalGetMutableMapStringBytes().getMutableMap()
+            .clear();
         return this;
       }
-
-      /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
-      public Builder removeMapStringBytes(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        internalGetMutableMapStringBytes().getMutableMap().remove(key);
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
+      public Builder removeMapStringBytes(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringBytes().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
       public java.util.Map<java.lang.String, com.google.protobuf.ByteString>
           getMutableMapStringBytes() {
         bitField2_ |= 0x00040000;
         return internalGetMutableMapStringBytes().getMutableMap();
       }
-
-      /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
-      public Builder putMapStringBytes(java.lang.String key, com.google.protobuf.ByteString value) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        if (value == null) {
-          throw new NullPointerException("map value");
-        }
-        internalGetMutableMapStringBytes().getMutableMap().put(key, value);
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
+      public Builder putMapStringBytes(
+          java.lang.String key,
+          com.google.protobuf.ByteString value) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        if (value == null) { throw new NullPointerException("map value"); }
+        internalGetMutableMapStringBytes().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00040000;
         return this;
       }
-
-      /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
       public Builder putAllMapStringBytes(
           java.util.Map<java.lang.String, com.google.protobuf.ByteString> values) {
-        internalGetMutableMapStringBytes().getMutableMap().putAll(values);
+        internalGetMutableMapStringBytes().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00040000;
         return this;
       }
 
-      private static final class MapStringNestedMessageConverter
-          implements com.google.protobuf.MapFieldBuilder.Converter<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .NestedMessageOrBuilder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> {
+      private static final class MapStringNestedMessageConverter implements com.google.protobuf.MapFieldBuilder.Converter<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> {
         @java.lang.Override
-        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-            build(
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                        .NestedMessageOrBuilder
-                    val) {
-          if (val
-              instanceof
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) {
-            return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .NestedMessage)
-                val;
-          }
-          return ((legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage.Builder)
-                  val)
-              .build();
+        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage build(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder val) {
+          if (val instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) { return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) val; }
+          return ((legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder) val).build();
         }
 
         @java.lang.Override
-        public com.google.protobuf.MapEntry<
-                java.lang.String,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-            defaultEntry() {
+        public com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> defaultEntry() {
           return MapStringNestedMessageDefaultEntryHolder.defaultEntry;
         }
-      }
-      ;
-
-      private static final MapStringNestedMessageConverter mapStringNestedMessageConverter =
-          new MapStringNestedMessageConverter();
+      };
+      private static final MapStringNestedMessageConverter mapStringNestedMessageConverter = new MapStringNestedMessageConverter();
 
       private com.google.protobuf.MapFieldBuilder<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .NestedMessageOrBuilder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder>
-          mapStringNestedMessage_;
-
-      private com.google.protobuf.MapFieldBuilder<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .NestedMessageOrBuilder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder>
+          java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder> mapStringNestedMessage_;
+      private com.google.protobuf.MapFieldBuilder<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder>
           internalGetMapStringNestedMessage() {
         if (mapStringNestedMessage_ == null) {
           return new com.google.protobuf.MapFieldBuilder<>(mapStringNestedMessageConverter);
         }
         return mapStringNestedMessage_;
       }
-
-      private com.google.protobuf.MapFieldBuilder<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .NestedMessageOrBuilder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder>
+      private com.google.protobuf.MapFieldBuilder<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder>
           internalGetMutableMapStringNestedMessage() {
         if (mapStringNestedMessage_ == null) {
-          mapStringNestedMessage_ =
-              new com.google.protobuf.MapFieldBuilder<>(mapStringNestedMessageConverter);
+          mapStringNestedMessage_ = new com.google.protobuf.MapFieldBuilder<>(mapStringNestedMessageConverter);
         }
         bitField2_ |= 0x00080000;
         onChanged();
         return mapStringNestedMessage_;
       }
-
       public int getMapStringNestedMessageCount() {
         return internalGetMapStringNestedMessage().ensureBuilderMap().size();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
        */
       @java.lang.Override
-      public boolean containsMapStringNestedMessage(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public boolean containsMapStringNestedMessage(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         return internalGetMapStringNestedMessage().ensureBuilderMap().containsKey(key);
       }
-
-      /** Use {@link #getMapStringNestedMessageMap()} instead. */
+      /**
+       * Use {@link #getMapStringNestedMessageMap()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
-      public java.util.Map<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-          getMapStringNestedMessage() {
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> getMapStringNestedMessage() {
         return getMapStringNestedMessageMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
        */
       @java.lang.Override
-      public java.util.Map<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-          getMapStringNestedMessageMap() {
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> getMapStringNestedMessageMap() {
         return internalGetMapStringNestedMessage().getImmutableMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
        */
       @java.lang.Override
-      public /* nullable */ legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          getMapStringNestedMessageOrDefault(
-              java.lang.String key,
-              /* nullable */
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  defaultValue) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        java.util.Map<
-                java.lang.String,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .NestedMessageOrBuilder>
-            map = internalGetMutableMapStringNestedMessage().ensureBuilderMap();
-        return map.containsKey(key)
-            ? mapStringNestedMessageConverter.build(map.get(key))
-            : defaultValue;
+      public /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getMapStringNestedMessageOrDefault(
+          java.lang.String key,
+          /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> map = internalGetMutableMapStringNestedMessage().ensureBuilderMap();
+        return map.containsKey(key) ? mapStringNestedMessageConverter.build(map.get(key)) : defaultValue;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
        */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-          getMapStringNestedMessageOrThrow(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        java.util.Map<
-                java.lang.String,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .NestedMessageOrBuilder>
-            map = internalGetMutableMapStringNestedMessage().ensureBuilderMap();
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getMapStringNestedMessageOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> map = internalGetMutableMapStringNestedMessage().ensureBuilderMap();
         if (!map.containsKey(key)) {
           throw new java.lang.IllegalArgumentException();
         }
         return mapStringNestedMessageConverter.build(map.get(key));
       }
-
       public Builder clearMapStringNestedMessage() {
         bitField2_ = (bitField2_ & ~0x00080000);
         internalGetMutableMapStringNestedMessage().clear();
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
        */
-      public Builder removeMapStringNestedMessage(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        internalGetMutableMapStringNestedMessage().ensureBuilderMap().remove(key);
+      public Builder removeMapStringNestedMessage(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringNestedMessage().ensureBuilderMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
           getMutableMapStringNestedMessage() {
         bitField2_ |= 0x00080000;
         return internalGetMutableMapStringNestedMessage().ensureMessageMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
        */
       public Builder putMapStringNestedMessage(
           java.lang.String key,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              value) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        if (value == null) {
-          throw new NullPointerException("map value");
-        }
-        internalGetMutableMapStringNestedMessage().ensureBuilderMap().put(key, value);
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage value) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        if (value == null) { throw new NullPointerException("map value"); }
+        internalGetMutableMapStringNestedMessage().ensureBuilderMap()
+            .put(key, value);
         bitField2_ |= 0x00080000;
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
        */
       public Builder putAllMapStringNestedMessage(
-          java.util.Map<
-                  java.lang.String,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage>
-              values) {
-        for (java.util.Map.Entry<
-                java.lang.String,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-            e : values.entrySet()) {
+          java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> values) {
+        for (java.util.Map.Entry<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> e : values.entrySet()) {
           if (e.getKey() == null || e.getValue() == null) {
             throw new NullPointerException();
           }
         }
-        internalGetMutableMapStringNestedMessage().ensureBuilderMap().putAll(values);
+        internalGetMutableMapStringNestedMessage().ensureBuilderMap()
+            .putAll(values);
         bitField2_ |= 0x00080000;
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .Builder
-          putMapStringNestedMessageBuilderIfAbsent(java.lang.String key) {
-        java.util.Map<
-                java.lang.String,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .NestedMessageOrBuilder>
-            builderMap = internalGetMutableMapStringNestedMessage().ensureBuilderMap();
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder
-            entry = builderMap.get(key);
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder putMapStringNestedMessageBuilderIfAbsent(
+          java.lang.String key) {
+        java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> builderMap = internalGetMutableMapStringNestedMessage().ensureBuilderMap();
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder entry = builderMap.get(key);
         if (entry == null) {
-          entry =
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .newBuilder();
+          entry = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.newBuilder();
           builderMap.put(key, entry);
         }
-        if (entry
-            instanceof
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) {
-          entry =
-              ((legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage)
-                      entry)
-                  .toBuilder();
+        if (entry instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) {
+          entry = ((legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) entry).toBuilder();
           builderMap.put(key, entry);
         }
-        return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                .Builder)
-            entry;
+        return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder) entry;
       }
 
-      private static final class MapStringForeignMessageConverter
-          implements com.google.protobuf.MapFieldBuilder.Converter<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> {
+      private static final class MapStringForeignMessageConverter implements com.google.protobuf.MapFieldBuilder.Converter<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> {
         @java.lang.Override
-        public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage build(
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder val) {
-          if (val instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage) {
-            return (legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage) val;
-          }
-          return ((legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder) val)
-              .build();
+        public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage build(legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder val) {
+          if (val instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage) { return (legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage) val; }
+          return ((legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder) val).build();
         }
 
         @java.lang.Override
-        public com.google.protobuf.MapEntry<
-                java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-            defaultEntry() {
+        public com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> defaultEntry() {
           return MapStringForeignMessageDefaultEntryHolder.defaultEntry;
         }
-      }
-      ;
-
-      private static final MapStringForeignMessageConverter mapStringForeignMessageConverter =
-          new MapStringForeignMessageConverter();
-
-      private com.google.protobuf.MapFieldBuilder<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder>
-          mapStringForeignMessage_;
+      };
+      private static final MapStringForeignMessageConverter mapStringForeignMessageConverter = new MapStringForeignMessageConverter();
 
       private com.google.protobuf.MapFieldBuilder<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder>
+          java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder> mapStringForeignMessage_;
+      private com.google.protobuf.MapFieldBuilder<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder>
           internalGetMapStringForeignMessage() {
         if (mapStringForeignMessage_ == null) {
           return new com.google.protobuf.MapFieldBuilder<>(mapStringForeignMessageConverter);
         }
         return mapStringForeignMessage_;
       }
-
-      private com.google.protobuf.MapFieldBuilder<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder>
+      private com.google.protobuf.MapFieldBuilder<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder>
           internalGetMutableMapStringForeignMessage() {
         if (mapStringForeignMessage_ == null) {
-          mapStringForeignMessage_ =
-              new com.google.protobuf.MapFieldBuilder<>(mapStringForeignMessageConverter);
+          mapStringForeignMessage_ = new com.google.protobuf.MapFieldBuilder<>(mapStringForeignMessageConverter);
         }
         bitField2_ |= 0x00100000;
         onChanged();
         return mapStringForeignMessage_;
       }
-
       public int getMapStringForeignMessageCount() {
         return internalGetMapStringForeignMessage().ensureBuilderMap().size();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
        */
       @java.lang.Override
-      public boolean containsMapStringForeignMessage(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public boolean containsMapStringForeignMessage(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         return internalGetMapStringForeignMessage().ensureBuilderMap().containsKey(key);
       }
-
-      /** Use {@link #getMapStringForeignMessageMap()} instead. */
+      /**
+       * Use {@link #getMapStringForeignMessageMap()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
-      public java.util.Map<
-              java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-          getMapStringForeignMessage() {
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> getMapStringForeignMessage() {
         return getMapStringForeignMessageMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
        */
       @java.lang.Override
-      public java.util.Map<
-              java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-          getMapStringForeignMessageMap() {
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> getMapStringForeignMessageMap() {
         return internalGetMapStringForeignMessage().getImmutableMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
        */
       @java.lang.Override
-      public /* nullable */ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-          getMapStringForeignMessageOrDefault(
-              java.lang.String key,
-              /* nullable */
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage defaultValue) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        java.util.Map<
-                java.lang.String,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>
-            map = internalGetMutableMapStringForeignMessage().ensureBuilderMap();
-        return map.containsKey(key)
-            ? mapStringForeignMessageConverter.build(map.get(key))
-            : defaultValue;
+      public /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getMapStringForeignMessageOrDefault(
+          java.lang.String key,
+          /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder> map = internalGetMutableMapStringForeignMessage().ensureBuilderMap();
+        return map.containsKey(key) ? mapStringForeignMessageConverter.build(map.get(key)) : defaultValue;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
        */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-          getMapStringForeignMessageOrThrow(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        java.util.Map<
-                java.lang.String,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>
-            map = internalGetMutableMapStringForeignMessage().ensureBuilderMap();
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getMapStringForeignMessageOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder> map = internalGetMutableMapStringForeignMessage().ensureBuilderMap();
         if (!map.containsKey(key)) {
           throw new java.lang.IllegalArgumentException();
         }
         return mapStringForeignMessageConverter.build(map.get(key));
       }
-
       public Builder clearMapStringForeignMessage() {
         bitField2_ = (bitField2_ & ~0x00100000);
         internalGetMutableMapStringForeignMessage().clear();
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
        */
-      public Builder removeMapStringForeignMessage(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        internalGetMutableMapStringForeignMessage().ensureBuilderMap().remove(key);
+      public Builder removeMapStringForeignMessage(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringForeignMessage().ensureBuilderMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<
-              java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
           getMutableMapStringForeignMessage() {
         bitField2_ |= 0x00100000;
         return internalGetMutableMapStringForeignMessage().ensureMessageMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
        */
       public Builder putMapStringForeignMessage(
           java.lang.String key,
           legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage value) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        if (value == null) {
-          throw new NullPointerException("map value");
-        }
-        internalGetMutableMapStringForeignMessage().ensureBuilderMap().put(key, value);
+        if (key == null) { throw new NullPointerException("map key"); }
+        if (value == null) { throw new NullPointerException("map value"); }
+        internalGetMutableMapStringForeignMessage().ensureBuilderMap()
+            .put(key, value);
         bitField2_ |= 0x00100000;
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
        */
       public Builder putAllMapStringForeignMessage(
-          java.util.Map<
-                  java.lang.String,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-              values) {
-        for (java.util.Map.Entry<
-                java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-            e : values.entrySet()) {
+          java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> values) {
+        for (java.util.Map.Entry<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> e : values.entrySet()) {
           if (e.getKey() == null || e.getValue() == null) {
             throw new NullPointerException();
           }
         }
-        internalGetMutableMapStringForeignMessage().ensureBuilderMap().putAll(values);
+        internalGetMutableMapStringForeignMessage().ensureBuilderMap()
+            .putAll(values);
         bitField2_ |= 0x00100000;
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder
-          putMapStringForeignMessageBuilderIfAbsent(java.lang.String key) {
-        java.util.Map<
-                java.lang.String,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>
-            builderMap = internalGetMutableMapStringForeignMessage().ensureBuilderMap();
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder entry =
-            builderMap.get(key);
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder putMapStringForeignMessageBuilderIfAbsent(
+          java.lang.String key) {
+        java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder> builderMap = internalGetMutableMapStringForeignMessage().ensureBuilderMap();
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder entry = builderMap.get(key);
         if (entry == null) {
           entry = legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.newBuilder();
           builderMap.put(key, entry);
         }
         if (entry instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage) {
-          entry =
-              ((legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage) entry)
-                  .toBuilder();
+          entry = ((legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage) entry).toBuilder();
           builderMap.put(key, entry);
         }
         return (legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder) entry;
       }
 
-      private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
-          mapStringNestedEnum_;
-
+      private com.google.protobuf.MapField<
+          java.lang.String, java.lang.Integer> mapStringNestedEnum_;
       private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
           internalGetMapStringNestedEnum() {
         if (mapStringNestedEnum_ == null) {
@@ -23068,13 +20719,11 @@ public Builder putAllMapStringForeignMessage(
         }
         return mapStringNestedEnum_;
       }
-
       private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
           internalGetMutableMapStringNestedEnum() {
         if (mapStringNestedEnum_ == null) {
-          mapStringNestedEnum_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapStringNestedEnumDefaultEntryHolder.defaultEntry);
+          mapStringNestedEnum_ = com.google.protobuf.MapField.newMapField(
+              MapStringNestedEnumDefaultEntryHolder.defaultEntry);
         }
         if (!mapStringNestedEnum_.isMutable()) {
           mapStringNestedEnum_ = mapStringNestedEnum_.copy();
@@ -23083,81 +20732,58 @@ public Builder putAllMapStringForeignMessage(
         onChanged();
         return mapStringNestedEnum_;
       }
-
       public int getMapStringNestedEnumCount() {
         return internalGetMapStringNestedEnum().getMap().size();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
       @java.lang.Override
-      public boolean containsMapStringNestedEnum(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public boolean containsMapStringNestedEnum(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         return internalGetMapStringNestedEnum().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapStringNestedEnumMap()} instead. */
+      /**
+       * Use {@link #getMapStringNestedEnumMap()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
-      public java.util.Map<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-          getMapStringNestedEnum() {
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
+      getMapStringNestedEnum() {
         return getMapStringNestedEnumMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
       @java.lang.Override
-      public java.util.Map<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-          getMapStringNestedEnumMap() {
-        return internalGetAdaptedMapStringNestedEnumMap(internalGetMapStringNestedEnum().getMap());
-      }
-
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
+      getMapStringNestedEnumMap() {
+        return internalGetAdaptedMapStringNestedEnumMap(
+            internalGetMapStringNestedEnum().getMap());}
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
       @java.lang.Override
-      public /* nullable */ legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedEnum
-          getMapStringNestedEnumOrDefault(
-              java.lang.String key,
-              /* nullable */
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                  defaultValue) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getMapStringNestedEnumOrDefault(
+          java.lang.String key,
+          /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, java.lang.Integer> map =
             internalGetMapStringNestedEnum().getMap();
         return map.containsKey(key)
-            ? mapStringNestedEnumValueConverter.doForward(map.get(key))
-            : defaultValue;
+               ? mapStringNestedEnumValueConverter.doForward(map.get(key))
+               : defaultValue;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-          getMapStringNestedEnumOrThrow(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getMapStringNestedEnumOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, java.lang.Integer> map =
             internalGetMapStringNestedEnum().getMap();
         if (!map.containsKey(key)) {
@@ -23165,49 +20791,42 @@ public boolean containsMapStringNestedEnum(java.lang.String key) {
         }
         return mapStringNestedEnumValueConverter.doForward(map.get(key));
       }
-
-      /** Use {@link #getMapStringNestedEnumValueMap()} instead. */
+      /**
+       * Use {@link #getMapStringNestedEnumValueMap()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
-      public java.util.Map<java.lang.String, java.lang.Integer> getMapStringNestedEnumValue() {
+      public java.util.Map<java.lang.String, java.lang.Integer>
+      getMapStringNestedEnumValue() {
         return getMapStringNestedEnumValueMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
       @java.lang.Override
-      public java.util.Map<java.lang.String, java.lang.Integer> getMapStringNestedEnumValueMap() {
+      public java.util.Map<java.lang.String, java.lang.Integer>
+      getMapStringNestedEnumValueMap() {
         return internalGetMapStringNestedEnum().getMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
       @java.lang.Override
-      public int getMapStringNestedEnumValueOrDefault(java.lang.String key, int defaultValue) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public int getMapStringNestedEnumValueOrDefault(
+          java.lang.String key,
+          int defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, java.lang.Integer> map =
             internalGetMapStringNestedEnum().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
       @java.lang.Override
-      public int getMapStringNestedEnumValueOrThrow(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public int getMapStringNestedEnumValueOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, java.lang.Integer> map =
             internalGetMapStringNestedEnum().getMap();
         if (!map.containsKey(key)) {
@@ -23215,111 +20834,91 @@ public int getMapStringNestedEnumValueOrThrow(java.lang.String key) {
         }
         return map.get(key);
       }
-
       public Builder clearMapStringNestedEnum() {
         bitField2_ = (bitField2_ & ~0x00200000);
-        internalGetMutableMapStringNestedEnum().getMutableMap().clear();
+        internalGetMutableMapStringNestedEnum().getMutableMap()
+            .clear();
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
-      public Builder removeMapStringNestedEnum(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        internalGetMutableMapStringNestedEnum().getMutableMap().remove(key);
+      public Builder removeMapStringNestedEnum(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringNestedEnum().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
           getMutableMapStringNestedEnum() {
         bitField2_ |= 0x00200000;
         return internalGetAdaptedMapStringNestedEnumMap(
-            internalGetMutableMapStringNestedEnum().getMutableMap());
+             internalGetMutableMapStringNestedEnum().getMutableMap());
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
       public Builder putMapStringNestedEnum(
           java.lang.String key,
           legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+        if (key == null) { throw new NullPointerException("map key"); }
 
-        internalGetMutableMapStringNestedEnum()
-            .getMutableMap()
+        internalGetMutableMapStringNestedEnum().getMutableMap()
             .put(key, mapStringNestedEnumValueConverter.doBackward(value));
         bitField2_ |= 0x00200000;
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
       public Builder putAllMapStringNestedEnum(
-          java.util.Map<
-                  java.lang.String,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-              values) {
+          java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> values) {
         internalGetAdaptedMapStringNestedEnumMap(
-                internalGetMutableMapStringNestedEnum().getMutableMap())
-            .putAll(values);
+            internalGetMutableMapStringNestedEnum().getMutableMap())
+                .putAll(values);
         bitField2_ |= 0x00200000;
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
       public java.util.Map<java.lang.String, java.lang.Integer>
-          getMutableMapStringNestedEnumValue() {
+      getMutableMapStringNestedEnumValue() {
         bitField2_ |= 0x00200000;
         return internalGetMutableMapStringNestedEnum().getMutableMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
-      public Builder putMapStringNestedEnumValue(java.lang.String key, int value) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public Builder putMapStringNestedEnumValue(
+          java.lang.String key,
+          int value) {
+        if (key == null) { throw new NullPointerException("map key"); }
 
-        internalGetMutableMapStringNestedEnum().getMutableMap().put(key, value);
+        internalGetMutableMapStringNestedEnum().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00200000;
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
       public Builder putAllMapStringNestedEnumValue(
           java.util.Map<java.lang.String, java.lang.Integer> values) {
-        internalGetMutableMapStringNestedEnum().getMutableMap().putAll(values);
+        internalGetMutableMapStringNestedEnum().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00200000;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
-          mapStringForeignEnum_;
-
+      private com.google.protobuf.MapField<
+          java.lang.String, java.lang.Integer> mapStringForeignEnum_;
       private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
           internalGetMapStringForeignEnum() {
         if (mapStringForeignEnum_ == null) {
@@ -23328,13 +20927,11 @@ public Builder putAllMapStringNestedEnumValue(
         }
         return mapStringForeignEnum_;
       }
-
       private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
           internalGetMutableMapStringForeignEnum() {
         if (mapStringForeignEnum_ == null) {
-          mapStringForeignEnum_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapStringForeignEnumDefaultEntryHolder.defaultEntry);
+          mapStringForeignEnum_ = com.google.protobuf.MapField.newMapField(
+              MapStringForeignEnumDefaultEntryHolder.defaultEntry);
         }
         if (!mapStringForeignEnum_.isMutable()) {
           mapStringForeignEnum_ = mapStringForeignEnum_.copy();
@@ -23343,78 +20940,58 @@ public Builder putAllMapStringNestedEnumValue(
         onChanged();
         return mapStringForeignEnum_;
       }
-
       public int getMapStringForeignEnumCount() {
         return internalGetMapStringForeignEnum().getMap().size();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
       @java.lang.Override
-      public boolean containsMapStringForeignEnum(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public boolean containsMapStringForeignEnum(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         return internalGetMapStringForeignEnum().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapStringForeignEnumMap()} instead. */
+      /**
+       * Use {@link #getMapStringForeignEnumMap()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
-      public java.util.Map<
-              java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-          getMapStringForeignEnum() {
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
+      getMapStringForeignEnum() {
         return getMapStringForeignEnumMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
       @java.lang.Override
-      public java.util.Map<
-              java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-          getMapStringForeignEnumMap() {
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
+      getMapStringForeignEnumMap() {
         return internalGetAdaptedMapStringForeignEnumMap(
-            internalGetMapStringForeignEnum().getMap());
-      }
-
+            internalGetMapStringForeignEnum().getMap());}
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
       @java.lang.Override
-      public /* nullable */ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum
-          getMapStringForeignEnumOrDefault(
-              java.lang.String key,
-              /* nullable */
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum defaultValue) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getMapStringForeignEnumOrDefault(
+          java.lang.String key,
+          /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, java.lang.Integer> map =
             internalGetMapStringForeignEnum().getMap();
         return map.containsKey(key)
-            ? mapStringForeignEnumValueConverter.doForward(map.get(key))
-            : defaultValue;
+               ? mapStringForeignEnumValueConverter.doForward(map.get(key))
+               : defaultValue;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum
-          getMapStringForeignEnumOrThrow(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getMapStringForeignEnumOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, java.lang.Integer> map =
             internalGetMapStringForeignEnum().getMap();
         if (!map.containsKey(key)) {
@@ -23422,49 +20999,42 @@ public boolean containsMapStringForeignEnum(java.lang.String key) {
         }
         return mapStringForeignEnumValueConverter.doForward(map.get(key));
       }
-
-      /** Use {@link #getMapStringForeignEnumValueMap()} instead. */
+      /**
+       * Use {@link #getMapStringForeignEnumValueMap()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
-      public java.util.Map<java.lang.String, java.lang.Integer> getMapStringForeignEnumValue() {
+      public java.util.Map<java.lang.String, java.lang.Integer>
+      getMapStringForeignEnumValue() {
         return getMapStringForeignEnumValueMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
       @java.lang.Override
-      public java.util.Map<java.lang.String, java.lang.Integer> getMapStringForeignEnumValueMap() {
+      public java.util.Map<java.lang.String, java.lang.Integer>
+      getMapStringForeignEnumValueMap() {
         return internalGetMapStringForeignEnum().getMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
       @java.lang.Override
-      public int getMapStringForeignEnumValueOrDefault(java.lang.String key, int defaultValue) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public int getMapStringForeignEnumValueOrDefault(
+          java.lang.String key,
+          int defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, java.lang.Integer> map =
             internalGetMapStringForeignEnum().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
       @java.lang.Override
-      public int getMapStringForeignEnumValueOrThrow(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public int getMapStringForeignEnumValueOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, java.lang.Integer> map =
             internalGetMapStringForeignEnum().getMap();
         if (!map.containsKey(key)) {
@@ -23472,118 +21042,98 @@ public int getMapStringForeignEnumValueOrThrow(java.lang.String key) {
         }
         return map.get(key);
       }
-
       public Builder clearMapStringForeignEnum() {
         bitField2_ = (bitField2_ & ~0x00400000);
-        internalGetMutableMapStringForeignEnum().getMutableMap().clear();
+        internalGetMutableMapStringForeignEnum().getMutableMap()
+            .clear();
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
-      public Builder removeMapStringForeignEnum(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        internalGetMutableMapStringForeignEnum().getMutableMap().remove(key);
+      public Builder removeMapStringForeignEnum(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringForeignEnum().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<
-              java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
           getMutableMapStringForeignEnum() {
         bitField2_ |= 0x00400000;
         return internalGetAdaptedMapStringForeignEnumMap(
-            internalGetMutableMapStringForeignEnum().getMutableMap());
+             internalGetMutableMapStringForeignEnum().getMutableMap());
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
       public Builder putMapStringForeignEnum(
           java.lang.String key,
           legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum value) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+        if (key == null) { throw new NullPointerException("map key"); }
 
-        internalGetMutableMapStringForeignEnum()
-            .getMutableMap()
+        internalGetMutableMapStringForeignEnum().getMutableMap()
             .put(key, mapStringForeignEnumValueConverter.doBackward(value));
         bitField2_ |= 0x00400000;
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
       public Builder putAllMapStringForeignEnum(
-          java.util.Map<
-                  java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-              values) {
+          java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum> values) {
         internalGetAdaptedMapStringForeignEnumMap(
-                internalGetMutableMapStringForeignEnum().getMutableMap())
-            .putAll(values);
+            internalGetMutableMapStringForeignEnum().getMutableMap())
+                .putAll(values);
         bitField2_ |= 0x00400000;
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
       public java.util.Map<java.lang.String, java.lang.Integer>
-          getMutableMapStringForeignEnumValue() {
+      getMutableMapStringForeignEnumValue() {
         bitField2_ |= 0x00400000;
         return internalGetMutableMapStringForeignEnum().getMutableMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
-      public Builder putMapStringForeignEnumValue(java.lang.String key, int value) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public Builder putMapStringForeignEnumValue(
+          java.lang.String key,
+          int value) {
+        if (key == null) { throw new NullPointerException("map key"); }
 
-        internalGetMutableMapStringForeignEnum().getMutableMap().put(key, value);
+        internalGetMutableMapStringForeignEnum().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00400000;
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
       public Builder putAllMapStringForeignEnumValue(
           java.util.Map<java.lang.String, java.lang.Integer> values) {
-        internalGetMutableMapStringForeignEnum().getMutableMap().putAll(values);
+        internalGetMutableMapStringForeignEnum().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00400000;
         return this;
       }
 
       /**
        * <code>uint32 oneof_uint32 = 111;</code>
-       *
        * @return Whether the oneofUint32 field is set.
        */
       public boolean hasOneofUint32() {
         return oneofFieldCase_ == 111;
       }
-
       /**
        * <code>uint32 oneof_uint32 = 111;</code>
-       *
        * @return The oneofUint32.
        */
       public int getOneofUint32() {
@@ -23592,10 +21142,8 @@ public int getOneofUint32() {
         }
         return 0;
       }
-
       /**
        * <code>uint32 oneof_uint32 = 111;</code>
-       *
        * @param value The oneofUint32 to set.
        * @return This builder for chaining.
        */
@@ -23606,10 +21154,8 @@ public Builder setOneofUint32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>uint32 oneof_uint32 = 111;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOneofUint32() {
@@ -23622,60 +21168,37 @@ public Builder clearOneofUint32() {
       }
 
       private com.google.protobuf.SingleFieldBuilder<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .NestedMessageOrBuilder>
-          oneofNestedMessageBuilder_;
-
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> oneofNestedMessageBuilder_;
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
        * @return Whether the oneofNestedMessage field is set.
        */
       @java.lang.Override
       public boolean hasOneofNestedMessage() {
         return oneofFieldCase_ == 112;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
        * @return The oneofNestedMessage.
        */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-          getOneofNestedMessage() {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getOneofNestedMessage() {
         if (oneofNestedMessageBuilder_ == null) {
           if (oneofFieldCase_ == 112) {
-            return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .NestedMessage)
-                oneofField_;
+            return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) oneofField_;
           }
-          return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .getDefaultInstance();
+          return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance();
         } else {
           if (oneofFieldCase_ == 112) {
             return oneofNestedMessageBuilder_.getMessage();
           }
-          return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .getDefaultInstance();
+          return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance();
         }
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
        */
-      public Builder setOneofNestedMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              value) {
+      public Builder setOneofNestedMessage(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage value) {
         if (oneofNestedMessageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -23688,16 +21211,11 @@ public Builder setOneofNestedMessage(
         oneofFieldCase_ = 112;
         return this;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
        */
       public Builder setOneofNestedMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder
-              builderForValue) {
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder builderForValue) {
         if (oneofNestedMessageBuilder_ == null) {
           oneofField_ = builderForValue.build();
           onChanged();
@@ -23707,28 +21225,15 @@ public Builder setOneofNestedMessage(
         oneofFieldCase_ = 112;
         return this;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
        */
-      public Builder mergeOneofNestedMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              value) {
+      public Builder mergeOneofNestedMessage(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage value) {
         if (oneofNestedMessageBuilder_ == null) {
-          if (oneofFieldCase_ == 112
-              && oneofField_
-                  != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage.getDefaultInstance()) {
-            oneofField_ =
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                    .newBuilder(
-                        (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                                .NestedMessage)
-                            oneofField_)
-                    .mergeFrom(value)
-                    .buildPartial();
+          if (oneofFieldCase_ == 112 &&
+              oneofField_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance()) {
+            oneofField_ = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.newBuilder((legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) oneofField_)
+                .mergeFrom(value).buildPartial();
           } else {
             oneofField_ = value;
           }
@@ -23743,11 +21248,8 @@ public Builder mergeOneofNestedMessage(
         oneofFieldCase_ = 112;
         return this;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
        */
       public Builder clearOneofNestedMessage() {
         if (oneofNestedMessageBuilder_ == null) {
@@ -23765,69 +21267,39 @@ public Builder clearOneofNestedMessage() {
         }
         return this;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .Builder
-          getOneofNestedMessageBuilder() {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder getOneofNestedMessageBuilder() {
         return getOneofNestedMessageFieldBuilder().getBuilder();
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
        */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessageOrBuilder
-          getOneofNestedMessageOrBuilder() {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder getOneofNestedMessageOrBuilder() {
         if ((oneofFieldCase_ == 112) && (oneofNestedMessageBuilder_ != null)) {
           return oneofNestedMessageBuilder_.getMessageOrBuilder();
         } else {
           if (oneofFieldCase_ == 112) {
-            return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .NestedMessage)
-                oneofField_;
+            return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) oneofField_;
           }
-          return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .getDefaultInstance();
+          return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance();
         }
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .NestedMessageOrBuilder>
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> 
           getOneofNestedMessageFieldBuilder() {
         if (oneofNestedMessageBuilder_ == null) {
           if (!(oneofFieldCase_ == 112)) {
-            oneofField_ =
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                    .getDefaultInstance();
+            oneofField_ = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance();
           }
-          oneofNestedMessageBuilder_ =
-              new com.google.protobuf.SingleFieldBuilder<
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage.Builder,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessageOrBuilder>(
-                  (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                          .NestedMessage)
-                      oneofField_,
+          oneofNestedMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder>(
+                  (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) oneofField_,
                   getParentForChildren(),
                   isClean());
           oneofField_ = null;
@@ -23839,17 +21311,14 @@ public Builder clearOneofNestedMessage() {
 
       /**
        * <code>string oneof_string = 113;</code>
-       *
        * @return Whether the oneofString field is set.
        */
       @java.lang.Override
       public boolean hasOneofString() {
         return oneofFieldCase_ == 113;
       }
-
       /**
        * <code>string oneof_string = 113;</code>
-       *
        * @return The oneofString.
        */
       @java.lang.Override
@@ -23859,7 +21328,8 @@ public java.lang.String getOneofString() {
           ref = oneofField_;
         }
         if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (oneofFieldCase_ == 113) {
             oneofField_ = s;
@@ -23869,21 +21339,21 @@ public java.lang.String getOneofString() {
           return (java.lang.String) ref;
         }
       }
-
       /**
        * <code>string oneof_string = 113;</code>
-       *
        * @return The bytes for oneofString.
        */
       @java.lang.Override
-      public com.google.protobuf.ByteString getOneofStringBytes() {
+      public com.google.protobuf.ByteString
+          getOneofStringBytes() {
         java.lang.Object ref = "";
         if (oneofFieldCase_ == 113) {
           ref = oneofField_;
         }
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
-              com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
           if (oneofFieldCase_ == 113) {
             oneofField_ = b;
           }
@@ -23892,26 +21362,21 @@ public com.google.protobuf.ByteString getOneofStringBytes() {
           return (com.google.protobuf.ByteString) ref;
         }
       }
-
       /**
        * <code>string oneof_string = 113;</code>
-       *
        * @param value The oneofString to set.
        * @return This builder for chaining.
        */
-      public Builder setOneofString(java.lang.String value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setOneofString(
+          java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
         oneofFieldCase_ = 113;
         oneofField_ = value;
         onChanged();
         return this;
       }
-
       /**
        * <code>string oneof_string = 113;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOneofString() {
@@ -23922,17 +21387,14 @@ public Builder clearOneofString() {
         }
         return this;
       }
-
       /**
        * <code>string oneof_string = 113;</code>
-       *
        * @param value The bytes for oneofString to set.
        * @return This builder for chaining.
        */
-      public Builder setOneofStringBytes(com.google.protobuf.ByteString value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setOneofStringBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
         checkByteStringIsUtf8(value);
         oneofFieldCase_ = 113;
         oneofField_ = value;
@@ -23942,16 +21404,13 @@ public Builder setOneofStringBytes(com.google.protobuf.ByteString value) {
 
       /**
        * <code>bytes oneof_bytes = 114;</code>
-       *
        * @return Whether the oneofBytes field is set.
        */
       public boolean hasOneofBytes() {
         return oneofFieldCase_ == 114;
       }
-
       /**
        * <code>bytes oneof_bytes = 114;</code>
-       *
        * @return The oneofBytes.
        */
       public com.google.protobuf.ByteString getOneofBytes() {
@@ -23960,26 +21419,20 @@ public com.google.protobuf.ByteString getOneofBytes() {
         }
         return com.google.protobuf.ByteString.EMPTY;
       }
-
       /**
        * <code>bytes oneof_bytes = 114;</code>
-       *
        * @param value The oneofBytes to set.
        * @return This builder for chaining.
        */
       public Builder setOneofBytes(com.google.protobuf.ByteString value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         oneofFieldCase_ = 114;
         oneofField_ = value;
         onChanged();
         return this;
       }
-
       /**
        * <code>bytes oneof_bytes = 114;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOneofBytes() {
@@ -23993,16 +21446,13 @@ public Builder clearOneofBytes() {
 
       /**
        * <code>bool oneof_bool = 115;</code>
-       *
        * @return Whether the oneofBool field is set.
        */
       public boolean hasOneofBool() {
         return oneofFieldCase_ == 115;
       }
-
       /**
        * <code>bool oneof_bool = 115;</code>
-       *
        * @return The oneofBool.
        */
       public boolean getOneofBool() {
@@ -24011,10 +21461,8 @@ public boolean getOneofBool() {
         }
         return false;
       }
-
       /**
        * <code>bool oneof_bool = 115;</code>
-       *
        * @param value The oneofBool to set.
        * @return This builder for chaining.
        */
@@ -24025,10 +21473,8 @@ public Builder setOneofBool(boolean value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>bool oneof_bool = 115;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOneofBool() {
@@ -24042,16 +21488,13 @@ public Builder clearOneofBool() {
 
       /**
        * <code>uint64 oneof_uint64 = 116;</code>
-       *
        * @return Whether the oneofUint64 field is set.
        */
       public boolean hasOneofUint64() {
         return oneofFieldCase_ == 116;
       }
-
       /**
        * <code>uint64 oneof_uint64 = 116;</code>
-       *
        * @return The oneofUint64.
        */
       public long getOneofUint64() {
@@ -24060,10 +21503,8 @@ public long getOneofUint64() {
         }
         return 0L;
       }
-
       /**
        * <code>uint64 oneof_uint64 = 116;</code>
-       *
        * @param value The oneofUint64 to set.
        * @return This builder for chaining.
        */
@@ -24074,10 +21515,8 @@ public Builder setOneofUint64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>uint64 oneof_uint64 = 116;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOneofUint64() {
@@ -24091,16 +21530,13 @@ public Builder clearOneofUint64() {
 
       /**
        * <code>float oneof_float = 117;</code>
-       *
        * @return Whether the oneofFloat field is set.
        */
       public boolean hasOneofFloat() {
         return oneofFieldCase_ == 117;
       }
-
       /**
        * <code>float oneof_float = 117;</code>
-       *
        * @return The oneofFloat.
        */
       public float getOneofFloat() {
@@ -24109,10 +21545,8 @@ public float getOneofFloat() {
         }
         return 0F;
       }
-
       /**
        * <code>float oneof_float = 117;</code>
-       *
        * @param value The oneofFloat to set.
        * @return This builder for chaining.
        */
@@ -24123,10 +21557,8 @@ public Builder setOneofFloat(float value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>float oneof_float = 117;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOneofFloat() {
@@ -24140,16 +21572,13 @@ public Builder clearOneofFloat() {
 
       /**
        * <code>double oneof_double = 118;</code>
-       *
        * @return Whether the oneofDouble field is set.
        */
       public boolean hasOneofDouble() {
         return oneofFieldCase_ == 118;
       }
-
       /**
        * <code>double oneof_double = 118;</code>
-       *
        * @return The oneofDouble.
        */
       public double getOneofDouble() {
@@ -24158,10 +21587,8 @@ public double getOneofDouble() {
         }
         return 0D;
       }
-
       /**
        * <code>double oneof_double = 118;</code>
-       *
        * @param value The oneofDouble to set.
        * @return This builder for chaining.
        */
@@ -24172,10 +21599,8 @@ public Builder setOneofDouble(double value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>double oneof_double = 118;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOneofDouble() {
@@ -24189,17 +21614,14 @@ public Builder clearOneofDouble() {
 
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-       *
        * @return Whether the oneofEnum field is set.
        */
       @java.lang.Override
       public boolean hasOneofEnum() {
         return oneofFieldCase_ == 119;
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-       *
        * @return The enum numeric value on the wire for oneofEnum.
        */
       @java.lang.Override
@@ -24209,10 +21631,8 @@ public int getOneofEnumValue() {
         }
         return 0;
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-       *
        * @param value The enum numeric value on the wire for oneofEnum to set.
        * @return This builder for chaining.
        */
@@ -24222,35 +21642,25 @@ public Builder setOneofEnumValue(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-       *
        * @return The oneofEnum.
        */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-          getOneofEnum() {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getOneofEnum() {
         if (oneofFieldCase_ == 119) {
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum result =
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                  .forNumber((java.lang.Integer) oneofField_);
-          return result == null
-              ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                  .UNRECOGNIZED
-              : result;
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.forNumber(
+              (java.lang.Integer) oneofField_);
+          return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.UNRECOGNIZED : result;
         }
         return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.FOO;
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-       *
        * @param value The oneofEnum to set.
        * @return This builder for chaining.
        */
-      public Builder setOneofEnum(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
+      public Builder setOneofEnum(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -24259,10 +21669,8 @@ public Builder setOneofEnum(
         onChanged();
         return this;
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOneofEnum() {
@@ -24278,41 +21686,36 @@ public Builder clearOneofEnum() {
     }
 
     // @@protoc_insertion_point(class_scope:legacy_gencode_test.proto3.TestMostTypesProto3)
-    private static final legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-        DEFAULT_INSTANCE;
-
+    private static final legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE =
-          new legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3();
+      DEFAULT_INSTANCE = new legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3();
     }
 
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-        getDefaultInstance() {
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    private static final com.google.protobuf.Parser<TestMostTypesProto3> PARSER =
-        new com.google.protobuf.AbstractParser<TestMostTypesProto3>() {
-          @java.lang.Override
-          public TestMostTypesProto3 parsePartialFrom(
-              com.google.protobuf.CodedInputStream input,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
-          }
-        };
+    private static final com.google.protobuf.Parser<TestMostTypesProto3>
+        PARSER = new com.google.protobuf.AbstractParser<TestMostTypesProto3>() {
+      @java.lang.Override
+      public TestMostTypesProto3 parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (com.google.protobuf.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new com.google.protobuf.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
+      }
+    };
 
     public static com.google.protobuf.Parser<TestMostTypesProto3> parser() {
       return PARSER;
@@ -24324,70 +21727,63 @@ public com.google.protobuf.Parser<TestMostTypesProto3> getParserForType() {
     }
 
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-        getDefaultInstanceForType() {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
+
   }
 
-  public interface ForeignMessageOrBuilder
-      extends
+  public interface ForeignMessageOrBuilder extends
       // @@protoc_insertion_point(interface_extends:legacy_gencode_test.proto3.ForeignMessage)
       com.google.protobuf.MessageOrBuilder {
 
     /**
      * <code>int32 c = 1;</code>
-     *
      * @return The c.
      */
     int getC();
   }
-
-  /** Protobuf type {@code legacy_gencode_test.proto3.ForeignMessage} */
-  public static final class ForeignMessage extends com.google.protobuf.GeneratedMessage
-      implements
+  /**
+   * Protobuf type {@code legacy_gencode_test.proto3.ForeignMessage}
+   */
+  public static final class ForeignMessage extends
+      com.google.protobuf.GeneratedMessage implements
       // @@protoc_insertion_point(message_implements:legacy_gencode_test.proto3.ForeignMessage)
       ForeignMessageOrBuilder {
-    private static final long serialVersionUID = 0L;
-
+  private static final long serialVersionUID = 0L;
     static {
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
-          com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
-          /* major= */ 4,
-          /* minor= */ 26,
-          /* patch= */ 0,
-          /* suffix= */ "",
-          ForeignMessage.class.getName());
+        com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+        /* major= */ 4,
+        /* minor= */ 26,
+        /* patch= */ 0,
+        /* suffix= */ "",
+        ForeignMessage.class.getName());
     }
-
     // Use ForeignMessage.newBuilder() to construct.
     private ForeignMessage(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
     }
+    private ForeignMessage() {
+    }
 
-    private ForeignMessage() {}
-
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return legacy_gencode_test.proto3.Proto3GencodeTestProto
-          .internal_static_legacy_gencode_test_proto3_ForeignMessage_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_ForeignMessage_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return legacy_gencode_test.proto3.Proto3GencodeTestProto
-          .internal_static_legacy_gencode_test_proto3_ForeignMessage_fieldAccessorTable
+      return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_ForeignMessage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.class,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder.class);
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.class, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder.class);
     }
 
     public static final int C_FIELD_NUMBER = 1;
     private int c_ = 0;
-
     /**
      * <code>int32 c = 1;</code>
-     *
      * @return The c.
      */
     @java.lang.Override
@@ -24396,7 +21792,6 @@ public int getC() {
     }
 
     private byte memoizedIsInitialized = -1;
-
     @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
@@ -24408,7 +21803,8 @@ public final boolean isInitialized() {
     }
 
     @java.lang.Override
-    public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
       if (c_ != 0) {
         output.writeInt32(1, c_);
       }
@@ -24422,7 +21818,8 @@ public int getSerializedSize() {
 
       size = 0;
       if (c_ != 0) {
-        size += com.google.protobuf.CodedOutputStream.computeInt32Size(1, c_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(1, c_);
       }
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
@@ -24432,15 +21829,15 @@ public int getSerializedSize() {
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
-        return true;
+       return true;
       }
       if (!(obj instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage)) {
         return super.equals(obj);
       }
-      legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage other =
-          (legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage) obj;
+      legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage other = (legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage) obj;
 
-      if (getC() != other.getC()) return false;
+      if (getC()
+          != other.getC()) return false;
       if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
@@ -24460,131 +21857,127 @@ public int hashCode() {
     }
 
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(
-        java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(
-        java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(
-        byte[] data) throws com.google.protobuf.InvalidProtocolBufferException {
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(
-        byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(
-        java.io.InputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input);
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(
-        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseDelimitedWithIOException(PARSER, input);
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        parseDelimitedFrom(
-            java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseDelimitedWithIOException(
-          PARSER, input, extensionRegistry);
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(
-        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input);
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
     @java.lang.Override
-    public Builder newBuilderForType() {
-      return newBuilder();
-    }
-
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-
-    public static Builder newBuilder(
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage prototype) {
+    public static Builder newBuilder(legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-
     @java.lang.Override
     public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
 
     @java.lang.Override
-    protected Builder newBuilderForType(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
-
-    /** Protobuf type {@code legacy_gencode_test.proto3.ForeignMessage} */
-    public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder<Builder>
-        implements
+    /**
+     * Protobuf type {@code legacy_gencode_test.proto3.ForeignMessage}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:legacy_gencode_test.proto3.ForeignMessage)
         legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_ForeignMessage_descriptor;
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_ForeignMessage_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_ForeignMessage_fieldAccessorTable
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_ForeignMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.class,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder.class);
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.class, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder.class);
       }
 
-      // Construct using
-      // legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.newBuilder()
-      private Builder() {}
+      // Construct using legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.newBuilder()
+      private Builder() {
 
-      private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
-        super(parent);
       }
 
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        super(parent);
+
+      }
       @java.lang.Override
       public Builder clear() {
         super.clear();
@@ -24594,16 +21987,14 @@ public Builder clear() {
       }
 
       @java.lang.Override
-      public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_ForeignMessage_descriptor;
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_ForeignMessage_descriptor;
       }
 
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-          getDefaultInstanceForType() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-            .getDefaultInstance();
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getDefaultInstanceForType() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance();
       }
 
       @java.lang.Override
@@ -24617,17 +22008,13 @@ public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage build()
 
       @java.lang.Override
       public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage buildPartial() {
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage result =
-            new legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage result = new legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage result) {
+      private void buildPartial0(legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.c_ = c_;
@@ -24637,19 +22024,15 @@ private void buildPartial0(
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage) {
-          return mergeFrom(
-              (legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage) other);
+          return mergeFrom((legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage other) {
-        if (other
-            == legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-                .getDefaultInstance()) return this;
+      public Builder mergeFrom(legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage other) {
+        if (other == legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance()) return this;
         if (other.getC() != 0) {
           setC(other.getC());
         }
@@ -24679,19 +22062,17 @@ public Builder mergeFrom(
               case 0:
                 done = true;
                 break;
-              case 8:
-                {
-                  c_ = input.readInt32();
-                  bitField0_ |= 0x00000001;
-                  break;
-                } // case 8
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
+              case 8: {
+                c_ = input.readInt32();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
             } // switch (tag)
           } // while (!done)
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -24701,24 +22082,19 @@ public Builder mergeFrom(
         } // finally
         return this;
       }
-
       private int bitField0_;
 
-      private int c_;
-
+      private int c_ ;
       /**
        * <code>int32 c = 1;</code>
-       *
        * @return The c.
        */
       @java.lang.Override
       public int getC() {
         return c_;
       }
-
       /**
        * <code>int32 c = 1;</code>
-       *
        * @param value The c to set.
        * @return This builder for chaining.
        */
@@ -24729,10 +22105,8 @@ public Builder setC(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>int32 c = 1;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearC() {
@@ -24746,40 +22120,36 @@ public Builder clearC() {
     }
 
     // @@protoc_insertion_point(class_scope:legacy_gencode_test.proto3.ForeignMessage)
-    private static final legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        DEFAULT_INSTANCE;
-
+    private static final legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage DEFAULT_INSTANCE;
     static {
       DEFAULT_INSTANCE = new legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage();
     }
 
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        getDefaultInstance() {
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    private static final com.google.protobuf.Parser<ForeignMessage> PARSER =
-        new com.google.protobuf.AbstractParser<ForeignMessage>() {
-          @java.lang.Override
-          public ForeignMessage parsePartialFrom(
-              com.google.protobuf.CodedInputStream input,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
-          }
-        };
+    private static final com.google.protobuf.Parser<ForeignMessage>
+        PARSER = new com.google.protobuf.AbstractParser<ForeignMessage>() {
+      @java.lang.Override
+      public ForeignMessage parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (com.google.protobuf.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new com.google.protobuf.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
+      }
+    };
 
     public static com.google.protobuf.Parser<ForeignMessage> parser() {
       return PARSER;
@@ -24791,680 +22161,456 @@ public com.google.protobuf.Parser<ForeignMessage> getParserForType() {
     }
 
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        getDefaultInstanceForType() {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
+
   }
 
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMessage_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMessage_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMessage_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_NestedTestMessage_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_NestedTestMessage_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_NestedTestMessage_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32Int32Entry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32Int32Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32Int32Entry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt64Int64Entry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt64Int64Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt64Int64Entry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint32Uint32Entry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint32Uint32Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint32Uint32Entry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint64Uint64Entry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint64Uint64Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint64Uint64Entry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint32Sint32Entry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint32Sint32Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint32Sint32Entry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint64Sint64Entry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint64Sint64Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint64Sint64Entry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed32Fixed32Entry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed32Fixed32Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed32Fixed32Entry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed64Fixed64Entry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed64Fixed64Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed64Fixed64Entry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed32Sfixed32Entry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed32Sfixed32Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed32Sfixed32Entry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed64Sfixed64Entry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed64Sfixed64Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed64Sfixed64Entry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32FloatEntry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32FloatEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32FloatEntry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32DoubleEntry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32DoubleEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32DoubleEntry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapBoolBoolEntry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapBoolBoolEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapBoolBoolEntry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringStringEntry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringStringEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringStringEntry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringBytesEntry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringBytesEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringBytesEntry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedMessageEntry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedMessageEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedMessageEntry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignMessageEntry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignMessageEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignMessageEntry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedEnumEntry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedEnumEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedEnumEntry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignEnumEntry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignEnumEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignEnumEntry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_ForeignMessage_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_ForeignMessage_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_ForeignMessage_fieldAccessorTable;
 
-  public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
     return descriptor;
   }
-
-  private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
-
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n"
-          + "\031proto3_gencode_test.proto\022\032legacy_gencode_test.proto3\"R\n"
-          + "\013TestMessage\022\t\n"
-          + "\001x\030\002 \001(\t\0228\n"
-          + "\001y\030\003 \001(\0132-.legacy_gencode_test.proto3.NestedTestMessage\"\036\n"
-          + "\021NestedTestMessage\022\t\n"
-          + "\001z\030\001 \003(\005\"\2621\n"
-          + "\023TestMostTypesProto3\022\026\n"
-          + "\016optional_int32\030\001 \001(\005\022\026\n"
-          + "\016optional_int64\030\002 \001(\003\022\027\n"
-          + "\017optional_uint32\030\003 \001(\r"
-          + "\022\027\n"
-          + "\017optional_uint64\030\004 \001(\004\022\027\n"
-          + "\017optional_sint32\030\005 \001(\021\022\027\n"
-          + "\017optional_sint64\030\006 \001(\022\022\030\n"
-          + "\020optional_fixed32\030\007 \001(\007\022\030\n"
-          + "\020optional_fixed64\030\010 \001(\006\022\031\n"
-          + "\021optional_sfixed32\030\t \001(\017\022\031\n"
-          + "\021optional_sfixed64\030\n"
-          + " \001(\020\022\026\n"
-          + "\016optional_float\030\013 \001(\002\022\027\n"
-          + "\017optional_double\030\014 \001(\001\022\025\n\r"
-          + "optional_bool\030\r"
-          + " \001(\010\022\027\n"
-          + "\017optional_string\030\016 \001(\t\022\026\n"
-          + "\016optional_bytes\030\017 \001(\014\022^\n"
-          + "\027optional_nested_message\030\022 "
-          + "\001(\0132=.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage\022L\n"
-          + "\030optional_foreign_message\030\023"
-          + " \001(\0132*.legacy_gencode_test.proto3.ForeignMessage\022X\n"
-          + "\024optional_nested_enum\030\025"
-          + " \001(\0162:.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum\022F\n"
-          + "\025optional_foreign_enum\030\026"
-          + " \001(\0162\'.legacy_gencode_test.proto3.ForeignEnum\022Z\n"
-          + "\025optional_aliased_enum\030\027 \001(\0162;.legacy_gencode_test."
-          + "proto3.TestMostTypesProto3.AliasedEnum\022J\n"
-          + "\021recursive_message\030\033"
-          + " \001(\0132/.legacy_gencode_test.proto3.TestMostTypesProto3\022\026\n"
-          + "\016repeated_int32\030\037 \003(\005\022\026\n"
-          + "\016repeated_int64\030  \003(\003\022\027\n"
-          + "\017repeated_uint32\030! \003(\r"
-          + "\022\027\n"
-          + "\017repeated_uint64\030\" \003(\004\022\027\n"
-          + "\017repeated_sint32\030# \003(\021\022\027\n"
-          + "\017repeated_sint64\030$ \003(\022\022\030\n"
-          + "\020repeated_fixed32\030% \003(\007\022\030\n"
-          + "\020repeated_fixed64\030& \003(\006\022\031\n"
-          + "\021repeated_sfixed32\030\' \003(\017\022\031\n"
-          + "\021repeated_sfixed64\030( \003(\020\022\026\n"
-          + "\016repeated_float\030) \003(\002\022\027\n"
-          + "\017repeated_double\030* \003(\001\022\025\n\r"
-          + "repeated_bool\030+ \003(\010\022\027\n"
-          + "\017repeated_string\030, \003(\t\022\026\n"
-          + "\016repeated_bytes\030- \003(\014\022^\n"
-          + "\027repeated_nested_message\0300 \003"
-          + "(\0132=.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage\022L\n"
-          + "\030repeated_foreign_message\0301"
-          + " \003(\0132*.legacy_gencode_test.proto3.ForeignMessage\022X\n"
-          + "\024repeated_nested_enum\0303"
-          + " \003(\0162:.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum\022F\n"
-          + "\025repeated_foreign_enum\0304"
-          + " \003(\0162\'.legacy_gencode_test.proto3.ForeignEnum\022\030\n"
-          + "\014packed_int32\030K \003(\005B\002\020\001\022\030\n"
-          + "\014packed_int64\030L \003(\003B\002\020\001\022\031\n"
-          + "\r"
-          + "packed_uint32\030M \003(\r"
-          + "B\002\020\001\022\031\n\r"
-          + "packed_uint64\030N \003(\004B\002\020\001\022\031\n\r"
-          + "packed_sint32\030O \003(\021B\002\020\001\022\031\n\r"
-          + "packed_sint64\030P \003(\022B\002\020\001\022\032\n"
-          + "\016packed_fixed32\030Q \003(\007B\002\020\001\022\032\n"
-          + "\016packed_fixed64\030R \003(\006B\002\020\001\022\033\n"
-          + "\017packed_sfixed32\030S \003(\017B\002\020\001\022\033\n"
-          + "\017packed_sfixed64\030T \003(\020B\002\020\001\022\030\n"
-          + "\014packed_float\030U \003(\002B\002\020\001\022\031\n\r"
-          + "packed_double\030V \003(\001B\002\020\001\022\027\n"
-          + "\013packed_bool\030W \003(\010B\002\020\001\022Z\n"
-          + "\022packed_nested_enum\030X"
-          + " \003(\0162:.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnumB\002\020\001\022\032\n"
-          + "\016unpacked_int32\030Y \003(\005B\002\020\000\022\032\n"
-          + "\016unpacked_int64\030Z \003(\003B\002\020\000\022\033\n"
-          + "\017unpacked_uint32\030[ \003(\r"
-          + "B\002\020\000\022\033\n"
-          + "\017unpacked_uint64\030\\ \003(\004B\002\020\000\022\033\n"
-          + "\017unpacked_sint32\030] \003(\021B\002\020\000\022\033\n"
-          + "\017unpacked_sint64\030^ \003(\022B\002\020\000\022\034\n"
-          + "\020unpacked_fixed32\030_ \003(\007B\002\020\000\022\034\n"
-          + "\020unpacked_fixed64\030` \003(\006B\002\020\000\022\035\n"
-          + "\021unpacked_sfixed32\030a \003(\017B\002\020\000\022\035\n"
-          + "\021unpacked_sfixed64\030b \003(\020B\002\020\000\022\032\n"
-          + "\016unpacked_float\030c \003(\002B\002\020\000\022\033\n"
-          + "\017unpacked_double\030d \003(\001B\002\020\000\022\031\n\r"
-          + "unpacked_bool\030e \003(\010B\002\020\000\022\\\n"
-          + "\024unpacked_nested_enum\030f \003(\0162:."
-          + "legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnumB\002\020\000\022[\n"
-          + "\017map_int32_int32\0308"
-          + " \003(\0132B.legacy_gencode_test.proto3.TestMostTypesProto3.MapInt32Int32Entry\022[\n"
-          + "\017map_int64_int64\0309 \003(\0132B.legacy_gencode_tes"
-          + "t.proto3.TestMostTypesProto3.MapInt64Int64Entry\022_\n"
-          + "\021map_uint32_uint32\030: \003(\0132D.leg"
-          + "acy_gencode_test.proto3.TestMostTypesProto3.MapUint32Uint32Entry\022_\n"
-          + "\021map_uint64_uint64\030; \003(\0132D.legacy_gencode_test.proto3"
-          + ".TestMostTypesProto3.MapUint64Uint64Entry\022_\n"
-          + "\021map_sint32_sint32\030< \003(\0132D.legacy_ge"
-          + "ncode_test.proto3.TestMostTypesProto3.MapSint32Sint32Entry\022_\n"
-          + "\021map_sint64_sint64\030="
-          + " \003(\0132D.legacy_gencode_test.proto3.TestMostTypesProto3.MapSint64Sint64Entry\022c\n"
-          + "\023map_fixed32_fixed32\030> \003(\0132F.legacy_gencod"
-          + "e_test.proto3.TestMostTypesProto3.MapFixed32Fixed32Entry\022c\n"
-          + "\023map_fixed64_fixed64\030?"
-          + " \003(\0132F.legacy_gencode_test.proto3.TestMostTypesProto3.MapFixed64Fixed64Entry\022g\n"
-          + "\025map_sfixed32_sfixed32\030@ \003(\0132H.legacy_ge"
-          + "ncode_test.proto3.TestMostTypesProto3.MapSfixed32Sfixed32Entry\022g\n"
-          + "\025map_sfixed64_sfixed64\030A \003(\0132H.legacy_gencode_test.prot"
-          + "o3.TestMostTypesProto3.MapSfixed64Sfixed64Entry\022[\n"
-          + "\017map_int32_float\030B \003(\0132B.legac"
-          + "y_gencode_test.proto3.TestMostTypesProto3.MapInt32FloatEntry\022]\n"
-          + "\020map_int32_double\030C"
-          + " \003(\0132C.legacy_gencode_test.proto3.TestMostTypesProto3.MapInt32DoubleEntry\022W\n\r"
-          + "map_bool_bool\030D \003(\0132@.legacy_gencode_test"
-          + ".proto3.TestMostTypesProto3.MapBoolBoolEntry\022_\n"
-          + "\021map_string_string\030E \003(\0132D.legacy"
-          + "_gencode_test.proto3.TestMostTypesProto3.MapStringStringEntry\022]\n"
-          + "\020map_string_bytes\030F"
-          + " \003(\0132C.legacy_gencode_test.proto3.TestMostTypesProto3.MapStringBytesEntry\022n\n"
-          + "\031map_string_nested_message\030G \003(\0132K.legacy"
-          + "_gencode_test.proto3.TestMostTypesProto3.MapStringNestedMessageEntry\022p\n"
-          + "\032map_string_foreign_message\030H \003(\0132L.legacy_gencod"
-          + "e_test.proto3.TestMostTypesProto3.MapStringForeignMessageEntry\022h\n"
-          + "\026map_string_nested_enum\030I \003(\0132H.legacy_gencode_test.pro"
-          + "to3.TestMostTypesProto3.MapStringNestedEnumEntry\022j\n"
-          + "\027map_string_foreign_enum\030J \003("
-          + "\0132I.legacy_gencode_test.proto3.TestMostTypesProto3.MapStringForeignEnumEntry\022\026\n"
-          + "\014oneof_uint32\030o \001(\r"
-          + "H\000\022]\n"
-          + "\024oneof_nested_message\030p"
-          + " \001(\0132=.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessageH\000\022\026\n"
-          + "\014oneof_string\030q \001(\tH\000\022\025\n"
-          + "\013oneof_bytes\030r \001(\014H\000\022\024\n\n"
-          + "oneof_bool\030s \001(\010H\000\022\026\n"
-          + "\014oneof_uint64\030t \001(\004H\000\022\025\n"
-          + "\013oneof_float\030u \001(\002H\000\022\026\n"
-          + "\014oneof_double\030v \001(\001H\000\022P\n\n"
-          + "oneof_enum\030w \001(\0162:.le"
-          + "gacy_gencode_test.proto3.TestMostTypesProto3.NestedEnumH\000\032`\n\r"
-          + "NestedMessage\022\t\n"
-          + "\001a\030\001 \001(\005\022D\n"
-          + "\013corecursive\030\002"
-          + " \001(\0132/.legacy_gencode_test.proto3.TestMostTypesProto3\0324\n"
-          + "\022MapInt32Int32Entry\022\013\n"
-          + "\003key\030\001 \001(\005\022\r\n"
-          + "\005value\030\002 \001(\005:\0028\001\0324\n"
-          + "\022MapInt64Int64Entry\022\013\n"
-          + "\003key\030\001 \001(\003\022\r\n"
-          + "\005value\030\002 \001(\003:\0028\001\0326\n"
-          + "\024MapUint32Uint32Entry\022\013\n"
-          + "\003key\030\001 \001(\r"
-          + "\022\r\n"
-          + "\005value\030\002 \001(\r"
-          + ":\0028\001\0326\n"
-          + "\024MapUint64Uint64Entry\022\013\n"
-          + "\003key\030\001 \001(\004\022\r\n"
-          + "\005value\030\002 \001(\004:\0028\001\0326\n"
-          + "\024MapSint32Sint32Entry\022\013\n"
-          + "\003key\030\001 \001(\021\022\r\n"
-          + "\005value\030\002 \001(\021:\0028\001\0326\n"
-          + "\024MapSint64Sint64Entry\022\013\n"
-          + "\003key\030\001 \001(\022\022\r\n"
-          + "\005value\030\002 \001(\022:\0028\001\0328\n"
-          + "\026MapFixed32Fixed32Entry\022\013\n"
-          + "\003key\030\001 \001(\007\022\r\n"
-          + "\005value\030\002 \001(\007:\0028\001\0328\n"
-          + "\026MapFixed64Fixed64Entry\022\013\n"
-          + "\003key\030\001 \001(\006\022\r\n"
-          + "\005value\030\002 \001(\006:\0028\001\032:\n"
-          + "\030MapSfixed32Sfixed32Entry\022\013\n"
-          + "\003key\030\001 \001(\017\022\r\n"
-          + "\005value\030\002 \001(\017:\0028\001\032:\n"
-          + "\030MapSfixed64Sfixed64Entry\022\013\n"
-          + "\003key\030\001 \001(\020\022\r\n"
-          + "\005value\030\002 \001(\020:\0028\001\0324\n"
-          + "\022MapInt32FloatEntry\022\013\n"
-          + "\003key\030\001 \001(\005\022\r"
-          + "\n"
-          + "\005value\030\002 \001(\002:\0028\001\0325\n"
-          + "\023MapInt32DoubleEntry\022\013\n"
-          + "\003key\030\001 \001(\005\022\r\n"
-          + "\005value\030\002 \001(\001:\0028\001\0322\n"
-          + "\020MapBoolBoolEntry\022\013\n"
-          + "\003key\030\001 \001(\010\022\r\n"
-          + "\005value\030\002 \001(\010:\0028\001\0326\n"
-          + "\024MapStringStringEntry\022\013\n"
-          + "\003key\030\001 \001(\t\022\r\n"
-          + "\005value\030\002 \001(\t:\0028\001\0325\n"
-          + "\023MapStringBytesEntry\022\013\n"
-          + "\003key\030\001 \001(\t\022\r\n"
-          + "\005value\030\002 \001(\014:\0028\001\032|\n"
-          + "\033MapStringNestedMessageEntry\022\013\n"
-          + "\003key\030\001 \001(\t\022L\n"
-          + "\005value\030\002 \001(\0132=.legacy_gencode_test.pro"
-          + "to3.TestMostTypesProto3.NestedMessage:\0028\001\032j\n"
-          + "\034MapStringForeignMessageEntry\022\013\n"
-          + "\003key\030\001 \001(\t\0229\n"
-          + "\005value\030\002"
-          + " \001(\0132*.legacy_gencode_test.proto3.ForeignMessage:\0028\001\032v\n"
-          + "\030MapStringNestedEnumEntry\022\013\n"
-          + "\003key\030\001 \001(\t\022I\n"
-          + "\005value\030\002"
-          + " \001(\0162:.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum:\0028\001\032d\n"
-          + "\031MapStringForeignEnumEntry\022\013\n"
-          + "\003key\030\001 \001(\t\0226\n"
-          + "\005value\030\002 \001(\0162\'.legacy_gencode_test.proto3.ForeignEnum:\0028\001\"9\n\n"
-          + "NestedEnum\022\007\n"
-          + "\003FOO\020\000\022\007\n"
-          + "\003BAR\020\001\022\007\n"
-          + "\003BAZ\020\002\022\020\n"
-          + "\003NEG\020\377\377\377\377\377\377\377\377\377\001\"Y\n"
-          + "\013AliasedEnum\022\r\n"
-          + "\tALIAS_FOO\020\000\022\r\n"
-          + "\tALIAS_BAR\020\001\022\r\n"
-          + "\tALIAS_BAZ\020\002\022\007\n"
-          + "\003MOO\020\002\022\007\n"
-          + "\003moo\020\002\022\007\n"
-          + "\003bAz\020\002\032\002\020\001B\r\n"
-          + "\013oneof_field\"\033\n"
-          + "\016ForeignMessage\022\t\n"
-          + "\001c\030\001 \001(\005*@\n"
-          + "\013ForeignEnum\022\017\n"
-          + "\013FOREIGN_FOO\020\000\022\017\n"
-          + "\013FOREIGN_BAR\020\001\022\017\n"
-          + "\013FOREIGN_BAZ\020\002B\030B\026Proto3GencodeTestProtob\006proto3"
+      "\n\031proto3_gencode_test.proto\022\032legacy_genc" +
+      "ode_test.proto3\"R\n\013TestMessage\022\t\n\001x\030\002 \001(" +
+      "\t\0228\n\001y\030\003 \001(\0132-.legacy_gencode_test.proto" +
+      "3.NestedTestMessage\"\036\n\021NestedTestMessage" +
+      "\022\t\n\001z\030\001 \003(\005\"\2621\n\023TestMostTypesProto3\022\026\n\016o" +
+      "ptional_int32\030\001 \001(\005\022\026\n\016optional_int64\030\002 " +
+      "\001(\003\022\027\n\017optional_uint32\030\003 \001(\r\022\027\n\017optional" +
+      "_uint64\030\004 \001(\004\022\027\n\017optional_sint32\030\005 \001(\021\022\027" +
+      "\n\017optional_sint64\030\006 \001(\022\022\030\n\020optional_fixe" +
+      "d32\030\007 \001(\007\022\030\n\020optional_fixed64\030\010 \001(\006\022\031\n\021o" +
+      "ptional_sfixed32\030\t \001(\017\022\031\n\021optional_sfixe" +
+      "d64\030\n \001(\020\022\026\n\016optional_float\030\013 \001(\002\022\027\n\017opt" +
+      "ional_double\030\014 \001(\001\022\025\n\roptional_bool\030\r \001(" +
+      "\010\022\027\n\017optional_string\030\016 \001(\t\022\026\n\016optional_b" +
+      "ytes\030\017 \001(\014\022^\n\027optional_nested_message\030\022 " +
+      "\001(\0132=.legacy_gencode_test.proto3.TestMos" +
+      "tTypesProto3.NestedMessage\022L\n\030optional_f" +
+      "oreign_message\030\023 \001(\0132*.legacy_gencode_te" +
+      "st.proto3.ForeignMessage\022X\n\024optional_nes" +
+      "ted_enum\030\025 \001(\0162:.legacy_gencode_test.pro" +
+      "to3.TestMostTypesProto3.NestedEnum\022F\n\025op" +
+      "tional_foreign_enum\030\026 \001(\0162\'.legacy_genco" +
+      "de_test.proto3.ForeignEnum\022Z\n\025optional_a" +
+      "liased_enum\030\027 \001(\0162;.legacy_gencode_test." +
+      "proto3.TestMostTypesProto3.AliasedEnum\022J" +
+      "\n\021recursive_message\030\033 \001(\0132/.legacy_genco" +
+      "de_test.proto3.TestMostTypesProto3\022\026\n\016re" +
+      "peated_int32\030\037 \003(\005\022\026\n\016repeated_int64\030  \003" +
+      "(\003\022\027\n\017repeated_uint32\030! \003(\r\022\027\n\017repeated_" +
+      "uint64\030\" \003(\004\022\027\n\017repeated_sint32\030# \003(\021\022\027\n" +
+      "\017repeated_sint64\030$ \003(\022\022\030\n\020repeated_fixed" +
+      "32\030% \003(\007\022\030\n\020repeated_fixed64\030& \003(\006\022\031\n\021re" +
+      "peated_sfixed32\030\' \003(\017\022\031\n\021repeated_sfixed" +
+      "64\030( \003(\020\022\026\n\016repeated_float\030) \003(\002\022\027\n\017repe" +
+      "ated_double\030* \003(\001\022\025\n\rrepeated_bool\030+ \003(\010" +
+      "\022\027\n\017repeated_string\030, \003(\t\022\026\n\016repeated_by" +
+      "tes\030- \003(\014\022^\n\027repeated_nested_message\0300 \003" +
+      "(\0132=.legacy_gencode_test.proto3.TestMost" +
+      "TypesProto3.NestedMessage\022L\n\030repeated_fo" +
+      "reign_message\0301 \003(\0132*.legacy_gencode_tes" +
+      "t.proto3.ForeignMessage\022X\n\024repeated_nest" +
+      "ed_enum\0303 \003(\0162:.legacy_gencode_test.prot" +
+      "o3.TestMostTypesProto3.NestedEnum\022F\n\025rep" +
+      "eated_foreign_enum\0304 \003(\0162\'.legacy_gencod" +
+      "e_test.proto3.ForeignEnum\022\030\n\014packed_int3" +
+      "2\030K \003(\005B\002\020\001\022\030\n\014packed_int64\030L \003(\003B\002\020\001\022\031\n" +
+      "\rpacked_uint32\030M \003(\rB\002\020\001\022\031\n\rpacked_uint6" +
+      "4\030N \003(\004B\002\020\001\022\031\n\rpacked_sint32\030O \003(\021B\002\020\001\022\031" +
+      "\n\rpacked_sint64\030P \003(\022B\002\020\001\022\032\n\016packed_fixe" +
+      "d32\030Q \003(\007B\002\020\001\022\032\n\016packed_fixed64\030R \003(\006B\002\020" +
+      "\001\022\033\n\017packed_sfixed32\030S \003(\017B\002\020\001\022\033\n\017packed" +
+      "_sfixed64\030T \003(\020B\002\020\001\022\030\n\014packed_float\030U \003(" +
+      "\002B\002\020\001\022\031\n\rpacked_double\030V \003(\001B\002\020\001\022\027\n\013pack" +
+      "ed_bool\030W \003(\010B\002\020\001\022Z\n\022packed_nested_enum\030" +
+      "X \003(\0162:.legacy_gencode_test.proto3.TestM" +
+      "ostTypesProto3.NestedEnumB\002\020\001\022\032\n\016unpacke" +
+      "d_int32\030Y \003(\005B\002\020\000\022\032\n\016unpacked_int64\030Z \003(" +
+      "\003B\002\020\000\022\033\n\017unpacked_uint32\030[ \003(\rB\002\020\000\022\033\n\017un" +
+      "packed_uint64\030\\ \003(\004B\002\020\000\022\033\n\017unpacked_sint" +
+      "32\030] \003(\021B\002\020\000\022\033\n\017unpacked_sint64\030^ \003(\022B\002\020" +
+      "\000\022\034\n\020unpacked_fixed32\030_ \003(\007B\002\020\000\022\034\n\020unpac" +
+      "ked_fixed64\030` \003(\006B\002\020\000\022\035\n\021unpacked_sfixed" +
+      "32\030a \003(\017B\002\020\000\022\035\n\021unpacked_sfixed64\030b \003(\020B" +
+      "\002\020\000\022\032\n\016unpacked_float\030c \003(\002B\002\020\000\022\033\n\017unpac" +
+      "ked_double\030d \003(\001B\002\020\000\022\031\n\runpacked_bool\030e " +
+      "\003(\010B\002\020\000\022\\\n\024unpacked_nested_enum\030f \003(\0162:." +
+      "legacy_gencode_test.proto3.TestMostTypes" +
+      "Proto3.NestedEnumB\002\020\000\022[\n\017map_int32_int32" +
+      "\0308 \003(\0132B.legacy_gencode_test.proto3.Test" +
+      "MostTypesProto3.MapInt32Int32Entry\022[\n\017ma" +
+      "p_int64_int64\0309 \003(\0132B.legacy_gencode_tes" +
+      "t.proto3.TestMostTypesProto3.MapInt64Int" +
+      "64Entry\022_\n\021map_uint32_uint32\030: \003(\0132D.leg" +
+      "acy_gencode_test.proto3.TestMostTypesPro" +
+      "to3.MapUint32Uint32Entry\022_\n\021map_uint64_u" +
+      "int64\030; \003(\0132D.legacy_gencode_test.proto3" +
+      ".TestMostTypesProto3.MapUint64Uint64Entr" +
+      "y\022_\n\021map_sint32_sint32\030< \003(\0132D.legacy_ge" +
+      "ncode_test.proto3.TestMostTypesProto3.Ma" +
+      "pSint32Sint32Entry\022_\n\021map_sint64_sint64\030" +
+      "= \003(\0132D.legacy_gencode_test.proto3.TestM" +
+      "ostTypesProto3.MapSint64Sint64Entry\022c\n\023m" +
+      "ap_fixed32_fixed32\030> \003(\0132F.legacy_gencod" +
+      "e_test.proto3.TestMostTypesProto3.MapFix" +
+      "ed32Fixed32Entry\022c\n\023map_fixed64_fixed64\030" +
+      "? \003(\0132F.legacy_gencode_test.proto3.TestM" +
+      "ostTypesProto3.MapFixed64Fixed64Entry\022g\n" +
+      "\025map_sfixed32_sfixed32\030@ \003(\0132H.legacy_ge" +
+      "ncode_test.proto3.TestMostTypesProto3.Ma" +
+      "pSfixed32Sfixed32Entry\022g\n\025map_sfixed64_s" +
+      "fixed64\030A \003(\0132H.legacy_gencode_test.prot" +
+      "o3.TestMostTypesProto3.MapSfixed64Sfixed" +
+      "64Entry\022[\n\017map_int32_float\030B \003(\0132B.legac" +
+      "y_gencode_test.proto3.TestMostTypesProto" +
+      "3.MapInt32FloatEntry\022]\n\020map_int32_double" +
+      "\030C \003(\0132C.legacy_gencode_test.proto3.Test" +
+      "MostTypesProto3.MapInt32DoubleEntry\022W\n\rm" +
+      "ap_bool_bool\030D \003(\0132@.legacy_gencode_test" +
+      ".proto3.TestMostTypesProto3.MapBoolBoolE" +
+      "ntry\022_\n\021map_string_string\030E \003(\0132D.legacy" +
+      "_gencode_test.proto3.TestMostTypesProto3" +
+      ".MapStringStringEntry\022]\n\020map_string_byte" +
+      "s\030F \003(\0132C.legacy_gencode_test.proto3.Tes" +
+      "tMostTypesProto3.MapStringBytesEntry\022n\n\031" +
+      "map_string_nested_message\030G \003(\0132K.legacy" +
+      "_gencode_test.proto3.TestMostTypesProto3" +
+      ".MapStringNestedMessageEntry\022p\n\032map_stri" +
+      "ng_foreign_message\030H \003(\0132L.legacy_gencod" +
+      "e_test.proto3.TestMostTypesProto3.MapStr" +
+      "ingForeignMessageEntry\022h\n\026map_string_nes" +
+      "ted_enum\030I \003(\0132H.legacy_gencode_test.pro" +
+      "to3.TestMostTypesProto3.MapStringNestedE" +
+      "numEntry\022j\n\027map_string_foreign_enum\030J \003(" +
+      "\0132I.legacy_gencode_test.proto3.TestMostT" +
+      "ypesProto3.MapStringForeignEnumEntry\022\026\n\014" +
+      "oneof_uint32\030o \001(\rH\000\022]\n\024oneof_nested_mes" +
+      "sage\030p \001(\0132=.legacy_gencode_test.proto3." +
+      "TestMostTypesProto3.NestedMessageH\000\022\026\n\014o" +
+      "neof_string\030q \001(\tH\000\022\025\n\013oneof_bytes\030r \001(\014" +
+      "H\000\022\024\n\noneof_bool\030s \001(\010H\000\022\026\n\014oneof_uint64" +
+      "\030t \001(\004H\000\022\025\n\013oneof_float\030u \001(\002H\000\022\026\n\014oneof" +
+      "_double\030v \001(\001H\000\022P\n\noneof_enum\030w \001(\0162:.le" +
+      "gacy_gencode_test.proto3.TestMostTypesPr" +
+      "oto3.NestedEnumH\000\032`\n\rNestedMessage\022\t\n\001a\030" +
+      "\001 \001(\005\022D\n\013corecursive\030\002 \001(\0132/.legacy_genc" +
+      "ode_test.proto3.TestMostTypesProto3\0324\n\022M" +
+      "apInt32Int32Entry\022\013\n\003key\030\001 \001(\005\022\r\n\005value\030" +
+      "\002 \001(\005:\0028\001\0324\n\022MapInt64Int64Entry\022\013\n\003key\030\001" +
+      " \001(\003\022\r\n\005value\030\002 \001(\003:\0028\001\0326\n\024MapUint32Uint" +
+      "32Entry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001\032" +
+      "6\n\024MapUint64Uint64Entry\022\013\n\003key\030\001 \001(\004\022\r\n\005" +
+      "value\030\002 \001(\004:\0028\001\0326\n\024MapSint32Sint32Entry\022" +
+      "\013\n\003key\030\001 \001(\021\022\r\n\005value\030\002 \001(\021:\0028\001\0326\n\024MapSi" +
+      "nt64Sint64Entry\022\013\n\003key\030\001 \001(\022\022\r\n\005value\030\002 " +
+      "\001(\022:\0028\001\0328\n\026MapFixed32Fixed32Entry\022\013\n\003key" +
+      "\030\001 \001(\007\022\r\n\005value\030\002 \001(\007:\0028\001\0328\n\026MapFixed64F" +
+      "ixed64Entry\022\013\n\003key\030\001 \001(\006\022\r\n\005value\030\002 \001(\006:" +
+      "\0028\001\032:\n\030MapSfixed32Sfixed32Entry\022\013\n\003key\030\001" +
+      " \001(\017\022\r\n\005value\030\002 \001(\017:\0028\001\032:\n\030MapSfixed64Sf" +
+      "ixed64Entry\022\013\n\003key\030\001 \001(\020\022\r\n\005value\030\002 \001(\020:" +
+      "\0028\001\0324\n\022MapInt32FloatEntry\022\013\n\003key\030\001 \001(\005\022\r" +
+      "\n\005value\030\002 \001(\002:\0028\001\0325\n\023MapInt32DoubleEntry" +
+      "\022\013\n\003key\030\001 \001(\005\022\r\n\005value\030\002 \001(\001:\0028\001\0322\n\020MapB" +
+      "oolBoolEntry\022\013\n\003key\030\001 \001(\010\022\r\n\005value\030\002 \001(\010" +
+      ":\0028\001\0326\n\024MapStringStringEntry\022\013\n\003key\030\001 \001(" +
+      "\t\022\r\n\005value\030\002 \001(\t:\0028\001\0325\n\023MapStringBytesEn" +
+      "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\014:\0028\001\032|\n\033M" +
+      "apStringNestedMessageEntry\022\013\n\003key\030\001 \001(\t\022" +
+      "L\n\005value\030\002 \001(\0132=.legacy_gencode_test.pro" +
+      "to3.TestMostTypesProto3.NestedMessage:\0028" +
+      "\001\032j\n\034MapStringForeignMessageEntry\022\013\n\003key" +
+      "\030\001 \001(\t\0229\n\005value\030\002 \001(\0132*.legacy_gencode_t" +
+      "est.proto3.ForeignMessage:\0028\001\032v\n\030MapStri" +
+      "ngNestedEnumEntry\022\013\n\003key\030\001 \001(\t\022I\n\005value\030" +
+      "\002 \001(\0162:.legacy_gencode_test.proto3.TestM" +
+      "ostTypesProto3.NestedEnum:\0028\001\032d\n\031MapStri" +
+      "ngForeignEnumEntry\022\013\n\003key\030\001 \001(\t\0226\n\005value" +
+      "\030\002 \001(\0162\'.legacy_gencode_test.proto3.Fore" +
+      "ignEnum:\0028\001\"9\n\nNestedEnum\022\007\n\003FOO\020\000\022\007\n\003BA" +
+      "R\020\001\022\007\n\003BAZ\020\002\022\020\n\003NEG\020\377\377\377\377\377\377\377\377\377\001\"Y\n\013Aliase" +
+      "dEnum\022\r\n\tALIAS_FOO\020\000\022\r\n\tALIAS_BAR\020\001\022\r\n\tA" +
+      "LIAS_BAZ\020\002\022\007\n\003MOO\020\002\022\007\n\003moo\020\002\022\007\n\003bAz\020\002\032\002\020" +
+      "\001B\r\n\013oneof_field\"\033\n\016ForeignMessage\022\t\n\001c\030" +
+      "\001 \001(\005*@\n\013ForeignEnum\022\017\n\013FOREIGN_FOO\020\000\022\017\n" +
+      "\013FOREIGN_BAR\020\001\022\017\n\013FOREIGN_BAZ\020\002B\030B\026Proto" +
+      "3GencodeTestProtob\006proto3"
     };
-    descriptor =
-        com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
-            descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] {});
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
     internal_static_legacy_gencode_test_proto3_TestMessage_descriptor =
-        getDescriptor().getMessageTypes().get(0);
-    internal_static_legacy_gencode_test_proto3_TestMessage_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMessage_descriptor,
-            new java.lang.String[] {
-              "X", "Y",
-            });
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_legacy_gencode_test_proto3_TestMessage_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMessage_descriptor,
+        new java.lang.String[] { "X", "Y", });
     internal_static_legacy_gencode_test_proto3_NestedTestMessage_descriptor =
-        getDescriptor().getMessageTypes().get(1);
-    internal_static_legacy_gencode_test_proto3_NestedTestMessage_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_NestedTestMessage_descriptor,
-            new java.lang.String[] {
-              "Z",
-            });
+      getDescriptor().getMessageTypes().get(1);
+    internal_static_legacy_gencode_test_proto3_NestedTestMessage_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_NestedTestMessage_descriptor,
+        new java.lang.String[] { "Z", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor =
-        getDescriptor().getMessageTypes().get(2);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor,
-            new java.lang.String[] {
-              "OptionalInt32",
-              "OptionalInt64",
-              "OptionalUint32",
-              "OptionalUint64",
-              "OptionalSint32",
-              "OptionalSint64",
-              "OptionalFixed32",
-              "OptionalFixed64",
-              "OptionalSfixed32",
-              "OptionalSfixed64",
-              "OptionalFloat",
-              "OptionalDouble",
-              "OptionalBool",
-              "OptionalString",
-              "OptionalBytes",
-              "OptionalNestedMessage",
-              "OptionalForeignMessage",
-              "OptionalNestedEnum",
-              "OptionalForeignEnum",
-              "OptionalAliasedEnum",
-              "RecursiveMessage",
-              "RepeatedInt32",
-              "RepeatedInt64",
-              "RepeatedUint32",
-              "RepeatedUint64",
-              "RepeatedSint32",
-              "RepeatedSint64",
-              "RepeatedFixed32",
-              "RepeatedFixed64",
-              "RepeatedSfixed32",
-              "RepeatedSfixed64",
-              "RepeatedFloat",
-              "RepeatedDouble",
-              "RepeatedBool",
-              "RepeatedString",
-              "RepeatedBytes",
-              "RepeatedNestedMessage",
-              "RepeatedForeignMessage",
-              "RepeatedNestedEnum",
-              "RepeatedForeignEnum",
-              "PackedInt32",
-              "PackedInt64",
-              "PackedUint32",
-              "PackedUint64",
-              "PackedSint32",
-              "PackedSint64",
-              "PackedFixed32",
-              "PackedFixed64",
-              "PackedSfixed32",
-              "PackedSfixed64",
-              "PackedFloat",
-              "PackedDouble",
-              "PackedBool",
-              "PackedNestedEnum",
-              "UnpackedInt32",
-              "UnpackedInt64",
-              "UnpackedUint32",
-              "UnpackedUint64",
-              "UnpackedSint32",
-              "UnpackedSint64",
-              "UnpackedFixed32",
-              "UnpackedFixed64",
-              "UnpackedSfixed32",
-              "UnpackedSfixed64",
-              "UnpackedFloat",
-              "UnpackedDouble",
-              "UnpackedBool",
-              "UnpackedNestedEnum",
-              "MapInt32Int32",
-              "MapInt64Int64",
-              "MapUint32Uint32",
-              "MapUint64Uint64",
-              "MapSint32Sint32",
-              "MapSint64Sint64",
-              "MapFixed32Fixed32",
-              "MapFixed64Fixed64",
-              "MapSfixed32Sfixed32",
-              "MapSfixed64Sfixed64",
-              "MapInt32Float",
-              "MapInt32Double",
-              "MapBoolBool",
-              "MapStringString",
-              "MapStringBytes",
-              "MapStringNestedMessage",
-              "MapStringForeignMessage",
-              "MapStringNestedEnum",
-              "MapStringForeignEnum",
-              "OneofUint32",
-              "OneofNestedMessage",
-              "OneofString",
-              "OneofBytes",
-              "OneofBool",
-              "OneofUint64",
-              "OneofFloat",
-              "OneofDouble",
-              "OneofEnum",
-              "OneofField",
-            });
+      getDescriptor().getMessageTypes().get(2);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor,
+        new java.lang.String[] { "OptionalInt32", "OptionalInt64", "OptionalUint32", "OptionalUint64", "OptionalSint32", "OptionalSint64", "OptionalFixed32", "OptionalFixed64", "OptionalSfixed32", "OptionalSfixed64", "OptionalFloat", "OptionalDouble", "OptionalBool", "OptionalString", "OptionalBytes", "OptionalNestedMessage", "OptionalForeignMessage", "OptionalNestedEnum", "OptionalForeignEnum", "OptionalAliasedEnum", "RecursiveMessage", "RepeatedInt32", "RepeatedInt64", "RepeatedUint32", "RepeatedUint64", "RepeatedSint32", "RepeatedSint64", "RepeatedFixed32", "RepeatedFixed64", "RepeatedSfixed32", "RepeatedSfixed64", "RepeatedFloat", "RepeatedDouble", "RepeatedBool", "RepeatedString", "RepeatedBytes", "RepeatedNestedMessage", "RepeatedForeignMessage", "RepeatedNestedEnum", "RepeatedForeignEnum", "PackedInt32", "PackedInt64", "PackedUint32", "PackedUint64", "PackedSint32", "PackedSint64", "PackedFixed32", "PackedFixed64", "PackedSfixed32", "PackedSfixed64", "PackedFloat", "PackedDouble", "PackedBool", "PackedNestedEnum", "UnpackedInt32", "UnpackedInt64", "UnpackedUint32", "UnpackedUint64", "UnpackedSint32", "UnpackedSint64", "UnpackedFixed32", "UnpackedFixed64", "UnpackedSfixed32", "UnpackedSfixed64", "UnpackedFloat", "UnpackedDouble", "UnpackedBool", "UnpackedNestedEnum", "MapInt32Int32", "MapInt64Int64", "MapUint32Uint32", "MapUint64Uint64", "MapSint32Sint32", "MapSint64Sint64", "MapFixed32Fixed32", "MapFixed64Fixed64", "MapSfixed32Sfixed32", "MapSfixed64Sfixed64", "MapInt32Float", "MapInt32Double", "MapBoolBool", "MapStringString", "MapStringBytes", "MapStringNestedMessage", "MapStringForeignMessage", "MapStringNestedEnum", "MapStringForeignEnum", "OneofUint32", "OneofNestedMessage", "OneofString", "OneofBytes", "OneofBool", "OneofUint64", "OneofFloat", "OneofDouble", "OneofEnum", "OneofField", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(0);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_descriptor,
-            new java.lang.String[] {
-              "A", "Corecursive",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(0);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_descriptor,
+        new java.lang.String[] { "A", "Corecursive", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32Int32Entry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(1);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32Int32Entry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32Int32Entry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(1);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32Int32Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32Int32Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt64Int64Entry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(2);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt64Int64Entry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt64Int64Entry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(2);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt64Int64Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt64Int64Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint32Uint32Entry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(3);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint32Uint32Entry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint32Uint32Entry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(3);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint32Uint32Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint32Uint32Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint64Uint64Entry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(4);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint64Uint64Entry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint64Uint64Entry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(4);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint64Uint64Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint64Uint64Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint32Sint32Entry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(5);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint32Sint32Entry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint32Sint32Entry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(5);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint32Sint32Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint32Sint32Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint64Sint64Entry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(6);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint64Sint64Entry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint64Sint64Entry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(6);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint64Sint64Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint64Sint64Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed32Fixed32Entry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(7);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed32Fixed32Entry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed32Fixed32Entry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(7);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed32Fixed32Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed32Fixed32Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed64Fixed64Entry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(8);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed64Fixed64Entry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed64Fixed64Entry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(8);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed64Fixed64Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed64Fixed64Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed32Sfixed32Entry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(9);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed32Sfixed32Entry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed32Sfixed32Entry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(9);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed32Sfixed32Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed32Sfixed32Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed64Sfixed64Entry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(10);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed64Sfixed64Entry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed64Sfixed64Entry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(10);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed64Sfixed64Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed64Sfixed64Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32FloatEntry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(11);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32FloatEntry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32FloatEntry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(11);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32FloatEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32FloatEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32DoubleEntry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(12);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32DoubleEntry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32DoubleEntry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(12);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32DoubleEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32DoubleEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapBoolBoolEntry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(13);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapBoolBoolEntry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapBoolBoolEntry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(13);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapBoolBoolEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapBoolBoolEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringStringEntry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(14);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringStringEntry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringStringEntry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(14);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringStringEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringStringEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringBytesEntry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(15);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringBytesEntry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringBytesEntry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(15);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringBytesEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringBytesEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedMessageEntry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(16);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedMessageEntry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedMessageEntry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(16);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedMessageEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedMessageEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignMessageEntry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(17);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignMessageEntry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignMessageEntry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(17);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignMessageEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignMessageEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedEnumEntry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(18);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedEnumEntry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedEnumEntry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(18);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedEnumEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedEnumEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignEnumEntry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(19);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignEnumEntry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignEnumEntry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(19);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignEnumEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignEnumEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_ForeignMessage_descriptor =
-        getDescriptor().getMessageTypes().get(3);
-    internal_static_legacy_gencode_test_proto3_ForeignMessage_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_ForeignMessage_descriptor,
-            new java.lang.String[] {
-              "C",
-            });
+      getDescriptor().getMessageTypes().get(3);
+    internal_static_legacy_gencode_test_proto3_ForeignMessage_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_ForeignMessage_descriptor,
+        new java.lang.String[] { "C", });
     descriptor.resolveAllFeaturesImmutable();
   }
 
diff --git a/compatibility/smoke/v32.1/BUILD.bazel b/compatibility/smoke/v32.1/BUILD.bazel
index 599ca4733284a..3194d76786471 100644
--- a/compatibility/smoke/v32.1/BUILD.bazel
+++ b/compatibility/smoke/v32.1/BUILD.bazel
@@ -1,8 +1,8 @@
 load("@rules_java//java:java_library.bzl", "java_library")
 
 java_library(
-    name = "checked_in_gencode",
-    srcs = glob(["**/*.java"]),
-    visibility = ["//compatibility:__subpackages__"],
-    deps = ["//:protobuf_java"],
+	name = "checked_in_gencode",
+	srcs = glob(["**/*.java"]),
+	deps = ["//:protobuf_java"],
+	visibility = ["//compatibility:__subpackages__"],
 )
diff --git a/compatibility/smoke/v32.1/legacy_gencode_test/proto2/Proto2GencodeTestProto.java b/compatibility/smoke/v32.1/legacy_gencode_test/proto2/Proto2GencodeTestProto.java
new file mode 100644
index 0000000000000..2700c69cc9987
--- /dev/null
+++ b/compatibility/smoke/v32.1/legacy_gencode_test/proto2/Proto2GencodeTestProto.java
@@ -0,0 +1,22436 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// NO CHECKED-IN PROTOBUF GENCODE
+// source: proto2_gencode_test.proto
+// Protobuf Java Version: 4.32.1
+
+package legacy_gencode_test.proto2;
+
+@com.google.protobuf.Generated
+public final class Proto2GencodeTestProto extends com.google.protobuf.GeneratedFile {
+  private Proto2GencodeTestProto() {}
+  static {
+    com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
+      com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+      /* major= */ 4,
+      /* minor= */ 32,
+      /* patch= */ 1,
+      /* suffix= */ "",
+      Proto2GencodeTestProto.class.getName());
+  }
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+    registry.add(legacy_gencode_test.proto2.Proto2GencodeTestProto.extensionInt32);
+    registry.add(legacy_gencode_test.proto2.Proto2GencodeTestProto.extensionMessage);
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  /**
+   * Protobuf enum {@code legacy_gencode_test.proto2.ForeignEnum}
+   */
+  public enum ForeignEnum
+      implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     * <code>FOREIGN_FOO = 0;</code>
+     */
+    FOREIGN_FOO(0),
+    /**
+     * <code>FOREIGN_BAR = 1;</code>
+     */
+    FOREIGN_BAR(1),
+    /**
+     * <code>FOREIGN_BAZ = 2;</code>
+     */
+    FOREIGN_BAZ(2),
+    ;
+
+    static {
+      com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
+        com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+        /* major= */ 4,
+        /* minor= */ 32,
+        /* patch= */ 1,
+        /* suffix= */ "",
+        ForeignEnum.class.getName());
+    }
+    /**
+     * <code>FOREIGN_FOO = 0;</code>
+     */
+    public static final int FOREIGN_FOO_VALUE = 0;
+    /**
+     * <code>FOREIGN_BAR = 1;</code>
+     */
+    public static final int FOREIGN_BAR_VALUE = 1;
+    /**
+     * <code>FOREIGN_BAZ = 2;</code>
+     */
+    public static final int FOREIGN_BAZ_VALUE = 2;
+
+
+    public final int getNumber() {
+      return value;
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static ForeignEnum valueOf(int value) {
+      return forNumber(value);
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     */
+    public static ForeignEnum forNumber(int value) {
+      switch (value) {
+        case 0: return FOREIGN_FOO;
+        case 1: return FOREIGN_BAR;
+        case 2: return FOREIGN_BAZ;
+        default: return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap<ForeignEnum>
+        internalGetValueMap() {
+      return internalValueMap;
+    }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        ForeignEnum> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap<ForeignEnum>() {
+            public ForeignEnum findValueByNumber(int number) {
+              return ForeignEnum.forNumber(number);
+            }
+          };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
+      return getDescriptor().getValues().get(ordinal());
+    }
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
+      return getDescriptor();
+    }
+    public static com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.getDescriptor().getEnumTypes().get(0);
+    }
+
+    private static final ForeignEnum[] VALUES = values();
+
+    public static ForeignEnum valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private ForeignEnum(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:legacy_gencode_test.proto2.ForeignEnum)
+  }
+
+  public interface TestMessageOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:legacy_gencode_test.proto2.TestMessage)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>optional string x = 2;</code>
+     * @return Whether the x field is set.
+     */
+    boolean hasX();
+    /**
+     * <code>optional string x = 2;</code>
+     * @return The x.
+     */
+    java.lang.String getX();
+    /**
+     * <code>optional string x = 2;</code>
+     * @return The bytes for x.
+     */
+    com.google.protobuf.ByteString
+        getXBytes();
+
+    /**
+     * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+     * @return Whether the y field is set.
+     */
+    boolean hasY();
+    /**
+     * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+     * @return The y.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage getY();
+    /**
+     * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessageOrBuilder getYOrBuilder();
+  }
+  /**
+   * Protobuf type {@code legacy_gencode_test.proto2.TestMessage}
+   */
+  public static final class TestMessage extends
+      com.google.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:legacy_gencode_test.proto2.TestMessage)
+      TestMessageOrBuilder {
+  private static final long serialVersionUID = 0L;
+    static {
+      com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
+        com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+        /* major= */ 4,
+        /* minor= */ 32,
+        /* patch= */ 1,
+        /* suffix= */ "",
+        TestMessage.class.getName());
+    }
+    // Use TestMessage.newBuilder() to construct.
+    private TestMessage(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      super(builder);
+    }
+    private TestMessage() {
+      x_ = "";
+    }
+
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMessage_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMessage_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage.class, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage.Builder.class);
+    }
+
+    private int bitField0_;
+    public static final int X_FIELD_NUMBER = 2;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object x_ = "";
+    /**
+     * <code>optional string x = 2;</code>
+     * @return Whether the x field is set.
+     */
+    @java.lang.Override
+    public boolean hasX() {
+      return ((bitField0_ & 0x00000001) != 0);
+    }
+    /**
+     * <code>optional string x = 2;</code>
+     * @return The x.
+     */
+    @java.lang.Override
+    public java.lang.String getX() {
+      java.lang.Object ref = x_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
+          x_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     * <code>optional string x = 2;</code>
+     * @return The bytes for x.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getXBytes() {
+      java.lang.Object ref = x_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        x_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int Y_FIELD_NUMBER = 3;
+    private legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage y_;
+    /**
+     * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+     * @return Whether the y field is set.
+     */
+    @java.lang.Override
+    public boolean hasY() {
+      return ((bitField0_ & 0x00000002) != 0);
+    }
+    /**
+     * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+     * @return The y.
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage getY() {
+      return y_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.getDefaultInstance() : y_;
+    }
+    /**
+     * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessageOrBuilder getYOrBuilder() {
+      return y_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.getDefaultInstance() : y_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (((bitField0_ & 0x00000001) != 0)) {
+        com.google.protobuf.GeneratedMessage.writeString(output, 2, x_);
+      }
+      if (((bitField0_ & 0x00000002) != 0)) {
+        output.writeMessage(3, getY());
+      }
+      getUnknownFields().writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        size += com.google.protobuf.GeneratedMessage.computeStringSize(2, x_);
+      }
+      if (((bitField0_ & 0x00000002) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(3, getY());
+      }
+      size += getUnknownFields().getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage)) {
+        return super.equals(obj);
+      }
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage other = (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage) obj;
+
+      if (hasX() != other.hasX()) return false;
+      if (hasX()) {
+        if (!getX()
+            .equals(other.getX())) return false;
+      }
+      if (hasY() != other.hasY()) return false;
+      if (hasY()) {
+        if (!getY()
+            .equals(other.getY())) return false;
+      }
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasX()) {
+        hash = (37 * hash) + X_FIELD_NUMBER;
+        hash = (53 * hash) + getX().hashCode();
+      }
+      if (hasY()) {
+        hash = (37 * hash) + Y_FIELD_NUMBER;
+        hash = (53 * hash) + getY().hashCode();
+      }
+      hash = (29 * hash) + getUnknownFields().hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code legacy_gencode_test.proto2.TestMessage}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:legacy_gencode_test.proto2.TestMessage)
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessageOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMessage_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMessage_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage.class, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage.Builder.class);
+      }
+
+      // Construct using legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessage
+                .alwaysUseFieldBuilders) {
+          internalGetYFieldBuilder();
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        bitField0_ = 0;
+        x_ = "";
+        y_ = null;
+        if (yBuilder_ != null) {
+          yBuilder_.dispose();
+          yBuilder_ = null;
+        }
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMessage_descriptor;
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage getDefaultInstanceForType() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage build() {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage buildPartial() {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage result = new legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage result) {
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.x_ = x_;
+          to_bitField0_ |= 0x00000001;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.y_ = yBuilder_ == null
+              ? y_
+              : yBuilder_.build();
+          to_bitField0_ |= 0x00000002;
+        }
+        result.bitField0_ |= to_bitField0_;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage) {
+          return mergeFrom((legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage other) {
+        if (other == legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage.getDefaultInstance()) return this;
+        if (other.hasX()) {
+          x_ = other.x_;
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
+        if (other.hasY()) {
+          mergeY(other.getY());
+        }
+        this.mergeUnknownFields(other.getUnknownFields());
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
+        try {
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 18: {
+                x_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 18
+              case 26: {
+                input.readMessage(
+                    internalGetYFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 26
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.unwrapIOException();
+        } finally {
+          onChanged();
+        } // finally
+        return this;
+      }
+      private int bitField0_;
+
+      private java.lang.Object x_ = "";
+      /**
+       * <code>optional string x = 2;</code>
+       * @return Whether the x field is set.
+       */
+      public boolean hasX() {
+        return ((bitField0_ & 0x00000001) != 0);
+      }
+      /**
+       * <code>optional string x = 2;</code>
+       * @return The x.
+       */
+      public java.lang.String getX() {
+        java.lang.Object ref = x_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          if (bs.isValidUtf8()) {
+            x_ = s;
+          }
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>optional string x = 2;</code>
+       * @return The bytes for x.
+       */
+      public com.google.protobuf.ByteString
+          getXBytes() {
+        java.lang.Object ref = x_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          x_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>optional string x = 2;</code>
+       * @param value The x to set.
+       * @return This builder for chaining.
+       */
+      public Builder setX(
+          java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
+        x_ = value;
+        bitField0_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string x = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearX() {
+        x_ = getDefaultInstance().getX();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string x = 2;</code>
+       * @param value The bytes for x to set.
+       * @return This builder for chaining.
+       */
+      public Builder setXBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
+        x_ = value;
+        bitField0_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+
+      private legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage y_;
+      private com.google.protobuf.SingleFieldBuilder<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessageOrBuilder> yBuilder_;
+      /**
+       * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+       * @return Whether the y field is set.
+       */
+      public boolean hasY() {
+        return ((bitField0_ & 0x00000002) != 0);
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+       * @return The y.
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage getY() {
+        if (yBuilder_ == null) {
+          return y_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.getDefaultInstance() : y_;
+        } else {
+          return yBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+       */
+      public Builder setY(legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage value) {
+        if (yBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          y_ = value;
+        } else {
+          yBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00000002;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+       */
+      public Builder setY(
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.Builder builderForValue) {
+        if (yBuilder_ == null) {
+          y_ = builderForValue.build();
+        } else {
+          yBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00000002;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+       */
+      public Builder mergeY(legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage value) {
+        if (yBuilder_ == null) {
+          if (((bitField0_ & 0x00000002) != 0) &&
+            y_ != null &&
+            y_ != legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.getDefaultInstance()) {
+            getYBuilder().mergeFrom(value);
+          } else {
+            y_ = value;
+          }
+        } else {
+          yBuilder_.mergeFrom(value);
+        }
+        if (y_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+       */
+      public Builder clearY() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        y_ = null;
+        if (yBuilder_ != null) {
+          yBuilder_.dispose();
+          yBuilder_ = null;
+        }
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.Builder getYBuilder() {
+        bitField0_ |= 0x00000002;
+        onChanged();
+        return internalGetYFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessageOrBuilder getYOrBuilder() {
+        if (yBuilder_ != null) {
+          return yBuilder_.getMessageOrBuilder();
+        } else {
+          return y_ == null ?
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.getDefaultInstance() : y_;
+        }
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.NestedTestMessage y = 3;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilder<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessageOrBuilder> 
+          internalGetYFieldBuilder() {
+        if (yBuilder_ == null) {
+          yBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessageOrBuilder>(
+                  getY(),
+                  getParentForChildren(),
+                  isClean());
+          y_ = null;
+        }
+        return yBuilder_;
+      }
+
+      // @@protoc_insertion_point(builder_scope:legacy_gencode_test.proto2.TestMessage)
+    }
+
+    // @@protoc_insertion_point(class_scope:legacy_gencode_test.proto2.TestMessage)
+    private static final legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage();
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<TestMessage>
+        PARSER = new com.google.protobuf.AbstractParser<TestMessage>() {
+      @java.lang.Override
+      public TestMessage parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (com.google.protobuf.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new com.google.protobuf.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
+      }
+    };
+
+    public static com.google.protobuf.Parser<TestMessage> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<TestMessage> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMessage getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  public interface NestedTestMessageOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:legacy_gencode_test.proto2.NestedTestMessage)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>repeated int32 z = 1;</code>
+     * @return A list containing the z.
+     */
+    java.util.List<java.lang.Integer> getZList();
+    /**
+     * <code>repeated int32 z = 1;</code>
+     * @return The count of z.
+     */
+    int getZCount();
+    /**
+     * <code>repeated int32 z = 1;</code>
+     * @param index The index of the element to return.
+     * @return The z at the given index.
+     */
+    int getZ(int index);
+  }
+  /**
+   * Protobuf type {@code legacy_gencode_test.proto2.NestedTestMessage}
+   */
+  public static final class NestedTestMessage extends
+      com.google.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:legacy_gencode_test.proto2.NestedTestMessage)
+      NestedTestMessageOrBuilder {
+  private static final long serialVersionUID = 0L;
+    static {
+      com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
+        com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+        /* major= */ 4,
+        /* minor= */ 32,
+        /* patch= */ 1,
+        /* suffix= */ "",
+        NestedTestMessage.class.getName());
+    }
+    // Use NestedTestMessage.newBuilder() to construct.
+    private NestedTestMessage(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      super(builder);
+    }
+    private NestedTestMessage() {
+      z_ = emptyIntList();
+    }
+
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_NestedTestMessage_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_NestedTestMessage_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.class, legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.Builder.class);
+    }
+
+    public static final int Z_FIELD_NUMBER = 1;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList z_ =
+        emptyIntList();
+    /**
+     * <code>repeated int32 z = 1;</code>
+     * @return A list containing the z.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getZList() {
+      return z_;
+    }
+    /**
+     * <code>repeated int32 z = 1;</code>
+     * @return The count of z.
+     */
+    public int getZCount() {
+      return z_.size();
+    }
+    /**
+     * <code>repeated int32 z = 1;</code>
+     * @param index The index of the element to return.
+     * @return The z at the given index.
+     */
+    public int getZ(int index) {
+      return z_.getInt(index);
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      for (int i = 0; i < z_.size(); i++) {
+        output.writeInt32(1, z_.getInt(i));
+      }
+      getUnknownFields().writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      {
+        int dataSize = 0;
+        for (int i = 0; i < z_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt32SizeNoTag(z_.getInt(i));
+        }
+        size += dataSize;
+        size += 1 * getZList().size();
+      }
+      size += getUnknownFields().getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage)) {
+        return super.equals(obj);
+      }
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage other = (legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage) obj;
+
+      if (!getZList()
+          .equals(other.getZList())) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (getZCount() > 0) {
+        hash = (37 * hash) + Z_FIELD_NUMBER;
+        hash = (53 * hash) + getZList().hashCode();
+      }
+      hash = (29 * hash) + getUnknownFields().hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code legacy_gencode_test.proto2.NestedTestMessage}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:legacy_gencode_test.proto2.NestedTestMessage)
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessageOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_NestedTestMessage_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_NestedTestMessage_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.class, legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.Builder.class);
+      }
+
+      // Construct using legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.newBuilder()
+      private Builder() {
+
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        super(parent);
+
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        bitField0_ = 0;
+        z_ = emptyIntList();
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_NestedTestMessage_descriptor;
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage getDefaultInstanceForType() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage build() {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage buildPartial() {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage result = new legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          z_.makeImmutable();
+          result.z_ = z_;
+        }
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage) {
+          return mergeFrom((legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage other) {
+        if (other == legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage.getDefaultInstance()) return this;
+        if (!other.z_.isEmpty()) {
+          if (z_.isEmpty()) {
+            z_ = other.z_;
+            z_.makeImmutable();
+            bitField0_ |= 0x00000001;
+          } else {
+            ensureZIsMutable();
+            z_.addAll(other.z_);
+          }
+          onChanged();
+        }
+        this.mergeUnknownFields(other.getUnknownFields());
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
+        try {
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                int v = input.readInt32();
+                ensureZIsMutable();
+                z_.addInt(v);
+                break;
+              } // case 8
+              case 10: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureZIsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  z_.addInt(input.readInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.unwrapIOException();
+        } finally {
+          onChanged();
+        } // finally
+        return this;
+      }
+      private int bitField0_;
+
+      private com.google.protobuf.Internal.IntList z_ = emptyIntList();
+      private void ensureZIsMutable() {
+        if (!z_.isModifiable()) {
+          z_ = makeMutableCopy(z_);
+        }
+        bitField0_ |= 0x00000001;
+      }
+      /**
+       * <code>repeated int32 z = 1;</code>
+       * @return A list containing the z.
+       */
+      public java.util.List<java.lang.Integer>
+          getZList() {
+        z_.makeImmutable();
+        return z_;
+      }
+      /**
+       * <code>repeated int32 z = 1;</code>
+       * @return The count of z.
+       */
+      public int getZCount() {
+        return z_.size();
+      }
+      /**
+       * <code>repeated int32 z = 1;</code>
+       * @param index The index of the element to return.
+       * @return The z at the given index.
+       */
+      public int getZ(int index) {
+        return z_.getInt(index);
+      }
+      /**
+       * <code>repeated int32 z = 1;</code>
+       * @param index The index to set the value at.
+       * @param value The z to set.
+       * @return This builder for chaining.
+       */
+      public Builder setZ(
+          int index, int value) {
+
+        ensureZIsMutable();
+        z_.setInt(index, value);
+        bitField0_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 z = 1;</code>
+       * @param value The z to add.
+       * @return This builder for chaining.
+       */
+      public Builder addZ(int value) {
+
+        ensureZIsMutable();
+        z_.addInt(value);
+        bitField0_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 z = 1;</code>
+       * @param values The z to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllZ(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureZIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, z_);
+        bitField0_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 z = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearZ() {
+        z_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
+      // @@protoc_insertion_point(builder_scope:legacy_gencode_test.proto2.NestedTestMessage)
+    }
+
+    // @@protoc_insertion_point(class_scope:legacy_gencode_test.proto2.NestedTestMessage)
+    private static final legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage();
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<NestedTestMessage>
+        PARSER = new com.google.protobuf.AbstractParser<NestedTestMessage>() {
+      @java.lang.Override
+      public NestedTestMessage parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (com.google.protobuf.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new com.google.protobuf.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
+      }
+    };
+
+    public static com.google.protobuf.Parser<NestedTestMessage> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<NestedTestMessage> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.NestedTestMessage getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  public interface TestMostTypesProto2OrBuilder extends
+      // @@protoc_insertion_point(interface_extends:legacy_gencode_test.proto2.TestMostTypesProto2)
+      com.google.protobuf.GeneratedMessage.
+          ExtendableMessageOrBuilder<TestMostTypesProto2> {
+
+    /**
+     * <code>optional int32 optional_int32 = 1;</code>
+     * @return Whether the optionalInt32 field is set.
+     */
+    boolean hasOptionalInt32();
+    /**
+     * <code>optional int32 optional_int32 = 1;</code>
+     * @return The optionalInt32.
+     */
+    int getOptionalInt32();
+
+    /**
+     * <code>optional int64 optional_int64 = 2;</code>
+     * @return Whether the optionalInt64 field is set.
+     */
+    boolean hasOptionalInt64();
+    /**
+     * <code>optional int64 optional_int64 = 2;</code>
+     * @return The optionalInt64.
+     */
+    long getOptionalInt64();
+
+    /**
+     * <code>optional uint32 optional_uint32 = 3;</code>
+     * @return Whether the optionalUint32 field is set.
+     */
+    boolean hasOptionalUint32();
+    /**
+     * <code>optional uint32 optional_uint32 = 3;</code>
+     * @return The optionalUint32.
+     */
+    int getOptionalUint32();
+
+    /**
+     * <code>optional uint64 optional_uint64 = 4;</code>
+     * @return Whether the optionalUint64 field is set.
+     */
+    boolean hasOptionalUint64();
+    /**
+     * <code>optional uint64 optional_uint64 = 4;</code>
+     * @return The optionalUint64.
+     */
+    long getOptionalUint64();
+
+    /**
+     * <code>optional sint32 optional_sint32 = 5;</code>
+     * @return Whether the optionalSint32 field is set.
+     */
+    boolean hasOptionalSint32();
+    /**
+     * <code>optional sint32 optional_sint32 = 5;</code>
+     * @return The optionalSint32.
+     */
+    int getOptionalSint32();
+
+    /**
+     * <code>optional sint64 optional_sint64 = 6;</code>
+     * @return Whether the optionalSint64 field is set.
+     */
+    boolean hasOptionalSint64();
+    /**
+     * <code>optional sint64 optional_sint64 = 6;</code>
+     * @return The optionalSint64.
+     */
+    long getOptionalSint64();
+
+    /**
+     * <code>optional fixed32 optional_fixed32 = 7;</code>
+     * @return Whether the optionalFixed32 field is set.
+     */
+    boolean hasOptionalFixed32();
+    /**
+     * <code>optional fixed32 optional_fixed32 = 7;</code>
+     * @return The optionalFixed32.
+     */
+    int getOptionalFixed32();
+
+    /**
+     * <code>optional fixed64 optional_fixed64 = 8;</code>
+     * @return Whether the optionalFixed64 field is set.
+     */
+    boolean hasOptionalFixed64();
+    /**
+     * <code>optional fixed64 optional_fixed64 = 8;</code>
+     * @return The optionalFixed64.
+     */
+    long getOptionalFixed64();
+
+    /**
+     * <code>optional sfixed32 optional_sfixed32 = 9;</code>
+     * @return Whether the optionalSfixed32 field is set.
+     */
+    boolean hasOptionalSfixed32();
+    /**
+     * <code>optional sfixed32 optional_sfixed32 = 9;</code>
+     * @return The optionalSfixed32.
+     */
+    int getOptionalSfixed32();
+
+    /**
+     * <code>optional sfixed64 optional_sfixed64 = 10;</code>
+     * @return Whether the optionalSfixed64 field is set.
+     */
+    boolean hasOptionalSfixed64();
+    /**
+     * <code>optional sfixed64 optional_sfixed64 = 10;</code>
+     * @return The optionalSfixed64.
+     */
+    long getOptionalSfixed64();
+
+    /**
+     * <code>optional float optional_float = 11;</code>
+     * @return Whether the optionalFloat field is set.
+     */
+    boolean hasOptionalFloat();
+    /**
+     * <code>optional float optional_float = 11;</code>
+     * @return The optionalFloat.
+     */
+    float getOptionalFloat();
+
+    /**
+     * <code>optional double optional_double = 12;</code>
+     * @return Whether the optionalDouble field is set.
+     */
+    boolean hasOptionalDouble();
+    /**
+     * <code>optional double optional_double = 12;</code>
+     * @return The optionalDouble.
+     */
+    double getOptionalDouble();
+
+    /**
+     * <code>optional bool optional_bool = 13;</code>
+     * @return Whether the optionalBool field is set.
+     */
+    boolean hasOptionalBool();
+    /**
+     * <code>optional bool optional_bool = 13;</code>
+     * @return The optionalBool.
+     */
+    boolean getOptionalBool();
+
+    /**
+     * <code>optional string optional_string = 14;</code>
+     * @return Whether the optionalString field is set.
+     */
+    boolean hasOptionalString();
+    /**
+     * <code>optional string optional_string = 14;</code>
+     * @return The optionalString.
+     */
+    java.lang.String getOptionalString();
+    /**
+     * <code>optional string optional_string = 14;</code>
+     * @return The bytes for optionalString.
+     */
+    com.google.protobuf.ByteString
+        getOptionalStringBytes();
+
+    /**
+     * <code>optional bytes optional_bytes = 15;</code>
+     * @return Whether the optionalBytes field is set.
+     */
+    boolean hasOptionalBytes();
+    /**
+     * <code>optional bytes optional_bytes = 15;</code>
+     * @return The optionalBytes.
+     */
+    com.google.protobuf.ByteString getOptionalBytes();
+
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+     * @return Whether the optionalNestedMessage field is set.
+     */
+    boolean hasOptionalNestedMessage();
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+     * @return The optionalNestedMessage.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getOptionalNestedMessage();
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder getOptionalNestedMessageOrBuilder();
+
+    /**
+     * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+     * @return Whether the optionalForeignMessage field is set.
+     */
+    boolean hasOptionalForeignMessage();
+    /**
+     * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+     * @return The optionalForeignMessage.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getOptionalForeignMessage();
+    /**
+     * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder getOptionalForeignMessageOrBuilder();
+
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum optional_nested_enum = 21;</code>
+     * @return Whether the optionalNestedEnum field is set.
+     */
+    boolean hasOptionalNestedEnum();
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum optional_nested_enum = 21;</code>
+     * @return The optionalNestedEnum.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getOptionalNestedEnum();
+
+    /**
+     * <code>optional .legacy_gencode_test.proto2.ForeignEnum optional_foreign_enum = 22;</code>
+     * @return Whether the optionalForeignEnum field is set.
+     */
+    boolean hasOptionalForeignEnum();
+    /**
+     * <code>optional .legacy_gencode_test.proto2.ForeignEnum optional_foreign_enum = 22;</code>
+     * @return The optionalForeignEnum.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getOptionalForeignEnum();
+
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.AliasedEnum optional_aliased_enum = 23;</code>
+     * @return Whether the optionalAliasedEnum field is set.
+     */
+    boolean hasOptionalAliasedEnum();
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.AliasedEnum optional_aliased_enum = 23;</code>
+     * @return The optionalAliasedEnum.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum getOptionalAliasedEnum();
+
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+     * @return Whether the recursiveMessage field is set.
+     */
+    boolean hasRecursiveMessage();
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+     * @return The recursiveMessage.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 getRecursiveMessage();
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder getRecursiveMessageOrBuilder();
+
+    /**
+     * <pre>
+     * Repeated
+     * </pre>
+     *
+     * <code>repeated int32 repeated_int32 = 31;</code>
+     * @return A list containing the repeatedInt32.
+     */
+    java.util.List<java.lang.Integer> getRepeatedInt32List();
+    /**
+     * <pre>
+     * Repeated
+     * </pre>
+     *
+     * <code>repeated int32 repeated_int32 = 31;</code>
+     * @return The count of repeatedInt32.
+     */
+    int getRepeatedInt32Count();
+    /**
+     * <pre>
+     * Repeated
+     * </pre>
+     *
+     * <code>repeated int32 repeated_int32 = 31;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedInt32 at the given index.
+     */
+    int getRepeatedInt32(int index);
+
+    /**
+     * <code>repeated int64 repeated_int64 = 32;</code>
+     * @return A list containing the repeatedInt64.
+     */
+    java.util.List<java.lang.Long> getRepeatedInt64List();
+    /**
+     * <code>repeated int64 repeated_int64 = 32;</code>
+     * @return The count of repeatedInt64.
+     */
+    int getRepeatedInt64Count();
+    /**
+     * <code>repeated int64 repeated_int64 = 32;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedInt64 at the given index.
+     */
+    long getRepeatedInt64(int index);
+
+    /**
+     * <code>repeated uint32 repeated_uint32 = 33;</code>
+     * @return A list containing the repeatedUint32.
+     */
+    java.util.List<java.lang.Integer> getRepeatedUint32List();
+    /**
+     * <code>repeated uint32 repeated_uint32 = 33;</code>
+     * @return The count of repeatedUint32.
+     */
+    int getRepeatedUint32Count();
+    /**
+     * <code>repeated uint32 repeated_uint32 = 33;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedUint32 at the given index.
+     */
+    int getRepeatedUint32(int index);
+
+    /**
+     * <code>repeated uint64 repeated_uint64 = 34;</code>
+     * @return A list containing the repeatedUint64.
+     */
+    java.util.List<java.lang.Long> getRepeatedUint64List();
+    /**
+     * <code>repeated uint64 repeated_uint64 = 34;</code>
+     * @return The count of repeatedUint64.
+     */
+    int getRepeatedUint64Count();
+    /**
+     * <code>repeated uint64 repeated_uint64 = 34;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedUint64 at the given index.
+     */
+    long getRepeatedUint64(int index);
+
+    /**
+     * <code>repeated sint32 repeated_sint32 = 35;</code>
+     * @return A list containing the repeatedSint32.
+     */
+    java.util.List<java.lang.Integer> getRepeatedSint32List();
+    /**
+     * <code>repeated sint32 repeated_sint32 = 35;</code>
+     * @return The count of repeatedSint32.
+     */
+    int getRepeatedSint32Count();
+    /**
+     * <code>repeated sint32 repeated_sint32 = 35;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedSint32 at the given index.
+     */
+    int getRepeatedSint32(int index);
+
+    /**
+     * <code>repeated sint64 repeated_sint64 = 36;</code>
+     * @return A list containing the repeatedSint64.
+     */
+    java.util.List<java.lang.Long> getRepeatedSint64List();
+    /**
+     * <code>repeated sint64 repeated_sint64 = 36;</code>
+     * @return The count of repeatedSint64.
+     */
+    int getRepeatedSint64Count();
+    /**
+     * <code>repeated sint64 repeated_sint64 = 36;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedSint64 at the given index.
+     */
+    long getRepeatedSint64(int index);
+
+    /**
+     * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+     * @return A list containing the repeatedFixed32.
+     */
+    java.util.List<java.lang.Integer> getRepeatedFixed32List();
+    /**
+     * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+     * @return The count of repeatedFixed32.
+     */
+    int getRepeatedFixed32Count();
+    /**
+     * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedFixed32 at the given index.
+     */
+    int getRepeatedFixed32(int index);
+
+    /**
+     * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+     * @return A list containing the repeatedFixed64.
+     */
+    java.util.List<java.lang.Long> getRepeatedFixed64List();
+    /**
+     * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+     * @return The count of repeatedFixed64.
+     */
+    int getRepeatedFixed64Count();
+    /**
+     * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedFixed64 at the given index.
+     */
+    long getRepeatedFixed64(int index);
+
+    /**
+     * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+     * @return A list containing the repeatedSfixed32.
+     */
+    java.util.List<java.lang.Integer> getRepeatedSfixed32List();
+    /**
+     * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+     * @return The count of repeatedSfixed32.
+     */
+    int getRepeatedSfixed32Count();
+    /**
+     * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedSfixed32 at the given index.
+     */
+    int getRepeatedSfixed32(int index);
+
+    /**
+     * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+     * @return A list containing the repeatedSfixed64.
+     */
+    java.util.List<java.lang.Long> getRepeatedSfixed64List();
+    /**
+     * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+     * @return The count of repeatedSfixed64.
+     */
+    int getRepeatedSfixed64Count();
+    /**
+     * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedSfixed64 at the given index.
+     */
+    long getRepeatedSfixed64(int index);
+
+    /**
+     * <code>repeated float repeated_float = 41;</code>
+     * @return A list containing the repeatedFloat.
+     */
+    java.util.List<java.lang.Float> getRepeatedFloatList();
+    /**
+     * <code>repeated float repeated_float = 41;</code>
+     * @return The count of repeatedFloat.
+     */
+    int getRepeatedFloatCount();
+    /**
+     * <code>repeated float repeated_float = 41;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedFloat at the given index.
+     */
+    float getRepeatedFloat(int index);
+
+    /**
+     * <code>repeated double repeated_double = 42;</code>
+     * @return A list containing the repeatedDouble.
+     */
+    java.util.List<java.lang.Double> getRepeatedDoubleList();
+    /**
+     * <code>repeated double repeated_double = 42;</code>
+     * @return The count of repeatedDouble.
+     */
+    int getRepeatedDoubleCount();
+    /**
+     * <code>repeated double repeated_double = 42;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedDouble at the given index.
+     */
+    double getRepeatedDouble(int index);
+
+    /**
+     * <code>repeated bool repeated_bool = 43;</code>
+     * @return A list containing the repeatedBool.
+     */
+    java.util.List<java.lang.Boolean> getRepeatedBoolList();
+    /**
+     * <code>repeated bool repeated_bool = 43;</code>
+     * @return The count of repeatedBool.
+     */
+    int getRepeatedBoolCount();
+    /**
+     * <code>repeated bool repeated_bool = 43;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedBool at the given index.
+     */
+    boolean getRepeatedBool(int index);
+
+    /**
+     * <code>repeated string repeated_string = 44;</code>
+     * @return A list containing the repeatedString.
+     */
+    java.util.List<java.lang.String>
+        getRepeatedStringList();
+    /**
+     * <code>repeated string repeated_string = 44;</code>
+     * @return The count of repeatedString.
+     */
+    int getRepeatedStringCount();
+    /**
+     * <code>repeated string repeated_string = 44;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedString at the given index.
+     */
+    java.lang.String getRepeatedString(int index);
+    /**
+     * <code>repeated string repeated_string = 44;</code>
+     * @param index The index of the value to return.
+     * @return The bytes of the repeatedString at the given index.
+     */
+    com.google.protobuf.ByteString
+        getRepeatedStringBytes(int index);
+
+    /**
+     * <code>repeated bytes repeated_bytes = 45;</code>
+     * @return A list containing the repeatedBytes.
+     */
+    java.util.List<com.google.protobuf.ByteString> getRepeatedBytesList();
+    /**
+     * <code>repeated bytes repeated_bytes = 45;</code>
+     * @return The count of repeatedBytes.
+     */
+    int getRepeatedBytesCount();
+    /**
+     * <code>repeated bytes repeated_bytes = 45;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedBytes at the given index.
+     */
+    com.google.protobuf.ByteString getRepeatedBytes(int index);
+
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+     */
+    java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> 
+        getRepeatedNestedMessageList();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getRepeatedNestedMessage(int index);
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+     */
+    int getRepeatedNestedMessageCount();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+     */
+    java.util.List<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> 
+        getRepeatedNestedMessageOrBuilderList();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder getRepeatedNestedMessageOrBuilder(
+        int index);
+
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+     */
+    java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> 
+        getRepeatedForeignMessageList();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getRepeatedForeignMessage(int index);
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+     */
+    int getRepeatedForeignMessageCount();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+     */
+    java.util.List<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder> 
+        getRepeatedForeignMessageOrBuilderList();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder getRepeatedForeignMessageOrBuilder(
+        int index);
+
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+     * @return A list containing the repeatedNestedEnum.
+     */
+    java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> getRepeatedNestedEnumList();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+     * @return The count of repeatedNestedEnum.
+     */
+    int getRepeatedNestedEnumCount();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedNestedEnum at the given index.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getRepeatedNestedEnum(int index);
+
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+     * @return A list containing the repeatedForeignEnum.
+     */
+    java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum> getRepeatedForeignEnumList();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+     * @return The count of repeatedForeignEnum.
+     */
+    int getRepeatedForeignEnumCount();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedForeignEnum at the given index.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getRepeatedForeignEnum(int index);
+
+    /**
+     * <pre>
+     * Packed
+     * </pre>
+     *
+     * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+     * @return A list containing the packedInt32.
+     */
+    java.util.List<java.lang.Integer> getPackedInt32List();
+    /**
+     * <pre>
+     * Packed
+     * </pre>
+     *
+     * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+     * @return The count of packedInt32.
+     */
+    int getPackedInt32Count();
+    /**
+     * <pre>
+     * Packed
+     * </pre>
+     *
+     * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedInt32 at the given index.
+     */
+    int getPackedInt32(int index);
+
+    /**
+     * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+     * @return A list containing the packedInt64.
+     */
+    java.util.List<java.lang.Long> getPackedInt64List();
+    /**
+     * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+     * @return The count of packedInt64.
+     */
+    int getPackedInt64Count();
+    /**
+     * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedInt64 at the given index.
+     */
+    long getPackedInt64(int index);
+
+    /**
+     * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+     * @return A list containing the packedUint32.
+     */
+    java.util.List<java.lang.Integer> getPackedUint32List();
+    /**
+     * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+     * @return The count of packedUint32.
+     */
+    int getPackedUint32Count();
+    /**
+     * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedUint32 at the given index.
+     */
+    int getPackedUint32(int index);
+
+    /**
+     * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+     * @return A list containing the packedUint64.
+     */
+    java.util.List<java.lang.Long> getPackedUint64List();
+    /**
+     * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+     * @return The count of packedUint64.
+     */
+    int getPackedUint64Count();
+    /**
+     * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedUint64 at the given index.
+     */
+    long getPackedUint64(int index);
+
+    /**
+     * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+     * @return A list containing the packedSint32.
+     */
+    java.util.List<java.lang.Integer> getPackedSint32List();
+    /**
+     * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+     * @return The count of packedSint32.
+     */
+    int getPackedSint32Count();
+    /**
+     * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedSint32 at the given index.
+     */
+    int getPackedSint32(int index);
+
+    /**
+     * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+     * @return A list containing the packedSint64.
+     */
+    java.util.List<java.lang.Long> getPackedSint64List();
+    /**
+     * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+     * @return The count of packedSint64.
+     */
+    int getPackedSint64Count();
+    /**
+     * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedSint64 at the given index.
+     */
+    long getPackedSint64(int index);
+
+    /**
+     * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+     * @return A list containing the packedFixed32.
+     */
+    java.util.List<java.lang.Integer> getPackedFixed32List();
+    /**
+     * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+     * @return The count of packedFixed32.
+     */
+    int getPackedFixed32Count();
+    /**
+     * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedFixed32 at the given index.
+     */
+    int getPackedFixed32(int index);
+
+    /**
+     * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+     * @return A list containing the packedFixed64.
+     */
+    java.util.List<java.lang.Long> getPackedFixed64List();
+    /**
+     * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+     * @return The count of packedFixed64.
+     */
+    int getPackedFixed64Count();
+    /**
+     * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedFixed64 at the given index.
+     */
+    long getPackedFixed64(int index);
+
+    /**
+     * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+     * @return A list containing the packedSfixed32.
+     */
+    java.util.List<java.lang.Integer> getPackedSfixed32List();
+    /**
+     * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+     * @return The count of packedSfixed32.
+     */
+    int getPackedSfixed32Count();
+    /**
+     * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedSfixed32 at the given index.
+     */
+    int getPackedSfixed32(int index);
+
+    /**
+     * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+     * @return A list containing the packedSfixed64.
+     */
+    java.util.List<java.lang.Long> getPackedSfixed64List();
+    /**
+     * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+     * @return The count of packedSfixed64.
+     */
+    int getPackedSfixed64Count();
+    /**
+     * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedSfixed64 at the given index.
+     */
+    long getPackedSfixed64(int index);
+
+    /**
+     * <code>repeated float packed_float = 85 [packed = true];</code>
+     * @return A list containing the packedFloat.
+     */
+    java.util.List<java.lang.Float> getPackedFloatList();
+    /**
+     * <code>repeated float packed_float = 85 [packed = true];</code>
+     * @return The count of packedFloat.
+     */
+    int getPackedFloatCount();
+    /**
+     * <code>repeated float packed_float = 85 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedFloat at the given index.
+     */
+    float getPackedFloat(int index);
+
+    /**
+     * <code>repeated double packed_double = 86 [packed = true];</code>
+     * @return A list containing the packedDouble.
+     */
+    java.util.List<java.lang.Double> getPackedDoubleList();
+    /**
+     * <code>repeated double packed_double = 86 [packed = true];</code>
+     * @return The count of packedDouble.
+     */
+    int getPackedDoubleCount();
+    /**
+     * <code>repeated double packed_double = 86 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedDouble at the given index.
+     */
+    double getPackedDouble(int index);
+
+    /**
+     * <code>repeated bool packed_bool = 87 [packed = true];</code>
+     * @return A list containing the packedBool.
+     */
+    java.util.List<java.lang.Boolean> getPackedBoolList();
+    /**
+     * <code>repeated bool packed_bool = 87 [packed = true];</code>
+     * @return The count of packedBool.
+     */
+    int getPackedBoolCount();
+    /**
+     * <code>repeated bool packed_bool = 87 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedBool at the given index.
+     */
+    boolean getPackedBool(int index);
+
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+     * @return A list containing the packedNestedEnum.
+     */
+    java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> getPackedNestedEnumList();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+     * @return The count of packedNestedEnum.
+     */
+    int getPackedNestedEnumCount();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedNestedEnum at the given index.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getPackedNestedEnum(int index);
+
+    /**
+     * <pre>
+     * Unpacked
+     * </pre>
+     *
+     * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+     * @return A list containing the unpackedInt32.
+     */
+    java.util.List<java.lang.Integer> getUnpackedInt32List();
+    /**
+     * <pre>
+     * Unpacked
+     * </pre>
+     *
+     * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+     * @return The count of unpackedInt32.
+     */
+    int getUnpackedInt32Count();
+    /**
+     * <pre>
+     * Unpacked
+     * </pre>
+     *
+     * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedInt32 at the given index.
+     */
+    int getUnpackedInt32(int index);
+
+    /**
+     * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+     * @return A list containing the unpackedInt64.
+     */
+    java.util.List<java.lang.Long> getUnpackedInt64List();
+    /**
+     * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+     * @return The count of unpackedInt64.
+     */
+    int getUnpackedInt64Count();
+    /**
+     * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedInt64 at the given index.
+     */
+    long getUnpackedInt64(int index);
+
+    /**
+     * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+     * @return A list containing the unpackedUint32.
+     */
+    java.util.List<java.lang.Integer> getUnpackedUint32List();
+    /**
+     * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+     * @return The count of unpackedUint32.
+     */
+    int getUnpackedUint32Count();
+    /**
+     * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedUint32 at the given index.
+     */
+    int getUnpackedUint32(int index);
+
+    /**
+     * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+     * @return A list containing the unpackedUint64.
+     */
+    java.util.List<java.lang.Long> getUnpackedUint64List();
+    /**
+     * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+     * @return The count of unpackedUint64.
+     */
+    int getUnpackedUint64Count();
+    /**
+     * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedUint64 at the given index.
+     */
+    long getUnpackedUint64(int index);
+
+    /**
+     * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+     * @return A list containing the unpackedSint32.
+     */
+    java.util.List<java.lang.Integer> getUnpackedSint32List();
+    /**
+     * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+     * @return The count of unpackedSint32.
+     */
+    int getUnpackedSint32Count();
+    /**
+     * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedSint32 at the given index.
+     */
+    int getUnpackedSint32(int index);
+
+    /**
+     * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+     * @return A list containing the unpackedSint64.
+     */
+    java.util.List<java.lang.Long> getUnpackedSint64List();
+    /**
+     * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+     * @return The count of unpackedSint64.
+     */
+    int getUnpackedSint64Count();
+    /**
+     * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedSint64 at the given index.
+     */
+    long getUnpackedSint64(int index);
+
+    /**
+     * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+     * @return A list containing the unpackedFixed32.
+     */
+    java.util.List<java.lang.Integer> getUnpackedFixed32List();
+    /**
+     * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+     * @return The count of unpackedFixed32.
+     */
+    int getUnpackedFixed32Count();
+    /**
+     * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedFixed32 at the given index.
+     */
+    int getUnpackedFixed32(int index);
+
+    /**
+     * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+     * @return A list containing the unpackedFixed64.
+     */
+    java.util.List<java.lang.Long> getUnpackedFixed64List();
+    /**
+     * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+     * @return The count of unpackedFixed64.
+     */
+    int getUnpackedFixed64Count();
+    /**
+     * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedFixed64 at the given index.
+     */
+    long getUnpackedFixed64(int index);
+
+    /**
+     * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+     * @return A list containing the unpackedSfixed32.
+     */
+    java.util.List<java.lang.Integer> getUnpackedSfixed32List();
+    /**
+     * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+     * @return The count of unpackedSfixed32.
+     */
+    int getUnpackedSfixed32Count();
+    /**
+     * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedSfixed32 at the given index.
+     */
+    int getUnpackedSfixed32(int index);
+
+    /**
+     * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+     * @return A list containing the unpackedSfixed64.
+     */
+    java.util.List<java.lang.Long> getUnpackedSfixed64List();
+    /**
+     * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+     * @return The count of unpackedSfixed64.
+     */
+    int getUnpackedSfixed64Count();
+    /**
+     * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedSfixed64 at the given index.
+     */
+    long getUnpackedSfixed64(int index);
+
+    /**
+     * <code>repeated float unpacked_float = 99 [packed = false];</code>
+     * @return A list containing the unpackedFloat.
+     */
+    java.util.List<java.lang.Float> getUnpackedFloatList();
+    /**
+     * <code>repeated float unpacked_float = 99 [packed = false];</code>
+     * @return The count of unpackedFloat.
+     */
+    int getUnpackedFloatCount();
+    /**
+     * <code>repeated float unpacked_float = 99 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedFloat at the given index.
+     */
+    float getUnpackedFloat(int index);
+
+    /**
+     * <code>repeated double unpacked_double = 100 [packed = false];</code>
+     * @return A list containing the unpackedDouble.
+     */
+    java.util.List<java.lang.Double> getUnpackedDoubleList();
+    /**
+     * <code>repeated double unpacked_double = 100 [packed = false];</code>
+     * @return The count of unpackedDouble.
+     */
+    int getUnpackedDoubleCount();
+    /**
+     * <code>repeated double unpacked_double = 100 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedDouble at the given index.
+     */
+    double getUnpackedDouble(int index);
+
+    /**
+     * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+     * @return A list containing the unpackedBool.
+     */
+    java.util.List<java.lang.Boolean> getUnpackedBoolList();
+    /**
+     * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+     * @return The count of unpackedBool.
+     */
+    int getUnpackedBoolCount();
+    /**
+     * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedBool at the given index.
+     */
+    boolean getUnpackedBool(int index);
+
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+     * @return A list containing the unpackedNestedEnum.
+     */
+    java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> getUnpackedNestedEnumList();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+     * @return The count of unpackedNestedEnum.
+     */
+    int getUnpackedNestedEnumCount();
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedNestedEnum at the given index.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getUnpackedNestedEnum(int index);
+
+    /**
+     * <pre>
+     * Map
+     * </pre>
+     *
+     * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+     */
+    int getMapInt32Int32Count();
+    /**
+     * <pre>
+     * Map
+     * </pre>
+     *
+     * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+     */
+    boolean containsMapInt32Int32(
+        int key);
+    /**
+     * Use {@link #getMapInt32Int32Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapInt32Int32();
+    /**
+     * <pre>
+     * Map
+     * </pre>
+     *
+     * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapInt32Int32Map();
+    /**
+     * <pre>
+     * Map
+     * </pre>
+     *
+     * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+     */
+    int getMapInt32Int32OrDefault(
+        int key,
+        int defaultValue);
+    /**
+     * <pre>
+     * Map
+     * </pre>
+     *
+     * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+     */
+    int getMapInt32Int32OrThrow(
+        int key);
+
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
+    int getMapInt64Int64Count();
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
+    boolean containsMapInt64Int64(
+        long key);
+    /**
+     * Use {@link #getMapInt64Int64Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapInt64Int64();
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapInt64Int64Map();
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
+    long getMapInt64Int64OrDefault(
+        long key,
+        long defaultValue);
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
+    long getMapInt64Int64OrThrow(
+        long key);
+
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
+    int getMapUint32Uint32Count();
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
+    boolean containsMapUint32Uint32(
+        int key);
+    /**
+     * Use {@link #getMapUint32Uint32Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapUint32Uint32();
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapUint32Uint32Map();
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
+    int getMapUint32Uint32OrDefault(
+        int key,
+        int defaultValue);
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
+    int getMapUint32Uint32OrThrow(
+        int key);
+
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
+    int getMapUint64Uint64Count();
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
+    boolean containsMapUint64Uint64(
+        long key);
+    /**
+     * Use {@link #getMapUint64Uint64Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapUint64Uint64();
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapUint64Uint64Map();
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
+    long getMapUint64Uint64OrDefault(
+        long key,
+        long defaultValue);
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
+    long getMapUint64Uint64OrThrow(
+        long key);
+
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
+    int getMapSint32Sint32Count();
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
+    boolean containsMapSint32Sint32(
+        int key);
+    /**
+     * Use {@link #getMapSint32Sint32Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapSint32Sint32();
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapSint32Sint32Map();
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
+    int getMapSint32Sint32OrDefault(
+        int key,
+        int defaultValue);
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
+    int getMapSint32Sint32OrThrow(
+        int key);
+
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
+    int getMapSint64Sint64Count();
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
+    boolean containsMapSint64Sint64(
+        long key);
+    /**
+     * Use {@link #getMapSint64Sint64Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapSint64Sint64();
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapSint64Sint64Map();
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
+    long getMapSint64Sint64OrDefault(
+        long key,
+        long defaultValue);
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
+    long getMapSint64Sint64OrThrow(
+        long key);
+
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
+    int getMapFixed32Fixed32Count();
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
+    boolean containsMapFixed32Fixed32(
+        int key);
+    /**
+     * Use {@link #getMapFixed32Fixed32Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapFixed32Fixed32();
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapFixed32Fixed32Map();
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
+    int getMapFixed32Fixed32OrDefault(
+        int key,
+        int defaultValue);
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
+    int getMapFixed32Fixed32OrThrow(
+        int key);
+
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
+    int getMapFixed64Fixed64Count();
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
+    boolean containsMapFixed64Fixed64(
+        long key);
+    /**
+     * Use {@link #getMapFixed64Fixed64Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapFixed64Fixed64();
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapFixed64Fixed64Map();
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
+    long getMapFixed64Fixed64OrDefault(
+        long key,
+        long defaultValue);
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
+    long getMapFixed64Fixed64OrThrow(
+        long key);
+
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    int getMapSfixed32Sfixed32Count();
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    boolean containsMapSfixed32Sfixed32(
+        int key);
+    /**
+     * Use {@link #getMapSfixed32Sfixed32Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapSfixed32Sfixed32();
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapSfixed32Sfixed32Map();
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    int getMapSfixed32Sfixed32OrDefault(
+        int key,
+        int defaultValue);
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    int getMapSfixed32Sfixed32OrThrow(
+        int key);
+
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    int getMapSfixed64Sfixed64Count();
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    boolean containsMapSfixed64Sfixed64(
+        long key);
+    /**
+     * Use {@link #getMapSfixed64Sfixed64Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapSfixed64Sfixed64();
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapSfixed64Sfixed64Map();
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    long getMapSfixed64Sfixed64OrDefault(
+        long key,
+        long defaultValue);
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    long getMapSfixed64Sfixed64OrThrow(
+        long key);
+
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    int getMapInt32FloatCount();
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    boolean containsMapInt32Float(
+        int key);
+    /**
+     * Use {@link #getMapInt32FloatMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Float>
+    getMapInt32Float();
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Float>
+    getMapInt32FloatMap();
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    float getMapInt32FloatOrDefault(
+        int key,
+        float defaultValue);
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    float getMapInt32FloatOrThrow(
+        int key);
+
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    int getMapInt32DoubleCount();
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    boolean containsMapInt32Double(
+        int key);
+    /**
+     * Use {@link #getMapInt32DoubleMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Double>
+    getMapInt32Double();
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Double>
+    getMapInt32DoubleMap();
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    double getMapInt32DoubleOrDefault(
+        int key,
+        double defaultValue);
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    double getMapInt32DoubleOrThrow(
+        int key);
+
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    int getMapBoolBoolCount();
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    boolean containsMapBoolBool(
+        boolean key);
+    /**
+     * Use {@link #getMapBoolBoolMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Boolean, java.lang.Boolean>
+    getMapBoolBool();
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    java.util.Map<java.lang.Boolean, java.lang.Boolean>
+    getMapBoolBoolMap();
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    boolean getMapBoolBoolOrDefault(
+        boolean key,
+        boolean defaultValue);
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    boolean getMapBoolBoolOrThrow(
+        boolean key);
+
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    int getMapStringStringCount();
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    boolean containsMapStringString(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringStringMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, java.lang.String>
+    getMapStringString();
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    java.util.Map<java.lang.String, java.lang.String>
+    getMapStringStringMap();
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    /* nullable */
+java.lang.String getMapStringStringOrDefault(
+        java.lang.String key,
+        /* nullable */
+java.lang.String defaultValue);
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    java.lang.String getMapStringStringOrThrow(
+        java.lang.String key);
+
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    int getMapStringBytesCount();
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    boolean containsMapStringBytes(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringBytesMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, com.google.protobuf.ByteString>
+    getMapStringBytes();
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    java.util.Map<java.lang.String, com.google.protobuf.ByteString>
+    getMapStringBytesMap();
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    /* nullable */
+com.google.protobuf.ByteString getMapStringBytesOrDefault(
+        java.lang.String key,
+        /* nullable */
+com.google.protobuf.ByteString defaultValue);
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    com.google.protobuf.ByteString getMapStringBytesOrThrow(
+        java.lang.String key);
+
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    int getMapStringNestedMessageCount();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    boolean containsMapStringNestedMessage(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringNestedMessageMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage>
+    getMapStringNestedMessage();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage>
+    getMapStringNestedMessageMap();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getMapStringNestedMessageOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage defaultValue);
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getMapStringNestedMessageOrThrow(
+        java.lang.String key);
+
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    int getMapStringForeignMessageCount();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    boolean containsMapStringForeignMessage(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringForeignMessageMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage>
+    getMapStringForeignMessage();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage>
+    getMapStringForeignMessageMap();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getMapStringForeignMessageOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage defaultValue);
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getMapStringForeignMessageOrThrow(
+        java.lang.String key);
+
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    int getMapStringNestedEnumCount();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    boolean containsMapStringNestedEnum(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringNestedEnumMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>
+    getMapStringNestedEnum();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>
+    getMapStringNestedEnumMap();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getMapStringNestedEnumOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum         defaultValue);
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getMapStringNestedEnumOrThrow(
+        java.lang.String key);
+
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    int getMapStringForeignEnumCount();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    boolean containsMapStringForeignEnum(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringForeignEnumMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum>
+    getMapStringForeignEnum();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum>
+    getMapStringForeignEnumMap();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getMapStringForeignEnumOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum         defaultValue);
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getMapStringForeignEnumOrThrow(
+        java.lang.String key);
+
+    /**
+     * <code>uint32 oneof_uint32 = 111;</code>
+     * @return Whether the oneofUint32 field is set.
+     */
+    boolean hasOneofUint32();
+    /**
+     * <code>uint32 oneof_uint32 = 111;</code>
+     * @return The oneofUint32.
+     */
+    int getOneofUint32();
+
+    /**
+     * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+     * @return Whether the oneofNestedMessage field is set.
+     */
+    boolean hasOneofNestedMessage();
+    /**
+     * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+     * @return The oneofNestedMessage.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getOneofNestedMessage();
+    /**
+     * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder getOneofNestedMessageOrBuilder();
+
+    /**
+     * <code>string oneof_string = 113;</code>
+     * @return Whether the oneofString field is set.
+     */
+    boolean hasOneofString();
+    /**
+     * <code>string oneof_string = 113;</code>
+     * @return The oneofString.
+     */
+    java.lang.String getOneofString();
+    /**
+     * <code>string oneof_string = 113;</code>
+     * @return The bytes for oneofString.
+     */
+    com.google.protobuf.ByteString
+        getOneofStringBytes();
+
+    /**
+     * <code>bytes oneof_bytes = 114;</code>
+     * @return Whether the oneofBytes field is set.
+     */
+    boolean hasOneofBytes();
+    /**
+     * <code>bytes oneof_bytes = 114;</code>
+     * @return The oneofBytes.
+     */
+    com.google.protobuf.ByteString getOneofBytes();
+
+    /**
+     * <code>bool oneof_bool = 115;</code>
+     * @return Whether the oneofBool field is set.
+     */
+    boolean hasOneofBool();
+    /**
+     * <code>bool oneof_bool = 115;</code>
+     * @return The oneofBool.
+     */
+    boolean getOneofBool();
+
+    /**
+     * <code>uint64 oneof_uint64 = 116;</code>
+     * @return Whether the oneofUint64 field is set.
+     */
+    boolean hasOneofUint64();
+    /**
+     * <code>uint64 oneof_uint64 = 116;</code>
+     * @return The oneofUint64.
+     */
+    long getOneofUint64();
+
+    /**
+     * <code>float oneof_float = 117;</code>
+     * @return Whether the oneofFloat field is set.
+     */
+    boolean hasOneofFloat();
+    /**
+     * <code>float oneof_float = 117;</code>
+     * @return The oneofFloat.
+     */
+    float getOneofFloat();
+
+    /**
+     * <code>double oneof_double = 118;</code>
+     * @return Whether the oneofDouble field is set.
+     */
+    boolean hasOneofDouble();
+    /**
+     * <code>double oneof_double = 118;</code>
+     * @return The oneofDouble.
+     */
+    double getOneofDouble();
+
+    /**
+     * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum oneof_enum = 119;</code>
+     * @return Whether the oneofEnum field is set.
+     */
+    boolean hasOneofEnum();
+    /**
+     * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum oneof_enum = 119;</code>
+     * @return The oneofEnum.
+     */
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getOneofEnum();
+
+    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.OneofFieldCase getOneofFieldCase();
+  }
+  /**
+   * <pre>
+   * Proto2 version of TestMostTypesProto3
+   * </pre>
+   *
+   * Protobuf type {@code legacy_gencode_test.proto2.TestMostTypesProto2}
+   */
+  public static final class TestMostTypesProto2 extends
+      com.google.protobuf.GeneratedMessage.ExtendableMessage<
+        TestMostTypesProto2> implements
+      // @@protoc_insertion_point(message_implements:legacy_gencode_test.proto2.TestMostTypesProto2)
+      TestMostTypesProto2OrBuilder {
+  private static final long serialVersionUID = 0L;
+    static {
+      com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
+        com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+        /* major= */ 4,
+        /* minor= */ 32,
+        /* patch= */ 1,
+        /* suffix= */ "",
+        TestMostTypesProto2.class.getName());
+    }
+    // Use TestMostTypesProto2.newBuilder() to construct.
+    private TestMostTypesProto2(com.google.protobuf.GeneratedMessage.ExtendableBuilder<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2, ?> builder) {
+      super(builder);
+    }
+    private TestMostTypesProto2() {
+      optionalString_ = "";
+      optionalBytes_ = com.google.protobuf.ByteString.EMPTY;
+      optionalNestedEnum_ = 0;
+      optionalForeignEnum_ = 0;
+      optionalAliasedEnum_ = 0;
+      repeatedInt32_ = emptyIntList();
+      repeatedInt64_ = emptyLongList();
+      repeatedUint32_ = emptyIntList();
+      repeatedUint64_ = emptyLongList();
+      repeatedSint32_ = emptyIntList();
+      repeatedSint64_ = emptyLongList();
+      repeatedFixed32_ = emptyIntList();
+      repeatedFixed64_ = emptyLongList();
+      repeatedSfixed32_ = emptyIntList();
+      repeatedSfixed64_ = emptyLongList();
+      repeatedFloat_ = emptyFloatList();
+      repeatedDouble_ = emptyDoubleList();
+      repeatedBool_ = emptyBooleanList();
+      repeatedString_ =
+          com.google.protobuf.LazyStringArrayList.emptyList();
+      repeatedBytes_ = emptyList(com.google.protobuf.ByteString.class);
+      repeatedNestedMessage_ = java.util.Collections.emptyList();
+      repeatedForeignMessage_ = java.util.Collections.emptyList();
+      repeatedNestedEnum_ = emptyIntList();
+      repeatedForeignEnum_ = emptyIntList();
+      packedInt32_ = emptyIntList();
+      packedInt64_ = emptyLongList();
+      packedUint32_ = emptyIntList();
+      packedUint64_ = emptyLongList();
+      packedSint32_ = emptyIntList();
+      packedSint64_ = emptyLongList();
+      packedFixed32_ = emptyIntList();
+      packedFixed64_ = emptyLongList();
+      packedSfixed32_ = emptyIntList();
+      packedSfixed64_ = emptyLongList();
+      packedFloat_ = emptyFloatList();
+      packedDouble_ = emptyDoubleList();
+      packedBool_ = emptyBooleanList();
+      packedNestedEnum_ = emptyIntList();
+      unpackedInt32_ = emptyIntList();
+      unpackedInt64_ = emptyLongList();
+      unpackedUint32_ = emptyIntList();
+      unpackedUint64_ = emptyLongList();
+      unpackedSint32_ = emptyIntList();
+      unpackedSint64_ = emptyLongList();
+      unpackedFixed32_ = emptyIntList();
+      unpackedFixed64_ = emptyLongList();
+      unpackedSfixed32_ = emptyIntList();
+      unpackedSfixed64_ = emptyLongList();
+      unpackedFloat_ = emptyFloatList();
+      unpackedDouble_ = emptyDoubleList();
+      unpackedBool_ = emptyBooleanList();
+      unpackedNestedEnum_ = emptyIntList();
+    }
+
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor;
+    }
+
+    @SuppressWarnings({"rawtypes"})
+    @java.lang.Override
+    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
+        int number) {
+      switch (number) {
+        case 56:
+          return internalGetMapInt32Int32();
+        case 57:
+          return internalGetMapInt64Int64();
+        case 58:
+          return internalGetMapUint32Uint32();
+        case 59:
+          return internalGetMapUint64Uint64();
+        case 60:
+          return internalGetMapSint32Sint32();
+        case 61:
+          return internalGetMapSint64Sint64();
+        case 62:
+          return internalGetMapFixed32Fixed32();
+        case 63:
+          return internalGetMapFixed64Fixed64();
+        case 64:
+          return internalGetMapSfixed32Sfixed32();
+        case 65:
+          return internalGetMapSfixed64Sfixed64();
+        case 66:
+          return internalGetMapInt32Float();
+        case 67:
+          return internalGetMapInt32Double();
+        case 68:
+          return internalGetMapBoolBool();
+        case 69:
+          return internalGetMapStringString();
+        case 70:
+          return internalGetMapStringBytes();
+        case 71:
+          return internalGetMapStringNestedMessage();
+        case 72:
+          return internalGetMapStringForeignMessage();
+        case 73:
+          return internalGetMapStringNestedEnum();
+        case 74:
+          return internalGetMapStringForeignEnum();
+        default:
+          throw new RuntimeException(
+              "Invalid map field number: " + number);
+      }
+    }
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.class, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder.class);
+    }
+
+    /**
+     * Protobuf enum {@code legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum}
+     */
+    public enum NestedEnum
+        implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * <code>FOO = 0;</code>
+       */
+      FOO(0),
+      /**
+       * <code>BAR = 1;</code>
+       */
+      BAR(1),
+      /**
+       * <code>BAZ = 2;</code>
+       */
+      BAZ(2),
+      /**
+       * <code>NEG = -1;</code>
+       */
+      NEG(-1),
+      ;
+
+      static {
+        com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
+          com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+          /* major= */ 4,
+          /* minor= */ 32,
+          /* patch= */ 1,
+          /* suffix= */ "",
+          NestedEnum.class.getName());
+      }
+      /**
+       * <code>FOO = 0;</code>
+       */
+      public static final int FOO_VALUE = 0;
+      /**
+       * <code>BAR = 1;</code>
+       */
+      public static final int BAR_VALUE = 1;
+      /**
+       * <code>BAZ = 2;</code>
+       */
+      public static final int BAZ_VALUE = 2;
+      /**
+       * <code>NEG = -1;</code>
+       */
+      public static final int NEG_VALUE = -1;
+
+
+      public final int getNumber() {
+        return value;
+      }
+
+      /**
+       * @param value The numeric wire value of the corresponding enum entry.
+       * @return The enum associated with the given numeric wire value.
+       * @deprecated Use {@link #forNumber(int)} instead.
+       */
+      @java.lang.Deprecated
+      public static NestedEnum valueOf(int value) {
+        return forNumber(value);
+      }
+
+      /**
+       * @param value The numeric wire value of the corresponding enum entry.
+       * @return The enum associated with the given numeric wire value.
+       */
+      public static NestedEnum forNumber(int value) {
+        switch (value) {
+          case 0: return FOO;
+          case 1: return BAR;
+          case 2: return BAZ;
+          case -1: return NEG;
+          default: return null;
+        }
+      }
+
+      public static com.google.protobuf.Internal.EnumLiteMap<NestedEnum>
+          internalGetValueMap() {
+        return internalValueMap;
+      }
+      private static final com.google.protobuf.Internal.EnumLiteMap<
+          NestedEnum> internalValueMap =
+            new com.google.protobuf.Internal.EnumLiteMap<NestedEnum>() {
+              public NestedEnum findValueByNumber(int number) {
+                return NestedEnum.forNumber(number);
+              }
+            };
+
+      public final com.google.protobuf.Descriptors.EnumValueDescriptor
+          getValueDescriptor() {
+        return getDescriptor().getValues().get(ordinal());
+      }
+      public final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptorForType() {
+        return getDescriptor();
+      }
+      public static com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDescriptor().getEnumTypes().get(0);
+      }
+
+      private static final NestedEnum[] VALUES = values();
+
+      public static NestedEnum valueOf(
+          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+        if (desc.getType() != getDescriptor()) {
+          throw new java.lang.IllegalArgumentException(
+            "EnumValueDescriptor is not for this type.");
+        }
+        return VALUES[desc.getIndex()];
+      }
+
+      private final int value;
+
+      private NestedEnum(int value) {
+        this.value = value;
+      }
+
+      // @@protoc_insertion_point(enum_scope:legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum)
+    }
+
+    /**
+     * Protobuf enum {@code legacy_gencode_test.proto2.TestMostTypesProto2.AliasedEnum}
+     */
+    public enum AliasedEnum
+        implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * <code>ALIAS_FOO = 0;</code>
+       */
+      ALIAS_FOO(0),
+      /**
+       * <code>ALIAS_BAR = 1;</code>
+       */
+      ALIAS_BAR(1),
+      /**
+       * <code>ALIAS_BAZ = 2;</code>
+       */
+      ALIAS_BAZ(2),
+      ;
+
+      static {
+        com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
+          com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+          /* major= */ 4,
+          /* minor= */ 32,
+          /* patch= */ 1,
+          /* suffix= */ "",
+          AliasedEnum.class.getName());
+      }
+      /**
+       * <code>MOO = 2;</code>
+       */
+      public static final AliasedEnum MOO = ALIAS_BAZ;
+      /**
+       * <code>moo = 2;</code>
+       */
+      public static final AliasedEnum moo = ALIAS_BAZ;
+      /**
+       * <code>bAz = 2;</code>
+       */
+      public static final AliasedEnum bAz = ALIAS_BAZ;
+      /**
+       * <code>ALIAS_FOO = 0;</code>
+       */
+      public static final int ALIAS_FOO_VALUE = 0;
+      /**
+       * <code>ALIAS_BAR = 1;</code>
+       */
+      public static final int ALIAS_BAR_VALUE = 1;
+      /**
+       * <code>ALIAS_BAZ = 2;</code>
+       */
+      public static final int ALIAS_BAZ_VALUE = 2;
+      /**
+       * <code>MOO = 2;</code>
+       */
+      public static final int MOO_VALUE = 2;
+      /**
+       * <code>moo = 2;</code>
+       */
+      public static final int moo_VALUE = 2;
+      /**
+       * <code>bAz = 2;</code>
+       */
+      public static final int bAz_VALUE = 2;
+
+
+      public final int getNumber() {
+        return value;
+      }
+
+      /**
+       * @param value The numeric wire value of the corresponding enum entry.
+       * @return The enum associated with the given numeric wire value.
+       * @deprecated Use {@link #forNumber(int)} instead.
+       */
+      @java.lang.Deprecated
+      public static AliasedEnum valueOf(int value) {
+        return forNumber(value);
+      }
+
+      /**
+       * @param value The numeric wire value of the corresponding enum entry.
+       * @return The enum associated with the given numeric wire value.
+       */
+      public static AliasedEnum forNumber(int value) {
+        switch (value) {
+          case 0: return ALIAS_FOO;
+          case 1: return ALIAS_BAR;
+          case 2: return ALIAS_BAZ;
+          default: return null;
+        }
+      }
+
+      public static com.google.protobuf.Internal.EnumLiteMap<AliasedEnum>
+          internalGetValueMap() {
+        return internalValueMap;
+      }
+      private static final com.google.protobuf.Internal.EnumLiteMap<
+          AliasedEnum> internalValueMap =
+            new com.google.protobuf.Internal.EnumLiteMap<AliasedEnum>() {
+              public AliasedEnum findValueByNumber(int number) {
+                return AliasedEnum.forNumber(number);
+              }
+            };
+
+      public final com.google.protobuf.Descriptors.EnumValueDescriptor
+          getValueDescriptor() {
+        return getDescriptor().getValues().get(ordinal());
+      }
+      public final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptorForType() {
+        return getDescriptor();
+      }
+      public static com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDescriptor().getEnumTypes().get(1);
+      }
+
+      private static final AliasedEnum[] VALUES = getStaticValuesArray();
+      private static AliasedEnum[] getStaticValuesArray() {
+        return new AliasedEnum[] {
+        ALIAS_FOO, ALIAS_BAR, ALIAS_BAZ, MOO, moo, bAz, 
+        };
+      }
+      public static AliasedEnum valueOf(
+          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+        if (desc.getType() != getDescriptor()) {
+          throw new java.lang.IllegalArgumentException(
+            "EnumValueDescriptor is not for this type.");
+        }
+        return VALUES[desc.getIndex()];
+      }
+
+      private final int value;
+
+      private AliasedEnum(int value) {
+        this.value = value;
+      }
+
+      // @@protoc_insertion_point(enum_scope:legacy_gencode_test.proto2.TestMostTypesProto2.AliasedEnum)
+    }
+
+    public interface NestedMessageOrBuilder extends
+        // @@protoc_insertion_point(interface_extends:legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage)
+        com.google.protobuf.MessageOrBuilder {
+
+      /**
+       * <code>optional int32 a = 1;</code>
+       * @return Whether the a field is set.
+       */
+      boolean hasA();
+      /**
+       * <code>optional int32 a = 1;</code>
+       * @return The a.
+       */
+      int getA();
+
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+       * @return Whether the corecursive field is set.
+       */
+      boolean hasCorecursive();
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+       * @return The corecursive.
+       */
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 getCorecursive();
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+       */
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder getCorecursiveOrBuilder();
+    }
+    /**
+     * Protobuf type {@code legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage}
+     */
+    public static final class NestedMessage extends
+        com.google.protobuf.GeneratedMessage implements
+        // @@protoc_insertion_point(message_implements:legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage)
+        NestedMessageOrBuilder {
+    private static final long serialVersionUID = 0L;
+      static {
+        com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
+          com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+          /* major= */ 4,
+          /* minor= */ 32,
+          /* patch= */ 1,
+          /* suffix= */ "",
+          NestedMessage.class.getName());
+      }
+      // Use NestedMessage.newBuilder() to construct.
+      private NestedMessage(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+        super(builder);
+      }
+      private NestedMessage() {
+      }
+
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_NestedMessage_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_NestedMessage_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.class, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder.class);
+      }
+
+      private int bitField0_;
+      public static final int A_FIELD_NUMBER = 1;
+      private int a_ = 0;
+      /**
+       * <code>optional int32 a = 1;</code>
+       * @return Whether the a field is set.
+       */
+      @java.lang.Override
+      public boolean hasA() {
+        return ((bitField0_ & 0x00000001) != 0);
+      }
+      /**
+       * <code>optional int32 a = 1;</code>
+       * @return The a.
+       */
+      @java.lang.Override
+      public int getA() {
+        return a_;
+      }
+
+      public static final int CORECURSIVE_FIELD_NUMBER = 2;
+      private legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 corecursive_;
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+       * @return Whether the corecursive field is set.
+       */
+      @java.lang.Override
+      public boolean hasCorecursive() {
+        return ((bitField0_ & 0x00000002) != 0);
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+       * @return The corecursive.
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 getCorecursive() {
+        return corecursive_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance() : corecursive_;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder getCorecursiveOrBuilder() {
+        return corecursive_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance() : corecursive_;
+      }
+
+      private byte memoizedIsInitialized = -1;
+      @java.lang.Override
+      public final boolean isInitialized() {
+        byte isInitialized = memoizedIsInitialized;
+        if (isInitialized == 1) return true;
+        if (isInitialized == 0) return false;
+
+        if (hasCorecursive()) {
+          if (!getCorecursive().isInitialized()) {
+            memoizedIsInitialized = 0;
+            return false;
+          }
+        }
+        memoizedIsInitialized = 1;
+        return true;
+      }
+
+      @java.lang.Override
+      public void writeTo(com.google.protobuf.CodedOutputStream output)
+                          throws java.io.IOException {
+        if (((bitField0_ & 0x00000001) != 0)) {
+          output.writeInt32(1, a_);
+        }
+        if (((bitField0_ & 0x00000002) != 0)) {
+          output.writeMessage(2, getCorecursive());
+        }
+        getUnknownFields().writeTo(output);
+      }
+
+      @java.lang.Override
+      public int getSerializedSize() {
+        int size = memoizedSize;
+        if (size != -1) return size;
+
+        size = 0;
+        if (((bitField0_ & 0x00000001) != 0)) {
+          size += com.google.protobuf.CodedOutputStream
+            .computeInt32Size(1, a_);
+        }
+        if (((bitField0_ & 0x00000002) != 0)) {
+          size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(2, getCorecursive());
+        }
+        size += getUnknownFields().getSerializedSize();
+        memoizedSize = size;
+        return size;
+      }
+
+      @java.lang.Override
+      public boolean equals(final java.lang.Object obj) {
+        if (obj == this) {
+         return true;
+        }
+        if (!(obj instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage)) {
+          return super.equals(obj);
+        }
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage other = (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) obj;
+
+        if (hasA() != other.hasA()) return false;
+        if (hasA()) {
+          if (getA()
+              != other.getA()) return false;
+        }
+        if (hasCorecursive() != other.hasCorecursive()) return false;
+        if (hasCorecursive()) {
+          if (!getCorecursive()
+              .equals(other.getCorecursive())) return false;
+        }
+        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+        return true;
+      }
+
+      @java.lang.Override
+      public int hashCode() {
+        if (memoizedHashCode != 0) {
+          return memoizedHashCode;
+        }
+        int hash = 41;
+        hash = (19 * hash) + getDescriptor().hashCode();
+        if (hasA()) {
+          hash = (37 * hash) + A_FIELD_NUMBER;
+          hash = (53 * hash) + getA();
+        }
+        if (hasCorecursive()) {
+          hash = (37 * hash) + CORECURSIVE_FIELD_NUMBER;
+          hash = (53 * hash) + getCorecursive().hashCode();
+        }
+        hash = (29 * hash) + getUnknownFields().hashCode();
+        memoizedHashCode = hash;
+        return hash;
+      }
+
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseFrom(
+          java.nio.ByteBuffer data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data);
+      }
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseFrom(
+          java.nio.ByteBuffer data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data, extensionRegistry);
+      }
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseFrom(
+          com.google.protobuf.ByteString data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data);
+      }
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseFrom(
+          com.google.protobuf.ByteString data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data, extensionRegistry);
+      }
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseFrom(byte[] data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data);
+      }
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseFrom(
+          byte[] data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data, extensionRegistry);
+      }
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseFrom(java.io.InputStream input)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessage
+            .parseWithIOException(PARSER, input);
+      }
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseFrom(
+          java.io.InputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessage
+            .parseWithIOException(PARSER, input, extensionRegistry);
+      }
+
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseDelimitedFrom(java.io.InputStream input)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessage
+            .parseDelimitedWithIOException(PARSER, input);
+      }
+
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseDelimitedFrom(
+          java.io.InputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessage
+            .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+      }
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseFrom(
+          com.google.protobuf.CodedInputStream input)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessage
+            .parseWithIOException(PARSER, input);
+      }
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage parseFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessage
+            .parseWithIOException(PARSER, input, extensionRegistry);
+      }
+
+      @java.lang.Override
+      public Builder newBuilderForType() { return newBuilder(); }
+      public static Builder newBuilder() {
+        return DEFAULT_INSTANCE.toBuilder();
+      }
+      public static Builder newBuilder(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage prototype) {
+        return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+      }
+      @java.lang.Override
+      public Builder toBuilder() {
+        return this == DEFAULT_INSTANCE
+            ? new Builder() : new Builder().mergeFrom(this);
+      }
+
+      @java.lang.Override
+      protected Builder newBuilderForType(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        Builder builder = new Builder(parent);
+        return builder;
+      }
+      /**
+       * Protobuf type {@code legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage}
+       */
+      public static final class Builder extends
+          com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+          // @@protoc_insertion_point(builder_implements:legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage)
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder {
+        public static final com.google.protobuf.Descriptors.Descriptor
+            getDescriptor() {
+          return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_NestedMessage_descriptor;
+        }
+
+        @java.lang.Override
+        protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+            internalGetFieldAccessorTable() {
+          return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_NestedMessage_fieldAccessorTable
+              .ensureFieldAccessorsInitialized(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.class, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder.class);
+        }
+
+        // Construct using legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.newBuilder()
+        private Builder() {
+          maybeForceBuilderInitialization();
+        }
+
+        private Builder(
+            com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          super(parent);
+          maybeForceBuilderInitialization();
+        }
+        private void maybeForceBuilderInitialization() {
+          if (com.google.protobuf.GeneratedMessage
+                  .alwaysUseFieldBuilders) {
+            internalGetCorecursiveFieldBuilder();
+          }
+        }
+        @java.lang.Override
+        public Builder clear() {
+          super.clear();
+          bitField0_ = 0;
+          a_ = 0;
+          corecursive_ = null;
+          if (corecursiveBuilder_ != null) {
+            corecursiveBuilder_.dispose();
+            corecursiveBuilder_ = null;
+          }
+          return this;
+        }
+
+        @java.lang.Override
+        public com.google.protobuf.Descriptors.Descriptor
+            getDescriptorForType() {
+          return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_NestedMessage_descriptor;
+        }
+
+        @java.lang.Override
+        public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getDefaultInstanceForType() {
+          return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance();
+        }
+
+        @java.lang.Override
+        public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage build() {
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage result = buildPartial();
+          if (!result.isInitialized()) {
+            throw newUninitializedMessageException(result);
+          }
+          return result;
+        }
+
+        @java.lang.Override
+        public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage buildPartial() {
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage result = new legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage(this);
+          if (bitField0_ != 0) { buildPartial0(result); }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartial0(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage result) {
+          int from_bitField0_ = bitField0_;
+          int to_bitField0_ = 0;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.a_ = a_;
+            to_bitField0_ |= 0x00000001;
+          }
+          if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.corecursive_ = corecursiveBuilder_ == null
+                ? corecursive_
+                : corecursiveBuilder_.build();
+            to_bitField0_ |= 0x00000002;
+          }
+          result.bitField0_ |= to_bitField0_;
+        }
+
+        @java.lang.Override
+        public Builder mergeFrom(com.google.protobuf.Message other) {
+          if (other instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) {
+            return mergeFrom((legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage)other);
+          } else {
+            super.mergeFrom(other);
+            return this;
+          }
+        }
+
+        public Builder mergeFrom(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage other) {
+          if (other == legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance()) return this;
+          if (other.hasA()) {
+            setA(other.getA());
+          }
+          if (other.hasCorecursive()) {
+            mergeCorecursive(other.getCorecursive());
+          }
+          this.mergeUnknownFields(other.getUnknownFields());
+          onChanged();
+          return this;
+        }
+
+        @java.lang.Override
+        public final boolean isInitialized() {
+          if (hasCorecursive()) {
+            if (!getCorecursive().isInitialized()) {
+              return false;
+            }
+          }
+          return true;
+        }
+
+        @java.lang.Override
+        public Builder mergeFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+          if (extensionRegistry == null) {
+            throw new java.lang.NullPointerException();
+          }
+          try {
+            boolean done = false;
+            while (!done) {
+              int tag = input.readTag();
+              switch (tag) {
+                case 0:
+                  done = true;
+                  break;
+                case 8: {
+                  a_ = input.readInt32();
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 8
+                case 18: {
+                  input.readMessage(
+                      internalGetCorecursiveFieldBuilder().getBuilder(),
+                      extensionRegistry);
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 18
+                default: {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+              } // switch (tag)
+            } // while (!done)
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.unwrapIOException();
+          } finally {
+            onChanged();
+          } // finally
+          return this;
+        }
+        private int bitField0_;
+
+        private int a_ ;
+        /**
+         * <code>optional int32 a = 1;</code>
+         * @return Whether the a field is set.
+         */
+        @java.lang.Override
+        public boolean hasA() {
+          return ((bitField0_ & 0x00000001) != 0);
+        }
+        /**
+         * <code>optional int32 a = 1;</code>
+         * @return The a.
+         */
+        @java.lang.Override
+        public int getA() {
+          return a_;
+        }
+        /**
+         * <code>optional int32 a = 1;</code>
+         * @param value The a to set.
+         * @return This builder for chaining.
+         */
+        public Builder setA(int value) {
+
+          a_ = value;
+          bitField0_ |= 0x00000001;
+          onChanged();
+          return this;
+        }
+        /**
+         * <code>optional int32 a = 1;</code>
+         * @return This builder for chaining.
+         */
+        public Builder clearA() {
+          bitField0_ = (bitField0_ & ~0x00000001);
+          a_ = 0;
+          onChanged();
+          return this;
+        }
+
+        private legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 corecursive_;
+        private com.google.protobuf.SingleFieldBuilder<
+            legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder> corecursiveBuilder_;
+        /**
+         * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+         * @return Whether the corecursive field is set.
+         */
+        public boolean hasCorecursive() {
+          return ((bitField0_ & 0x00000002) != 0);
+        }
+        /**
+         * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+         * @return The corecursive.
+         */
+        public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 getCorecursive() {
+          if (corecursiveBuilder_ == null) {
+            return corecursive_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance() : corecursive_;
+          } else {
+            return corecursiveBuilder_.getMessage();
+          }
+        }
+        /**
+         * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+         */
+        public Builder setCorecursive(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 value) {
+          if (corecursiveBuilder_ == null) {
+            if (value == null) {
+              throw new NullPointerException();
+            }
+            corecursive_ = value;
+          } else {
+            corecursiveBuilder_.setMessage(value);
+          }
+          bitField0_ |= 0x00000002;
+          onChanged();
+          return this;
+        }
+        /**
+         * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+         */
+        public Builder setCorecursive(
+            legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder builderForValue) {
+          if (corecursiveBuilder_ == null) {
+            corecursive_ = builderForValue.build();
+          } else {
+            corecursiveBuilder_.setMessage(builderForValue.build());
+          }
+          bitField0_ |= 0x00000002;
+          onChanged();
+          return this;
+        }
+        /**
+         * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+         */
+        public Builder mergeCorecursive(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 value) {
+          if (corecursiveBuilder_ == null) {
+            if (((bitField0_ & 0x00000002) != 0) &&
+              corecursive_ != null &&
+              corecursive_ != legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance()) {
+              getCorecursiveBuilder().mergeFrom(value);
+            } else {
+              corecursive_ = value;
+            }
+          } else {
+            corecursiveBuilder_.mergeFrom(value);
+          }
+          if (corecursive_ != null) {
+            bitField0_ |= 0x00000002;
+            onChanged();
+          }
+          return this;
+        }
+        /**
+         * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+         */
+        public Builder clearCorecursive() {
+          bitField0_ = (bitField0_ & ~0x00000002);
+          corecursive_ = null;
+          if (corecursiveBuilder_ != null) {
+            corecursiveBuilder_.dispose();
+            corecursiveBuilder_ = null;
+          }
+          onChanged();
+          return this;
+        }
+        /**
+         * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+         */
+        public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder getCorecursiveBuilder() {
+          bitField0_ |= 0x00000002;
+          onChanged();
+          return internalGetCorecursiveFieldBuilder().getBuilder();
+        }
+        /**
+         * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+         */
+        public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder getCorecursiveOrBuilder() {
+          if (corecursiveBuilder_ != null) {
+            return corecursiveBuilder_.getMessageOrBuilder();
+          } else {
+            return corecursive_ == null ?
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance() : corecursive_;
+          }
+        }
+        /**
+         * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 corecursive = 2;</code>
+         */
+        private com.google.protobuf.SingleFieldBuilder<
+            legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder> 
+            internalGetCorecursiveFieldBuilder() {
+          if (corecursiveBuilder_ == null) {
+            corecursiveBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder>(
+                    getCorecursive(),
+                    getParentForChildren(),
+                    isClean());
+            corecursive_ = null;
+          }
+          return corecursiveBuilder_;
+        }
+
+        // @@protoc_insertion_point(builder_scope:legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage)
+      }
+
+      // @@protoc_insertion_point(class_scope:legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage)
+      private static final legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage DEFAULT_INSTANCE;
+      static {
+        DEFAULT_INSTANCE = new legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage();
+      }
+
+      public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getDefaultInstance() {
+        return DEFAULT_INSTANCE;
+      }
+
+      private static final com.google.protobuf.Parser<NestedMessage>
+          PARSER = new com.google.protobuf.AbstractParser<NestedMessage>() {
+        @java.lang.Override
+        public NestedMessage parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
+        }
+      };
+
+      public static com.google.protobuf.Parser<NestedMessage> parser() {
+        return PARSER;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Parser<NestedMessage> getParserForType() {
+        return PARSER;
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getDefaultInstanceForType() {
+        return DEFAULT_INSTANCE;
+      }
+
+    }
+
+    private int bitField0_;
+    private int oneofFieldCase_ = 0;
+    @SuppressWarnings("serial")
+    private java.lang.Object oneofField_;
+    public enum OneofFieldCase
+        implements com.google.protobuf.Internal.EnumLite,
+            com.google.protobuf.AbstractMessage.InternalOneOfEnum {
+      ONEOF_UINT32(111),
+      ONEOF_NESTED_MESSAGE(112),
+      ONEOF_STRING(113),
+      ONEOF_BYTES(114),
+      ONEOF_BOOL(115),
+      ONEOF_UINT64(116),
+      ONEOF_FLOAT(117),
+      ONEOF_DOUBLE(118),
+      ONEOF_ENUM(119),
+      ONEOFFIELD_NOT_SET(0);
+      private final int value;
+      private OneofFieldCase(int value) {
+        this.value = value;
+      }
+      /**
+       * @param value The number of the enum to look for.
+       * @return The enum associated with the given number.
+       * @deprecated Use {@link #forNumber(int)} instead.
+       */
+      @java.lang.Deprecated
+      public static OneofFieldCase valueOf(int value) {
+        return forNumber(value);
+      }
+
+      public static OneofFieldCase forNumber(int value) {
+        switch (value) {
+          case 111: return ONEOF_UINT32;
+          case 112: return ONEOF_NESTED_MESSAGE;
+          case 113: return ONEOF_STRING;
+          case 114: return ONEOF_BYTES;
+          case 115: return ONEOF_BOOL;
+          case 116: return ONEOF_UINT64;
+          case 117: return ONEOF_FLOAT;
+          case 118: return ONEOF_DOUBLE;
+          case 119: return ONEOF_ENUM;
+          case 0: return ONEOFFIELD_NOT_SET;
+          default: return null;
+        }
+      }
+      public int getNumber() {
+        return this.value;
+      }
+    };
+
+    public OneofFieldCase
+    getOneofFieldCase() {
+      return OneofFieldCase.forNumber(
+          oneofFieldCase_);
+    }
+
+    public static final int OPTIONAL_INT32_FIELD_NUMBER = 1;
+    private int optionalInt32_ = 0;
+    /**
+     * <code>optional int32 optional_int32 = 1;</code>
+     * @return Whether the optionalInt32 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalInt32() {
+      return ((bitField0_ & 0x00000001) != 0);
+    }
+    /**
+     * <code>optional int32 optional_int32 = 1;</code>
+     * @return The optionalInt32.
+     */
+    @java.lang.Override
+    public int getOptionalInt32() {
+      return optionalInt32_;
+    }
+
+    public static final int OPTIONAL_INT64_FIELD_NUMBER = 2;
+    private long optionalInt64_ = 0L;
+    /**
+     * <code>optional int64 optional_int64 = 2;</code>
+     * @return Whether the optionalInt64 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalInt64() {
+      return ((bitField0_ & 0x00000002) != 0);
+    }
+    /**
+     * <code>optional int64 optional_int64 = 2;</code>
+     * @return The optionalInt64.
+     */
+    @java.lang.Override
+    public long getOptionalInt64() {
+      return optionalInt64_;
+    }
+
+    public static final int OPTIONAL_UINT32_FIELD_NUMBER = 3;
+    private int optionalUint32_ = 0;
+    /**
+     * <code>optional uint32 optional_uint32 = 3;</code>
+     * @return Whether the optionalUint32 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalUint32() {
+      return ((bitField0_ & 0x00000004) != 0);
+    }
+    /**
+     * <code>optional uint32 optional_uint32 = 3;</code>
+     * @return The optionalUint32.
+     */
+    @java.lang.Override
+    public int getOptionalUint32() {
+      return optionalUint32_;
+    }
+
+    public static final int OPTIONAL_UINT64_FIELD_NUMBER = 4;
+    private long optionalUint64_ = 0L;
+    /**
+     * <code>optional uint64 optional_uint64 = 4;</code>
+     * @return Whether the optionalUint64 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalUint64() {
+      return ((bitField0_ & 0x00000008) != 0);
+    }
+    /**
+     * <code>optional uint64 optional_uint64 = 4;</code>
+     * @return The optionalUint64.
+     */
+    @java.lang.Override
+    public long getOptionalUint64() {
+      return optionalUint64_;
+    }
+
+    public static final int OPTIONAL_SINT32_FIELD_NUMBER = 5;
+    private int optionalSint32_ = 0;
+    /**
+     * <code>optional sint32 optional_sint32 = 5;</code>
+     * @return Whether the optionalSint32 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalSint32() {
+      return ((bitField0_ & 0x00000010) != 0);
+    }
+    /**
+     * <code>optional sint32 optional_sint32 = 5;</code>
+     * @return The optionalSint32.
+     */
+    @java.lang.Override
+    public int getOptionalSint32() {
+      return optionalSint32_;
+    }
+
+    public static final int OPTIONAL_SINT64_FIELD_NUMBER = 6;
+    private long optionalSint64_ = 0L;
+    /**
+     * <code>optional sint64 optional_sint64 = 6;</code>
+     * @return Whether the optionalSint64 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalSint64() {
+      return ((bitField0_ & 0x00000020) != 0);
+    }
+    /**
+     * <code>optional sint64 optional_sint64 = 6;</code>
+     * @return The optionalSint64.
+     */
+    @java.lang.Override
+    public long getOptionalSint64() {
+      return optionalSint64_;
+    }
+
+    public static final int OPTIONAL_FIXED32_FIELD_NUMBER = 7;
+    private int optionalFixed32_ = 0;
+    /**
+     * <code>optional fixed32 optional_fixed32 = 7;</code>
+     * @return Whether the optionalFixed32 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalFixed32() {
+      return ((bitField0_ & 0x00000040) != 0);
+    }
+    /**
+     * <code>optional fixed32 optional_fixed32 = 7;</code>
+     * @return The optionalFixed32.
+     */
+    @java.lang.Override
+    public int getOptionalFixed32() {
+      return optionalFixed32_;
+    }
+
+    public static final int OPTIONAL_FIXED64_FIELD_NUMBER = 8;
+    private long optionalFixed64_ = 0L;
+    /**
+     * <code>optional fixed64 optional_fixed64 = 8;</code>
+     * @return Whether the optionalFixed64 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalFixed64() {
+      return ((bitField0_ & 0x00000080) != 0);
+    }
+    /**
+     * <code>optional fixed64 optional_fixed64 = 8;</code>
+     * @return The optionalFixed64.
+     */
+    @java.lang.Override
+    public long getOptionalFixed64() {
+      return optionalFixed64_;
+    }
+
+    public static final int OPTIONAL_SFIXED32_FIELD_NUMBER = 9;
+    private int optionalSfixed32_ = 0;
+    /**
+     * <code>optional sfixed32 optional_sfixed32 = 9;</code>
+     * @return Whether the optionalSfixed32 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalSfixed32() {
+      return ((bitField0_ & 0x00000100) != 0);
+    }
+    /**
+     * <code>optional sfixed32 optional_sfixed32 = 9;</code>
+     * @return The optionalSfixed32.
+     */
+    @java.lang.Override
+    public int getOptionalSfixed32() {
+      return optionalSfixed32_;
+    }
+
+    public static final int OPTIONAL_SFIXED64_FIELD_NUMBER = 10;
+    private long optionalSfixed64_ = 0L;
+    /**
+     * <code>optional sfixed64 optional_sfixed64 = 10;</code>
+     * @return Whether the optionalSfixed64 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalSfixed64() {
+      return ((bitField0_ & 0x00000200) != 0);
+    }
+    /**
+     * <code>optional sfixed64 optional_sfixed64 = 10;</code>
+     * @return The optionalSfixed64.
+     */
+    @java.lang.Override
+    public long getOptionalSfixed64() {
+      return optionalSfixed64_;
+    }
+
+    public static final int OPTIONAL_FLOAT_FIELD_NUMBER = 11;
+    private float optionalFloat_ = 0F;
+    /**
+     * <code>optional float optional_float = 11;</code>
+     * @return Whether the optionalFloat field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalFloat() {
+      return ((bitField0_ & 0x00000400) != 0);
+    }
+    /**
+     * <code>optional float optional_float = 11;</code>
+     * @return The optionalFloat.
+     */
+    @java.lang.Override
+    public float getOptionalFloat() {
+      return optionalFloat_;
+    }
+
+    public static final int OPTIONAL_DOUBLE_FIELD_NUMBER = 12;
+    private double optionalDouble_ = 0D;
+    /**
+     * <code>optional double optional_double = 12;</code>
+     * @return Whether the optionalDouble field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalDouble() {
+      return ((bitField0_ & 0x00000800) != 0);
+    }
+    /**
+     * <code>optional double optional_double = 12;</code>
+     * @return The optionalDouble.
+     */
+    @java.lang.Override
+    public double getOptionalDouble() {
+      return optionalDouble_;
+    }
+
+    public static final int OPTIONAL_BOOL_FIELD_NUMBER = 13;
+    private boolean optionalBool_ = false;
+    /**
+     * <code>optional bool optional_bool = 13;</code>
+     * @return Whether the optionalBool field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalBool() {
+      return ((bitField0_ & 0x00001000) != 0);
+    }
+    /**
+     * <code>optional bool optional_bool = 13;</code>
+     * @return The optionalBool.
+     */
+    @java.lang.Override
+    public boolean getOptionalBool() {
+      return optionalBool_;
+    }
+
+    public static final int OPTIONAL_STRING_FIELD_NUMBER = 14;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object optionalString_ = "";
+    /**
+     * <code>optional string optional_string = 14;</code>
+     * @return Whether the optionalString field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalString() {
+      return ((bitField0_ & 0x00002000) != 0);
+    }
+    /**
+     * <code>optional string optional_string = 14;</code>
+     * @return The optionalString.
+     */
+    @java.lang.Override
+    public java.lang.String getOptionalString() {
+      java.lang.Object ref = optionalString_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
+          optionalString_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     * <code>optional string optional_string = 14;</code>
+     * @return The bytes for optionalString.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getOptionalStringBytes() {
+      java.lang.Object ref = optionalString_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        optionalString_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int OPTIONAL_BYTES_FIELD_NUMBER = 15;
+    private com.google.protobuf.ByteString optionalBytes_ = com.google.protobuf.ByteString.EMPTY;
+    /**
+     * <code>optional bytes optional_bytes = 15;</code>
+     * @return Whether the optionalBytes field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalBytes() {
+      return ((bitField0_ & 0x00004000) != 0);
+    }
+    /**
+     * <code>optional bytes optional_bytes = 15;</code>
+     * @return The optionalBytes.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString getOptionalBytes() {
+      return optionalBytes_;
+    }
+
+    public static final int OPTIONAL_NESTED_MESSAGE_FIELD_NUMBER = 18;
+    private legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage optionalNestedMessage_;
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+     * @return Whether the optionalNestedMessage field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalNestedMessage() {
+      return ((bitField0_ & 0x00008000) != 0);
+    }
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+     * @return The optionalNestedMessage.
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getOptionalNestedMessage() {
+      return optionalNestedMessage_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance() : optionalNestedMessage_;
+    }
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder getOptionalNestedMessageOrBuilder() {
+      return optionalNestedMessage_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance() : optionalNestedMessage_;
+    }
+
+    public static final int OPTIONAL_FOREIGN_MESSAGE_FIELD_NUMBER = 19;
+    private legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage optionalForeignMessage_;
+    /**
+     * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+     * @return Whether the optionalForeignMessage field is set.
+     */
+    @java.lang.Override
+    public boolean hasOptionalForeignMessage() {
+      return ((bitField0_ & 0x00010000) != 0);
+    }
+    /**
+     * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+     * @return The optionalForeignMessage.
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getOptionalForeignMessage() {
+      return optionalForeignMessage_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.getDefaultInstance() : optionalForeignMessage_;
+    }
+    /**
+     * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder getOptionalForeignMessageOrBuilder() {
+      return optionalForeignMessage_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.getDefaultInstance() : optionalForeignMessage_;
+    }
+
+    public static final int OPTIONAL_NESTED_ENUM_FIELD_NUMBER = 21;
+    private int optionalNestedEnum_ = 0;
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum optional_nested_enum = 21;</code>
+     * @return Whether the optionalNestedEnum field is set.
+     */
+    @java.lang.Override public boolean hasOptionalNestedEnum() {
+      return ((bitField0_ & 0x00020000) != 0);
+    }
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum optional_nested_enum = 21;</code>
+     * @return The optionalNestedEnum.
+     */
+    @java.lang.Override public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getOptionalNestedEnum() {
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(optionalNestedEnum_);
+      return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.FOO : result;
+    }
+
+    public static final int OPTIONAL_FOREIGN_ENUM_FIELD_NUMBER = 22;
+    private int optionalForeignEnum_ = 0;
+    /**
+     * <code>optional .legacy_gencode_test.proto2.ForeignEnum optional_foreign_enum = 22;</code>
+     * @return Whether the optionalForeignEnum field is set.
+     */
+    @java.lang.Override public boolean hasOptionalForeignEnum() {
+      return ((bitField0_ & 0x00040000) != 0);
+    }
+    /**
+     * <code>optional .legacy_gencode_test.proto2.ForeignEnum optional_foreign_enum = 22;</code>
+     * @return The optionalForeignEnum.
+     */
+    @java.lang.Override public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getOptionalForeignEnum() {
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.forNumber(optionalForeignEnum_);
+      return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.FOREIGN_FOO : result;
+    }
+
+    public static final int OPTIONAL_ALIASED_ENUM_FIELD_NUMBER = 23;
+    private int optionalAliasedEnum_ = 0;
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.AliasedEnum optional_aliased_enum = 23;</code>
+     * @return Whether the optionalAliasedEnum field is set.
+     */
+    @java.lang.Override public boolean hasOptionalAliasedEnum() {
+      return ((bitField0_ & 0x00080000) != 0);
+    }
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.AliasedEnum optional_aliased_enum = 23;</code>
+     * @return The optionalAliasedEnum.
+     */
+    @java.lang.Override public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum getOptionalAliasedEnum() {
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum.forNumber(optionalAliasedEnum_);
+      return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum.ALIAS_FOO : result;
+    }
+
+    public static final int RECURSIVE_MESSAGE_FIELD_NUMBER = 27;
+    private legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 recursiveMessage_;
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+     * @return Whether the recursiveMessage field is set.
+     */
+    @java.lang.Override
+    public boolean hasRecursiveMessage() {
+      return ((bitField0_ & 0x00100000) != 0);
+    }
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+     * @return The recursiveMessage.
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 getRecursiveMessage() {
+      return recursiveMessage_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance() : recursiveMessage_;
+    }
+    /**
+     * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder getRecursiveMessageOrBuilder() {
+      return recursiveMessage_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance() : recursiveMessage_;
+    }
+
+    public static final int REPEATED_INT32_FIELD_NUMBER = 31;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList repeatedInt32_ =
+        emptyIntList();
+    /**
+     * <pre>
+     * Repeated
+     * </pre>
+     *
+     * <code>repeated int32 repeated_int32 = 31;</code>
+     * @return A list containing the repeatedInt32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getRepeatedInt32List() {
+      return repeatedInt32_;
+    }
+    /**
+     * <pre>
+     * Repeated
+     * </pre>
+     *
+     * <code>repeated int32 repeated_int32 = 31;</code>
+     * @return The count of repeatedInt32.
+     */
+    public int getRepeatedInt32Count() {
+      return repeatedInt32_.size();
+    }
+    /**
+     * <pre>
+     * Repeated
+     * </pre>
+     *
+     * <code>repeated int32 repeated_int32 = 31;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedInt32 at the given index.
+     */
+    public int getRepeatedInt32(int index) {
+      return repeatedInt32_.getInt(index);
+    }
+
+    public static final int REPEATED_INT64_FIELD_NUMBER = 32;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList repeatedInt64_ =
+        emptyLongList();
+    /**
+     * <code>repeated int64 repeated_int64 = 32;</code>
+     * @return A list containing the repeatedInt64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getRepeatedInt64List() {
+      return repeatedInt64_;
+    }
+    /**
+     * <code>repeated int64 repeated_int64 = 32;</code>
+     * @return The count of repeatedInt64.
+     */
+    public int getRepeatedInt64Count() {
+      return repeatedInt64_.size();
+    }
+    /**
+     * <code>repeated int64 repeated_int64 = 32;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedInt64 at the given index.
+     */
+    public long getRepeatedInt64(int index) {
+      return repeatedInt64_.getLong(index);
+    }
+
+    public static final int REPEATED_UINT32_FIELD_NUMBER = 33;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList repeatedUint32_ =
+        emptyIntList();
+    /**
+     * <code>repeated uint32 repeated_uint32 = 33;</code>
+     * @return A list containing the repeatedUint32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getRepeatedUint32List() {
+      return repeatedUint32_;
+    }
+    /**
+     * <code>repeated uint32 repeated_uint32 = 33;</code>
+     * @return The count of repeatedUint32.
+     */
+    public int getRepeatedUint32Count() {
+      return repeatedUint32_.size();
+    }
+    /**
+     * <code>repeated uint32 repeated_uint32 = 33;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedUint32 at the given index.
+     */
+    public int getRepeatedUint32(int index) {
+      return repeatedUint32_.getInt(index);
+    }
+
+    public static final int REPEATED_UINT64_FIELD_NUMBER = 34;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList repeatedUint64_ =
+        emptyLongList();
+    /**
+     * <code>repeated uint64 repeated_uint64 = 34;</code>
+     * @return A list containing the repeatedUint64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getRepeatedUint64List() {
+      return repeatedUint64_;
+    }
+    /**
+     * <code>repeated uint64 repeated_uint64 = 34;</code>
+     * @return The count of repeatedUint64.
+     */
+    public int getRepeatedUint64Count() {
+      return repeatedUint64_.size();
+    }
+    /**
+     * <code>repeated uint64 repeated_uint64 = 34;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedUint64 at the given index.
+     */
+    public long getRepeatedUint64(int index) {
+      return repeatedUint64_.getLong(index);
+    }
+
+    public static final int REPEATED_SINT32_FIELD_NUMBER = 35;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList repeatedSint32_ =
+        emptyIntList();
+    /**
+     * <code>repeated sint32 repeated_sint32 = 35;</code>
+     * @return A list containing the repeatedSint32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getRepeatedSint32List() {
+      return repeatedSint32_;
+    }
+    /**
+     * <code>repeated sint32 repeated_sint32 = 35;</code>
+     * @return The count of repeatedSint32.
+     */
+    public int getRepeatedSint32Count() {
+      return repeatedSint32_.size();
+    }
+    /**
+     * <code>repeated sint32 repeated_sint32 = 35;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedSint32 at the given index.
+     */
+    public int getRepeatedSint32(int index) {
+      return repeatedSint32_.getInt(index);
+    }
+
+    public static final int REPEATED_SINT64_FIELD_NUMBER = 36;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList repeatedSint64_ =
+        emptyLongList();
+    /**
+     * <code>repeated sint64 repeated_sint64 = 36;</code>
+     * @return A list containing the repeatedSint64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getRepeatedSint64List() {
+      return repeatedSint64_;
+    }
+    /**
+     * <code>repeated sint64 repeated_sint64 = 36;</code>
+     * @return The count of repeatedSint64.
+     */
+    public int getRepeatedSint64Count() {
+      return repeatedSint64_.size();
+    }
+    /**
+     * <code>repeated sint64 repeated_sint64 = 36;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedSint64 at the given index.
+     */
+    public long getRepeatedSint64(int index) {
+      return repeatedSint64_.getLong(index);
+    }
+
+    public static final int REPEATED_FIXED32_FIELD_NUMBER = 37;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList repeatedFixed32_ =
+        emptyIntList();
+    /**
+     * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+     * @return A list containing the repeatedFixed32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getRepeatedFixed32List() {
+      return repeatedFixed32_;
+    }
+    /**
+     * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+     * @return The count of repeatedFixed32.
+     */
+    public int getRepeatedFixed32Count() {
+      return repeatedFixed32_.size();
+    }
+    /**
+     * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedFixed32 at the given index.
+     */
+    public int getRepeatedFixed32(int index) {
+      return repeatedFixed32_.getInt(index);
+    }
+
+    public static final int REPEATED_FIXED64_FIELD_NUMBER = 38;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList repeatedFixed64_ =
+        emptyLongList();
+    /**
+     * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+     * @return A list containing the repeatedFixed64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getRepeatedFixed64List() {
+      return repeatedFixed64_;
+    }
+    /**
+     * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+     * @return The count of repeatedFixed64.
+     */
+    public int getRepeatedFixed64Count() {
+      return repeatedFixed64_.size();
+    }
+    /**
+     * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedFixed64 at the given index.
+     */
+    public long getRepeatedFixed64(int index) {
+      return repeatedFixed64_.getLong(index);
+    }
+
+    public static final int REPEATED_SFIXED32_FIELD_NUMBER = 39;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList repeatedSfixed32_ =
+        emptyIntList();
+    /**
+     * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+     * @return A list containing the repeatedSfixed32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getRepeatedSfixed32List() {
+      return repeatedSfixed32_;
+    }
+    /**
+     * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+     * @return The count of repeatedSfixed32.
+     */
+    public int getRepeatedSfixed32Count() {
+      return repeatedSfixed32_.size();
+    }
+    /**
+     * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedSfixed32 at the given index.
+     */
+    public int getRepeatedSfixed32(int index) {
+      return repeatedSfixed32_.getInt(index);
+    }
+
+    public static final int REPEATED_SFIXED64_FIELD_NUMBER = 40;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList repeatedSfixed64_ =
+        emptyLongList();
+    /**
+     * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+     * @return A list containing the repeatedSfixed64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getRepeatedSfixed64List() {
+      return repeatedSfixed64_;
+    }
+    /**
+     * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+     * @return The count of repeatedSfixed64.
+     */
+    public int getRepeatedSfixed64Count() {
+      return repeatedSfixed64_.size();
+    }
+    /**
+     * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedSfixed64 at the given index.
+     */
+    public long getRepeatedSfixed64(int index) {
+      return repeatedSfixed64_.getLong(index);
+    }
+
+    public static final int REPEATED_FLOAT_FIELD_NUMBER = 41;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.FloatList repeatedFloat_ =
+        emptyFloatList();
+    /**
+     * <code>repeated float repeated_float = 41;</code>
+     * @return A list containing the repeatedFloat.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Float>
+        getRepeatedFloatList() {
+      return repeatedFloat_;
+    }
+    /**
+     * <code>repeated float repeated_float = 41;</code>
+     * @return The count of repeatedFloat.
+     */
+    public int getRepeatedFloatCount() {
+      return repeatedFloat_.size();
+    }
+    /**
+     * <code>repeated float repeated_float = 41;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedFloat at the given index.
+     */
+    public float getRepeatedFloat(int index) {
+      return repeatedFloat_.getFloat(index);
+    }
+
+    public static final int REPEATED_DOUBLE_FIELD_NUMBER = 42;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.DoubleList repeatedDouble_ =
+        emptyDoubleList();
+    /**
+     * <code>repeated double repeated_double = 42;</code>
+     * @return A list containing the repeatedDouble.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Double>
+        getRepeatedDoubleList() {
+      return repeatedDouble_;
+    }
+    /**
+     * <code>repeated double repeated_double = 42;</code>
+     * @return The count of repeatedDouble.
+     */
+    public int getRepeatedDoubleCount() {
+      return repeatedDouble_.size();
+    }
+    /**
+     * <code>repeated double repeated_double = 42;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedDouble at the given index.
+     */
+    public double getRepeatedDouble(int index) {
+      return repeatedDouble_.getDouble(index);
+    }
+
+    public static final int REPEATED_BOOL_FIELD_NUMBER = 43;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.BooleanList repeatedBool_ =
+        emptyBooleanList();
+    /**
+     * <code>repeated bool repeated_bool = 43;</code>
+     * @return A list containing the repeatedBool.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Boolean>
+        getRepeatedBoolList() {
+      return repeatedBool_;
+    }
+    /**
+     * <code>repeated bool repeated_bool = 43;</code>
+     * @return The count of repeatedBool.
+     */
+    public int getRepeatedBoolCount() {
+      return repeatedBool_.size();
+    }
+    /**
+     * <code>repeated bool repeated_bool = 43;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedBool at the given index.
+     */
+    public boolean getRepeatedBool(int index) {
+      return repeatedBool_.getBoolean(index);
+    }
+
+    public static final int REPEATED_STRING_FIELD_NUMBER = 44;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.LazyStringArrayList repeatedString_ =
+        com.google.protobuf.LazyStringArrayList.emptyList();
+    /**
+     * <code>repeated string repeated_string = 44;</code>
+     * @return A list containing the repeatedString.
+     */
+    public com.google.protobuf.ProtocolStringList
+        getRepeatedStringList() {
+      return repeatedString_;
+    }
+    /**
+     * <code>repeated string repeated_string = 44;</code>
+     * @return The count of repeatedString.
+     */
+    public int getRepeatedStringCount() {
+      return repeatedString_.size();
+    }
+    /**
+     * <code>repeated string repeated_string = 44;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedString at the given index.
+     */
+    public java.lang.String getRepeatedString(int index) {
+      return repeatedString_.get(index);
+    }
+    /**
+     * <code>repeated string repeated_string = 44;</code>
+     * @param index The index of the value to return.
+     * @return The bytes of the repeatedString at the given index.
+     */
+    public com.google.protobuf.ByteString
+        getRepeatedStringBytes(int index) {
+      return repeatedString_.getByteString(index);
+    }
+
+    public static final int REPEATED_BYTES_FIELD_NUMBER = 45;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.ProtobufList<com.google.protobuf.ByteString> repeatedBytes_ =
+        emptyList(com.google.protobuf.ByteString.class);
+    /**
+     * <code>repeated bytes repeated_bytes = 45;</code>
+     * @return A list containing the repeatedBytes.
+     */
+    @java.lang.Override
+    public java.util.List<com.google.protobuf.ByteString>
+        getRepeatedBytesList() {
+      return repeatedBytes_;
+    }
+    /**
+     * <code>repeated bytes repeated_bytes = 45;</code>
+     * @return The count of repeatedBytes.
+     */
+    public int getRepeatedBytesCount() {
+      return repeatedBytes_.size();
+    }
+    /**
+     * <code>repeated bytes repeated_bytes = 45;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedBytes at the given index.
+     */
+    public com.google.protobuf.ByteString getRepeatedBytes(int index) {
+      return repeatedBytes_.get(index);
+    }
+
+    public static final int REPEATED_NESTED_MESSAGE_FIELD_NUMBER = 48;
+    @SuppressWarnings("serial")
+    private java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> repeatedNestedMessage_;
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+     */
+    @java.lang.Override
+    public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> getRepeatedNestedMessageList() {
+      return repeatedNestedMessage_;
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> 
+        getRepeatedNestedMessageOrBuilderList() {
+      return repeatedNestedMessage_;
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+     */
+    @java.lang.Override
+    public int getRepeatedNestedMessageCount() {
+      return repeatedNestedMessage_.size();
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getRepeatedNestedMessage(int index) {
+      return repeatedNestedMessage_.get(index);
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder getRepeatedNestedMessageOrBuilder(
+        int index) {
+      return repeatedNestedMessage_.get(index);
+    }
+
+    public static final int REPEATED_FOREIGN_MESSAGE_FIELD_NUMBER = 49;
+    @SuppressWarnings("serial")
+    private java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> repeatedForeignMessage_;
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+     */
+    @java.lang.Override
+    public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> getRepeatedForeignMessageList() {
+      return repeatedForeignMessage_;
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder> 
+        getRepeatedForeignMessageOrBuilderList() {
+      return repeatedForeignMessage_;
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+     */
+    @java.lang.Override
+    public int getRepeatedForeignMessageCount() {
+      return repeatedForeignMessage_.size();
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getRepeatedForeignMessage(int index) {
+      return repeatedForeignMessage_.get(index);
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder getRepeatedForeignMessageOrBuilder(
+        int index) {
+      return repeatedForeignMessage_.get(index);
+    }
+
+    public static final int REPEATED_NESTED_ENUM_FIELD_NUMBER = 51;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList repeatedNestedEnum_ =
+        emptyIntList();
+    private static final     com.google.protobuf.Internal.IntListAdapter.IntConverter<
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> repeatedNestedEnum_converter_ =
+            new com.google.protobuf.Internal.IntListAdapter.IntConverter<
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>() {
+              public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum convert(int from) {
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(from);
+                return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.FOO : result;
+              }
+            };
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+     * @return A list containing the repeatedNestedEnum.
+     */
+    @java.lang.Override
+    public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> getRepeatedNestedEnumList() {
+      return new com.google.protobuf.Internal.IntListAdapter<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>(repeatedNestedEnum_, repeatedNestedEnum_converter_);
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+     * @return The count of repeatedNestedEnum.
+     */
+    @java.lang.Override
+    public int getRepeatedNestedEnumCount() {
+      return repeatedNestedEnum_.size();
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedNestedEnum at the given index.
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getRepeatedNestedEnum(int index) {
+      return repeatedNestedEnum_converter_.convert(repeatedNestedEnum_.getInt(index));
+    }
+
+    public static final int REPEATED_FOREIGN_ENUM_FIELD_NUMBER = 52;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList repeatedForeignEnum_ =
+        emptyIntList();
+    private static final     com.google.protobuf.Internal.IntListAdapter.IntConverter<
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum> repeatedForeignEnum_converter_ =
+            new com.google.protobuf.Internal.IntListAdapter.IntConverter<
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum>() {
+              public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum convert(int from) {
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.forNumber(from);
+                return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.FOREIGN_FOO : result;
+              }
+            };
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+     * @return A list containing the repeatedForeignEnum.
+     */
+    @java.lang.Override
+    public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum> getRepeatedForeignEnumList() {
+      return new com.google.protobuf.Internal.IntListAdapter<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum>(repeatedForeignEnum_, repeatedForeignEnum_converter_);
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+     * @return The count of repeatedForeignEnum.
+     */
+    @java.lang.Override
+    public int getRepeatedForeignEnumCount() {
+      return repeatedForeignEnum_.size();
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+     * @param index The index of the element to return.
+     * @return The repeatedForeignEnum at the given index.
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getRepeatedForeignEnum(int index) {
+      return repeatedForeignEnum_converter_.convert(repeatedForeignEnum_.getInt(index));
+    }
+
+    public static final int PACKED_INT32_FIELD_NUMBER = 75;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList packedInt32_ =
+        emptyIntList();
+    /**
+     * <pre>
+     * Packed
+     * </pre>
+     *
+     * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+     * @return A list containing the packedInt32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getPackedInt32List() {
+      return packedInt32_;
+    }
+    /**
+     * <pre>
+     * Packed
+     * </pre>
+     *
+     * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+     * @return The count of packedInt32.
+     */
+    public int getPackedInt32Count() {
+      return packedInt32_.size();
+    }
+    /**
+     * <pre>
+     * Packed
+     * </pre>
+     *
+     * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedInt32 at the given index.
+     */
+    public int getPackedInt32(int index) {
+      return packedInt32_.getInt(index);
+    }
+    private int packedInt32MemoizedSerializedSize = -1;
+
+    public static final int PACKED_INT64_FIELD_NUMBER = 76;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList packedInt64_ =
+        emptyLongList();
+    /**
+     * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+     * @return A list containing the packedInt64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getPackedInt64List() {
+      return packedInt64_;
+    }
+    /**
+     * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+     * @return The count of packedInt64.
+     */
+    public int getPackedInt64Count() {
+      return packedInt64_.size();
+    }
+    /**
+     * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedInt64 at the given index.
+     */
+    public long getPackedInt64(int index) {
+      return packedInt64_.getLong(index);
+    }
+    private int packedInt64MemoizedSerializedSize = -1;
+
+    public static final int PACKED_UINT32_FIELD_NUMBER = 77;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList packedUint32_ =
+        emptyIntList();
+    /**
+     * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+     * @return A list containing the packedUint32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getPackedUint32List() {
+      return packedUint32_;
+    }
+    /**
+     * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+     * @return The count of packedUint32.
+     */
+    public int getPackedUint32Count() {
+      return packedUint32_.size();
+    }
+    /**
+     * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedUint32 at the given index.
+     */
+    public int getPackedUint32(int index) {
+      return packedUint32_.getInt(index);
+    }
+    private int packedUint32MemoizedSerializedSize = -1;
+
+    public static final int PACKED_UINT64_FIELD_NUMBER = 78;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList packedUint64_ =
+        emptyLongList();
+    /**
+     * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+     * @return A list containing the packedUint64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getPackedUint64List() {
+      return packedUint64_;
+    }
+    /**
+     * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+     * @return The count of packedUint64.
+     */
+    public int getPackedUint64Count() {
+      return packedUint64_.size();
+    }
+    /**
+     * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedUint64 at the given index.
+     */
+    public long getPackedUint64(int index) {
+      return packedUint64_.getLong(index);
+    }
+    private int packedUint64MemoizedSerializedSize = -1;
+
+    public static final int PACKED_SINT32_FIELD_NUMBER = 79;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList packedSint32_ =
+        emptyIntList();
+    /**
+     * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+     * @return A list containing the packedSint32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getPackedSint32List() {
+      return packedSint32_;
+    }
+    /**
+     * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+     * @return The count of packedSint32.
+     */
+    public int getPackedSint32Count() {
+      return packedSint32_.size();
+    }
+    /**
+     * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedSint32 at the given index.
+     */
+    public int getPackedSint32(int index) {
+      return packedSint32_.getInt(index);
+    }
+    private int packedSint32MemoizedSerializedSize = -1;
+
+    public static final int PACKED_SINT64_FIELD_NUMBER = 80;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList packedSint64_ =
+        emptyLongList();
+    /**
+     * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+     * @return A list containing the packedSint64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getPackedSint64List() {
+      return packedSint64_;
+    }
+    /**
+     * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+     * @return The count of packedSint64.
+     */
+    public int getPackedSint64Count() {
+      return packedSint64_.size();
+    }
+    /**
+     * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedSint64 at the given index.
+     */
+    public long getPackedSint64(int index) {
+      return packedSint64_.getLong(index);
+    }
+    private int packedSint64MemoizedSerializedSize = -1;
+
+    public static final int PACKED_FIXED32_FIELD_NUMBER = 81;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList packedFixed32_ =
+        emptyIntList();
+    /**
+     * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+     * @return A list containing the packedFixed32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getPackedFixed32List() {
+      return packedFixed32_;
+    }
+    /**
+     * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+     * @return The count of packedFixed32.
+     */
+    public int getPackedFixed32Count() {
+      return packedFixed32_.size();
+    }
+    /**
+     * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedFixed32 at the given index.
+     */
+    public int getPackedFixed32(int index) {
+      return packedFixed32_.getInt(index);
+    }
+    private int packedFixed32MemoizedSerializedSize = -1;
+
+    public static final int PACKED_FIXED64_FIELD_NUMBER = 82;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList packedFixed64_ =
+        emptyLongList();
+    /**
+     * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+     * @return A list containing the packedFixed64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getPackedFixed64List() {
+      return packedFixed64_;
+    }
+    /**
+     * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+     * @return The count of packedFixed64.
+     */
+    public int getPackedFixed64Count() {
+      return packedFixed64_.size();
+    }
+    /**
+     * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedFixed64 at the given index.
+     */
+    public long getPackedFixed64(int index) {
+      return packedFixed64_.getLong(index);
+    }
+    private int packedFixed64MemoizedSerializedSize = -1;
+
+    public static final int PACKED_SFIXED32_FIELD_NUMBER = 83;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList packedSfixed32_ =
+        emptyIntList();
+    /**
+     * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+     * @return A list containing the packedSfixed32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getPackedSfixed32List() {
+      return packedSfixed32_;
+    }
+    /**
+     * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+     * @return The count of packedSfixed32.
+     */
+    public int getPackedSfixed32Count() {
+      return packedSfixed32_.size();
+    }
+    /**
+     * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedSfixed32 at the given index.
+     */
+    public int getPackedSfixed32(int index) {
+      return packedSfixed32_.getInt(index);
+    }
+    private int packedSfixed32MemoizedSerializedSize = -1;
+
+    public static final int PACKED_SFIXED64_FIELD_NUMBER = 84;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList packedSfixed64_ =
+        emptyLongList();
+    /**
+     * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+     * @return A list containing the packedSfixed64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getPackedSfixed64List() {
+      return packedSfixed64_;
+    }
+    /**
+     * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+     * @return The count of packedSfixed64.
+     */
+    public int getPackedSfixed64Count() {
+      return packedSfixed64_.size();
+    }
+    /**
+     * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedSfixed64 at the given index.
+     */
+    public long getPackedSfixed64(int index) {
+      return packedSfixed64_.getLong(index);
+    }
+    private int packedSfixed64MemoizedSerializedSize = -1;
+
+    public static final int PACKED_FLOAT_FIELD_NUMBER = 85;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.FloatList packedFloat_ =
+        emptyFloatList();
+    /**
+     * <code>repeated float packed_float = 85 [packed = true];</code>
+     * @return A list containing the packedFloat.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Float>
+        getPackedFloatList() {
+      return packedFloat_;
+    }
+    /**
+     * <code>repeated float packed_float = 85 [packed = true];</code>
+     * @return The count of packedFloat.
+     */
+    public int getPackedFloatCount() {
+      return packedFloat_.size();
+    }
+    /**
+     * <code>repeated float packed_float = 85 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedFloat at the given index.
+     */
+    public float getPackedFloat(int index) {
+      return packedFloat_.getFloat(index);
+    }
+    private int packedFloatMemoizedSerializedSize = -1;
+
+    public static final int PACKED_DOUBLE_FIELD_NUMBER = 86;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.DoubleList packedDouble_ =
+        emptyDoubleList();
+    /**
+     * <code>repeated double packed_double = 86 [packed = true];</code>
+     * @return A list containing the packedDouble.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Double>
+        getPackedDoubleList() {
+      return packedDouble_;
+    }
+    /**
+     * <code>repeated double packed_double = 86 [packed = true];</code>
+     * @return The count of packedDouble.
+     */
+    public int getPackedDoubleCount() {
+      return packedDouble_.size();
+    }
+    /**
+     * <code>repeated double packed_double = 86 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedDouble at the given index.
+     */
+    public double getPackedDouble(int index) {
+      return packedDouble_.getDouble(index);
+    }
+    private int packedDoubleMemoizedSerializedSize = -1;
+
+    public static final int PACKED_BOOL_FIELD_NUMBER = 87;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.BooleanList packedBool_ =
+        emptyBooleanList();
+    /**
+     * <code>repeated bool packed_bool = 87 [packed = true];</code>
+     * @return A list containing the packedBool.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Boolean>
+        getPackedBoolList() {
+      return packedBool_;
+    }
+    /**
+     * <code>repeated bool packed_bool = 87 [packed = true];</code>
+     * @return The count of packedBool.
+     */
+    public int getPackedBoolCount() {
+      return packedBool_.size();
+    }
+    /**
+     * <code>repeated bool packed_bool = 87 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedBool at the given index.
+     */
+    public boolean getPackedBool(int index) {
+      return packedBool_.getBoolean(index);
+    }
+    private int packedBoolMemoizedSerializedSize = -1;
+
+    public static final int PACKED_NESTED_ENUM_FIELD_NUMBER = 88;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList packedNestedEnum_ =
+        emptyIntList();
+    private static final     com.google.protobuf.Internal.IntListAdapter.IntConverter<
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> packedNestedEnum_converter_ =
+            new com.google.protobuf.Internal.IntListAdapter.IntConverter<
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>() {
+              public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum convert(int from) {
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(from);
+                return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.FOO : result;
+              }
+            };
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+     * @return A list containing the packedNestedEnum.
+     */
+    @java.lang.Override
+    public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> getPackedNestedEnumList() {
+      return new com.google.protobuf.Internal.IntListAdapter<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>(packedNestedEnum_, packedNestedEnum_converter_);
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+     * @return The count of packedNestedEnum.
+     */
+    @java.lang.Override
+    public int getPackedNestedEnumCount() {
+      return packedNestedEnum_.size();
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+     * @param index The index of the element to return.
+     * @return The packedNestedEnum at the given index.
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getPackedNestedEnum(int index) {
+      return packedNestedEnum_converter_.convert(packedNestedEnum_.getInt(index));
+    }
+    private int packedNestedEnumMemoizedSerializedSize;
+
+    public static final int UNPACKED_INT32_FIELD_NUMBER = 89;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList unpackedInt32_ =
+        emptyIntList();
+    /**
+     * <pre>
+     * Unpacked
+     * </pre>
+     *
+     * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+     * @return A list containing the unpackedInt32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getUnpackedInt32List() {
+      return unpackedInt32_;
+    }
+    /**
+     * <pre>
+     * Unpacked
+     * </pre>
+     *
+     * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+     * @return The count of unpackedInt32.
+     */
+    public int getUnpackedInt32Count() {
+      return unpackedInt32_.size();
+    }
+    /**
+     * <pre>
+     * Unpacked
+     * </pre>
+     *
+     * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedInt32 at the given index.
+     */
+    public int getUnpackedInt32(int index) {
+      return unpackedInt32_.getInt(index);
+    }
+
+    public static final int UNPACKED_INT64_FIELD_NUMBER = 90;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList unpackedInt64_ =
+        emptyLongList();
+    /**
+     * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+     * @return A list containing the unpackedInt64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getUnpackedInt64List() {
+      return unpackedInt64_;
+    }
+    /**
+     * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+     * @return The count of unpackedInt64.
+     */
+    public int getUnpackedInt64Count() {
+      return unpackedInt64_.size();
+    }
+    /**
+     * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedInt64 at the given index.
+     */
+    public long getUnpackedInt64(int index) {
+      return unpackedInt64_.getLong(index);
+    }
+
+    public static final int UNPACKED_UINT32_FIELD_NUMBER = 91;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList unpackedUint32_ =
+        emptyIntList();
+    /**
+     * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+     * @return A list containing the unpackedUint32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getUnpackedUint32List() {
+      return unpackedUint32_;
+    }
+    /**
+     * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+     * @return The count of unpackedUint32.
+     */
+    public int getUnpackedUint32Count() {
+      return unpackedUint32_.size();
+    }
+    /**
+     * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedUint32 at the given index.
+     */
+    public int getUnpackedUint32(int index) {
+      return unpackedUint32_.getInt(index);
+    }
+
+    public static final int UNPACKED_UINT64_FIELD_NUMBER = 92;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList unpackedUint64_ =
+        emptyLongList();
+    /**
+     * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+     * @return A list containing the unpackedUint64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getUnpackedUint64List() {
+      return unpackedUint64_;
+    }
+    /**
+     * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+     * @return The count of unpackedUint64.
+     */
+    public int getUnpackedUint64Count() {
+      return unpackedUint64_.size();
+    }
+    /**
+     * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedUint64 at the given index.
+     */
+    public long getUnpackedUint64(int index) {
+      return unpackedUint64_.getLong(index);
+    }
+
+    public static final int UNPACKED_SINT32_FIELD_NUMBER = 93;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList unpackedSint32_ =
+        emptyIntList();
+    /**
+     * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+     * @return A list containing the unpackedSint32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getUnpackedSint32List() {
+      return unpackedSint32_;
+    }
+    /**
+     * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+     * @return The count of unpackedSint32.
+     */
+    public int getUnpackedSint32Count() {
+      return unpackedSint32_.size();
+    }
+    /**
+     * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedSint32 at the given index.
+     */
+    public int getUnpackedSint32(int index) {
+      return unpackedSint32_.getInt(index);
+    }
+
+    public static final int UNPACKED_SINT64_FIELD_NUMBER = 94;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList unpackedSint64_ =
+        emptyLongList();
+    /**
+     * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+     * @return A list containing the unpackedSint64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getUnpackedSint64List() {
+      return unpackedSint64_;
+    }
+    /**
+     * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+     * @return The count of unpackedSint64.
+     */
+    public int getUnpackedSint64Count() {
+      return unpackedSint64_.size();
+    }
+    /**
+     * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedSint64 at the given index.
+     */
+    public long getUnpackedSint64(int index) {
+      return unpackedSint64_.getLong(index);
+    }
+
+    public static final int UNPACKED_FIXED32_FIELD_NUMBER = 95;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList unpackedFixed32_ =
+        emptyIntList();
+    /**
+     * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+     * @return A list containing the unpackedFixed32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getUnpackedFixed32List() {
+      return unpackedFixed32_;
+    }
+    /**
+     * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+     * @return The count of unpackedFixed32.
+     */
+    public int getUnpackedFixed32Count() {
+      return unpackedFixed32_.size();
+    }
+    /**
+     * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedFixed32 at the given index.
+     */
+    public int getUnpackedFixed32(int index) {
+      return unpackedFixed32_.getInt(index);
+    }
+
+    public static final int UNPACKED_FIXED64_FIELD_NUMBER = 96;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList unpackedFixed64_ =
+        emptyLongList();
+    /**
+     * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+     * @return A list containing the unpackedFixed64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getUnpackedFixed64List() {
+      return unpackedFixed64_;
+    }
+    /**
+     * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+     * @return The count of unpackedFixed64.
+     */
+    public int getUnpackedFixed64Count() {
+      return unpackedFixed64_.size();
+    }
+    /**
+     * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedFixed64 at the given index.
+     */
+    public long getUnpackedFixed64(int index) {
+      return unpackedFixed64_.getLong(index);
+    }
+
+    public static final int UNPACKED_SFIXED32_FIELD_NUMBER = 97;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList unpackedSfixed32_ =
+        emptyIntList();
+    /**
+     * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+     * @return A list containing the unpackedSfixed32.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getUnpackedSfixed32List() {
+      return unpackedSfixed32_;
+    }
+    /**
+     * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+     * @return The count of unpackedSfixed32.
+     */
+    public int getUnpackedSfixed32Count() {
+      return unpackedSfixed32_.size();
+    }
+    /**
+     * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedSfixed32 at the given index.
+     */
+    public int getUnpackedSfixed32(int index) {
+      return unpackedSfixed32_.getInt(index);
+    }
+
+    public static final int UNPACKED_SFIXED64_FIELD_NUMBER = 98;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.LongList unpackedSfixed64_ =
+        emptyLongList();
+    /**
+     * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+     * @return A list containing the unpackedSfixed64.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getUnpackedSfixed64List() {
+      return unpackedSfixed64_;
+    }
+    /**
+     * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+     * @return The count of unpackedSfixed64.
+     */
+    public int getUnpackedSfixed64Count() {
+      return unpackedSfixed64_.size();
+    }
+    /**
+     * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedSfixed64 at the given index.
+     */
+    public long getUnpackedSfixed64(int index) {
+      return unpackedSfixed64_.getLong(index);
+    }
+
+    public static final int UNPACKED_FLOAT_FIELD_NUMBER = 99;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.FloatList unpackedFloat_ =
+        emptyFloatList();
+    /**
+     * <code>repeated float unpacked_float = 99 [packed = false];</code>
+     * @return A list containing the unpackedFloat.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Float>
+        getUnpackedFloatList() {
+      return unpackedFloat_;
+    }
+    /**
+     * <code>repeated float unpacked_float = 99 [packed = false];</code>
+     * @return The count of unpackedFloat.
+     */
+    public int getUnpackedFloatCount() {
+      return unpackedFloat_.size();
+    }
+    /**
+     * <code>repeated float unpacked_float = 99 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedFloat at the given index.
+     */
+    public float getUnpackedFloat(int index) {
+      return unpackedFloat_.getFloat(index);
+    }
+
+    public static final int UNPACKED_DOUBLE_FIELD_NUMBER = 100;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.DoubleList unpackedDouble_ =
+        emptyDoubleList();
+    /**
+     * <code>repeated double unpacked_double = 100 [packed = false];</code>
+     * @return A list containing the unpackedDouble.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Double>
+        getUnpackedDoubleList() {
+      return unpackedDouble_;
+    }
+    /**
+     * <code>repeated double unpacked_double = 100 [packed = false];</code>
+     * @return The count of unpackedDouble.
+     */
+    public int getUnpackedDoubleCount() {
+      return unpackedDouble_.size();
+    }
+    /**
+     * <code>repeated double unpacked_double = 100 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedDouble at the given index.
+     */
+    public double getUnpackedDouble(int index) {
+      return unpackedDouble_.getDouble(index);
+    }
+
+    public static final int UNPACKED_BOOL_FIELD_NUMBER = 101;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.BooleanList unpackedBool_ =
+        emptyBooleanList();
+    /**
+     * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+     * @return A list containing the unpackedBool.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Boolean>
+        getUnpackedBoolList() {
+      return unpackedBool_;
+    }
+    /**
+     * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+     * @return The count of unpackedBool.
+     */
+    public int getUnpackedBoolCount() {
+      return unpackedBool_.size();
+    }
+    /**
+     * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedBool at the given index.
+     */
+    public boolean getUnpackedBool(int index) {
+      return unpackedBool_.getBoolean(index);
+    }
+
+    public static final int UNPACKED_NESTED_ENUM_FIELD_NUMBER = 102;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList unpackedNestedEnum_ =
+        emptyIntList();
+    private static final     com.google.protobuf.Internal.IntListAdapter.IntConverter<
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> unpackedNestedEnum_converter_ =
+            new com.google.protobuf.Internal.IntListAdapter.IntConverter<
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>() {
+              public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum convert(int from) {
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(from);
+                return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.FOO : result;
+              }
+            };
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+     * @return A list containing the unpackedNestedEnum.
+     */
+    @java.lang.Override
+    public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> getUnpackedNestedEnumList() {
+      return new com.google.protobuf.Internal.IntListAdapter<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>(unpackedNestedEnum_, unpackedNestedEnum_converter_);
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+     * @return The count of unpackedNestedEnum.
+     */
+    @java.lang.Override
+    public int getUnpackedNestedEnumCount() {
+      return unpackedNestedEnum_.size();
+    }
+    /**
+     * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+     * @param index The index of the element to return.
+     * @return The unpackedNestedEnum at the given index.
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getUnpackedNestedEnum(int index) {
+      return unpackedNestedEnum_converter_.convert(unpackedNestedEnum_.getInt(index));
+    }
+
+    public static final int MAP_INT32_INT32_FIELD_NUMBER = 56;
+    private static final class MapInt32Int32DefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32Int32Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.INT32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.INT32,
+                  0);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Integer> mapInt32Int32_;
+    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+    internalGetMapInt32Int32() {
+      if (mapInt32Int32_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapInt32Int32DefaultEntryHolder.defaultEntry);
+      }
+      return mapInt32Int32_;
+    }
+    public int getMapInt32Int32Count() {
+      return internalGetMapInt32Int32().getMap().size();
+    }
+    /**
+     * <pre>
+     * Map
+     * </pre>
+     *
+     * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapInt32Int32(
+        int key) {
+
+      return internalGetMapInt32Int32().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapInt32Int32Map()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32() {
+      return getMapInt32Int32Map();
+    }
+    /**
+     * <pre>
+     * Map
+     * </pre>
+     *
+     * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32Map() {
+      return internalGetMapInt32Int32().getMap();
+    }
+    /**
+     * <pre>
+     * Map
+     * </pre>
+     *
+     * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+     */
+    @java.lang.Override
+    public int getMapInt32Int32OrDefault(
+        int key,
+        int defaultValue) {
+
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapInt32Int32().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <pre>
+     * Map
+     * </pre>
+     *
+     * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+     */
+    @java.lang.Override
+    public int getMapInt32Int32OrThrow(
+        int key) {
+
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapInt32Int32().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_INT64_INT64_FIELD_NUMBER = 57;
+    private static final class MapInt64Int64DefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Long, java.lang.Long> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Long, java.lang.Long>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt64Int64Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.INT64,
+                  0L,
+                  com.google.protobuf.WireFormat.FieldType.INT64,
+                  0L);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Long, java.lang.Long> mapInt64Int64_;
+    private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+    internalGetMapInt64Int64() {
+      if (mapInt64Int64_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapInt64Int64DefaultEntryHolder.defaultEntry);
+      }
+      return mapInt64Int64_;
+    }
+    public int getMapInt64Int64Count() {
+      return internalGetMapInt64Int64().getMap().size();
+    }
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapInt64Int64(
+        long key) {
+
+      return internalGetMapInt64Int64().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapInt64Int64Map()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Long, java.lang.Long> getMapInt64Int64() {
+      return getMapInt64Int64Map();
+    }
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Long, java.lang.Long> getMapInt64Int64Map() {
+      return internalGetMapInt64Int64().getMap();
+    }
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
+    @java.lang.Override
+    public long getMapInt64Int64OrDefault(
+        long key,
+        long defaultValue) {
+
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapInt64Int64().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
+    @java.lang.Override
+    public long getMapInt64Int64OrThrow(
+        long key) {
+
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapInt64Int64().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_UINT32_UINT32_FIELD_NUMBER = 58;
+    private static final class MapUint32Uint32DefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint32Uint32Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.UINT32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.UINT32,
+                  0);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Integer> mapUint32Uint32_;
+    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+    internalGetMapUint32Uint32() {
+      if (mapUint32Uint32_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapUint32Uint32DefaultEntryHolder.defaultEntry);
+      }
+      return mapUint32Uint32_;
+    }
+    public int getMapUint32Uint32Count() {
+      return internalGetMapUint32Uint32().getMap().size();
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapUint32Uint32(
+        int key) {
+
+      return internalGetMapUint32Uint32().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapUint32Uint32Map()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getMapUint32Uint32() {
+      return getMapUint32Uint32Map();
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getMapUint32Uint32Map() {
+      return internalGetMapUint32Uint32().getMap();
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
+    @java.lang.Override
+    public int getMapUint32Uint32OrDefault(
+        int key,
+        int defaultValue) {
+
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapUint32Uint32().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
+    @java.lang.Override
+    public int getMapUint32Uint32OrThrow(
+        int key) {
+
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapUint32Uint32().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_UINT64_UINT64_FIELD_NUMBER = 59;
+    private static final class MapUint64Uint64DefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Long, java.lang.Long> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Long, java.lang.Long>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint64Uint64Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.UINT64,
+                  0L,
+                  com.google.protobuf.WireFormat.FieldType.UINT64,
+                  0L);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Long, java.lang.Long> mapUint64Uint64_;
+    private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+    internalGetMapUint64Uint64() {
+      if (mapUint64Uint64_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapUint64Uint64DefaultEntryHolder.defaultEntry);
+      }
+      return mapUint64Uint64_;
+    }
+    public int getMapUint64Uint64Count() {
+      return internalGetMapUint64Uint64().getMap().size();
+    }
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapUint64Uint64(
+        long key) {
+
+      return internalGetMapUint64Uint64().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapUint64Uint64Map()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Long, java.lang.Long> getMapUint64Uint64() {
+      return getMapUint64Uint64Map();
+    }
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Long, java.lang.Long> getMapUint64Uint64Map() {
+      return internalGetMapUint64Uint64().getMap();
+    }
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
+    @java.lang.Override
+    public long getMapUint64Uint64OrDefault(
+        long key,
+        long defaultValue) {
+
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapUint64Uint64().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
+    @java.lang.Override
+    public long getMapUint64Uint64OrThrow(
+        long key) {
+
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapUint64Uint64().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_SINT32_SINT32_FIELD_NUMBER = 60;
+    private static final class MapSint32Sint32DefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint32Sint32Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.SINT32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.SINT32,
+                  0);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Integer> mapSint32Sint32_;
+    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+    internalGetMapSint32Sint32() {
+      if (mapSint32Sint32_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapSint32Sint32DefaultEntryHolder.defaultEntry);
+      }
+      return mapSint32Sint32_;
+    }
+    public int getMapSint32Sint32Count() {
+      return internalGetMapSint32Sint32().getMap().size();
+    }
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapSint32Sint32(
+        int key) {
+
+      return internalGetMapSint32Sint32().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapSint32Sint32Map()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSint32Sint32() {
+      return getMapSint32Sint32Map();
+    }
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSint32Sint32Map() {
+      return internalGetMapSint32Sint32().getMap();
+    }
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
+    @java.lang.Override
+    public int getMapSint32Sint32OrDefault(
+        int key,
+        int defaultValue) {
+
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapSint32Sint32().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
+    @java.lang.Override
+    public int getMapSint32Sint32OrThrow(
+        int key) {
+
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapSint32Sint32().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_SINT64_SINT64_FIELD_NUMBER = 61;
+    private static final class MapSint64Sint64DefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Long, java.lang.Long> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Long, java.lang.Long>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint64Sint64Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.SINT64,
+                  0L,
+                  com.google.protobuf.WireFormat.FieldType.SINT64,
+                  0L);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Long, java.lang.Long> mapSint64Sint64_;
+    private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+    internalGetMapSint64Sint64() {
+      if (mapSint64Sint64_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapSint64Sint64DefaultEntryHolder.defaultEntry);
+      }
+      return mapSint64Sint64_;
+    }
+    public int getMapSint64Sint64Count() {
+      return internalGetMapSint64Sint64().getMap().size();
+    }
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapSint64Sint64(
+        long key) {
+
+      return internalGetMapSint64Sint64().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapSint64Sint64Map()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Long, java.lang.Long> getMapSint64Sint64() {
+      return getMapSint64Sint64Map();
+    }
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Long, java.lang.Long> getMapSint64Sint64Map() {
+      return internalGetMapSint64Sint64().getMap();
+    }
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
+    @java.lang.Override
+    public long getMapSint64Sint64OrDefault(
+        long key,
+        long defaultValue) {
+
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapSint64Sint64().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
+    @java.lang.Override
+    public long getMapSint64Sint64OrThrow(
+        long key) {
+
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapSint64Sint64().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_FIXED32_FIXED32_FIELD_NUMBER = 62;
+    private static final class MapFixed32Fixed32DefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed32Fixed32Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.FIXED32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.FIXED32,
+                  0);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Integer> mapFixed32Fixed32_;
+    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+    internalGetMapFixed32Fixed32() {
+      if (mapFixed32Fixed32_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapFixed32Fixed32DefaultEntryHolder.defaultEntry);
+      }
+      return mapFixed32Fixed32_;
+    }
+    public int getMapFixed32Fixed32Count() {
+      return internalGetMapFixed32Fixed32().getMap().size();
+    }
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapFixed32Fixed32(
+        int key) {
+
+      return internalGetMapFixed32Fixed32().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapFixed32Fixed32Map()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getMapFixed32Fixed32() {
+      return getMapFixed32Fixed32Map();
+    }
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getMapFixed32Fixed32Map() {
+      return internalGetMapFixed32Fixed32().getMap();
+    }
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
+    @java.lang.Override
+    public int getMapFixed32Fixed32OrDefault(
+        int key,
+        int defaultValue) {
+
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapFixed32Fixed32().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
+    @java.lang.Override
+    public int getMapFixed32Fixed32OrThrow(
+        int key) {
+
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapFixed32Fixed32().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_FIXED64_FIXED64_FIELD_NUMBER = 63;
+    private static final class MapFixed64Fixed64DefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Long, java.lang.Long> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Long, java.lang.Long>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed64Fixed64Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.FIXED64,
+                  0L,
+                  com.google.protobuf.WireFormat.FieldType.FIXED64,
+                  0L);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Long, java.lang.Long> mapFixed64Fixed64_;
+    private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+    internalGetMapFixed64Fixed64() {
+      if (mapFixed64Fixed64_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapFixed64Fixed64DefaultEntryHolder.defaultEntry);
+      }
+      return mapFixed64Fixed64_;
+    }
+    public int getMapFixed64Fixed64Count() {
+      return internalGetMapFixed64Fixed64().getMap().size();
+    }
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapFixed64Fixed64(
+        long key) {
+
+      return internalGetMapFixed64Fixed64().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapFixed64Fixed64Map()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Long, java.lang.Long> getMapFixed64Fixed64() {
+      return getMapFixed64Fixed64Map();
+    }
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Long, java.lang.Long> getMapFixed64Fixed64Map() {
+      return internalGetMapFixed64Fixed64().getMap();
+    }
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
+    @java.lang.Override
+    public long getMapFixed64Fixed64OrDefault(
+        long key,
+        long defaultValue) {
+
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapFixed64Fixed64().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
+    @java.lang.Override
+    public long getMapFixed64Fixed64OrThrow(
+        long key) {
+
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapFixed64Fixed64().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_SFIXED32_SFIXED32_FIELD_NUMBER = 64;
+    private static final class MapSfixed32Sfixed32DefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed32Sfixed32Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.SFIXED32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.SFIXED32,
+                  0);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Integer> mapSfixed32Sfixed32_;
+    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+    internalGetMapSfixed32Sfixed32() {
+      if (mapSfixed32Sfixed32_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry);
+      }
+      return mapSfixed32Sfixed32_;
+    }
+    public int getMapSfixed32Sfixed32Count() {
+      return internalGetMapSfixed32Sfixed32().getMap().size();
+    }
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapSfixed32Sfixed32(
+        int key) {
+
+      return internalGetMapSfixed32Sfixed32().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapSfixed32Sfixed32Map()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSfixed32Sfixed32() {
+      return getMapSfixed32Sfixed32Map();
+    }
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSfixed32Sfixed32Map() {
+      return internalGetMapSfixed32Sfixed32().getMap();
+    }
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    @java.lang.Override
+    public int getMapSfixed32Sfixed32OrDefault(
+        int key,
+        int defaultValue) {
+
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapSfixed32Sfixed32().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    @java.lang.Override
+    public int getMapSfixed32Sfixed32OrThrow(
+        int key) {
+
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapSfixed32Sfixed32().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_SFIXED64_SFIXED64_FIELD_NUMBER = 65;
+    private static final class MapSfixed64Sfixed64DefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Long, java.lang.Long> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Long, java.lang.Long>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed64Sfixed64Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.SFIXED64,
+                  0L,
+                  com.google.protobuf.WireFormat.FieldType.SFIXED64,
+                  0L);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Long, java.lang.Long> mapSfixed64Sfixed64_;
+    private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+    internalGetMapSfixed64Sfixed64() {
+      if (mapSfixed64Sfixed64_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry);
+      }
+      return mapSfixed64Sfixed64_;
+    }
+    public int getMapSfixed64Sfixed64Count() {
+      return internalGetMapSfixed64Sfixed64().getMap().size();
+    }
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapSfixed64Sfixed64(
+        long key) {
+
+      return internalGetMapSfixed64Sfixed64().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapSfixed64Sfixed64Map()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Long, java.lang.Long> getMapSfixed64Sfixed64() {
+      return getMapSfixed64Sfixed64Map();
+    }
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Long, java.lang.Long> getMapSfixed64Sfixed64Map() {
+      return internalGetMapSfixed64Sfixed64().getMap();
+    }
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    @java.lang.Override
+    public long getMapSfixed64Sfixed64OrDefault(
+        long key,
+        long defaultValue) {
+
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapSfixed64Sfixed64().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    @java.lang.Override
+    public long getMapSfixed64Sfixed64OrThrow(
+        long key) {
+
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapSfixed64Sfixed64().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_INT32_FLOAT_FIELD_NUMBER = 66;
+    private static final class MapInt32FloatDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Float> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Float>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32FloatEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.INT32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.FLOAT,
+                  0F);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Float> mapInt32Float_;
+    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float>
+    internalGetMapInt32Float() {
+      if (mapInt32Float_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapInt32FloatDefaultEntryHolder.defaultEntry);
+      }
+      return mapInt32Float_;
+    }
+    public int getMapInt32FloatCount() {
+      return internalGetMapInt32Float().getMap().size();
+    }
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapInt32Float(
+        int key) {
+
+      return internalGetMapInt32Float().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapInt32FloatMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Integer, java.lang.Float> getMapInt32Float() {
+      return getMapInt32FloatMap();
+    }
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Integer, java.lang.Float> getMapInt32FloatMap() {
+      return internalGetMapInt32Float().getMap();
+    }
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    @java.lang.Override
+    public float getMapInt32FloatOrDefault(
+        int key,
+        float defaultValue) {
+
+      java.util.Map<java.lang.Integer, java.lang.Float> map =
+          internalGetMapInt32Float().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    @java.lang.Override
+    public float getMapInt32FloatOrThrow(
+        int key) {
+
+      java.util.Map<java.lang.Integer, java.lang.Float> map =
+          internalGetMapInt32Float().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_INT32_DOUBLE_FIELD_NUMBER = 67;
+    private static final class MapInt32DoubleDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Double> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Double>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32DoubleEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.INT32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.DOUBLE,
+                  0D);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Double> mapInt32Double_;
+    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Double>
+    internalGetMapInt32Double() {
+      if (mapInt32Double_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapInt32DoubleDefaultEntryHolder.defaultEntry);
+      }
+      return mapInt32Double_;
+    }
+    public int getMapInt32DoubleCount() {
+      return internalGetMapInt32Double().getMap().size();
+    }
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapInt32Double(
+        int key) {
+
+      return internalGetMapInt32Double().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapInt32DoubleMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Integer, java.lang.Double> getMapInt32Double() {
+      return getMapInt32DoubleMap();
+    }
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Integer, java.lang.Double> getMapInt32DoubleMap() {
+      return internalGetMapInt32Double().getMap();
+    }
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    @java.lang.Override
+    public double getMapInt32DoubleOrDefault(
+        int key,
+        double defaultValue) {
+
+      java.util.Map<java.lang.Integer, java.lang.Double> map =
+          internalGetMapInt32Double().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    @java.lang.Override
+    public double getMapInt32DoubleOrThrow(
+        int key) {
+
+      java.util.Map<java.lang.Integer, java.lang.Double> map =
+          internalGetMapInt32Double().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_BOOL_BOOL_FIELD_NUMBER = 68;
+    private static final class MapBoolBoolDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Boolean, java.lang.Boolean> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Boolean, java.lang.Boolean>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapBoolBoolEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.BOOL,
+                  false,
+                  com.google.protobuf.WireFormat.FieldType.BOOL,
+                  false);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.Boolean, java.lang.Boolean> mapBoolBool_;
+    private com.google.protobuf.MapField<java.lang.Boolean, java.lang.Boolean>
+    internalGetMapBoolBool() {
+      if (mapBoolBool_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapBoolBoolDefaultEntryHolder.defaultEntry);
+      }
+      return mapBoolBool_;
+    }
+    public int getMapBoolBoolCount() {
+      return internalGetMapBoolBool().getMap().size();
+    }
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapBoolBool(
+        boolean key) {
+
+      return internalGetMapBoolBool().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapBoolBoolMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Boolean, java.lang.Boolean> getMapBoolBool() {
+      return getMapBoolBoolMap();
+    }
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.Boolean, java.lang.Boolean> getMapBoolBoolMap() {
+      return internalGetMapBoolBool().getMap();
+    }
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    @java.lang.Override
+    public boolean getMapBoolBoolOrDefault(
+        boolean key,
+        boolean defaultValue) {
+
+      java.util.Map<java.lang.Boolean, java.lang.Boolean> map =
+          internalGetMapBoolBool().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    @java.lang.Override
+    public boolean getMapBoolBoolOrThrow(
+        boolean key) {
+
+      java.util.Map<java.lang.Boolean, java.lang.Boolean> map =
+          internalGetMapBoolBool().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_STRING_STRING_FIELD_NUMBER = 69;
+    private static final class MapStringStringDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.String, java.lang.String> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.String, java.lang.String>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringStringEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "");
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.String, java.lang.String> mapStringString_;
+    private com.google.protobuf.MapField<java.lang.String, java.lang.String>
+    internalGetMapStringString() {
+      if (mapStringString_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapStringStringDefaultEntryHolder.defaultEntry);
+      }
+      return mapStringString_;
+    }
+    public int getMapStringStringCount() {
+      return internalGetMapStringString().getMap().size();
+    }
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapStringString(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      return internalGetMapStringString().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapStringStringMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.String, java.lang.String> getMapStringString() {
+      return getMapStringStringMap();
+    }
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.String, java.lang.String> getMapStringStringMap() {
+      return internalGetMapStringString().getMap();
+    }
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    @java.lang.Override
+    public /* nullable */
+java.lang.String getMapStringStringOrDefault(
+        java.lang.String key,
+        /* nullable */
+java.lang.String defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, java.lang.String> map =
+          internalGetMapStringString().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    @java.lang.Override
+    public java.lang.String getMapStringStringOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, java.lang.String> map =
+          internalGetMapStringString().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_STRING_BYTES_FIELD_NUMBER = 70;
+    private static final class MapStringBytesDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.String, com.google.protobuf.ByteString> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.String, com.google.protobuf.ByteString>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringBytesEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.BYTES,
+                  com.google.protobuf.ByteString.EMPTY);
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.String, com.google.protobuf.ByteString> mapStringBytes_;
+    private com.google.protobuf.MapField<java.lang.String, com.google.protobuf.ByteString>
+    internalGetMapStringBytes() {
+      if (mapStringBytes_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapStringBytesDefaultEntryHolder.defaultEntry);
+      }
+      return mapStringBytes_;
+    }
+    public int getMapStringBytesCount() {
+      return internalGetMapStringBytes().getMap().size();
+    }
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapStringBytes(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      return internalGetMapStringBytes().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapStringBytesMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.String, com.google.protobuf.ByteString> getMapStringBytes() {
+      return getMapStringBytesMap();
+    }
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.String, com.google.protobuf.ByteString> getMapStringBytesMap() {
+      return internalGetMapStringBytes().getMap();
+    }
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    @java.lang.Override
+    public /* nullable */
+com.google.protobuf.ByteString getMapStringBytesOrDefault(
+        java.lang.String key,
+        /* nullable */
+com.google.protobuf.ByteString defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, com.google.protobuf.ByteString> map =
+          internalGetMapStringBytes().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString getMapStringBytesOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, com.google.protobuf.ByteString> map =
+          internalGetMapStringBytes().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_STRING_NESTED_MESSAGE_FIELD_NUMBER = 71;
+    private static final class MapStringNestedMessageDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedMessageEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.MESSAGE,
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance());
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> mapStringNestedMessage_;
+    private com.google.protobuf.MapField<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage>
+    internalGetMapStringNestedMessage() {
+      if (mapStringNestedMessage_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapStringNestedMessageDefaultEntryHolder.defaultEntry);
+      }
+      return mapStringNestedMessage_;
+    }
+    public int getMapStringNestedMessageCount() {
+      return internalGetMapStringNestedMessage().getMap().size();
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapStringNestedMessage(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      return internalGetMapStringNestedMessage().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapStringNestedMessageMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> getMapStringNestedMessage() {
+      return getMapStringNestedMessageMap();
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> getMapStringNestedMessageMap() {
+      return internalGetMapStringNestedMessage().getMap();
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    @java.lang.Override
+    public /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getMapStringNestedMessageOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> map =
+          internalGetMapStringNestedMessage().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getMapStringNestedMessageOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> map =
+          internalGetMapStringNestedMessage().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_STRING_FOREIGN_MESSAGE_FIELD_NUMBER = 72;
+    private static final class MapStringForeignMessageDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignMessageEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.MESSAGE,
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.getDefaultInstance());
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> mapStringForeignMessage_;
+    private com.google.protobuf.MapField<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage>
+    internalGetMapStringForeignMessage() {
+      if (mapStringForeignMessage_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapStringForeignMessageDefaultEntryHolder.defaultEntry);
+      }
+      return mapStringForeignMessage_;
+    }
+    public int getMapStringForeignMessageCount() {
+      return internalGetMapStringForeignMessage().getMap().size();
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapStringForeignMessage(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      return internalGetMapStringForeignMessage().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapStringForeignMessageMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> getMapStringForeignMessage() {
+      return getMapStringForeignMessageMap();
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> getMapStringForeignMessageMap() {
+      return internalGetMapStringForeignMessage().getMap();
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    @java.lang.Override
+    public /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getMapStringForeignMessageOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> map =
+          internalGetMapStringForeignMessage().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getMapStringForeignMessageOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> map =
+          internalGetMapStringForeignMessage().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int MAP_STRING_NESTED_ENUM_FIELD_NUMBER = 73;
+    private static final class MapStringNestedEnumDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.String, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.String, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedEnumEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.ENUM,
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.FOO.getNumber());
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.String, java.lang.Integer> mapStringNestedEnum_;
+    private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
+    internalGetMapStringNestedEnum() {
+      if (mapStringNestedEnum_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapStringNestedEnumDefaultEntryHolder.defaultEntry);
+      }
+      return mapStringNestedEnum_;
+    }
+    private static final
+    com.google.protobuf.Internal.MapAdapter.Converter<
+        java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> mapStringNestedEnumValueConverter =
+            com.google.protobuf.Internal.MapAdapter.newEnumConverter(
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.internalGetValueMap(),
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.FOO);
+    private static final java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>
+    internalGetAdaptedMapStringNestedEnumMap(
+        java.util.Map<java.lang.String, java.lang.Integer> map) {
+      return new com.google.protobuf.Internal.MapAdapter<
+          java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum, java.lang.Integer>(
+              map, mapStringNestedEnumValueConverter);
+    }
+    public int getMapStringNestedEnumCount() {
+      return internalGetMapStringNestedEnum().getMap().size();
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapStringNestedEnum(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      return internalGetMapStringNestedEnum().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapStringNestedEnumMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>
+    getMapStringNestedEnum() {
+      return getMapStringNestedEnumMap();
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>
+    getMapStringNestedEnumMap() {
+      return internalGetAdaptedMapStringNestedEnumMap(
+          internalGetMapStringNestedEnum().getMap());}
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    @java.lang.Override
+    public /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getMapStringNestedEnumOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, java.lang.Integer> map =
+          internalGetMapStringNestedEnum().getMap();
+      return map.containsKey(key)
+             ? mapStringNestedEnumValueConverter.doForward(map.get(key))
+             : defaultValue;
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getMapStringNestedEnumOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, java.lang.Integer> map =
+          internalGetMapStringNestedEnum().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return mapStringNestedEnumValueConverter.doForward(map.get(key));
+    }
+
+    public static final int MAP_STRING_FOREIGN_ENUM_FIELD_NUMBER = 74;
+    private static final class MapStringForeignEnumDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.String, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.String, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignEnumEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.ENUM,
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.FOREIGN_FOO.getNumber());
+    }
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.String, java.lang.Integer> mapStringForeignEnum_;
+    private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
+    internalGetMapStringForeignEnum() {
+      if (mapStringForeignEnum_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MapStringForeignEnumDefaultEntryHolder.defaultEntry);
+      }
+      return mapStringForeignEnum_;
+    }
+    private static final
+    com.google.protobuf.Internal.MapAdapter.Converter<
+        java.lang.Integer, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum> mapStringForeignEnumValueConverter =
+            com.google.protobuf.Internal.MapAdapter.newEnumConverter(
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.internalGetValueMap(),
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.FOREIGN_FOO);
+    private static final java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum>
+    internalGetAdaptedMapStringForeignEnumMap(
+        java.util.Map<java.lang.String, java.lang.Integer> map) {
+      return new com.google.protobuf.Internal.MapAdapter<
+          java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum, java.lang.Integer>(
+              map, mapStringForeignEnumValueConverter);
+    }
+    public int getMapStringForeignEnumCount() {
+      return internalGetMapStringForeignEnum().getMap().size();
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    @java.lang.Override
+    public boolean containsMapStringForeignEnum(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      return internalGetMapStringForeignEnum().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMapStringForeignEnumMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum>
+    getMapStringForeignEnum() {
+      return getMapStringForeignEnumMap();
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum>
+    getMapStringForeignEnumMap() {
+      return internalGetAdaptedMapStringForeignEnumMap(
+          internalGetMapStringForeignEnum().getMap());}
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    @java.lang.Override
+    public /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getMapStringForeignEnumOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, java.lang.Integer> map =
+          internalGetMapStringForeignEnum().getMap();
+      return map.containsKey(key)
+             ? mapStringForeignEnumValueConverter.doForward(map.get(key))
+             : defaultValue;
+    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getMapStringForeignEnumOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, java.lang.Integer> map =
+          internalGetMapStringForeignEnum().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return mapStringForeignEnumValueConverter.doForward(map.get(key));
+    }
+
+    public static final int ONEOF_UINT32_FIELD_NUMBER = 111;
+    /**
+     * <code>uint32 oneof_uint32 = 111;</code>
+     * @return Whether the oneofUint32 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOneofUint32() {
+      return oneofFieldCase_ == 111;
+    }
+    /**
+     * <code>uint32 oneof_uint32 = 111;</code>
+     * @return The oneofUint32.
+     */
+    @java.lang.Override
+    public int getOneofUint32() {
+      if (oneofFieldCase_ == 111) {
+        return (java.lang.Integer) oneofField_;
+      }
+      return 0;
+    }
+
+    public static final int ONEOF_NESTED_MESSAGE_FIELD_NUMBER = 112;
+    /**
+     * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+     * @return Whether the oneofNestedMessage field is set.
+     */
+    @java.lang.Override
+    public boolean hasOneofNestedMessage() {
+      return oneofFieldCase_ == 112;
+    }
+    /**
+     * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+     * @return The oneofNestedMessage.
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getOneofNestedMessage() {
+      if (oneofFieldCase_ == 112) {
+         return (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) oneofField_;
+      }
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance();
+    }
+    /**
+     * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+     */
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder getOneofNestedMessageOrBuilder() {
+      if (oneofFieldCase_ == 112) {
+         return (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) oneofField_;
+      }
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance();
+    }
+
+    public static final int ONEOF_STRING_FIELD_NUMBER = 113;
+    /**
+     * <code>string oneof_string = 113;</code>
+     * @return Whether the oneofString field is set.
+     */
+    public boolean hasOneofString() {
+      return oneofFieldCase_ == 113;
+    }
+    /**
+     * <code>string oneof_string = 113;</code>
+     * @return The oneofString.
+     */
+    public java.lang.String getOneofString() {
+      java.lang.Object ref = "";
+      if (oneofFieldCase_ == 113) {
+        ref = oneofField_;
+      }
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8() && (oneofFieldCase_ == 113)) {
+          oneofField_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     * <code>string oneof_string = 113;</code>
+     * @return The bytes for oneofString.
+     */
+    public com.google.protobuf.ByteString
+        getOneofStringBytes() {
+      java.lang.Object ref = "";
+      if (oneofFieldCase_ == 113) {
+        ref = oneofField_;
+      }
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        if (oneofFieldCase_ == 113) {
+          oneofField_ = b;
+        }
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int ONEOF_BYTES_FIELD_NUMBER = 114;
+    /**
+     * <code>bytes oneof_bytes = 114;</code>
+     * @return Whether the oneofBytes field is set.
+     */
+    @java.lang.Override
+    public boolean hasOneofBytes() {
+      return oneofFieldCase_ == 114;
+    }
+    /**
+     * <code>bytes oneof_bytes = 114;</code>
+     * @return The oneofBytes.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString getOneofBytes() {
+      if (oneofFieldCase_ == 114) {
+        return (com.google.protobuf.ByteString) oneofField_;
+      }
+      return com.google.protobuf.ByteString.EMPTY;
+    }
+
+    public static final int ONEOF_BOOL_FIELD_NUMBER = 115;
+    /**
+     * <code>bool oneof_bool = 115;</code>
+     * @return Whether the oneofBool field is set.
+     */
+    @java.lang.Override
+    public boolean hasOneofBool() {
+      return oneofFieldCase_ == 115;
+    }
+    /**
+     * <code>bool oneof_bool = 115;</code>
+     * @return The oneofBool.
+     */
+    @java.lang.Override
+    public boolean getOneofBool() {
+      if (oneofFieldCase_ == 115) {
+        return (java.lang.Boolean) oneofField_;
+      }
+      return false;
+    }
+
+    public static final int ONEOF_UINT64_FIELD_NUMBER = 116;
+    /**
+     * <code>uint64 oneof_uint64 = 116;</code>
+     * @return Whether the oneofUint64 field is set.
+     */
+    @java.lang.Override
+    public boolean hasOneofUint64() {
+      return oneofFieldCase_ == 116;
+    }
+    /**
+     * <code>uint64 oneof_uint64 = 116;</code>
+     * @return The oneofUint64.
+     */
+    @java.lang.Override
+    public long getOneofUint64() {
+      if (oneofFieldCase_ == 116) {
+        return (java.lang.Long) oneofField_;
+      }
+      return 0L;
+    }
+
+    public static final int ONEOF_FLOAT_FIELD_NUMBER = 117;
+    /**
+     * <code>float oneof_float = 117;</code>
+     * @return Whether the oneofFloat field is set.
+     */
+    @java.lang.Override
+    public boolean hasOneofFloat() {
+      return oneofFieldCase_ == 117;
+    }
+    /**
+     * <code>float oneof_float = 117;</code>
+     * @return The oneofFloat.
+     */
+    @java.lang.Override
+    public float getOneofFloat() {
+      if (oneofFieldCase_ == 117) {
+        return (java.lang.Float) oneofField_;
+      }
+      return 0F;
+    }
+
+    public static final int ONEOF_DOUBLE_FIELD_NUMBER = 118;
+    /**
+     * <code>double oneof_double = 118;</code>
+     * @return Whether the oneofDouble field is set.
+     */
+    @java.lang.Override
+    public boolean hasOneofDouble() {
+      return oneofFieldCase_ == 118;
+    }
+    /**
+     * <code>double oneof_double = 118;</code>
+     * @return The oneofDouble.
+     */
+    @java.lang.Override
+    public double getOneofDouble() {
+      if (oneofFieldCase_ == 118) {
+        return (java.lang.Double) oneofField_;
+      }
+      return 0D;
+    }
+
+    public static final int ONEOF_ENUM_FIELD_NUMBER = 119;
+    /**
+     * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum oneof_enum = 119;</code>
+     * @return Whether the oneofEnum field is set.
+     */
+    public boolean hasOneofEnum() {
+      return oneofFieldCase_ == 119;
+    }
+    /**
+     * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum oneof_enum = 119;</code>
+     * @return The oneofEnum.
+     */
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getOneofEnum() {
+      if (oneofFieldCase_ == 119) {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(
+            (java.lang.Integer) oneofField_);
+        return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.FOO : result;
+      }
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.FOO;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      if (hasOptionalNestedMessage()) {
+        if (!getOptionalNestedMessage().isInitialized()) {
+          memoizedIsInitialized = 0;
+          return false;
+        }
+      }
+      if (hasRecursiveMessage()) {
+        if (!getRecursiveMessage().isInitialized()) {
+          memoizedIsInitialized = 0;
+          return false;
+        }
+      }
+      for (int i = 0; i < getRepeatedNestedMessageCount(); i++) {
+        if (!getRepeatedNestedMessage(i).isInitialized()) {
+          memoizedIsInitialized = 0;
+          return false;
+        }
+      }
+      for (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage item : getMapStringNestedMessageMap().values()) {
+        if (!item.isInitialized()) {
+          memoizedIsInitialized = 0;
+          return false;
+        }
+      }
+      if (hasOneofNestedMessage()) {
+        if (!getOneofNestedMessage().isInitialized()) {
+          memoizedIsInitialized = 0;
+          return false;
+        }
+      }
+      if (!extensionsAreInitialized()) {
+        memoizedIsInitialized = 0;
+        return false;
+      }
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      getSerializedSize();
+      com.google.protobuf.GeneratedMessage
+        .ExtendableMessage.ExtensionSerializer
+          extensionWriter = newExtensionSerializer();
+      if (((bitField0_ & 0x00000001) != 0)) {
+        output.writeInt32(1, optionalInt32_);
+      }
+      if (((bitField0_ & 0x00000002) != 0)) {
+        output.writeInt64(2, optionalInt64_);
+      }
+      if (((bitField0_ & 0x00000004) != 0)) {
+        output.writeUInt32(3, optionalUint32_);
+      }
+      if (((bitField0_ & 0x00000008) != 0)) {
+        output.writeUInt64(4, optionalUint64_);
+      }
+      if (((bitField0_ & 0x00000010) != 0)) {
+        output.writeSInt32(5, optionalSint32_);
+      }
+      if (((bitField0_ & 0x00000020) != 0)) {
+        output.writeSInt64(6, optionalSint64_);
+      }
+      if (((bitField0_ & 0x00000040) != 0)) {
+        output.writeFixed32(7, optionalFixed32_);
+      }
+      if (((bitField0_ & 0x00000080) != 0)) {
+        output.writeFixed64(8, optionalFixed64_);
+      }
+      if (((bitField0_ & 0x00000100) != 0)) {
+        output.writeSFixed32(9, optionalSfixed32_);
+      }
+      if (((bitField0_ & 0x00000200) != 0)) {
+        output.writeSFixed64(10, optionalSfixed64_);
+      }
+      if (((bitField0_ & 0x00000400) != 0)) {
+        output.writeFloat(11, optionalFloat_);
+      }
+      if (((bitField0_ & 0x00000800) != 0)) {
+        output.writeDouble(12, optionalDouble_);
+      }
+      if (((bitField0_ & 0x00001000) != 0)) {
+        output.writeBool(13, optionalBool_);
+      }
+      if (((bitField0_ & 0x00002000) != 0)) {
+        com.google.protobuf.GeneratedMessage.writeString(output, 14, optionalString_);
+      }
+      if (((bitField0_ & 0x00004000) != 0)) {
+        output.writeBytes(15, optionalBytes_);
+      }
+      if (((bitField0_ & 0x00008000) != 0)) {
+        output.writeMessage(18, getOptionalNestedMessage());
+      }
+      if (((bitField0_ & 0x00010000) != 0)) {
+        output.writeMessage(19, getOptionalForeignMessage());
+      }
+      if (((bitField0_ & 0x00020000) != 0)) {
+        output.writeEnum(21, optionalNestedEnum_);
+      }
+      if (((bitField0_ & 0x00040000) != 0)) {
+        output.writeEnum(22, optionalForeignEnum_);
+      }
+      if (((bitField0_ & 0x00080000) != 0)) {
+        output.writeEnum(23, optionalAliasedEnum_);
+      }
+      if (((bitField0_ & 0x00100000) != 0)) {
+        output.writeMessage(27, getRecursiveMessage());
+      }
+      for (int i = 0; i < repeatedInt32_.size(); i++) {
+        output.writeInt32(31, repeatedInt32_.getInt(i));
+      }
+      for (int i = 0; i < repeatedInt64_.size(); i++) {
+        output.writeInt64(32, repeatedInt64_.getLong(i));
+      }
+      for (int i = 0; i < repeatedUint32_.size(); i++) {
+        output.writeUInt32(33, repeatedUint32_.getInt(i));
+      }
+      for (int i = 0; i < repeatedUint64_.size(); i++) {
+        output.writeUInt64(34, repeatedUint64_.getLong(i));
+      }
+      for (int i = 0; i < repeatedSint32_.size(); i++) {
+        output.writeSInt32(35, repeatedSint32_.getInt(i));
+      }
+      for (int i = 0; i < repeatedSint64_.size(); i++) {
+        output.writeSInt64(36, repeatedSint64_.getLong(i));
+      }
+      for (int i = 0; i < repeatedFixed32_.size(); i++) {
+        output.writeFixed32(37, repeatedFixed32_.getInt(i));
+      }
+      for (int i = 0; i < repeatedFixed64_.size(); i++) {
+        output.writeFixed64(38, repeatedFixed64_.getLong(i));
+      }
+      for (int i = 0; i < repeatedSfixed32_.size(); i++) {
+        output.writeSFixed32(39, repeatedSfixed32_.getInt(i));
+      }
+      for (int i = 0; i < repeatedSfixed64_.size(); i++) {
+        output.writeSFixed64(40, repeatedSfixed64_.getLong(i));
+      }
+      for (int i = 0; i < repeatedFloat_.size(); i++) {
+        output.writeFloat(41, repeatedFloat_.getFloat(i));
+      }
+      for (int i = 0; i < repeatedDouble_.size(); i++) {
+        output.writeDouble(42, repeatedDouble_.getDouble(i));
+      }
+      for (int i = 0; i < repeatedBool_.size(); i++) {
+        output.writeBool(43, repeatedBool_.getBoolean(i));
+      }
+      for (int i = 0; i < repeatedString_.size(); i++) {
+        com.google.protobuf.GeneratedMessage.writeString(output, 44, repeatedString_.getRaw(i));
+      }
+      for (int i = 0; i < repeatedBytes_.size(); i++) {
+        output.writeBytes(45, repeatedBytes_.get(i));
+      }
+      for (int i = 0; i < repeatedNestedMessage_.size(); i++) {
+        output.writeMessage(48, repeatedNestedMessage_.get(i));
+      }
+      for (int i = 0; i < repeatedForeignMessage_.size(); i++) {
+        output.writeMessage(49, repeatedForeignMessage_.get(i));
+      }
+      for (int i = 0; i < repeatedNestedEnum_.size(); i++) {
+        output.writeEnum(51, repeatedNestedEnum_.getInt(i));
+      }
+      for (int i = 0; i < repeatedForeignEnum_.size(); i++) {
+        output.writeEnum(52, repeatedForeignEnum_.getInt(i));
+      }
+      com.google.protobuf.GeneratedMessage
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapInt32Int32(),
+          MapInt32Int32DefaultEntryHolder.defaultEntry,
+          56);
+      com.google.protobuf.GeneratedMessage
+        .serializeLongMapTo(
+          output,
+          internalGetMapInt64Int64(),
+          MapInt64Int64DefaultEntryHolder.defaultEntry,
+          57);
+      com.google.protobuf.GeneratedMessage
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapUint32Uint32(),
+          MapUint32Uint32DefaultEntryHolder.defaultEntry,
+          58);
+      com.google.protobuf.GeneratedMessage
+        .serializeLongMapTo(
+          output,
+          internalGetMapUint64Uint64(),
+          MapUint64Uint64DefaultEntryHolder.defaultEntry,
+          59);
+      com.google.protobuf.GeneratedMessage
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapSint32Sint32(),
+          MapSint32Sint32DefaultEntryHolder.defaultEntry,
+          60);
+      com.google.protobuf.GeneratedMessage
+        .serializeLongMapTo(
+          output,
+          internalGetMapSint64Sint64(),
+          MapSint64Sint64DefaultEntryHolder.defaultEntry,
+          61);
+      com.google.protobuf.GeneratedMessage
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapFixed32Fixed32(),
+          MapFixed32Fixed32DefaultEntryHolder.defaultEntry,
+          62);
+      com.google.protobuf.GeneratedMessage
+        .serializeLongMapTo(
+          output,
+          internalGetMapFixed64Fixed64(),
+          MapFixed64Fixed64DefaultEntryHolder.defaultEntry,
+          63);
+      com.google.protobuf.GeneratedMessage
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapSfixed32Sfixed32(),
+          MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry,
+          64);
+      com.google.protobuf.GeneratedMessage
+        .serializeLongMapTo(
+          output,
+          internalGetMapSfixed64Sfixed64(),
+          MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry,
+          65);
+      com.google.protobuf.GeneratedMessage
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapInt32Float(),
+          MapInt32FloatDefaultEntryHolder.defaultEntry,
+          66);
+      com.google.protobuf.GeneratedMessage
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapInt32Double(),
+          MapInt32DoubleDefaultEntryHolder.defaultEntry,
+          67);
+      com.google.protobuf.GeneratedMessage
+        .serializeBooleanMapTo(
+          output,
+          internalGetMapBoolBool(),
+          MapBoolBoolDefaultEntryHolder.defaultEntry,
+          68);
+      com.google.protobuf.GeneratedMessage
+        .serializeStringMapTo(
+          output,
+          internalGetMapStringString(),
+          MapStringStringDefaultEntryHolder.defaultEntry,
+          69);
+      com.google.protobuf.GeneratedMessage
+        .serializeStringMapTo(
+          output,
+          internalGetMapStringBytes(),
+          MapStringBytesDefaultEntryHolder.defaultEntry,
+          70);
+      com.google.protobuf.GeneratedMessage
+        .serializeStringMapTo(
+          output,
+          internalGetMapStringNestedMessage(),
+          MapStringNestedMessageDefaultEntryHolder.defaultEntry,
+          71);
+      com.google.protobuf.GeneratedMessage
+        .serializeStringMapTo(
+          output,
+          internalGetMapStringForeignMessage(),
+          MapStringForeignMessageDefaultEntryHolder.defaultEntry,
+          72);
+      com.google.protobuf.GeneratedMessage
+        .serializeStringMapTo(
+          output,
+          internalGetMapStringNestedEnum(),
+          MapStringNestedEnumDefaultEntryHolder.defaultEntry,
+          73);
+      com.google.protobuf.GeneratedMessage
+        .serializeStringMapTo(
+          output,
+          internalGetMapStringForeignEnum(),
+          MapStringForeignEnumDefaultEntryHolder.defaultEntry,
+          74);
+      if (getPackedInt32List().size() > 0) {
+        output.writeUInt32NoTag(602);
+        output.writeUInt32NoTag(packedInt32MemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedInt32_.size(); i++) {
+        output.writeInt32NoTag(packedInt32_.getInt(i));
+      }
+      if (getPackedInt64List().size() > 0) {
+        output.writeUInt32NoTag(610);
+        output.writeUInt32NoTag(packedInt64MemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedInt64_.size(); i++) {
+        output.writeInt64NoTag(packedInt64_.getLong(i));
+      }
+      if (getPackedUint32List().size() > 0) {
+        output.writeUInt32NoTag(618);
+        output.writeUInt32NoTag(packedUint32MemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedUint32_.size(); i++) {
+        output.writeUInt32NoTag(packedUint32_.getInt(i));
+      }
+      if (getPackedUint64List().size() > 0) {
+        output.writeUInt32NoTag(626);
+        output.writeUInt32NoTag(packedUint64MemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedUint64_.size(); i++) {
+        output.writeUInt64NoTag(packedUint64_.getLong(i));
+      }
+      if (getPackedSint32List().size() > 0) {
+        output.writeUInt32NoTag(634);
+        output.writeUInt32NoTag(packedSint32MemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedSint32_.size(); i++) {
+        output.writeSInt32NoTag(packedSint32_.getInt(i));
+      }
+      if (getPackedSint64List().size() > 0) {
+        output.writeUInt32NoTag(642);
+        output.writeUInt32NoTag(packedSint64MemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedSint64_.size(); i++) {
+        output.writeSInt64NoTag(packedSint64_.getLong(i));
+      }
+      if (getPackedFixed32List().size() > 0) {
+        output.writeUInt32NoTag(650);
+        output.writeUInt32NoTag(packedFixed32MemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedFixed32_.size(); i++) {
+        output.writeFixed32NoTag(packedFixed32_.getInt(i));
+      }
+      if (getPackedFixed64List().size() > 0) {
+        output.writeUInt32NoTag(658);
+        output.writeUInt32NoTag(packedFixed64MemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedFixed64_.size(); i++) {
+        output.writeFixed64NoTag(packedFixed64_.getLong(i));
+      }
+      if (getPackedSfixed32List().size() > 0) {
+        output.writeUInt32NoTag(666);
+        output.writeUInt32NoTag(packedSfixed32MemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedSfixed32_.size(); i++) {
+        output.writeSFixed32NoTag(packedSfixed32_.getInt(i));
+      }
+      if (getPackedSfixed64List().size() > 0) {
+        output.writeUInt32NoTag(674);
+        output.writeUInt32NoTag(packedSfixed64MemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedSfixed64_.size(); i++) {
+        output.writeSFixed64NoTag(packedSfixed64_.getLong(i));
+      }
+      if (getPackedFloatList().size() > 0) {
+        output.writeUInt32NoTag(682);
+        output.writeUInt32NoTag(packedFloatMemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedFloat_.size(); i++) {
+        output.writeFloatNoTag(packedFloat_.getFloat(i));
+      }
+      if (getPackedDoubleList().size() > 0) {
+        output.writeUInt32NoTag(690);
+        output.writeUInt32NoTag(packedDoubleMemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedDouble_.size(); i++) {
+        output.writeDoubleNoTag(packedDouble_.getDouble(i));
+      }
+      if (getPackedBoolList().size() > 0) {
+        output.writeUInt32NoTag(698);
+        output.writeUInt32NoTag(packedBoolMemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedBool_.size(); i++) {
+        output.writeBoolNoTag(packedBool_.getBoolean(i));
+      }
+      if (getPackedNestedEnumList().size() > 0) {
+        output.writeUInt32NoTag(706);
+        output.writeUInt32NoTag(packedNestedEnumMemoizedSerializedSize);
+      }
+      for (int i = 0; i < packedNestedEnum_.size(); i++) {
+        output.writeEnumNoTag(packedNestedEnum_.getInt(i));
+      }
+      for (int i = 0; i < unpackedInt32_.size(); i++) {
+        output.writeInt32(89, unpackedInt32_.getInt(i));
+      }
+      for (int i = 0; i < unpackedInt64_.size(); i++) {
+        output.writeInt64(90, unpackedInt64_.getLong(i));
+      }
+      for (int i = 0; i < unpackedUint32_.size(); i++) {
+        output.writeUInt32(91, unpackedUint32_.getInt(i));
+      }
+      for (int i = 0; i < unpackedUint64_.size(); i++) {
+        output.writeUInt64(92, unpackedUint64_.getLong(i));
+      }
+      for (int i = 0; i < unpackedSint32_.size(); i++) {
+        output.writeSInt32(93, unpackedSint32_.getInt(i));
+      }
+      for (int i = 0; i < unpackedSint64_.size(); i++) {
+        output.writeSInt64(94, unpackedSint64_.getLong(i));
+      }
+      for (int i = 0; i < unpackedFixed32_.size(); i++) {
+        output.writeFixed32(95, unpackedFixed32_.getInt(i));
+      }
+      for (int i = 0; i < unpackedFixed64_.size(); i++) {
+        output.writeFixed64(96, unpackedFixed64_.getLong(i));
+      }
+      for (int i = 0; i < unpackedSfixed32_.size(); i++) {
+        output.writeSFixed32(97, unpackedSfixed32_.getInt(i));
+      }
+      for (int i = 0; i < unpackedSfixed64_.size(); i++) {
+        output.writeSFixed64(98, unpackedSfixed64_.getLong(i));
+      }
+      for (int i = 0; i < unpackedFloat_.size(); i++) {
+        output.writeFloat(99, unpackedFloat_.getFloat(i));
+      }
+      for (int i = 0; i < unpackedDouble_.size(); i++) {
+        output.writeDouble(100, unpackedDouble_.getDouble(i));
+      }
+      for (int i = 0; i < unpackedBool_.size(); i++) {
+        output.writeBool(101, unpackedBool_.getBoolean(i));
+      }
+      for (int i = 0; i < unpackedNestedEnum_.size(); i++) {
+        output.writeEnum(102, unpackedNestedEnum_.getInt(i));
+      }
+      if (oneofFieldCase_ == 111) {
+        output.writeUInt32(
+            111, (int)((java.lang.Integer) oneofField_));
+      }
+      if (oneofFieldCase_ == 112) {
+        output.writeMessage(112, (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) oneofField_);
+      }
+      if (oneofFieldCase_ == 113) {
+        com.google.protobuf.GeneratedMessage.writeString(output, 113, oneofField_);
+      }
+      if (oneofFieldCase_ == 114) {
+        output.writeBytes(
+            114, (com.google.protobuf.ByteString) oneofField_);
+      }
+      if (oneofFieldCase_ == 115) {
+        output.writeBool(
+            115, (boolean)((java.lang.Boolean) oneofField_));
+      }
+      if (oneofFieldCase_ == 116) {
+        output.writeUInt64(
+            116, (long)((java.lang.Long) oneofField_));
+      }
+      if (oneofFieldCase_ == 117) {
+        output.writeFloat(
+            117, (float)((java.lang.Float) oneofField_));
+      }
+      if (oneofFieldCase_ == 118) {
+        output.writeDouble(
+            118, (double)((java.lang.Double) oneofField_));
+      }
+      if (oneofFieldCase_ == 119) {
+        output.writeEnum(119, ((java.lang.Integer) oneofField_));
+      }
+      extensionWriter.writeUntil(536870912, output);
+      getUnknownFields().writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(1, optionalInt32_);
+      }
+      if (((bitField0_ & 0x00000002) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt64Size(2, optionalInt64_);
+      }
+      if (((bitField0_ & 0x00000004) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(3, optionalUint32_);
+      }
+      if (((bitField0_ & 0x00000008) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(4, optionalUint64_);
+      }
+      if (((bitField0_ & 0x00000010) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeSInt32Size(5, optionalSint32_);
+      }
+      if (((bitField0_ & 0x00000020) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeSInt64Size(6, optionalSint64_);
+      }
+      if (((bitField0_ & 0x00000040) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeFixed32Size(7, optionalFixed32_);
+      }
+      if (((bitField0_ & 0x00000080) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeFixed64Size(8, optionalFixed64_);
+      }
+      if (((bitField0_ & 0x00000100) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeSFixed32Size(9, optionalSfixed32_);
+      }
+      if (((bitField0_ & 0x00000200) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeSFixed64Size(10, optionalSfixed64_);
+      }
+      if (((bitField0_ & 0x00000400) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeFloatSize(11, optionalFloat_);
+      }
+      if (((bitField0_ & 0x00000800) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeDoubleSize(12, optionalDouble_);
+      }
+      if (((bitField0_ & 0x00001000) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(13, optionalBool_);
+      }
+      if (((bitField0_ & 0x00002000) != 0)) {
+        size += com.google.protobuf.GeneratedMessage.computeStringSize(14, optionalString_);
+      }
+      if (((bitField0_ & 0x00004000) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(15, optionalBytes_);
+      }
+      if (((bitField0_ & 0x00008000) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(18, getOptionalNestedMessage());
+      }
+      if (((bitField0_ & 0x00010000) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(19, getOptionalForeignMessage());
+      }
+      if (((bitField0_ & 0x00020000) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(21, optionalNestedEnum_);
+      }
+      if (((bitField0_ & 0x00040000) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(22, optionalForeignEnum_);
+      }
+      if (((bitField0_ & 0x00080000) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(23, optionalAliasedEnum_);
+      }
+      if (((bitField0_ & 0x00100000) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(27, getRecursiveMessage());
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < repeatedInt32_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt32SizeNoTag(repeatedInt32_.getInt(i));
+        }
+        size += dataSize;
+        size += 2 * getRepeatedInt32List().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < repeatedInt64_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt64SizeNoTag(repeatedInt64_.getLong(i));
+        }
+        size += dataSize;
+        size += 2 * getRepeatedInt64List().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < repeatedUint32_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(repeatedUint32_.getInt(i));
+        }
+        size += dataSize;
+        size += 2 * getRepeatedUint32List().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < repeatedUint64_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt64SizeNoTag(repeatedUint64_.getLong(i));
+        }
+        size += dataSize;
+        size += 2 * getRepeatedUint64List().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < repeatedSint32_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt32SizeNoTag(repeatedSint32_.getInt(i));
+        }
+        size += dataSize;
+        size += 2 * getRepeatedSint32List().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < repeatedSint64_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt64SizeNoTag(repeatedSint64_.getLong(i));
+        }
+        size += dataSize;
+        size += 2 * getRepeatedSint64List().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 4 * getRepeatedFixed32List().size();
+        size += dataSize;
+        size += 2 * getRepeatedFixed32List().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 8 * getRepeatedFixed64List().size();
+        size += dataSize;
+        size += 2 * getRepeatedFixed64List().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 4 * getRepeatedSfixed32List().size();
+        size += dataSize;
+        size += 2 * getRepeatedSfixed32List().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 8 * getRepeatedSfixed64List().size();
+        size += dataSize;
+        size += 2 * getRepeatedSfixed64List().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 4 * getRepeatedFloatList().size();
+        size += dataSize;
+        size += 2 * getRepeatedFloatList().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 8 * getRepeatedDoubleList().size();
+        size += dataSize;
+        size += 2 * getRepeatedDoubleList().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 1 * getRepeatedBoolList().size();
+        size += dataSize;
+        size += 2 * getRepeatedBoolList().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < repeatedString_.size(); i++) {
+          dataSize += computeStringSizeNoTag(repeatedString_.getRaw(i));
+        }
+        size += dataSize;
+        size += 2 * getRepeatedStringList().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < repeatedBytes_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeBytesSizeNoTag(repeatedBytes_.get(i));
+        }
+        size += dataSize;
+        size += 2 * getRepeatedBytesList().size();
+      }
+      for (int i = 0; i < repeatedNestedMessage_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(48, repeatedNestedMessage_.get(i));
+      }
+      for (int i = 0; i < repeatedForeignMessage_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(49, repeatedForeignMessage_.get(i));
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < repeatedNestedEnum_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeEnumSizeNoTag(repeatedNestedEnum_.getInt(i));
+        }
+        size += dataSize;
+        size += 2 * repeatedNestedEnum_.size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < repeatedForeignEnum_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeEnumSizeNoTag(repeatedForeignEnum_.getInt(i));
+        }
+        size += dataSize;
+        size += 2 * repeatedForeignEnum_.size();
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetMapInt32Int32().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        mapInt32Int32__ = MapInt32Int32DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(56, mapInt32Int32__);
+      }
+      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry
+           : internalGetMapInt64Int64().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+        mapInt64Int64__ = MapInt64Int64DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(57, mapInt64Int64__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetMapUint32Uint32().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        mapUint32Uint32__ = MapUint32Uint32DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(58, mapUint32Uint32__);
+      }
+      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry
+           : internalGetMapUint64Uint64().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+        mapUint64Uint64__ = MapUint64Uint64DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(59, mapUint64Uint64__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetMapSint32Sint32().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        mapSint32Sint32__ = MapSint32Sint32DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(60, mapSint32Sint32__);
+      }
+      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry
+           : internalGetMapSint64Sint64().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+        mapSint64Sint64__ = MapSint64Sint64DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(61, mapSint64Sint64__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetMapFixed32Fixed32().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        mapFixed32Fixed32__ = MapFixed32Fixed32DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(62, mapFixed32Fixed32__);
+      }
+      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry
+           : internalGetMapFixed64Fixed64().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+        mapFixed64Fixed64__ = MapFixed64Fixed64DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(63, mapFixed64Fixed64__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetMapSfixed32Sfixed32().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        mapSfixed32Sfixed32__ = MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(64, mapSfixed32Sfixed32__);
+      }
+      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry
+           : internalGetMapSfixed64Sfixed64().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+        mapSfixed64Sfixed64__ = MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(65, mapSfixed64Sfixed64__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Float> entry
+           : internalGetMapInt32Float().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float>
+        mapInt32Float__ = MapInt32FloatDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(66, mapInt32Float__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Double> entry
+           : internalGetMapInt32Double().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Double>
+        mapInt32Double__ = MapInt32DoubleDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(67, mapInt32Double__);
+      }
+      for (java.util.Map.Entry<java.lang.Boolean, java.lang.Boolean> entry
+           : internalGetMapBoolBool().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Boolean, java.lang.Boolean>
+        mapBoolBool__ = MapBoolBoolDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(68, mapBoolBool__);
+      }
+      for (java.util.Map.Entry<java.lang.String, java.lang.String> entry
+           : internalGetMapStringString().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, java.lang.String>
+        mapStringString__ = MapStringStringDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(69, mapStringString__);
+      }
+      for (java.util.Map.Entry<java.lang.String, com.google.protobuf.ByteString> entry
+           : internalGetMapStringBytes().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, com.google.protobuf.ByteString>
+        mapStringBytes__ = MapStringBytesDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(70, mapStringBytes__);
+      }
+      for (java.util.Map.Entry<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> entry
+           : internalGetMapStringNestedMessage().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage>
+        mapStringNestedMessage__ = MapStringNestedMessageDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(71, mapStringNestedMessage__);
+      }
+      for (java.util.Map.Entry<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> entry
+           : internalGetMapStringForeignMessage().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage>
+        mapStringForeignMessage__ = MapStringForeignMessageDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(72, mapStringForeignMessage__);
+      }
+      for (java.util.Map.Entry<java.lang.String, java.lang.Integer> entry
+           : internalGetMapStringNestedEnum().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer>
+        mapStringNestedEnum__ = MapStringNestedEnumDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(73, mapStringNestedEnum__);
+      }
+      for (java.util.Map.Entry<java.lang.String, java.lang.Integer> entry
+           : internalGetMapStringForeignEnum().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer>
+        mapStringForeignEnum__ = MapStringForeignEnumDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(74, mapStringForeignEnum__);
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < packedInt32_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt32SizeNoTag(packedInt32_.getInt(i));
+        }
+        size += dataSize;
+        if (!getPackedInt32List().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedInt32MemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < packedInt64_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt64SizeNoTag(packedInt64_.getLong(i));
+        }
+        size += dataSize;
+        if (!getPackedInt64List().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedInt64MemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < packedUint32_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(packedUint32_.getInt(i));
+        }
+        size += dataSize;
+        if (!getPackedUint32List().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedUint32MemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < packedUint64_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt64SizeNoTag(packedUint64_.getLong(i));
+        }
+        size += dataSize;
+        if (!getPackedUint64List().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedUint64MemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < packedSint32_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt32SizeNoTag(packedSint32_.getInt(i));
+        }
+        size += dataSize;
+        if (!getPackedSint32List().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedSint32MemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < packedSint64_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt64SizeNoTag(packedSint64_.getLong(i));
+        }
+        size += dataSize;
+        if (!getPackedSint64List().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedSint64MemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        dataSize = 4 * getPackedFixed32List().size();
+        size += dataSize;
+        if (!getPackedFixed32List().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedFixed32MemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        dataSize = 8 * getPackedFixed64List().size();
+        size += dataSize;
+        if (!getPackedFixed64List().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedFixed64MemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        dataSize = 4 * getPackedSfixed32List().size();
+        size += dataSize;
+        if (!getPackedSfixed32List().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedSfixed32MemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        dataSize = 8 * getPackedSfixed64List().size();
+        size += dataSize;
+        if (!getPackedSfixed64List().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedSfixed64MemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        dataSize = 4 * getPackedFloatList().size();
+        size += dataSize;
+        if (!getPackedFloatList().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedFloatMemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        dataSize = 8 * getPackedDoubleList().size();
+        size += dataSize;
+        if (!getPackedDoubleList().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedDoubleMemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        dataSize = 1 * getPackedBoolList().size();
+        size += dataSize;
+        if (!getPackedBoolList().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        packedBoolMemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < packedNestedEnum_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeEnumSizeNoTag(packedNestedEnum_.getInt(i));
+        }
+        size += dataSize;
+        if (!getPackedNestedEnumList().isEmpty()) {  size += 2;
+          size += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(dataSize);
+        }packedNestedEnumMemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < unpackedInt32_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt32SizeNoTag(unpackedInt32_.getInt(i));
+        }
+        size += dataSize;
+        size += 2 * getUnpackedInt32List().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < unpackedInt64_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt64SizeNoTag(unpackedInt64_.getLong(i));
+        }
+        size += dataSize;
+        size += 2 * getUnpackedInt64List().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < unpackedUint32_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(unpackedUint32_.getInt(i));
+        }
+        size += dataSize;
+        size += 2 * getUnpackedUint32List().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < unpackedUint64_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt64SizeNoTag(unpackedUint64_.getLong(i));
+        }
+        size += dataSize;
+        size += 2 * getUnpackedUint64List().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < unpackedSint32_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt32SizeNoTag(unpackedSint32_.getInt(i));
+        }
+        size += dataSize;
+        size += 2 * getUnpackedSint32List().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < unpackedSint64_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt64SizeNoTag(unpackedSint64_.getLong(i));
+        }
+        size += dataSize;
+        size += 2 * getUnpackedSint64List().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 4 * getUnpackedFixed32List().size();
+        size += dataSize;
+        size += 2 * getUnpackedFixed32List().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 8 * getUnpackedFixed64List().size();
+        size += dataSize;
+        size += 2 * getUnpackedFixed64List().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 4 * getUnpackedSfixed32List().size();
+        size += dataSize;
+        size += 2 * getUnpackedSfixed32List().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 8 * getUnpackedSfixed64List().size();
+        size += dataSize;
+        size += 2 * getUnpackedSfixed64List().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 4 * getUnpackedFloatList().size();
+        size += dataSize;
+        size += 2 * getUnpackedFloatList().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 8 * getUnpackedDoubleList().size();
+        size += dataSize;
+        size += 2 * getUnpackedDoubleList().size();
+      }
+      {
+        int dataSize = 0;
+        dataSize = 1 * getUnpackedBoolList().size();
+        size += dataSize;
+        size += 2 * getUnpackedBoolList().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < unpackedNestedEnum_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeEnumSizeNoTag(unpackedNestedEnum_.getInt(i));
+        }
+        size += dataSize;
+        size += 2 * unpackedNestedEnum_.size();
+      }
+      if (oneofFieldCase_ == 111) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(
+              111, (int)((java.lang.Integer) oneofField_));
+      }
+      if (oneofFieldCase_ == 112) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(112, (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) oneofField_);
+      }
+      if (oneofFieldCase_ == 113) {
+        size += com.google.protobuf.GeneratedMessage.computeStringSize(113, oneofField_);
+      }
+      if (oneofFieldCase_ == 114) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(
+              114, (com.google.protobuf.ByteString) oneofField_);
+      }
+      if (oneofFieldCase_ == 115) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(
+              115, (boolean)((java.lang.Boolean) oneofField_));
+      }
+      if (oneofFieldCase_ == 116) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(
+              116, (long)((java.lang.Long) oneofField_));
+      }
+      if (oneofFieldCase_ == 117) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeFloatSize(
+              117, (float)((java.lang.Float) oneofField_));
+      }
+      if (oneofFieldCase_ == 118) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeDoubleSize(
+              118, (double)((java.lang.Double) oneofField_));
+      }
+      if (oneofFieldCase_ == 119) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(119, ((java.lang.Integer) oneofField_));
+      }
+      size += extensionsSerializedSize();
+      size += getUnknownFields().getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2)) {
+        return super.equals(obj);
+      }
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 other = (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2) obj;
+
+      if (hasOptionalInt32() != other.hasOptionalInt32()) return false;
+      if (hasOptionalInt32()) {
+        if (getOptionalInt32()
+            != other.getOptionalInt32()) return false;
+      }
+      if (hasOptionalInt64() != other.hasOptionalInt64()) return false;
+      if (hasOptionalInt64()) {
+        if (getOptionalInt64()
+            != other.getOptionalInt64()) return false;
+      }
+      if (hasOptionalUint32() != other.hasOptionalUint32()) return false;
+      if (hasOptionalUint32()) {
+        if (getOptionalUint32()
+            != other.getOptionalUint32()) return false;
+      }
+      if (hasOptionalUint64() != other.hasOptionalUint64()) return false;
+      if (hasOptionalUint64()) {
+        if (getOptionalUint64()
+            != other.getOptionalUint64()) return false;
+      }
+      if (hasOptionalSint32() != other.hasOptionalSint32()) return false;
+      if (hasOptionalSint32()) {
+        if (getOptionalSint32()
+            != other.getOptionalSint32()) return false;
+      }
+      if (hasOptionalSint64() != other.hasOptionalSint64()) return false;
+      if (hasOptionalSint64()) {
+        if (getOptionalSint64()
+            != other.getOptionalSint64()) return false;
+      }
+      if (hasOptionalFixed32() != other.hasOptionalFixed32()) return false;
+      if (hasOptionalFixed32()) {
+        if (getOptionalFixed32()
+            != other.getOptionalFixed32()) return false;
+      }
+      if (hasOptionalFixed64() != other.hasOptionalFixed64()) return false;
+      if (hasOptionalFixed64()) {
+        if (getOptionalFixed64()
+            != other.getOptionalFixed64()) return false;
+      }
+      if (hasOptionalSfixed32() != other.hasOptionalSfixed32()) return false;
+      if (hasOptionalSfixed32()) {
+        if (getOptionalSfixed32()
+            != other.getOptionalSfixed32()) return false;
+      }
+      if (hasOptionalSfixed64() != other.hasOptionalSfixed64()) return false;
+      if (hasOptionalSfixed64()) {
+        if (getOptionalSfixed64()
+            != other.getOptionalSfixed64()) return false;
+      }
+      if (hasOptionalFloat() != other.hasOptionalFloat()) return false;
+      if (hasOptionalFloat()) {
+        if (java.lang.Float.floatToIntBits(getOptionalFloat())
+            != java.lang.Float.floatToIntBits(
+                other.getOptionalFloat())) return false;
+      }
+      if (hasOptionalDouble() != other.hasOptionalDouble()) return false;
+      if (hasOptionalDouble()) {
+        if (java.lang.Double.doubleToLongBits(getOptionalDouble())
+            != java.lang.Double.doubleToLongBits(
+                other.getOptionalDouble())) return false;
+      }
+      if (hasOptionalBool() != other.hasOptionalBool()) return false;
+      if (hasOptionalBool()) {
+        if (getOptionalBool()
+            != other.getOptionalBool()) return false;
+      }
+      if (hasOptionalString() != other.hasOptionalString()) return false;
+      if (hasOptionalString()) {
+        if (!getOptionalString()
+            .equals(other.getOptionalString())) return false;
+      }
+      if (hasOptionalBytes() != other.hasOptionalBytes()) return false;
+      if (hasOptionalBytes()) {
+        if (!getOptionalBytes()
+            .equals(other.getOptionalBytes())) return false;
+      }
+      if (hasOptionalNestedMessage() != other.hasOptionalNestedMessage()) return false;
+      if (hasOptionalNestedMessage()) {
+        if (!getOptionalNestedMessage()
+            .equals(other.getOptionalNestedMessage())) return false;
+      }
+      if (hasOptionalForeignMessage() != other.hasOptionalForeignMessage()) return false;
+      if (hasOptionalForeignMessage()) {
+        if (!getOptionalForeignMessage()
+            .equals(other.getOptionalForeignMessage())) return false;
+      }
+      if (hasOptionalNestedEnum() != other.hasOptionalNestedEnum()) return false;
+      if (hasOptionalNestedEnum()) {
+        if (optionalNestedEnum_ != other.optionalNestedEnum_) return false;
+      }
+      if (hasOptionalForeignEnum() != other.hasOptionalForeignEnum()) return false;
+      if (hasOptionalForeignEnum()) {
+        if (optionalForeignEnum_ != other.optionalForeignEnum_) return false;
+      }
+      if (hasOptionalAliasedEnum() != other.hasOptionalAliasedEnum()) return false;
+      if (hasOptionalAliasedEnum()) {
+        if (optionalAliasedEnum_ != other.optionalAliasedEnum_) return false;
+      }
+      if (hasRecursiveMessage() != other.hasRecursiveMessage()) return false;
+      if (hasRecursiveMessage()) {
+        if (!getRecursiveMessage()
+            .equals(other.getRecursiveMessage())) return false;
+      }
+      if (!getRepeatedInt32List()
+          .equals(other.getRepeatedInt32List())) return false;
+      if (!getRepeatedInt64List()
+          .equals(other.getRepeatedInt64List())) return false;
+      if (!getRepeatedUint32List()
+          .equals(other.getRepeatedUint32List())) return false;
+      if (!getRepeatedUint64List()
+          .equals(other.getRepeatedUint64List())) return false;
+      if (!getRepeatedSint32List()
+          .equals(other.getRepeatedSint32List())) return false;
+      if (!getRepeatedSint64List()
+          .equals(other.getRepeatedSint64List())) return false;
+      if (!getRepeatedFixed32List()
+          .equals(other.getRepeatedFixed32List())) return false;
+      if (!getRepeatedFixed64List()
+          .equals(other.getRepeatedFixed64List())) return false;
+      if (!getRepeatedSfixed32List()
+          .equals(other.getRepeatedSfixed32List())) return false;
+      if (!getRepeatedSfixed64List()
+          .equals(other.getRepeatedSfixed64List())) return false;
+      if (!getRepeatedFloatList()
+          .equals(other.getRepeatedFloatList())) return false;
+      if (!getRepeatedDoubleList()
+          .equals(other.getRepeatedDoubleList())) return false;
+      if (!getRepeatedBoolList()
+          .equals(other.getRepeatedBoolList())) return false;
+      if (!getRepeatedStringList()
+          .equals(other.getRepeatedStringList())) return false;
+      if (!getRepeatedBytesList()
+          .equals(other.getRepeatedBytesList())) return false;
+      if (!getRepeatedNestedMessageList()
+          .equals(other.getRepeatedNestedMessageList())) return false;
+      if (!getRepeatedForeignMessageList()
+          .equals(other.getRepeatedForeignMessageList())) return false;
+      if (!repeatedNestedEnum_.equals(other.repeatedNestedEnum_)) return false;
+      if (!repeatedForeignEnum_.equals(other.repeatedForeignEnum_)) return false;
+      if (!getPackedInt32List()
+          .equals(other.getPackedInt32List())) return false;
+      if (!getPackedInt64List()
+          .equals(other.getPackedInt64List())) return false;
+      if (!getPackedUint32List()
+          .equals(other.getPackedUint32List())) return false;
+      if (!getPackedUint64List()
+          .equals(other.getPackedUint64List())) return false;
+      if (!getPackedSint32List()
+          .equals(other.getPackedSint32List())) return false;
+      if (!getPackedSint64List()
+          .equals(other.getPackedSint64List())) return false;
+      if (!getPackedFixed32List()
+          .equals(other.getPackedFixed32List())) return false;
+      if (!getPackedFixed64List()
+          .equals(other.getPackedFixed64List())) return false;
+      if (!getPackedSfixed32List()
+          .equals(other.getPackedSfixed32List())) return false;
+      if (!getPackedSfixed64List()
+          .equals(other.getPackedSfixed64List())) return false;
+      if (!getPackedFloatList()
+          .equals(other.getPackedFloatList())) return false;
+      if (!getPackedDoubleList()
+          .equals(other.getPackedDoubleList())) return false;
+      if (!getPackedBoolList()
+          .equals(other.getPackedBoolList())) return false;
+      if (!packedNestedEnum_.equals(other.packedNestedEnum_)) return false;
+      if (!getUnpackedInt32List()
+          .equals(other.getUnpackedInt32List())) return false;
+      if (!getUnpackedInt64List()
+          .equals(other.getUnpackedInt64List())) return false;
+      if (!getUnpackedUint32List()
+          .equals(other.getUnpackedUint32List())) return false;
+      if (!getUnpackedUint64List()
+          .equals(other.getUnpackedUint64List())) return false;
+      if (!getUnpackedSint32List()
+          .equals(other.getUnpackedSint32List())) return false;
+      if (!getUnpackedSint64List()
+          .equals(other.getUnpackedSint64List())) return false;
+      if (!getUnpackedFixed32List()
+          .equals(other.getUnpackedFixed32List())) return false;
+      if (!getUnpackedFixed64List()
+          .equals(other.getUnpackedFixed64List())) return false;
+      if (!getUnpackedSfixed32List()
+          .equals(other.getUnpackedSfixed32List())) return false;
+      if (!getUnpackedSfixed64List()
+          .equals(other.getUnpackedSfixed64List())) return false;
+      if (!getUnpackedFloatList()
+          .equals(other.getUnpackedFloatList())) return false;
+      if (!getUnpackedDoubleList()
+          .equals(other.getUnpackedDoubleList())) return false;
+      if (!getUnpackedBoolList()
+          .equals(other.getUnpackedBoolList())) return false;
+      if (!unpackedNestedEnum_.equals(other.unpackedNestedEnum_)) return false;
+      if (!internalGetMapInt32Int32().equals(
+          other.internalGetMapInt32Int32())) return false;
+      if (!internalGetMapInt64Int64().equals(
+          other.internalGetMapInt64Int64())) return false;
+      if (!internalGetMapUint32Uint32().equals(
+          other.internalGetMapUint32Uint32())) return false;
+      if (!internalGetMapUint64Uint64().equals(
+          other.internalGetMapUint64Uint64())) return false;
+      if (!internalGetMapSint32Sint32().equals(
+          other.internalGetMapSint32Sint32())) return false;
+      if (!internalGetMapSint64Sint64().equals(
+          other.internalGetMapSint64Sint64())) return false;
+      if (!internalGetMapFixed32Fixed32().equals(
+          other.internalGetMapFixed32Fixed32())) return false;
+      if (!internalGetMapFixed64Fixed64().equals(
+          other.internalGetMapFixed64Fixed64())) return false;
+      if (!internalGetMapSfixed32Sfixed32().equals(
+          other.internalGetMapSfixed32Sfixed32())) return false;
+      if (!internalGetMapSfixed64Sfixed64().equals(
+          other.internalGetMapSfixed64Sfixed64())) return false;
+      if (!internalGetMapInt32Float().equals(
+          other.internalGetMapInt32Float())) return false;
+      if (!internalGetMapInt32Double().equals(
+          other.internalGetMapInt32Double())) return false;
+      if (!internalGetMapBoolBool().equals(
+          other.internalGetMapBoolBool())) return false;
+      if (!internalGetMapStringString().equals(
+          other.internalGetMapStringString())) return false;
+      if (!internalGetMapStringBytes().equals(
+          other.internalGetMapStringBytes())) return false;
+      if (!internalGetMapStringNestedMessage().equals(
+          other.internalGetMapStringNestedMessage())) return false;
+      if (!internalGetMapStringForeignMessage().equals(
+          other.internalGetMapStringForeignMessage())) return false;
+      if (!internalGetMapStringNestedEnum().equals(
+          other.internalGetMapStringNestedEnum())) return false;
+      if (!internalGetMapStringForeignEnum().equals(
+          other.internalGetMapStringForeignEnum())) return false;
+      if (!getOneofFieldCase().equals(other.getOneofFieldCase())) return false;
+      switch (oneofFieldCase_) {
+        case 111:
+          if (getOneofUint32()
+              != other.getOneofUint32()) return false;
+          break;
+        case 112:
+          if (!getOneofNestedMessage()
+              .equals(other.getOneofNestedMessage())) return false;
+          break;
+        case 113:
+          if (!getOneofString()
+              .equals(other.getOneofString())) return false;
+          break;
+        case 114:
+          if (!getOneofBytes()
+              .equals(other.getOneofBytes())) return false;
+          break;
+        case 115:
+          if (getOneofBool()
+              != other.getOneofBool()) return false;
+          break;
+        case 116:
+          if (getOneofUint64()
+              != other.getOneofUint64()) return false;
+          break;
+        case 117:
+          if (java.lang.Float.floatToIntBits(getOneofFloat())
+              != java.lang.Float.floatToIntBits(
+                  other.getOneofFloat())) return false;
+          break;
+        case 118:
+          if (java.lang.Double.doubleToLongBits(getOneofDouble())
+              != java.lang.Double.doubleToLongBits(
+                  other.getOneofDouble())) return false;
+          break;
+        case 119:
+          if (!getOneofEnum()
+              .equals(other.getOneofEnum())) return false;
+          break;
+        case 0:
+        default:
+      }
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!getExtensionFields().equals(other.getExtensionFields()))
+        return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasOptionalInt32()) {
+        hash = (37 * hash) + OPTIONAL_INT32_FIELD_NUMBER;
+        hash = (53 * hash) + getOptionalInt32();
+      }
+      if (hasOptionalInt64()) {
+        hash = (37 * hash) + OPTIONAL_INT64_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getOptionalInt64());
+      }
+      if (hasOptionalUint32()) {
+        hash = (37 * hash) + OPTIONAL_UINT32_FIELD_NUMBER;
+        hash = (53 * hash) + getOptionalUint32();
+      }
+      if (hasOptionalUint64()) {
+        hash = (37 * hash) + OPTIONAL_UINT64_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getOptionalUint64());
+      }
+      if (hasOptionalSint32()) {
+        hash = (37 * hash) + OPTIONAL_SINT32_FIELD_NUMBER;
+        hash = (53 * hash) + getOptionalSint32();
+      }
+      if (hasOptionalSint64()) {
+        hash = (37 * hash) + OPTIONAL_SINT64_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getOptionalSint64());
+      }
+      if (hasOptionalFixed32()) {
+        hash = (37 * hash) + OPTIONAL_FIXED32_FIELD_NUMBER;
+        hash = (53 * hash) + getOptionalFixed32();
+      }
+      if (hasOptionalFixed64()) {
+        hash = (37 * hash) + OPTIONAL_FIXED64_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getOptionalFixed64());
+      }
+      if (hasOptionalSfixed32()) {
+        hash = (37 * hash) + OPTIONAL_SFIXED32_FIELD_NUMBER;
+        hash = (53 * hash) + getOptionalSfixed32();
+      }
+      if (hasOptionalSfixed64()) {
+        hash = (37 * hash) + OPTIONAL_SFIXED64_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getOptionalSfixed64());
+      }
+      if (hasOptionalFloat()) {
+        hash = (37 * hash) + OPTIONAL_FLOAT_FIELD_NUMBER;
+        hash = (53 * hash) + java.lang.Float.floatToIntBits(
+            getOptionalFloat());
+      }
+      if (hasOptionalDouble()) {
+        hash = (37 * hash) + OPTIONAL_DOUBLE_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            java.lang.Double.doubleToLongBits(getOptionalDouble()));
+      }
+      if (hasOptionalBool()) {
+        hash = (37 * hash) + OPTIONAL_BOOL_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+            getOptionalBool());
+      }
+      if (hasOptionalString()) {
+        hash = (37 * hash) + OPTIONAL_STRING_FIELD_NUMBER;
+        hash = (53 * hash) + getOptionalString().hashCode();
+      }
+      if (hasOptionalBytes()) {
+        hash = (37 * hash) + OPTIONAL_BYTES_FIELD_NUMBER;
+        hash = (53 * hash) + getOptionalBytes().hashCode();
+      }
+      if (hasOptionalNestedMessage()) {
+        hash = (37 * hash) + OPTIONAL_NESTED_MESSAGE_FIELD_NUMBER;
+        hash = (53 * hash) + getOptionalNestedMessage().hashCode();
+      }
+      if (hasOptionalForeignMessage()) {
+        hash = (37 * hash) + OPTIONAL_FOREIGN_MESSAGE_FIELD_NUMBER;
+        hash = (53 * hash) + getOptionalForeignMessage().hashCode();
+      }
+      if (hasOptionalNestedEnum()) {
+        hash = (37 * hash) + OPTIONAL_NESTED_ENUM_FIELD_NUMBER;
+        hash = (53 * hash) + optionalNestedEnum_;
+      }
+      if (hasOptionalForeignEnum()) {
+        hash = (37 * hash) + OPTIONAL_FOREIGN_ENUM_FIELD_NUMBER;
+        hash = (53 * hash) + optionalForeignEnum_;
+      }
+      if (hasOptionalAliasedEnum()) {
+        hash = (37 * hash) + OPTIONAL_ALIASED_ENUM_FIELD_NUMBER;
+        hash = (53 * hash) + optionalAliasedEnum_;
+      }
+      if (hasRecursiveMessage()) {
+        hash = (37 * hash) + RECURSIVE_MESSAGE_FIELD_NUMBER;
+        hash = (53 * hash) + getRecursiveMessage().hashCode();
+      }
+      if (getRepeatedInt32Count() > 0) {
+        hash = (37 * hash) + REPEATED_INT32_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedInt32List().hashCode();
+      }
+      if (getRepeatedInt64Count() > 0) {
+        hash = (37 * hash) + REPEATED_INT64_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedInt64List().hashCode();
+      }
+      if (getRepeatedUint32Count() > 0) {
+        hash = (37 * hash) + REPEATED_UINT32_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedUint32List().hashCode();
+      }
+      if (getRepeatedUint64Count() > 0) {
+        hash = (37 * hash) + REPEATED_UINT64_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedUint64List().hashCode();
+      }
+      if (getRepeatedSint32Count() > 0) {
+        hash = (37 * hash) + REPEATED_SINT32_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedSint32List().hashCode();
+      }
+      if (getRepeatedSint64Count() > 0) {
+        hash = (37 * hash) + REPEATED_SINT64_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedSint64List().hashCode();
+      }
+      if (getRepeatedFixed32Count() > 0) {
+        hash = (37 * hash) + REPEATED_FIXED32_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedFixed32List().hashCode();
+      }
+      if (getRepeatedFixed64Count() > 0) {
+        hash = (37 * hash) + REPEATED_FIXED64_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedFixed64List().hashCode();
+      }
+      if (getRepeatedSfixed32Count() > 0) {
+        hash = (37 * hash) + REPEATED_SFIXED32_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedSfixed32List().hashCode();
+      }
+      if (getRepeatedSfixed64Count() > 0) {
+        hash = (37 * hash) + REPEATED_SFIXED64_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedSfixed64List().hashCode();
+      }
+      if (getRepeatedFloatCount() > 0) {
+        hash = (37 * hash) + REPEATED_FLOAT_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedFloatList().hashCode();
+      }
+      if (getRepeatedDoubleCount() > 0) {
+        hash = (37 * hash) + REPEATED_DOUBLE_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedDoubleList().hashCode();
+      }
+      if (getRepeatedBoolCount() > 0) {
+        hash = (37 * hash) + REPEATED_BOOL_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedBoolList().hashCode();
+      }
+      if (getRepeatedStringCount() > 0) {
+        hash = (37 * hash) + REPEATED_STRING_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedStringList().hashCode();
+      }
+      if (getRepeatedBytesCount() > 0) {
+        hash = (37 * hash) + REPEATED_BYTES_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedBytesList().hashCode();
+      }
+      if (getRepeatedNestedMessageCount() > 0) {
+        hash = (37 * hash) + REPEATED_NESTED_MESSAGE_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedNestedMessageList().hashCode();
+      }
+      if (getRepeatedForeignMessageCount() > 0) {
+        hash = (37 * hash) + REPEATED_FOREIGN_MESSAGE_FIELD_NUMBER;
+        hash = (53 * hash) + getRepeatedForeignMessageList().hashCode();
+      }
+      if (getRepeatedNestedEnumCount() > 0) {
+        hash = (37 * hash) + REPEATED_NESTED_ENUM_FIELD_NUMBER;
+        hash = (53 * hash) + repeatedNestedEnum_.hashCode();
+      }
+      if (getRepeatedForeignEnumCount() > 0) {
+        hash = (37 * hash) + REPEATED_FOREIGN_ENUM_FIELD_NUMBER;
+        hash = (53 * hash) + repeatedForeignEnum_.hashCode();
+      }
+      if (getPackedInt32Count() > 0) {
+        hash = (37 * hash) + PACKED_INT32_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedInt32List().hashCode();
+      }
+      if (getPackedInt64Count() > 0) {
+        hash = (37 * hash) + PACKED_INT64_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedInt64List().hashCode();
+      }
+      if (getPackedUint32Count() > 0) {
+        hash = (37 * hash) + PACKED_UINT32_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedUint32List().hashCode();
+      }
+      if (getPackedUint64Count() > 0) {
+        hash = (37 * hash) + PACKED_UINT64_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedUint64List().hashCode();
+      }
+      if (getPackedSint32Count() > 0) {
+        hash = (37 * hash) + PACKED_SINT32_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedSint32List().hashCode();
+      }
+      if (getPackedSint64Count() > 0) {
+        hash = (37 * hash) + PACKED_SINT64_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedSint64List().hashCode();
+      }
+      if (getPackedFixed32Count() > 0) {
+        hash = (37 * hash) + PACKED_FIXED32_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedFixed32List().hashCode();
+      }
+      if (getPackedFixed64Count() > 0) {
+        hash = (37 * hash) + PACKED_FIXED64_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedFixed64List().hashCode();
+      }
+      if (getPackedSfixed32Count() > 0) {
+        hash = (37 * hash) + PACKED_SFIXED32_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedSfixed32List().hashCode();
+      }
+      if (getPackedSfixed64Count() > 0) {
+        hash = (37 * hash) + PACKED_SFIXED64_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedSfixed64List().hashCode();
+      }
+      if (getPackedFloatCount() > 0) {
+        hash = (37 * hash) + PACKED_FLOAT_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedFloatList().hashCode();
+      }
+      if (getPackedDoubleCount() > 0) {
+        hash = (37 * hash) + PACKED_DOUBLE_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedDoubleList().hashCode();
+      }
+      if (getPackedBoolCount() > 0) {
+        hash = (37 * hash) + PACKED_BOOL_FIELD_NUMBER;
+        hash = (53 * hash) + getPackedBoolList().hashCode();
+      }
+      if (getPackedNestedEnumCount() > 0) {
+        hash = (37 * hash) + PACKED_NESTED_ENUM_FIELD_NUMBER;
+        hash = (53 * hash) + packedNestedEnum_.hashCode();
+      }
+      if (getUnpackedInt32Count() > 0) {
+        hash = (37 * hash) + UNPACKED_INT32_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedInt32List().hashCode();
+      }
+      if (getUnpackedInt64Count() > 0) {
+        hash = (37 * hash) + UNPACKED_INT64_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedInt64List().hashCode();
+      }
+      if (getUnpackedUint32Count() > 0) {
+        hash = (37 * hash) + UNPACKED_UINT32_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedUint32List().hashCode();
+      }
+      if (getUnpackedUint64Count() > 0) {
+        hash = (37 * hash) + UNPACKED_UINT64_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedUint64List().hashCode();
+      }
+      if (getUnpackedSint32Count() > 0) {
+        hash = (37 * hash) + UNPACKED_SINT32_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedSint32List().hashCode();
+      }
+      if (getUnpackedSint64Count() > 0) {
+        hash = (37 * hash) + UNPACKED_SINT64_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedSint64List().hashCode();
+      }
+      if (getUnpackedFixed32Count() > 0) {
+        hash = (37 * hash) + UNPACKED_FIXED32_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedFixed32List().hashCode();
+      }
+      if (getUnpackedFixed64Count() > 0) {
+        hash = (37 * hash) + UNPACKED_FIXED64_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedFixed64List().hashCode();
+      }
+      if (getUnpackedSfixed32Count() > 0) {
+        hash = (37 * hash) + UNPACKED_SFIXED32_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedSfixed32List().hashCode();
+      }
+      if (getUnpackedSfixed64Count() > 0) {
+        hash = (37 * hash) + UNPACKED_SFIXED64_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedSfixed64List().hashCode();
+      }
+      if (getUnpackedFloatCount() > 0) {
+        hash = (37 * hash) + UNPACKED_FLOAT_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedFloatList().hashCode();
+      }
+      if (getUnpackedDoubleCount() > 0) {
+        hash = (37 * hash) + UNPACKED_DOUBLE_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedDoubleList().hashCode();
+      }
+      if (getUnpackedBoolCount() > 0) {
+        hash = (37 * hash) + UNPACKED_BOOL_FIELD_NUMBER;
+        hash = (53 * hash) + getUnpackedBoolList().hashCode();
+      }
+      if (getUnpackedNestedEnumCount() > 0) {
+        hash = (37 * hash) + UNPACKED_NESTED_ENUM_FIELD_NUMBER;
+        hash = (53 * hash) + unpackedNestedEnum_.hashCode();
+      }
+      if (!internalGetMapInt32Int32().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_INT32_INT32_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapInt32Int32().hashCode();
+      }
+      if (!internalGetMapInt64Int64().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_INT64_INT64_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapInt64Int64().hashCode();
+      }
+      if (!internalGetMapUint32Uint32().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_UINT32_UINT32_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapUint32Uint32().hashCode();
+      }
+      if (!internalGetMapUint64Uint64().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_UINT64_UINT64_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapUint64Uint64().hashCode();
+      }
+      if (!internalGetMapSint32Sint32().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_SINT32_SINT32_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapSint32Sint32().hashCode();
+      }
+      if (!internalGetMapSint64Sint64().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_SINT64_SINT64_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapSint64Sint64().hashCode();
+      }
+      if (!internalGetMapFixed32Fixed32().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_FIXED32_FIXED32_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapFixed32Fixed32().hashCode();
+      }
+      if (!internalGetMapFixed64Fixed64().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_FIXED64_FIXED64_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapFixed64Fixed64().hashCode();
+      }
+      if (!internalGetMapSfixed32Sfixed32().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_SFIXED32_SFIXED32_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapSfixed32Sfixed32().hashCode();
+      }
+      if (!internalGetMapSfixed64Sfixed64().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_SFIXED64_SFIXED64_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapSfixed64Sfixed64().hashCode();
+      }
+      if (!internalGetMapInt32Float().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_INT32_FLOAT_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapInt32Float().hashCode();
+      }
+      if (!internalGetMapInt32Double().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_INT32_DOUBLE_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapInt32Double().hashCode();
+      }
+      if (!internalGetMapBoolBool().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_BOOL_BOOL_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapBoolBool().hashCode();
+      }
+      if (!internalGetMapStringString().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_STRING_STRING_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapStringString().hashCode();
+      }
+      if (!internalGetMapStringBytes().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_STRING_BYTES_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapStringBytes().hashCode();
+      }
+      if (!internalGetMapStringNestedMessage().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_STRING_NESTED_MESSAGE_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapStringNestedMessage().hashCode();
+      }
+      if (!internalGetMapStringForeignMessage().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_STRING_FOREIGN_MESSAGE_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapStringForeignMessage().hashCode();
+      }
+      if (!internalGetMapStringNestedEnum().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_STRING_NESTED_ENUM_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapStringNestedEnum().hashCode();
+      }
+      if (!internalGetMapStringForeignEnum().getMap().isEmpty()) {
+        hash = (37 * hash) + MAP_STRING_FOREIGN_ENUM_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetMapStringForeignEnum().hashCode();
+      }
+      switch (oneofFieldCase_) {
+        case 111:
+          hash = (37 * hash) + ONEOF_UINT32_FIELD_NUMBER;
+          hash = (53 * hash) + getOneofUint32();
+          break;
+        case 112:
+          hash = (37 * hash) + ONEOF_NESTED_MESSAGE_FIELD_NUMBER;
+          hash = (53 * hash) + getOneofNestedMessage().hashCode();
+          break;
+        case 113:
+          hash = (37 * hash) + ONEOF_STRING_FIELD_NUMBER;
+          hash = (53 * hash) + getOneofString().hashCode();
+          break;
+        case 114:
+          hash = (37 * hash) + ONEOF_BYTES_FIELD_NUMBER;
+          hash = (53 * hash) + getOneofBytes().hashCode();
+          break;
+        case 115:
+          hash = (37 * hash) + ONEOF_BOOL_FIELD_NUMBER;
+          hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+              getOneofBool());
+          break;
+        case 116:
+          hash = (37 * hash) + ONEOF_UINT64_FIELD_NUMBER;
+          hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+              getOneofUint64());
+          break;
+        case 117:
+          hash = (37 * hash) + ONEOF_FLOAT_FIELD_NUMBER;
+          hash = (53 * hash) + java.lang.Float.floatToIntBits(
+              getOneofFloat());
+          break;
+        case 118:
+          hash = (37 * hash) + ONEOF_DOUBLE_FIELD_NUMBER;
+          hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+              java.lang.Double.doubleToLongBits(getOneofDouble()));
+          break;
+        case 119:
+          hash = (37 * hash) + ONEOF_ENUM_FIELD_NUMBER;
+          hash = (53 * hash) + getOneofEnum().getNumber();
+          break;
+        case 0:
+        default:
+      }
+      hash = hashFields(hash, getExtensionFields());
+      hash = (29 * hash) + getUnknownFields().hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * <pre>
+     * Proto2 version of TestMostTypesProto3
+     * </pre>
+     *
+     * Protobuf type {@code legacy_gencode_test.proto2.TestMostTypesProto2}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.ExtendableBuilder<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2, Builder> implements
+        // @@protoc_insertion_point(builder_implements:legacy_gencode_test.proto2.TestMostTypesProto2)
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor;
+      }
+
+      @SuppressWarnings({"rawtypes"})
+      protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
+          int number) {
+        switch (number) {
+          case 56:
+            return internalGetMapInt32Int32();
+          case 57:
+            return internalGetMapInt64Int64();
+          case 58:
+            return internalGetMapUint32Uint32();
+          case 59:
+            return internalGetMapUint64Uint64();
+          case 60:
+            return internalGetMapSint32Sint32();
+          case 61:
+            return internalGetMapSint64Sint64();
+          case 62:
+            return internalGetMapFixed32Fixed32();
+          case 63:
+            return internalGetMapFixed64Fixed64();
+          case 64:
+            return internalGetMapSfixed32Sfixed32();
+          case 65:
+            return internalGetMapSfixed64Sfixed64();
+          case 66:
+            return internalGetMapInt32Float();
+          case 67:
+            return internalGetMapInt32Double();
+          case 68:
+            return internalGetMapBoolBool();
+          case 69:
+            return internalGetMapStringString();
+          case 70:
+            return internalGetMapStringBytes();
+          case 71:
+            return internalGetMapStringNestedMessage();
+          case 72:
+            return internalGetMapStringForeignMessage();
+          case 73:
+            return internalGetMapStringNestedEnum();
+          case 74:
+            return internalGetMapStringForeignEnum();
+          default:
+            throw new RuntimeException(
+                "Invalid map field number: " + number);
+        }
+      }
+      @SuppressWarnings({"rawtypes"})
+      protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
+          int number) {
+        switch (number) {
+          case 56:
+            return internalGetMutableMapInt32Int32();
+          case 57:
+            return internalGetMutableMapInt64Int64();
+          case 58:
+            return internalGetMutableMapUint32Uint32();
+          case 59:
+            return internalGetMutableMapUint64Uint64();
+          case 60:
+            return internalGetMutableMapSint32Sint32();
+          case 61:
+            return internalGetMutableMapSint64Sint64();
+          case 62:
+            return internalGetMutableMapFixed32Fixed32();
+          case 63:
+            return internalGetMutableMapFixed64Fixed64();
+          case 64:
+            return internalGetMutableMapSfixed32Sfixed32();
+          case 65:
+            return internalGetMutableMapSfixed64Sfixed64();
+          case 66:
+            return internalGetMutableMapInt32Float();
+          case 67:
+            return internalGetMutableMapInt32Double();
+          case 68:
+            return internalGetMutableMapBoolBool();
+          case 69:
+            return internalGetMutableMapStringString();
+          case 70:
+            return internalGetMutableMapStringBytes();
+          case 71:
+            return internalGetMutableMapStringNestedMessage();
+          case 72:
+            return internalGetMutableMapStringForeignMessage();
+          case 73:
+            return internalGetMutableMapStringNestedEnum();
+          case 74:
+            return internalGetMutableMapStringForeignEnum();
+          default:
+            throw new RuntimeException(
+                "Invalid map field number: " + number);
+        }
+      }
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.class, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder.class);
+      }
+
+      // Construct using legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessage
+                .alwaysUseFieldBuilders) {
+          internalGetOptionalNestedMessageFieldBuilder();
+          internalGetOptionalForeignMessageFieldBuilder();
+          internalGetRecursiveMessageFieldBuilder();
+          internalGetRepeatedNestedMessageFieldBuilder();
+          internalGetRepeatedForeignMessageFieldBuilder();
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        bitField0_ = 0;
+        bitField1_ = 0;
+        bitField2_ = 0;
+        optionalInt32_ = 0;
+        optionalInt64_ = 0L;
+        optionalUint32_ = 0;
+        optionalUint64_ = 0L;
+        optionalSint32_ = 0;
+        optionalSint64_ = 0L;
+        optionalFixed32_ = 0;
+        optionalFixed64_ = 0L;
+        optionalSfixed32_ = 0;
+        optionalSfixed64_ = 0L;
+        optionalFloat_ = 0F;
+        optionalDouble_ = 0D;
+        optionalBool_ = false;
+        optionalString_ = "";
+        optionalBytes_ = com.google.protobuf.ByteString.EMPTY;
+        optionalNestedMessage_ = null;
+        if (optionalNestedMessageBuilder_ != null) {
+          optionalNestedMessageBuilder_.dispose();
+          optionalNestedMessageBuilder_ = null;
+        }
+        optionalForeignMessage_ = null;
+        if (optionalForeignMessageBuilder_ != null) {
+          optionalForeignMessageBuilder_.dispose();
+          optionalForeignMessageBuilder_ = null;
+        }
+        optionalNestedEnum_ = 0;
+        optionalForeignEnum_ = 0;
+        optionalAliasedEnum_ = 0;
+        recursiveMessage_ = null;
+        if (recursiveMessageBuilder_ != null) {
+          recursiveMessageBuilder_.dispose();
+          recursiveMessageBuilder_ = null;
+        }
+        repeatedInt32_ = emptyIntList();
+        repeatedInt64_ = emptyLongList();
+        repeatedUint32_ = emptyIntList();
+        repeatedUint64_ = emptyLongList();
+        repeatedSint32_ = emptyIntList();
+        repeatedSint64_ = emptyLongList();
+        repeatedFixed32_ = emptyIntList();
+        repeatedFixed64_ = emptyLongList();
+        repeatedSfixed32_ = emptyIntList();
+        repeatedSfixed64_ = emptyLongList();
+        repeatedFloat_ = emptyFloatList();
+        repeatedDouble_ = emptyDoubleList();
+        repeatedBool_ = emptyBooleanList();
+        repeatedString_ =
+            com.google.protobuf.LazyStringArrayList.emptyList();
+        repeatedBytes_ = emptyList(com.google.protobuf.ByteString.class);
+        if (repeatedNestedMessageBuilder_ == null) {
+          repeatedNestedMessage_ = java.util.Collections.emptyList();
+        } else {
+          repeatedNestedMessage_ = null;
+          repeatedNestedMessageBuilder_.clear();
+        }
+        bitField1_ = (bitField1_ & ~0x00000010);
+        if (repeatedForeignMessageBuilder_ == null) {
+          repeatedForeignMessage_ = java.util.Collections.emptyList();
+        } else {
+          repeatedForeignMessage_ = null;
+          repeatedForeignMessageBuilder_.clear();
+        }
+        bitField1_ = (bitField1_ & ~0x00000020);
+        repeatedNestedEnum_ = emptyIntList();
+        repeatedForeignEnum_ = emptyIntList();
+        packedInt32_ = emptyIntList();
+        packedInt64_ = emptyLongList();
+        packedUint32_ = emptyIntList();
+        packedUint64_ = emptyLongList();
+        packedSint32_ = emptyIntList();
+        packedSint64_ = emptyLongList();
+        packedFixed32_ = emptyIntList();
+        packedFixed64_ = emptyLongList();
+        packedSfixed32_ = emptyIntList();
+        packedSfixed64_ = emptyLongList();
+        packedFloat_ = emptyFloatList();
+        packedDouble_ = emptyDoubleList();
+        packedBool_ = emptyBooleanList();
+        packedNestedEnum_ = emptyIntList();
+        unpackedInt32_ = emptyIntList();
+        unpackedInt64_ = emptyLongList();
+        unpackedUint32_ = emptyIntList();
+        unpackedUint64_ = emptyLongList();
+        unpackedSint32_ = emptyIntList();
+        unpackedSint64_ = emptyLongList();
+        unpackedFixed32_ = emptyIntList();
+        unpackedFixed64_ = emptyLongList();
+        unpackedSfixed32_ = emptyIntList();
+        unpackedSfixed64_ = emptyLongList();
+        unpackedFloat_ = emptyFloatList();
+        unpackedDouble_ = emptyDoubleList();
+        unpackedBool_ = emptyBooleanList();
+        unpackedNestedEnum_ = emptyIntList();
+        internalGetMutableMapInt32Int32().clear();
+        internalGetMutableMapInt64Int64().clear();
+        internalGetMutableMapUint32Uint32().clear();
+        internalGetMutableMapUint64Uint64().clear();
+        internalGetMutableMapSint32Sint32().clear();
+        internalGetMutableMapSint64Sint64().clear();
+        internalGetMutableMapFixed32Fixed32().clear();
+        internalGetMutableMapFixed64Fixed64().clear();
+        internalGetMutableMapSfixed32Sfixed32().clear();
+        internalGetMutableMapSfixed64Sfixed64().clear();
+        internalGetMutableMapInt32Float().clear();
+        internalGetMutableMapInt32Double().clear();
+        internalGetMutableMapBoolBool().clear();
+        internalGetMutableMapStringString().clear();
+        internalGetMutableMapStringBytes().clear();
+        internalGetMutableMapStringNestedMessage().clear();
+        internalGetMutableMapStringForeignMessage().clear();
+        internalGetMutableMapStringNestedEnum().clear();
+        internalGetMutableMapStringForeignEnum().clear();
+        if (oneofNestedMessageBuilder_ != null) {
+          oneofNestedMessageBuilder_.clear();
+        }
+        oneofFieldCase_ = 0;
+        oneofField_ = null;
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor;
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 getDefaultInstanceForType() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 build() {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 buildPartial() {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 result = new legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2(this);
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        if (bitField1_ != 0) { buildPartial1(result); }
+        if (bitField2_ != 0) { buildPartial2(result); }
+        buildPartialOneofs(result);
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 result) {
+        if (repeatedNestedMessageBuilder_ == null) {
+          if (((bitField1_ & 0x00000010) != 0)) {
+            repeatedNestedMessage_ = java.util.Collections.unmodifiableList(repeatedNestedMessage_);
+            bitField1_ = (bitField1_ & ~0x00000010);
+          }
+          result.repeatedNestedMessage_ = repeatedNestedMessage_;
+        } else {
+          result.repeatedNestedMessage_ = repeatedNestedMessageBuilder_.build();
+        }
+        if (repeatedForeignMessageBuilder_ == null) {
+          if (((bitField1_ & 0x00000020) != 0)) {
+            repeatedForeignMessage_ = java.util.Collections.unmodifiableList(repeatedForeignMessage_);
+            bitField1_ = (bitField1_ & ~0x00000020);
+          }
+          result.repeatedForeignMessage_ = repeatedForeignMessage_;
+        } else {
+          result.repeatedForeignMessage_ = repeatedForeignMessageBuilder_.build();
+        }
+      }
+
+      private void buildPartial0(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 result) {
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.optionalInt32_ = optionalInt32_;
+          to_bitField0_ |= 0x00000001;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.optionalInt64_ = optionalInt64_;
+          to_bitField0_ |= 0x00000002;
+        }
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.optionalUint32_ = optionalUint32_;
+          to_bitField0_ |= 0x00000004;
+        }
+        if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.optionalUint64_ = optionalUint64_;
+          to_bitField0_ |= 0x00000008;
+        }
+        if (((from_bitField0_ & 0x00000010) != 0)) {
+          result.optionalSint32_ = optionalSint32_;
+          to_bitField0_ |= 0x00000010;
+        }
+        if (((from_bitField0_ & 0x00000020) != 0)) {
+          result.optionalSint64_ = optionalSint64_;
+          to_bitField0_ |= 0x00000020;
+        }
+        if (((from_bitField0_ & 0x00000040) != 0)) {
+          result.optionalFixed32_ = optionalFixed32_;
+          to_bitField0_ |= 0x00000040;
+        }
+        if (((from_bitField0_ & 0x00000080) != 0)) {
+          result.optionalFixed64_ = optionalFixed64_;
+          to_bitField0_ |= 0x00000080;
+        }
+        if (((from_bitField0_ & 0x00000100) != 0)) {
+          result.optionalSfixed32_ = optionalSfixed32_;
+          to_bitField0_ |= 0x00000100;
+        }
+        if (((from_bitField0_ & 0x00000200) != 0)) {
+          result.optionalSfixed64_ = optionalSfixed64_;
+          to_bitField0_ |= 0x00000200;
+        }
+        if (((from_bitField0_ & 0x00000400) != 0)) {
+          result.optionalFloat_ = optionalFloat_;
+          to_bitField0_ |= 0x00000400;
+        }
+        if (((from_bitField0_ & 0x00000800) != 0)) {
+          result.optionalDouble_ = optionalDouble_;
+          to_bitField0_ |= 0x00000800;
+        }
+        if (((from_bitField0_ & 0x00001000) != 0)) {
+          result.optionalBool_ = optionalBool_;
+          to_bitField0_ |= 0x00001000;
+        }
+        if (((from_bitField0_ & 0x00002000) != 0)) {
+          result.optionalString_ = optionalString_;
+          to_bitField0_ |= 0x00002000;
+        }
+        if (((from_bitField0_ & 0x00004000) != 0)) {
+          result.optionalBytes_ = optionalBytes_;
+          to_bitField0_ |= 0x00004000;
+        }
+        if (((from_bitField0_ & 0x00008000) != 0)) {
+          result.optionalNestedMessage_ = optionalNestedMessageBuilder_ == null
+              ? optionalNestedMessage_
+              : optionalNestedMessageBuilder_.build();
+          to_bitField0_ |= 0x00008000;
+        }
+        if (((from_bitField0_ & 0x00010000) != 0)) {
+          result.optionalForeignMessage_ = optionalForeignMessageBuilder_ == null
+              ? optionalForeignMessage_
+              : optionalForeignMessageBuilder_.build();
+          to_bitField0_ |= 0x00010000;
+        }
+        if (((from_bitField0_ & 0x00020000) != 0)) {
+          result.optionalNestedEnum_ = optionalNestedEnum_;
+          to_bitField0_ |= 0x00020000;
+        }
+        if (((from_bitField0_ & 0x00040000) != 0)) {
+          result.optionalForeignEnum_ = optionalForeignEnum_;
+          to_bitField0_ |= 0x00040000;
+        }
+        if (((from_bitField0_ & 0x00080000) != 0)) {
+          result.optionalAliasedEnum_ = optionalAliasedEnum_;
+          to_bitField0_ |= 0x00080000;
+        }
+        if (((from_bitField0_ & 0x00100000) != 0)) {
+          result.recursiveMessage_ = recursiveMessageBuilder_ == null
+              ? recursiveMessage_
+              : recursiveMessageBuilder_.build();
+          to_bitField0_ |= 0x00100000;
+        }
+        if (((from_bitField0_ & 0x00200000) != 0)) {
+          repeatedInt32_.makeImmutable();
+          result.repeatedInt32_ = repeatedInt32_;
+        }
+        if (((from_bitField0_ & 0x00400000) != 0)) {
+          repeatedInt64_.makeImmutable();
+          result.repeatedInt64_ = repeatedInt64_;
+        }
+        if (((from_bitField0_ & 0x00800000) != 0)) {
+          repeatedUint32_.makeImmutable();
+          result.repeatedUint32_ = repeatedUint32_;
+        }
+        if (((from_bitField0_ & 0x01000000) != 0)) {
+          repeatedUint64_.makeImmutable();
+          result.repeatedUint64_ = repeatedUint64_;
+        }
+        if (((from_bitField0_ & 0x02000000) != 0)) {
+          repeatedSint32_.makeImmutable();
+          result.repeatedSint32_ = repeatedSint32_;
+        }
+        if (((from_bitField0_ & 0x04000000) != 0)) {
+          repeatedSint64_.makeImmutable();
+          result.repeatedSint64_ = repeatedSint64_;
+        }
+        if (((from_bitField0_ & 0x08000000) != 0)) {
+          repeatedFixed32_.makeImmutable();
+          result.repeatedFixed32_ = repeatedFixed32_;
+        }
+        if (((from_bitField0_ & 0x10000000) != 0)) {
+          repeatedFixed64_.makeImmutable();
+          result.repeatedFixed64_ = repeatedFixed64_;
+        }
+        if (((from_bitField0_ & 0x20000000) != 0)) {
+          repeatedSfixed32_.makeImmutable();
+          result.repeatedSfixed32_ = repeatedSfixed32_;
+        }
+        if (((from_bitField0_ & 0x40000000) != 0)) {
+          repeatedSfixed64_.makeImmutable();
+          result.repeatedSfixed64_ = repeatedSfixed64_;
+        }
+        if (((from_bitField0_ & 0x80000000) != 0)) {
+          repeatedFloat_.makeImmutable();
+          result.repeatedFloat_ = repeatedFloat_;
+        }
+        result.bitField0_ |= to_bitField0_;
+      }
+
+      private void buildPartial1(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 result) {
+        int from_bitField1_ = bitField1_;
+        if (((from_bitField1_ & 0x00000001) != 0)) {
+          repeatedDouble_.makeImmutable();
+          result.repeatedDouble_ = repeatedDouble_;
+        }
+        if (((from_bitField1_ & 0x00000002) != 0)) {
+          repeatedBool_.makeImmutable();
+          result.repeatedBool_ = repeatedBool_;
+        }
+        if (((from_bitField1_ & 0x00000004) != 0)) {
+          repeatedString_.makeImmutable();
+          result.repeatedString_ = repeatedString_;
+        }
+        if (((from_bitField1_ & 0x00000008) != 0)) {
+          repeatedBytes_.makeImmutable();
+          result.repeatedBytes_ = repeatedBytes_;
+        }
+        if (((from_bitField1_ & 0x00000040) != 0)) {
+          repeatedNestedEnum_.makeImmutable();
+          result.repeatedNestedEnum_ = repeatedNestedEnum_;
+        }
+        if (((from_bitField1_ & 0x00000080) != 0)) {
+          repeatedForeignEnum_.makeImmutable();
+          result.repeatedForeignEnum_ = repeatedForeignEnum_;
+        }
+        if (((from_bitField1_ & 0x00000100) != 0)) {
+          packedInt32_.makeImmutable();
+          result.packedInt32_ = packedInt32_;
+        }
+        if (((from_bitField1_ & 0x00000200) != 0)) {
+          packedInt64_.makeImmutable();
+          result.packedInt64_ = packedInt64_;
+        }
+        if (((from_bitField1_ & 0x00000400) != 0)) {
+          packedUint32_.makeImmutable();
+          result.packedUint32_ = packedUint32_;
+        }
+        if (((from_bitField1_ & 0x00000800) != 0)) {
+          packedUint64_.makeImmutable();
+          result.packedUint64_ = packedUint64_;
+        }
+        if (((from_bitField1_ & 0x00001000) != 0)) {
+          packedSint32_.makeImmutable();
+          result.packedSint32_ = packedSint32_;
+        }
+        if (((from_bitField1_ & 0x00002000) != 0)) {
+          packedSint64_.makeImmutable();
+          result.packedSint64_ = packedSint64_;
+        }
+        if (((from_bitField1_ & 0x00004000) != 0)) {
+          packedFixed32_.makeImmutable();
+          result.packedFixed32_ = packedFixed32_;
+        }
+        if (((from_bitField1_ & 0x00008000) != 0)) {
+          packedFixed64_.makeImmutable();
+          result.packedFixed64_ = packedFixed64_;
+        }
+        if (((from_bitField1_ & 0x00010000) != 0)) {
+          packedSfixed32_.makeImmutable();
+          result.packedSfixed32_ = packedSfixed32_;
+        }
+        if (((from_bitField1_ & 0x00020000) != 0)) {
+          packedSfixed64_.makeImmutable();
+          result.packedSfixed64_ = packedSfixed64_;
+        }
+        if (((from_bitField1_ & 0x00040000) != 0)) {
+          packedFloat_.makeImmutable();
+          result.packedFloat_ = packedFloat_;
+        }
+        if (((from_bitField1_ & 0x00080000) != 0)) {
+          packedDouble_.makeImmutable();
+          result.packedDouble_ = packedDouble_;
+        }
+        if (((from_bitField1_ & 0x00100000) != 0)) {
+          packedBool_.makeImmutable();
+          result.packedBool_ = packedBool_;
+        }
+        if (((from_bitField1_ & 0x00200000) != 0)) {
+          packedNestedEnum_.makeImmutable();
+          result.packedNestedEnum_ = packedNestedEnum_;
+        }
+        if (((from_bitField1_ & 0x00400000) != 0)) {
+          unpackedInt32_.makeImmutable();
+          result.unpackedInt32_ = unpackedInt32_;
+        }
+        if (((from_bitField1_ & 0x00800000) != 0)) {
+          unpackedInt64_.makeImmutable();
+          result.unpackedInt64_ = unpackedInt64_;
+        }
+        if (((from_bitField1_ & 0x01000000) != 0)) {
+          unpackedUint32_.makeImmutable();
+          result.unpackedUint32_ = unpackedUint32_;
+        }
+        if (((from_bitField1_ & 0x02000000) != 0)) {
+          unpackedUint64_.makeImmutable();
+          result.unpackedUint64_ = unpackedUint64_;
+        }
+        if (((from_bitField1_ & 0x04000000) != 0)) {
+          unpackedSint32_.makeImmutable();
+          result.unpackedSint32_ = unpackedSint32_;
+        }
+        if (((from_bitField1_ & 0x08000000) != 0)) {
+          unpackedSint64_.makeImmutable();
+          result.unpackedSint64_ = unpackedSint64_;
+        }
+        if (((from_bitField1_ & 0x10000000) != 0)) {
+          unpackedFixed32_.makeImmutable();
+          result.unpackedFixed32_ = unpackedFixed32_;
+        }
+        if (((from_bitField1_ & 0x20000000) != 0)) {
+          unpackedFixed64_.makeImmutable();
+          result.unpackedFixed64_ = unpackedFixed64_;
+        }
+        if (((from_bitField1_ & 0x40000000) != 0)) {
+          unpackedSfixed32_.makeImmutable();
+          result.unpackedSfixed32_ = unpackedSfixed32_;
+        }
+        if (((from_bitField1_ & 0x80000000) != 0)) {
+          unpackedSfixed64_.makeImmutable();
+          result.unpackedSfixed64_ = unpackedSfixed64_;
+        }
+      }
+
+      private void buildPartial2(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 result) {
+        int from_bitField2_ = bitField2_;
+        if (((from_bitField2_ & 0x00000001) != 0)) {
+          unpackedFloat_.makeImmutable();
+          result.unpackedFloat_ = unpackedFloat_;
+        }
+        if (((from_bitField2_ & 0x00000002) != 0)) {
+          unpackedDouble_.makeImmutable();
+          result.unpackedDouble_ = unpackedDouble_;
+        }
+        if (((from_bitField2_ & 0x00000004) != 0)) {
+          unpackedBool_.makeImmutable();
+          result.unpackedBool_ = unpackedBool_;
+        }
+        if (((from_bitField2_ & 0x00000008) != 0)) {
+          unpackedNestedEnum_.makeImmutable();
+          result.unpackedNestedEnum_ = unpackedNestedEnum_;
+        }
+        if (((from_bitField2_ & 0x00000010) != 0)) {
+          result.mapInt32Int32_ = internalGetMapInt32Int32();
+          result.mapInt32Int32_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00000020) != 0)) {
+          result.mapInt64Int64_ = internalGetMapInt64Int64();
+          result.mapInt64Int64_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00000040) != 0)) {
+          result.mapUint32Uint32_ = internalGetMapUint32Uint32();
+          result.mapUint32Uint32_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00000080) != 0)) {
+          result.mapUint64Uint64_ = internalGetMapUint64Uint64();
+          result.mapUint64Uint64_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00000100) != 0)) {
+          result.mapSint32Sint32_ = internalGetMapSint32Sint32();
+          result.mapSint32Sint32_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00000200) != 0)) {
+          result.mapSint64Sint64_ = internalGetMapSint64Sint64();
+          result.mapSint64Sint64_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00000400) != 0)) {
+          result.mapFixed32Fixed32_ = internalGetMapFixed32Fixed32();
+          result.mapFixed32Fixed32_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00000800) != 0)) {
+          result.mapFixed64Fixed64_ = internalGetMapFixed64Fixed64();
+          result.mapFixed64Fixed64_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00001000) != 0)) {
+          result.mapSfixed32Sfixed32_ = internalGetMapSfixed32Sfixed32();
+          result.mapSfixed32Sfixed32_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00002000) != 0)) {
+          result.mapSfixed64Sfixed64_ = internalGetMapSfixed64Sfixed64();
+          result.mapSfixed64Sfixed64_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00004000) != 0)) {
+          result.mapInt32Float_ = internalGetMapInt32Float();
+          result.mapInt32Float_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00008000) != 0)) {
+          result.mapInt32Double_ = internalGetMapInt32Double();
+          result.mapInt32Double_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00010000) != 0)) {
+          result.mapBoolBool_ = internalGetMapBoolBool();
+          result.mapBoolBool_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00020000) != 0)) {
+          result.mapStringString_ = internalGetMapStringString();
+          result.mapStringString_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00040000) != 0)) {
+          result.mapStringBytes_ = internalGetMapStringBytes();
+          result.mapStringBytes_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00080000) != 0)) {
+          result.mapStringNestedMessage_ = internalGetMapStringNestedMessage().build(MapStringNestedMessageDefaultEntryHolder.defaultEntry);
+        }
+        if (((from_bitField2_ & 0x00100000) != 0)) {
+          result.mapStringForeignMessage_ = internalGetMapStringForeignMessage().build(MapStringForeignMessageDefaultEntryHolder.defaultEntry);
+        }
+        if (((from_bitField2_ & 0x00200000) != 0)) {
+          result.mapStringNestedEnum_ = internalGetMapStringNestedEnum();
+          result.mapStringNestedEnum_.makeImmutable();
+        }
+        if (((from_bitField2_ & 0x00400000) != 0)) {
+          result.mapStringForeignEnum_ = internalGetMapStringForeignEnum();
+          result.mapStringForeignEnum_.makeImmutable();
+        }
+      }
+
+      private void buildPartialOneofs(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 result) {
+        result.oneofFieldCase_ = oneofFieldCase_;
+        result.oneofField_ = this.oneofField_;
+        if (oneofFieldCase_ == 112 &&
+            oneofNestedMessageBuilder_ != null) {
+          result.oneofField_ = oneofNestedMessageBuilder_.build();
+        }
+      }
+
+      public <Type> Builder setExtension(
+          com.google.protobuf.GeneratedMessage.GeneratedExtension<
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2, Type> extension,
+          Type value) {
+        return super.setExtension(extension, value);
+      }
+      public <Type> Builder setExtension(
+          com.google.protobuf.GeneratedMessage.GeneratedExtension<
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2, java.util.List<Type>> extension,
+          int index, Type value) {
+        return super.setExtension(extension, index, value);
+      }
+      public <Type> Builder addExtension(
+          com.google.protobuf.GeneratedMessage.GeneratedExtension<
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2, java.util.List<Type>> extension,
+          Type value) {
+        return super.addExtension(extension, value);
+      }
+      public <Type> Builder clearExtension(
+          com.google.protobuf.GeneratedMessage.GeneratedExtension<
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2, Type> extension) {
+        return super.clearExtension(extension);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2) {
+          return mergeFrom((legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 other) {
+        if (other == legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance()) return this;
+        if (other.hasOptionalInt32()) {
+          setOptionalInt32(other.getOptionalInt32());
+        }
+        if (other.hasOptionalInt64()) {
+          setOptionalInt64(other.getOptionalInt64());
+        }
+        if (other.hasOptionalUint32()) {
+          setOptionalUint32(other.getOptionalUint32());
+        }
+        if (other.hasOptionalUint64()) {
+          setOptionalUint64(other.getOptionalUint64());
+        }
+        if (other.hasOptionalSint32()) {
+          setOptionalSint32(other.getOptionalSint32());
+        }
+        if (other.hasOptionalSint64()) {
+          setOptionalSint64(other.getOptionalSint64());
+        }
+        if (other.hasOptionalFixed32()) {
+          setOptionalFixed32(other.getOptionalFixed32());
+        }
+        if (other.hasOptionalFixed64()) {
+          setOptionalFixed64(other.getOptionalFixed64());
+        }
+        if (other.hasOptionalSfixed32()) {
+          setOptionalSfixed32(other.getOptionalSfixed32());
+        }
+        if (other.hasOptionalSfixed64()) {
+          setOptionalSfixed64(other.getOptionalSfixed64());
+        }
+        if (other.hasOptionalFloat()) {
+          setOptionalFloat(other.getOptionalFloat());
+        }
+        if (other.hasOptionalDouble()) {
+          setOptionalDouble(other.getOptionalDouble());
+        }
+        if (other.hasOptionalBool()) {
+          setOptionalBool(other.getOptionalBool());
+        }
+        if (other.hasOptionalString()) {
+          optionalString_ = other.optionalString_;
+          bitField0_ |= 0x00002000;
+          onChanged();
+        }
+        if (other.hasOptionalBytes()) {
+          setOptionalBytes(other.getOptionalBytes());
+        }
+        if (other.hasOptionalNestedMessage()) {
+          mergeOptionalNestedMessage(other.getOptionalNestedMessage());
+        }
+        if (other.hasOptionalForeignMessage()) {
+          mergeOptionalForeignMessage(other.getOptionalForeignMessage());
+        }
+        if (other.hasOptionalNestedEnum()) {
+          setOptionalNestedEnum(other.getOptionalNestedEnum());
+        }
+        if (other.hasOptionalForeignEnum()) {
+          setOptionalForeignEnum(other.getOptionalForeignEnum());
+        }
+        if (other.hasOptionalAliasedEnum()) {
+          setOptionalAliasedEnum(other.getOptionalAliasedEnum());
+        }
+        if (other.hasRecursiveMessage()) {
+          mergeRecursiveMessage(other.getRecursiveMessage());
+        }
+        if (!other.repeatedInt32_.isEmpty()) {
+          if (repeatedInt32_.isEmpty()) {
+            repeatedInt32_ = other.repeatedInt32_;
+            repeatedInt32_.makeImmutable();
+            bitField0_ |= 0x00200000;
+          } else {
+            ensureRepeatedInt32IsMutable();
+            repeatedInt32_.addAll(other.repeatedInt32_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedInt64_.isEmpty()) {
+          if (repeatedInt64_.isEmpty()) {
+            repeatedInt64_ = other.repeatedInt64_;
+            repeatedInt64_.makeImmutable();
+            bitField0_ |= 0x00400000;
+          } else {
+            ensureRepeatedInt64IsMutable();
+            repeatedInt64_.addAll(other.repeatedInt64_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedUint32_.isEmpty()) {
+          if (repeatedUint32_.isEmpty()) {
+            repeatedUint32_ = other.repeatedUint32_;
+            repeatedUint32_.makeImmutable();
+            bitField0_ |= 0x00800000;
+          } else {
+            ensureRepeatedUint32IsMutable();
+            repeatedUint32_.addAll(other.repeatedUint32_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedUint64_.isEmpty()) {
+          if (repeatedUint64_.isEmpty()) {
+            repeatedUint64_ = other.repeatedUint64_;
+            repeatedUint64_.makeImmutable();
+            bitField0_ |= 0x01000000;
+          } else {
+            ensureRepeatedUint64IsMutable();
+            repeatedUint64_.addAll(other.repeatedUint64_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedSint32_.isEmpty()) {
+          if (repeatedSint32_.isEmpty()) {
+            repeatedSint32_ = other.repeatedSint32_;
+            repeatedSint32_.makeImmutable();
+            bitField0_ |= 0x02000000;
+          } else {
+            ensureRepeatedSint32IsMutable();
+            repeatedSint32_.addAll(other.repeatedSint32_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedSint64_.isEmpty()) {
+          if (repeatedSint64_.isEmpty()) {
+            repeatedSint64_ = other.repeatedSint64_;
+            repeatedSint64_.makeImmutable();
+            bitField0_ |= 0x04000000;
+          } else {
+            ensureRepeatedSint64IsMutable();
+            repeatedSint64_.addAll(other.repeatedSint64_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedFixed32_.isEmpty()) {
+          if (repeatedFixed32_.isEmpty()) {
+            repeatedFixed32_ = other.repeatedFixed32_;
+            repeatedFixed32_.makeImmutable();
+            bitField0_ |= 0x08000000;
+          } else {
+            ensureRepeatedFixed32IsMutable();
+            repeatedFixed32_.addAll(other.repeatedFixed32_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedFixed64_.isEmpty()) {
+          if (repeatedFixed64_.isEmpty()) {
+            repeatedFixed64_ = other.repeatedFixed64_;
+            repeatedFixed64_.makeImmutable();
+            bitField0_ |= 0x10000000;
+          } else {
+            ensureRepeatedFixed64IsMutable();
+            repeatedFixed64_.addAll(other.repeatedFixed64_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedSfixed32_.isEmpty()) {
+          if (repeatedSfixed32_.isEmpty()) {
+            repeatedSfixed32_ = other.repeatedSfixed32_;
+            repeatedSfixed32_.makeImmutable();
+            bitField0_ |= 0x20000000;
+          } else {
+            ensureRepeatedSfixed32IsMutable();
+            repeatedSfixed32_.addAll(other.repeatedSfixed32_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedSfixed64_.isEmpty()) {
+          if (repeatedSfixed64_.isEmpty()) {
+            repeatedSfixed64_ = other.repeatedSfixed64_;
+            repeatedSfixed64_.makeImmutable();
+            bitField0_ |= 0x40000000;
+          } else {
+            ensureRepeatedSfixed64IsMutable();
+            repeatedSfixed64_.addAll(other.repeatedSfixed64_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedFloat_.isEmpty()) {
+          if (repeatedFloat_.isEmpty()) {
+            repeatedFloat_ = other.repeatedFloat_;
+            repeatedFloat_.makeImmutable();
+            bitField0_ |= 0x80000000;
+          } else {
+            ensureRepeatedFloatIsMutable();
+            repeatedFloat_.addAll(other.repeatedFloat_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedDouble_.isEmpty()) {
+          if (repeatedDouble_.isEmpty()) {
+            repeatedDouble_ = other.repeatedDouble_;
+            repeatedDouble_.makeImmutable();
+            bitField1_ |= 0x00000001;
+          } else {
+            ensureRepeatedDoubleIsMutable();
+            repeatedDouble_.addAll(other.repeatedDouble_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedBool_.isEmpty()) {
+          if (repeatedBool_.isEmpty()) {
+            repeatedBool_ = other.repeatedBool_;
+            repeatedBool_.makeImmutable();
+            bitField1_ |= 0x00000002;
+          } else {
+            ensureRepeatedBoolIsMutable();
+            repeatedBool_.addAll(other.repeatedBool_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedString_.isEmpty()) {
+          if (repeatedString_.isEmpty()) {
+            repeatedString_ = other.repeatedString_;
+            bitField1_ |= 0x00000004;
+          } else {
+            ensureRepeatedStringIsMutable();
+            repeatedString_.addAll(other.repeatedString_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedBytes_.isEmpty()) {
+          if (repeatedBytes_.isEmpty()) {
+            repeatedBytes_ = other.repeatedBytes_;
+            repeatedBytes_.makeImmutable();
+            bitField1_ |= 0x00000008;
+          } else {
+            ensureRepeatedBytesIsMutable();
+            repeatedBytes_.addAll(other.repeatedBytes_);
+          }
+          onChanged();
+        }
+        if (repeatedNestedMessageBuilder_ == null) {
+          if (!other.repeatedNestedMessage_.isEmpty()) {
+            if (repeatedNestedMessage_.isEmpty()) {
+              repeatedNestedMessage_ = other.repeatedNestedMessage_;
+              bitField1_ = (bitField1_ & ~0x00000010);
+            } else {
+              ensureRepeatedNestedMessageIsMutable();
+              repeatedNestedMessage_.addAll(other.repeatedNestedMessage_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.repeatedNestedMessage_.isEmpty()) {
+            if (repeatedNestedMessageBuilder_.isEmpty()) {
+              repeatedNestedMessageBuilder_.dispose();
+              repeatedNestedMessageBuilder_ = null;
+              repeatedNestedMessage_ = other.repeatedNestedMessage_;
+              bitField1_ = (bitField1_ & ~0x00000010);
+              repeatedNestedMessageBuilder_ = 
+                com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                   internalGetRepeatedNestedMessageFieldBuilder() : null;
+            } else {
+              repeatedNestedMessageBuilder_.addAllMessages(other.repeatedNestedMessage_);
+            }
+          }
+        }
+        if (repeatedForeignMessageBuilder_ == null) {
+          if (!other.repeatedForeignMessage_.isEmpty()) {
+            if (repeatedForeignMessage_.isEmpty()) {
+              repeatedForeignMessage_ = other.repeatedForeignMessage_;
+              bitField1_ = (bitField1_ & ~0x00000020);
+            } else {
+              ensureRepeatedForeignMessageIsMutable();
+              repeatedForeignMessage_.addAll(other.repeatedForeignMessage_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.repeatedForeignMessage_.isEmpty()) {
+            if (repeatedForeignMessageBuilder_.isEmpty()) {
+              repeatedForeignMessageBuilder_.dispose();
+              repeatedForeignMessageBuilder_ = null;
+              repeatedForeignMessage_ = other.repeatedForeignMessage_;
+              bitField1_ = (bitField1_ & ~0x00000020);
+              repeatedForeignMessageBuilder_ = 
+                com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                   internalGetRepeatedForeignMessageFieldBuilder() : null;
+            } else {
+              repeatedForeignMessageBuilder_.addAllMessages(other.repeatedForeignMessage_);
+            }
+          }
+        }
+        if (!other.repeatedNestedEnum_.isEmpty()) {
+          if (repeatedNestedEnum_.isEmpty()) {
+            repeatedNestedEnum_ = other.repeatedNestedEnum_;
+            repeatedNestedEnum_.makeImmutable();
+            bitField1_ |= 0x00000040;
+          } else {
+            ensureRepeatedNestedEnumIsMutable();
+            repeatedNestedEnum_.addAll(other.repeatedNestedEnum_);
+          }
+          onChanged();
+        }
+        if (!other.repeatedForeignEnum_.isEmpty()) {
+          if (repeatedForeignEnum_.isEmpty()) {
+            repeatedForeignEnum_ = other.repeatedForeignEnum_;
+            repeatedForeignEnum_.makeImmutable();
+            bitField1_ |= 0x00000080;
+          } else {
+            ensureRepeatedForeignEnumIsMutable();
+            repeatedForeignEnum_.addAll(other.repeatedForeignEnum_);
+          }
+          onChanged();
+        }
+        if (!other.packedInt32_.isEmpty()) {
+          if (packedInt32_.isEmpty()) {
+            packedInt32_ = other.packedInt32_;
+            packedInt32_.makeImmutable();
+            bitField1_ |= 0x00000100;
+          } else {
+            ensurePackedInt32IsMutable();
+            packedInt32_.addAll(other.packedInt32_);
+          }
+          onChanged();
+        }
+        if (!other.packedInt64_.isEmpty()) {
+          if (packedInt64_.isEmpty()) {
+            packedInt64_ = other.packedInt64_;
+            packedInt64_.makeImmutable();
+            bitField1_ |= 0x00000200;
+          } else {
+            ensurePackedInt64IsMutable();
+            packedInt64_.addAll(other.packedInt64_);
+          }
+          onChanged();
+        }
+        if (!other.packedUint32_.isEmpty()) {
+          if (packedUint32_.isEmpty()) {
+            packedUint32_ = other.packedUint32_;
+            packedUint32_.makeImmutable();
+            bitField1_ |= 0x00000400;
+          } else {
+            ensurePackedUint32IsMutable();
+            packedUint32_.addAll(other.packedUint32_);
+          }
+          onChanged();
+        }
+        if (!other.packedUint64_.isEmpty()) {
+          if (packedUint64_.isEmpty()) {
+            packedUint64_ = other.packedUint64_;
+            packedUint64_.makeImmutable();
+            bitField1_ |= 0x00000800;
+          } else {
+            ensurePackedUint64IsMutable();
+            packedUint64_.addAll(other.packedUint64_);
+          }
+          onChanged();
+        }
+        if (!other.packedSint32_.isEmpty()) {
+          if (packedSint32_.isEmpty()) {
+            packedSint32_ = other.packedSint32_;
+            packedSint32_.makeImmutable();
+            bitField1_ |= 0x00001000;
+          } else {
+            ensurePackedSint32IsMutable();
+            packedSint32_.addAll(other.packedSint32_);
+          }
+          onChanged();
+        }
+        if (!other.packedSint64_.isEmpty()) {
+          if (packedSint64_.isEmpty()) {
+            packedSint64_ = other.packedSint64_;
+            packedSint64_.makeImmutable();
+            bitField1_ |= 0x00002000;
+          } else {
+            ensurePackedSint64IsMutable();
+            packedSint64_.addAll(other.packedSint64_);
+          }
+          onChanged();
+        }
+        if (!other.packedFixed32_.isEmpty()) {
+          if (packedFixed32_.isEmpty()) {
+            packedFixed32_ = other.packedFixed32_;
+            packedFixed32_.makeImmutable();
+            bitField1_ |= 0x00004000;
+          } else {
+            ensurePackedFixed32IsMutable();
+            packedFixed32_.addAll(other.packedFixed32_);
+          }
+          onChanged();
+        }
+        if (!other.packedFixed64_.isEmpty()) {
+          if (packedFixed64_.isEmpty()) {
+            packedFixed64_ = other.packedFixed64_;
+            packedFixed64_.makeImmutable();
+            bitField1_ |= 0x00008000;
+          } else {
+            ensurePackedFixed64IsMutable();
+            packedFixed64_.addAll(other.packedFixed64_);
+          }
+          onChanged();
+        }
+        if (!other.packedSfixed32_.isEmpty()) {
+          if (packedSfixed32_.isEmpty()) {
+            packedSfixed32_ = other.packedSfixed32_;
+            packedSfixed32_.makeImmutable();
+            bitField1_ |= 0x00010000;
+          } else {
+            ensurePackedSfixed32IsMutable();
+            packedSfixed32_.addAll(other.packedSfixed32_);
+          }
+          onChanged();
+        }
+        if (!other.packedSfixed64_.isEmpty()) {
+          if (packedSfixed64_.isEmpty()) {
+            packedSfixed64_ = other.packedSfixed64_;
+            packedSfixed64_.makeImmutable();
+            bitField1_ |= 0x00020000;
+          } else {
+            ensurePackedSfixed64IsMutable();
+            packedSfixed64_.addAll(other.packedSfixed64_);
+          }
+          onChanged();
+        }
+        if (!other.packedFloat_.isEmpty()) {
+          if (packedFloat_.isEmpty()) {
+            packedFloat_ = other.packedFloat_;
+            packedFloat_.makeImmutable();
+            bitField1_ |= 0x00040000;
+          } else {
+            ensurePackedFloatIsMutable();
+            packedFloat_.addAll(other.packedFloat_);
+          }
+          onChanged();
+        }
+        if (!other.packedDouble_.isEmpty()) {
+          if (packedDouble_.isEmpty()) {
+            packedDouble_ = other.packedDouble_;
+            packedDouble_.makeImmutable();
+            bitField1_ |= 0x00080000;
+          } else {
+            ensurePackedDoubleIsMutable();
+            packedDouble_.addAll(other.packedDouble_);
+          }
+          onChanged();
+        }
+        if (!other.packedBool_.isEmpty()) {
+          if (packedBool_.isEmpty()) {
+            packedBool_ = other.packedBool_;
+            packedBool_.makeImmutable();
+            bitField1_ |= 0x00100000;
+          } else {
+            ensurePackedBoolIsMutable();
+            packedBool_.addAll(other.packedBool_);
+          }
+          onChanged();
+        }
+        if (!other.packedNestedEnum_.isEmpty()) {
+          if (packedNestedEnum_.isEmpty()) {
+            packedNestedEnum_ = other.packedNestedEnum_;
+            packedNestedEnum_.makeImmutable();
+            bitField1_ |= 0x00200000;
+          } else {
+            ensurePackedNestedEnumIsMutable();
+            packedNestedEnum_.addAll(other.packedNestedEnum_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedInt32_.isEmpty()) {
+          if (unpackedInt32_.isEmpty()) {
+            unpackedInt32_ = other.unpackedInt32_;
+            unpackedInt32_.makeImmutable();
+            bitField1_ |= 0x00400000;
+          } else {
+            ensureUnpackedInt32IsMutable();
+            unpackedInt32_.addAll(other.unpackedInt32_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedInt64_.isEmpty()) {
+          if (unpackedInt64_.isEmpty()) {
+            unpackedInt64_ = other.unpackedInt64_;
+            unpackedInt64_.makeImmutable();
+            bitField1_ |= 0x00800000;
+          } else {
+            ensureUnpackedInt64IsMutable();
+            unpackedInt64_.addAll(other.unpackedInt64_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedUint32_.isEmpty()) {
+          if (unpackedUint32_.isEmpty()) {
+            unpackedUint32_ = other.unpackedUint32_;
+            unpackedUint32_.makeImmutable();
+            bitField1_ |= 0x01000000;
+          } else {
+            ensureUnpackedUint32IsMutable();
+            unpackedUint32_.addAll(other.unpackedUint32_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedUint64_.isEmpty()) {
+          if (unpackedUint64_.isEmpty()) {
+            unpackedUint64_ = other.unpackedUint64_;
+            unpackedUint64_.makeImmutable();
+            bitField1_ |= 0x02000000;
+          } else {
+            ensureUnpackedUint64IsMutable();
+            unpackedUint64_.addAll(other.unpackedUint64_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedSint32_.isEmpty()) {
+          if (unpackedSint32_.isEmpty()) {
+            unpackedSint32_ = other.unpackedSint32_;
+            unpackedSint32_.makeImmutable();
+            bitField1_ |= 0x04000000;
+          } else {
+            ensureUnpackedSint32IsMutable();
+            unpackedSint32_.addAll(other.unpackedSint32_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedSint64_.isEmpty()) {
+          if (unpackedSint64_.isEmpty()) {
+            unpackedSint64_ = other.unpackedSint64_;
+            unpackedSint64_.makeImmutable();
+            bitField1_ |= 0x08000000;
+          } else {
+            ensureUnpackedSint64IsMutable();
+            unpackedSint64_.addAll(other.unpackedSint64_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedFixed32_.isEmpty()) {
+          if (unpackedFixed32_.isEmpty()) {
+            unpackedFixed32_ = other.unpackedFixed32_;
+            unpackedFixed32_.makeImmutable();
+            bitField1_ |= 0x10000000;
+          } else {
+            ensureUnpackedFixed32IsMutable();
+            unpackedFixed32_.addAll(other.unpackedFixed32_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedFixed64_.isEmpty()) {
+          if (unpackedFixed64_.isEmpty()) {
+            unpackedFixed64_ = other.unpackedFixed64_;
+            unpackedFixed64_.makeImmutable();
+            bitField1_ |= 0x20000000;
+          } else {
+            ensureUnpackedFixed64IsMutable();
+            unpackedFixed64_.addAll(other.unpackedFixed64_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedSfixed32_.isEmpty()) {
+          if (unpackedSfixed32_.isEmpty()) {
+            unpackedSfixed32_ = other.unpackedSfixed32_;
+            unpackedSfixed32_.makeImmutable();
+            bitField1_ |= 0x40000000;
+          } else {
+            ensureUnpackedSfixed32IsMutable();
+            unpackedSfixed32_.addAll(other.unpackedSfixed32_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedSfixed64_.isEmpty()) {
+          if (unpackedSfixed64_.isEmpty()) {
+            unpackedSfixed64_ = other.unpackedSfixed64_;
+            unpackedSfixed64_.makeImmutable();
+            bitField1_ |= 0x80000000;
+          } else {
+            ensureUnpackedSfixed64IsMutable();
+            unpackedSfixed64_.addAll(other.unpackedSfixed64_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedFloat_.isEmpty()) {
+          if (unpackedFloat_.isEmpty()) {
+            unpackedFloat_ = other.unpackedFloat_;
+            unpackedFloat_.makeImmutable();
+            bitField2_ |= 0x00000001;
+          } else {
+            ensureUnpackedFloatIsMutable();
+            unpackedFloat_.addAll(other.unpackedFloat_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedDouble_.isEmpty()) {
+          if (unpackedDouble_.isEmpty()) {
+            unpackedDouble_ = other.unpackedDouble_;
+            unpackedDouble_.makeImmutable();
+            bitField2_ |= 0x00000002;
+          } else {
+            ensureUnpackedDoubleIsMutable();
+            unpackedDouble_.addAll(other.unpackedDouble_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedBool_.isEmpty()) {
+          if (unpackedBool_.isEmpty()) {
+            unpackedBool_ = other.unpackedBool_;
+            unpackedBool_.makeImmutable();
+            bitField2_ |= 0x00000004;
+          } else {
+            ensureUnpackedBoolIsMutable();
+            unpackedBool_.addAll(other.unpackedBool_);
+          }
+          onChanged();
+        }
+        if (!other.unpackedNestedEnum_.isEmpty()) {
+          if (unpackedNestedEnum_.isEmpty()) {
+            unpackedNestedEnum_ = other.unpackedNestedEnum_;
+            unpackedNestedEnum_.makeImmutable();
+            bitField2_ |= 0x00000008;
+          } else {
+            ensureUnpackedNestedEnumIsMutable();
+            unpackedNestedEnum_.addAll(other.unpackedNestedEnum_);
+          }
+          onChanged();
+        }
+        internalGetMutableMapInt32Int32().mergeFrom(
+            other.internalGetMapInt32Int32());
+        bitField2_ |= 0x00000010;
+        internalGetMutableMapInt64Int64().mergeFrom(
+            other.internalGetMapInt64Int64());
+        bitField2_ |= 0x00000020;
+        internalGetMutableMapUint32Uint32().mergeFrom(
+            other.internalGetMapUint32Uint32());
+        bitField2_ |= 0x00000040;
+        internalGetMutableMapUint64Uint64().mergeFrom(
+            other.internalGetMapUint64Uint64());
+        bitField2_ |= 0x00000080;
+        internalGetMutableMapSint32Sint32().mergeFrom(
+            other.internalGetMapSint32Sint32());
+        bitField2_ |= 0x00000100;
+        internalGetMutableMapSint64Sint64().mergeFrom(
+            other.internalGetMapSint64Sint64());
+        bitField2_ |= 0x00000200;
+        internalGetMutableMapFixed32Fixed32().mergeFrom(
+            other.internalGetMapFixed32Fixed32());
+        bitField2_ |= 0x00000400;
+        internalGetMutableMapFixed64Fixed64().mergeFrom(
+            other.internalGetMapFixed64Fixed64());
+        bitField2_ |= 0x00000800;
+        internalGetMutableMapSfixed32Sfixed32().mergeFrom(
+            other.internalGetMapSfixed32Sfixed32());
+        bitField2_ |= 0x00001000;
+        internalGetMutableMapSfixed64Sfixed64().mergeFrom(
+            other.internalGetMapSfixed64Sfixed64());
+        bitField2_ |= 0x00002000;
+        internalGetMutableMapInt32Float().mergeFrom(
+            other.internalGetMapInt32Float());
+        bitField2_ |= 0x00004000;
+        internalGetMutableMapInt32Double().mergeFrom(
+            other.internalGetMapInt32Double());
+        bitField2_ |= 0x00008000;
+        internalGetMutableMapBoolBool().mergeFrom(
+            other.internalGetMapBoolBool());
+        bitField2_ |= 0x00010000;
+        internalGetMutableMapStringString().mergeFrom(
+            other.internalGetMapStringString());
+        bitField2_ |= 0x00020000;
+        internalGetMutableMapStringBytes().mergeFrom(
+            other.internalGetMapStringBytes());
+        bitField2_ |= 0x00040000;
+        internalGetMutableMapStringNestedMessage().mergeFrom(
+            other.internalGetMapStringNestedMessage());
+        bitField2_ |= 0x00080000;
+        internalGetMutableMapStringForeignMessage().mergeFrom(
+            other.internalGetMapStringForeignMessage());
+        bitField2_ |= 0x00100000;
+        internalGetMutableMapStringNestedEnum().mergeFrom(
+            other.internalGetMapStringNestedEnum());
+        bitField2_ |= 0x00200000;
+        internalGetMutableMapStringForeignEnum().mergeFrom(
+            other.internalGetMapStringForeignEnum());
+        bitField2_ |= 0x00400000;
+        switch (other.getOneofFieldCase()) {
+          case ONEOF_UINT32: {
+            setOneofUint32(other.getOneofUint32());
+            break;
+          }
+          case ONEOF_NESTED_MESSAGE: {
+            mergeOneofNestedMessage(other.getOneofNestedMessage());
+            break;
+          }
+          case ONEOF_STRING: {
+            oneofFieldCase_ = 113;
+            oneofField_ = other.oneofField_;
+            onChanged();
+            break;
+          }
+          case ONEOF_BYTES: {
+            setOneofBytes(other.getOneofBytes());
+            break;
+          }
+          case ONEOF_BOOL: {
+            setOneofBool(other.getOneofBool());
+            break;
+          }
+          case ONEOF_UINT64: {
+            setOneofUint64(other.getOneofUint64());
+            break;
+          }
+          case ONEOF_FLOAT: {
+            setOneofFloat(other.getOneofFloat());
+            break;
+          }
+          case ONEOF_DOUBLE: {
+            setOneofDouble(other.getOneofDouble());
+            break;
+          }
+          case ONEOF_ENUM: {
+            setOneofEnum(other.getOneofEnum());
+            break;
+          }
+          case ONEOFFIELD_NOT_SET: {
+            break;
+          }
+        }
+        this.mergeExtensionFields(other);
+        this.mergeUnknownFields(other.getUnknownFields());
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        if (hasOptionalNestedMessage()) {
+          if (!getOptionalNestedMessage().isInitialized()) {
+            return false;
+          }
+        }
+        if (hasRecursiveMessage()) {
+          if (!getRecursiveMessage().isInitialized()) {
+            return false;
+          }
+        }
+        for (int i = 0; i < getRepeatedNestedMessageCount(); i++) {
+          if (!getRepeatedNestedMessage(i).isInitialized()) {
+            return false;
+          }
+        }
+        for (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage item : getMapStringNestedMessageMap().values()) {
+          if (!item.isInitialized()) {
+            return false;
+          }
+        }
+        if (hasOneofNestedMessage()) {
+          if (!getOneofNestedMessage().isInitialized()) {
+            return false;
+          }
+        }
+        if (!extensionsAreInitialized()) {
+          return false;
+        }
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
+        try {
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                optionalInt32_ = input.readInt32();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 16: {
+                optionalInt64_ = input.readInt64();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 24: {
+                optionalUint32_ = input.readUInt32();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              case 32: {
+                optionalUint64_ = input.readUInt64();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 32
+              case 40: {
+                optionalSint32_ = input.readSInt32();
+                bitField0_ |= 0x00000010;
+                break;
+              } // case 40
+              case 48: {
+                optionalSint64_ = input.readSInt64();
+                bitField0_ |= 0x00000020;
+                break;
+              } // case 48
+              case 61: {
+                optionalFixed32_ = input.readFixed32();
+                bitField0_ |= 0x00000040;
+                break;
+              } // case 61
+              case 65: {
+                optionalFixed64_ = input.readFixed64();
+                bitField0_ |= 0x00000080;
+                break;
+              } // case 65
+              case 77: {
+                optionalSfixed32_ = input.readSFixed32();
+                bitField0_ |= 0x00000100;
+                break;
+              } // case 77
+              case 81: {
+                optionalSfixed64_ = input.readSFixed64();
+                bitField0_ |= 0x00000200;
+                break;
+              } // case 81
+              case 93: {
+                optionalFloat_ = input.readFloat();
+                bitField0_ |= 0x00000400;
+                break;
+              } // case 93
+              case 97: {
+                optionalDouble_ = input.readDouble();
+                bitField0_ |= 0x00000800;
+                break;
+              } // case 97
+              case 104: {
+                optionalBool_ = input.readBool();
+                bitField0_ |= 0x00001000;
+                break;
+              } // case 104
+              case 114: {
+                optionalString_ = input.readBytes();
+                bitField0_ |= 0x00002000;
+                break;
+              } // case 114
+              case 122: {
+                optionalBytes_ = input.readBytes();
+                bitField0_ |= 0x00004000;
+                break;
+              } // case 122
+              case 146: {
+                input.readMessage(
+                    internalGetOptionalNestedMessageFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00008000;
+                break;
+              } // case 146
+              case 154: {
+                input.readMessage(
+                    internalGetOptionalForeignMessageFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00010000;
+                break;
+              } // case 154
+              case 168: {
+                int tmpRaw = input.readEnum();
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum tmpValue =
+                    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(tmpRaw);
+                if (tmpValue == null) {
+                  mergeUnknownVarintField(21, tmpRaw);
+                } else {
+                  optionalNestedEnum_ = tmpRaw;
+                  bitField0_ |= 0x00020000;
+                }
+                break;
+              } // case 168
+              case 176: {
+                int tmpRaw = input.readEnum();
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum tmpValue =
+                    legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.forNumber(tmpRaw);
+                if (tmpValue == null) {
+                  mergeUnknownVarintField(22, tmpRaw);
+                } else {
+                  optionalForeignEnum_ = tmpRaw;
+                  bitField0_ |= 0x00040000;
+                }
+                break;
+              } // case 176
+              case 184: {
+                int tmpRaw = input.readEnum();
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum tmpValue =
+                    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum.forNumber(tmpRaw);
+                if (tmpValue == null) {
+                  mergeUnknownVarintField(23, tmpRaw);
+                } else {
+                  optionalAliasedEnum_ = tmpRaw;
+                  bitField0_ |= 0x00080000;
+                }
+                break;
+              } // case 184
+              case 218: {
+                input.readMessage(
+                    internalGetRecursiveMessageFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00100000;
+                break;
+              } // case 218
+              case 248: {
+                int v = input.readInt32();
+                ensureRepeatedInt32IsMutable();
+                repeatedInt32_.addInt(v);
+                break;
+              } // case 248
+              case 250: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedInt32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedInt32_.addInt(input.readInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 250
+              case 256: {
+                long v = input.readInt64();
+                ensureRepeatedInt64IsMutable();
+                repeatedInt64_.addLong(v);
+                break;
+              } // case 256
+              case 258: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedInt64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedInt64_.addLong(input.readInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 258
+              case 264: {
+                int v = input.readUInt32();
+                ensureRepeatedUint32IsMutable();
+                repeatedUint32_.addInt(v);
+                break;
+              } // case 264
+              case 266: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedUint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedUint32_.addInt(input.readUInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 266
+              case 272: {
+                long v = input.readUInt64();
+                ensureRepeatedUint64IsMutable();
+                repeatedUint64_.addLong(v);
+                break;
+              } // case 272
+              case 274: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedUint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedUint64_.addLong(input.readUInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 274
+              case 280: {
+                int v = input.readSInt32();
+                ensureRepeatedSint32IsMutable();
+                repeatedSint32_.addInt(v);
+                break;
+              } // case 280
+              case 282: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedSint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedSint32_.addInt(input.readSInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 282
+              case 288: {
+                long v = input.readSInt64();
+                ensureRepeatedSint64IsMutable();
+                repeatedSint64_.addLong(v);
+                break;
+              } // case 288
+              case 290: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedSint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedSint64_.addLong(input.readSInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 290
+              case 301: {
+                int v = input.readFixed32();
+                ensureRepeatedFixed32IsMutable();
+                repeatedFixed32_.addInt(v);
+                break;
+              } // case 301
+              case 298: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedFixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedFixed32_.addInt(input.readFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 298
+              case 305: {
+                long v = input.readFixed64();
+                ensureRepeatedFixed64IsMutable();
+                repeatedFixed64_.addLong(v);
+                break;
+              } // case 305
+              case 306: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedFixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedFixed64_.addLong(input.readFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 306
+              case 317: {
+                int v = input.readSFixed32();
+                ensureRepeatedSfixed32IsMutable();
+                repeatedSfixed32_.addInt(v);
+                break;
+              } // case 317
+              case 314: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedSfixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedSfixed32_.addInt(input.readSFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 314
+              case 321: {
+                long v = input.readSFixed64();
+                ensureRepeatedSfixed64IsMutable();
+                repeatedSfixed64_.addLong(v);
+                break;
+              } // case 321
+              case 322: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedSfixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedSfixed64_.addLong(input.readSFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 322
+              case 333: {
+                float v = input.readFloat();
+                ensureRepeatedFloatIsMutable();
+                repeatedFloat_.addFloat(v);
+                break;
+              } // case 333
+              case 330: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedFloatIsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedFloat_.addFloat(input.readFloat());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 330
+              case 337: {
+                double v = input.readDouble();
+                ensureRepeatedDoubleIsMutable();
+                repeatedDouble_.addDouble(v);
+                break;
+              } // case 337
+              case 338: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedDoubleIsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedDouble_.addDouble(input.readDouble());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 338
+              case 344: {
+                boolean v = input.readBool();
+                ensureRepeatedBoolIsMutable();
+                repeatedBool_.addBoolean(v);
+                break;
+              } // case 344
+              case 346: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedBoolIsMutable(alloc / 1);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedBool_.addBoolean(input.readBool());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 346
+              case 354: {
+                com.google.protobuf.ByteString bs = input.readBytes();
+                ensureRepeatedStringIsMutable();
+                repeatedString_.add(bs);
+                break;
+              } // case 354
+              case 362: {
+                com.google.protobuf.ByteString v = input.readBytes();
+                ensureRepeatedBytesIsMutable();
+                repeatedBytes_.add(v);
+                break;
+              } // case 362
+              case 386: {
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage m =
+                    input.readMessage(
+                        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.parser(),
+                        extensionRegistry);
+                if (repeatedNestedMessageBuilder_ == null) {
+                  ensureRepeatedNestedMessageIsMutable();
+                  repeatedNestedMessage_.add(m);
+                } else {
+                  repeatedNestedMessageBuilder_.addMessage(m);
+                }
+                break;
+              } // case 386
+              case 394: {
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage m =
+                    input.readMessage(
+                        legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.parser(),
+                        extensionRegistry);
+                if (repeatedForeignMessageBuilder_ == null) {
+                  ensureRepeatedForeignMessageIsMutable();
+                  repeatedForeignMessage_.add(m);
+                } else {
+                  repeatedForeignMessageBuilder_.addMessage(m);
+                }
+                break;
+              } // case 394
+              case 408: {
+                int tmpRaw = input.readEnum();
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum tmpValue =
+                    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(tmpRaw);
+                if (tmpValue == null) {
+                  mergeUnknownVarintField(51, tmpRaw);
+                } else {
+                  ensureRepeatedNestedEnumIsMutable();
+                  repeatedNestedEnum_.addInt(tmpRaw);
+                }
+                break;
+              } // case 408
+              case 410: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedNestedEnumIsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  int tmpRaw = input.readEnum();
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum tmpValue =
+                      legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(tmpRaw);
+                  if (tmpValue == null) {
+                    mergeUnknownVarintField(51, tmpRaw);
+                  } else {
+                    repeatedNestedEnum_.addInt(tmpRaw);
+                  }
+                }
+                input.popLimit(limit);
+                break;
+              } // case 410
+              case 416: {
+                int tmpRaw = input.readEnum();
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum tmpValue =
+                    legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.forNumber(tmpRaw);
+                if (tmpValue == null) {
+                  mergeUnknownVarintField(52, tmpRaw);
+                } else {
+                  ensureRepeatedForeignEnumIsMutable();
+                  repeatedForeignEnum_.addInt(tmpRaw);
+                }
+                break;
+              } // case 416
+              case 418: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedForeignEnumIsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  int tmpRaw = input.readEnum();
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum tmpValue =
+                      legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.forNumber(tmpRaw);
+                  if (tmpValue == null) {
+                    mergeUnknownVarintField(52, tmpRaw);
+                  } else {
+                    repeatedForeignEnum_.addInt(tmpRaw);
+                  }
+                }
+                input.popLimit(limit);
+                break;
+              } // case 418
+              case 450: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+                mapInt32Int32__ = input.readMessage(
+                    MapInt32Int32DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapInt32Int32().getMutableMap().put(
+                    mapInt32Int32__.getKey(), mapInt32Int32__.getValue());
+                bitField2_ |= 0x00000010;
+                break;
+              } // case 450
+              case 458: {
+                com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+                mapInt64Int64__ = input.readMessage(
+                    MapInt64Int64DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapInt64Int64().getMutableMap().put(
+                    mapInt64Int64__.getKey(), mapInt64Int64__.getValue());
+                bitField2_ |= 0x00000020;
+                break;
+              } // case 458
+              case 466: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+                mapUint32Uint32__ = input.readMessage(
+                    MapUint32Uint32DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapUint32Uint32().getMutableMap().put(
+                    mapUint32Uint32__.getKey(), mapUint32Uint32__.getValue());
+                bitField2_ |= 0x00000040;
+                break;
+              } // case 466
+              case 474: {
+                com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+                mapUint64Uint64__ = input.readMessage(
+                    MapUint64Uint64DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapUint64Uint64().getMutableMap().put(
+                    mapUint64Uint64__.getKey(), mapUint64Uint64__.getValue());
+                bitField2_ |= 0x00000080;
+                break;
+              } // case 474
+              case 482: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+                mapSint32Sint32__ = input.readMessage(
+                    MapSint32Sint32DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapSint32Sint32().getMutableMap().put(
+                    mapSint32Sint32__.getKey(), mapSint32Sint32__.getValue());
+                bitField2_ |= 0x00000100;
+                break;
+              } // case 482
+              case 490: {
+                com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+                mapSint64Sint64__ = input.readMessage(
+                    MapSint64Sint64DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapSint64Sint64().getMutableMap().put(
+                    mapSint64Sint64__.getKey(), mapSint64Sint64__.getValue());
+                bitField2_ |= 0x00000200;
+                break;
+              } // case 490
+              case 498: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+                mapFixed32Fixed32__ = input.readMessage(
+                    MapFixed32Fixed32DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapFixed32Fixed32().getMutableMap().put(
+                    mapFixed32Fixed32__.getKey(), mapFixed32Fixed32__.getValue());
+                bitField2_ |= 0x00000400;
+                break;
+              } // case 498
+              case 506: {
+                com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+                mapFixed64Fixed64__ = input.readMessage(
+                    MapFixed64Fixed64DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapFixed64Fixed64().getMutableMap().put(
+                    mapFixed64Fixed64__.getKey(), mapFixed64Fixed64__.getValue());
+                bitField2_ |= 0x00000800;
+                break;
+              } // case 506
+              case 514: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+                mapSfixed32Sfixed32__ = input.readMessage(
+                    MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapSfixed32Sfixed32().getMutableMap().put(
+                    mapSfixed32Sfixed32__.getKey(), mapSfixed32Sfixed32__.getValue());
+                bitField2_ |= 0x00001000;
+                break;
+              } // case 514
+              case 522: {
+                com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+                mapSfixed64Sfixed64__ = input.readMessage(
+                    MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapSfixed64Sfixed64().getMutableMap().put(
+                    mapSfixed64Sfixed64__.getKey(), mapSfixed64Sfixed64__.getValue());
+                bitField2_ |= 0x00002000;
+                break;
+              } // case 522
+              case 530: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float>
+                mapInt32Float__ = input.readMessage(
+                    MapInt32FloatDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapInt32Float().getMutableMap().put(
+                    mapInt32Float__.getKey(), mapInt32Float__.getValue());
+                bitField2_ |= 0x00004000;
+                break;
+              } // case 530
+              case 538: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Double>
+                mapInt32Double__ = input.readMessage(
+                    MapInt32DoubleDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapInt32Double().getMutableMap().put(
+                    mapInt32Double__.getKey(), mapInt32Double__.getValue());
+                bitField2_ |= 0x00008000;
+                break;
+              } // case 538
+              case 546: {
+                com.google.protobuf.MapEntry<java.lang.Boolean, java.lang.Boolean>
+                mapBoolBool__ = input.readMessage(
+                    MapBoolBoolDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapBoolBool().getMutableMap().put(
+                    mapBoolBool__.getKey(), mapBoolBool__.getValue());
+                bitField2_ |= 0x00010000;
+                break;
+              } // case 546
+              case 554: {
+                com.google.protobuf.MapEntry<java.lang.String, java.lang.String>
+                mapStringString__ = input.readMessage(
+                    MapStringStringDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapStringString().getMutableMap().put(
+                    mapStringString__.getKey(), mapStringString__.getValue());
+                bitField2_ |= 0x00020000;
+                break;
+              } // case 554
+              case 562: {
+                com.google.protobuf.MapEntry<java.lang.String, com.google.protobuf.ByteString>
+                mapStringBytes__ = input.readMessage(
+                    MapStringBytesDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapStringBytes().getMutableMap().put(
+                    mapStringBytes__.getKey(), mapStringBytes__.getValue());
+                bitField2_ |= 0x00040000;
+                break;
+              } // case 562
+              case 570: {
+                com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage>
+                mapStringNestedMessage__ = input.readMessage(
+                    MapStringNestedMessageDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapStringNestedMessage().ensureBuilderMap().put(
+                    mapStringNestedMessage__.getKey(), mapStringNestedMessage__.getValue());
+                bitField2_ |= 0x00080000;
+                break;
+              } // case 570
+              case 578: {
+                com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage>
+                mapStringForeignMessage__ = input.readMessage(
+                    MapStringForeignMessageDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapStringForeignMessage().ensureBuilderMap().put(
+                    mapStringForeignMessage__.getKey(), mapStringForeignMessage__.getValue());
+                bitField2_ |= 0x00100000;
+                break;
+              } // case 578
+              case 586: {
+                com.google.protobuf.ByteString bytes = input.readBytes();
+                com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer>
+                mapStringNestedEnum__ = MapStringNestedEnumDefaultEntryHolder.defaultEntry.getParserForType().parseFrom(bytes);
+                if (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(mapStringNestedEnum__.getValue()) == null) {
+                  mergeUnknownLengthDelimitedField(73, bytes);
+                } else {
+                  internalGetMutableMapStringNestedEnum().getMutableMap().put(
+                      mapStringNestedEnum__.getKey(), mapStringNestedEnum__.getValue());
+                  bitField2_ |= 0x00200000;
+                }
+                break;
+              } // case 586
+              case 594: {
+                com.google.protobuf.ByteString bytes = input.readBytes();
+                com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer>
+                mapStringForeignEnum__ = MapStringForeignEnumDefaultEntryHolder.defaultEntry.getParserForType().parseFrom(bytes);
+                if (legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.forNumber(mapStringForeignEnum__.getValue()) == null) {
+                  mergeUnknownLengthDelimitedField(74, bytes);
+                } else {
+                  internalGetMutableMapStringForeignEnum().getMutableMap().put(
+                      mapStringForeignEnum__.getKey(), mapStringForeignEnum__.getValue());
+                  bitField2_ |= 0x00400000;
+                }
+                break;
+              } // case 594
+              case 600: {
+                int v = input.readInt32();
+                ensurePackedInt32IsMutable();
+                packedInt32_.addInt(v);
+                break;
+              } // case 600
+              case 602: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedInt32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedInt32_.addInt(input.readInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 602
+              case 608: {
+                long v = input.readInt64();
+                ensurePackedInt64IsMutable();
+                packedInt64_.addLong(v);
+                break;
+              } // case 608
+              case 610: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedInt64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedInt64_.addLong(input.readInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 610
+              case 616: {
+                int v = input.readUInt32();
+                ensurePackedUint32IsMutable();
+                packedUint32_.addInt(v);
+                break;
+              } // case 616
+              case 618: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedUint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedUint32_.addInt(input.readUInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 618
+              case 624: {
+                long v = input.readUInt64();
+                ensurePackedUint64IsMutable();
+                packedUint64_.addLong(v);
+                break;
+              } // case 624
+              case 626: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedUint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedUint64_.addLong(input.readUInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 626
+              case 632: {
+                int v = input.readSInt32();
+                ensurePackedSint32IsMutable();
+                packedSint32_.addInt(v);
+                break;
+              } // case 632
+              case 634: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedSint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedSint32_.addInt(input.readSInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 634
+              case 640: {
+                long v = input.readSInt64();
+                ensurePackedSint64IsMutable();
+                packedSint64_.addLong(v);
+                break;
+              } // case 640
+              case 642: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedSint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedSint64_.addLong(input.readSInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 642
+              case 653: {
+                int v = input.readFixed32();
+                ensurePackedFixed32IsMutable();
+                packedFixed32_.addInt(v);
+                break;
+              } // case 653
+              case 650: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedFixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedFixed32_.addInt(input.readFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 650
+              case 657: {
+                long v = input.readFixed64();
+                ensurePackedFixed64IsMutable();
+                packedFixed64_.addLong(v);
+                break;
+              } // case 657
+              case 658: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedFixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedFixed64_.addLong(input.readFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 658
+              case 669: {
+                int v = input.readSFixed32();
+                ensurePackedSfixed32IsMutable();
+                packedSfixed32_.addInt(v);
+                break;
+              } // case 669
+              case 666: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedSfixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedSfixed32_.addInt(input.readSFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 666
+              case 673: {
+                long v = input.readSFixed64();
+                ensurePackedSfixed64IsMutable();
+                packedSfixed64_.addLong(v);
+                break;
+              } // case 673
+              case 674: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedSfixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedSfixed64_.addLong(input.readSFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 674
+              case 685: {
+                float v = input.readFloat();
+                ensurePackedFloatIsMutable();
+                packedFloat_.addFloat(v);
+                break;
+              } // case 685
+              case 682: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedFloatIsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedFloat_.addFloat(input.readFloat());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 682
+              case 689: {
+                double v = input.readDouble();
+                ensurePackedDoubleIsMutable();
+                packedDouble_.addDouble(v);
+                break;
+              } // case 689
+              case 690: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedDoubleIsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedDouble_.addDouble(input.readDouble());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 690
+              case 696: {
+                boolean v = input.readBool();
+                ensurePackedBoolIsMutable();
+                packedBool_.addBoolean(v);
+                break;
+              } // case 696
+              case 698: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedBoolIsMutable(alloc / 1);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedBool_.addBoolean(input.readBool());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 698
+              case 704: {
+                int tmpRaw = input.readEnum();
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum tmpValue =
+                    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(tmpRaw);
+                if (tmpValue == null) {
+                  mergeUnknownVarintField(88, tmpRaw);
+                } else {
+                  ensurePackedNestedEnumIsMutable();
+                  packedNestedEnum_.addInt(tmpRaw);
+                }
+                break;
+              } // case 704
+              case 706: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedNestedEnumIsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  int tmpRaw = input.readEnum();
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum tmpValue =
+                      legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(tmpRaw);
+                  if (tmpValue == null) {
+                    mergeUnknownVarintField(88, tmpRaw);
+                  } else {
+                    packedNestedEnum_.addInt(tmpRaw);
+                  }
+                }
+                input.popLimit(limit);
+                break;
+              } // case 706
+              case 712: {
+                int v = input.readInt32();
+                ensureUnpackedInt32IsMutable();
+                unpackedInt32_.addInt(v);
+                break;
+              } // case 712
+              case 714: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedInt32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedInt32_.addInt(input.readInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 714
+              case 720: {
+                long v = input.readInt64();
+                ensureUnpackedInt64IsMutable();
+                unpackedInt64_.addLong(v);
+                break;
+              } // case 720
+              case 722: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedInt64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedInt64_.addLong(input.readInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 722
+              case 728: {
+                int v = input.readUInt32();
+                ensureUnpackedUint32IsMutable();
+                unpackedUint32_.addInt(v);
+                break;
+              } // case 728
+              case 730: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedUint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedUint32_.addInt(input.readUInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 730
+              case 736: {
+                long v = input.readUInt64();
+                ensureUnpackedUint64IsMutable();
+                unpackedUint64_.addLong(v);
+                break;
+              } // case 736
+              case 738: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedUint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedUint64_.addLong(input.readUInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 738
+              case 744: {
+                int v = input.readSInt32();
+                ensureUnpackedSint32IsMutable();
+                unpackedSint32_.addInt(v);
+                break;
+              } // case 744
+              case 746: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedSint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedSint32_.addInt(input.readSInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 746
+              case 752: {
+                long v = input.readSInt64();
+                ensureUnpackedSint64IsMutable();
+                unpackedSint64_.addLong(v);
+                break;
+              } // case 752
+              case 754: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedSint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedSint64_.addLong(input.readSInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 754
+              case 765: {
+                int v = input.readFixed32();
+                ensureUnpackedFixed32IsMutable();
+                unpackedFixed32_.addInt(v);
+                break;
+              } // case 765
+              case 762: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedFixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedFixed32_.addInt(input.readFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 762
+              case 769: {
+                long v = input.readFixed64();
+                ensureUnpackedFixed64IsMutable();
+                unpackedFixed64_.addLong(v);
+                break;
+              } // case 769
+              case 770: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedFixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedFixed64_.addLong(input.readFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 770
+              case 781: {
+                int v = input.readSFixed32();
+                ensureUnpackedSfixed32IsMutable();
+                unpackedSfixed32_.addInt(v);
+                break;
+              } // case 781
+              case 778: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedSfixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedSfixed32_.addInt(input.readSFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 778
+              case 785: {
+                long v = input.readSFixed64();
+                ensureUnpackedSfixed64IsMutable();
+                unpackedSfixed64_.addLong(v);
+                break;
+              } // case 785
+              case 786: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedSfixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedSfixed64_.addLong(input.readSFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 786
+              case 797: {
+                float v = input.readFloat();
+                ensureUnpackedFloatIsMutable();
+                unpackedFloat_.addFloat(v);
+                break;
+              } // case 797
+              case 794: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedFloatIsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedFloat_.addFloat(input.readFloat());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 794
+              case 801: {
+                double v = input.readDouble();
+                ensureUnpackedDoubleIsMutable();
+                unpackedDouble_.addDouble(v);
+                break;
+              } // case 801
+              case 802: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedDoubleIsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedDouble_.addDouble(input.readDouble());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 802
+              case 808: {
+                boolean v = input.readBool();
+                ensureUnpackedBoolIsMutable();
+                unpackedBool_.addBoolean(v);
+                break;
+              } // case 808
+              case 810: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedBoolIsMutable(alloc / 1);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedBool_.addBoolean(input.readBool());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 810
+              case 816: {
+                int tmpRaw = input.readEnum();
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum tmpValue =
+                    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(tmpRaw);
+                if (tmpValue == null) {
+                  mergeUnknownVarintField(102, tmpRaw);
+                } else {
+                  ensureUnpackedNestedEnumIsMutable();
+                  unpackedNestedEnum_.addInt(tmpRaw);
+                }
+                break;
+              } // case 816
+              case 818: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedNestedEnumIsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  int tmpRaw = input.readEnum();
+                  legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum tmpValue =
+                      legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(tmpRaw);
+                  if (tmpValue == null) {
+                    mergeUnknownVarintField(102, tmpRaw);
+                  } else {
+                    unpackedNestedEnum_.addInt(tmpRaw);
+                  }
+                }
+                input.popLimit(limit);
+                break;
+              } // case 818
+              case 888: {
+                oneofField_ = input.readUInt32();
+                oneofFieldCase_ = 111;
+                break;
+              } // case 888
+              case 898: {
+                input.readMessage(
+                    internalGetOneofNestedMessageFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                oneofFieldCase_ = 112;
+                break;
+              } // case 898
+              case 906: {
+                com.google.protobuf.ByteString bs = input.readBytes();
+                oneofFieldCase_ = 113;
+                oneofField_ = bs;
+                break;
+              } // case 906
+              case 914: {
+                oneofField_ = input.readBytes();
+                oneofFieldCase_ = 114;
+                break;
+              } // case 914
+              case 920: {
+                oneofField_ = input.readBool();
+                oneofFieldCase_ = 115;
+                break;
+              } // case 920
+              case 928: {
+                oneofField_ = input.readUInt64();
+                oneofFieldCase_ = 116;
+                break;
+              } // case 928
+              case 941: {
+                oneofField_ = input.readFloat();
+                oneofFieldCase_ = 117;
+                break;
+              } // case 941
+              case 945: {
+                oneofField_ = input.readDouble();
+                oneofFieldCase_ = 118;
+                break;
+              } // case 945
+              case 952: {
+                int rawValue = input.readEnum();
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value =
+                    legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(rawValue);
+                if (value == null) {
+                  mergeUnknownVarintField(119, rawValue);
+                } else {
+                  oneofFieldCase_ = 119;
+                  oneofField_ = rawValue;
+                }
+                break;
+              } // case 952
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.unwrapIOException();
+        } finally {
+          onChanged();
+        } // finally
+        return this;
+      }
+      private int oneofFieldCase_ = 0;
+      private java.lang.Object oneofField_;
+      public OneofFieldCase
+          getOneofFieldCase() {
+        return OneofFieldCase.forNumber(
+            oneofFieldCase_);
+      }
+
+      public Builder clearOneofField() {
+        oneofFieldCase_ = 0;
+        oneofField_ = null;
+        onChanged();
+        return this;
+      }
+
+      private int bitField0_;
+      private int bitField1_;
+      private int bitField2_;
+
+      private int optionalInt32_ ;
+      /**
+       * <code>optional int32 optional_int32 = 1;</code>
+       * @return Whether the optionalInt32 field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalInt32() {
+        return ((bitField0_ & 0x00000001) != 0);
+      }
+      /**
+       * <code>optional int32 optional_int32 = 1;</code>
+       * @return The optionalInt32.
+       */
+      @java.lang.Override
+      public int getOptionalInt32() {
+        return optionalInt32_;
+      }
+      /**
+       * <code>optional int32 optional_int32 = 1;</code>
+       * @param value The optionalInt32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalInt32(int value) {
+
+        optionalInt32_ = value;
+        bitField0_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional int32 optional_int32 = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalInt32() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        optionalInt32_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private long optionalInt64_ ;
+      /**
+       * <code>optional int64 optional_int64 = 2;</code>
+       * @return Whether the optionalInt64 field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalInt64() {
+        return ((bitField0_ & 0x00000002) != 0);
+      }
+      /**
+       * <code>optional int64 optional_int64 = 2;</code>
+       * @return The optionalInt64.
+       */
+      @java.lang.Override
+      public long getOptionalInt64() {
+        return optionalInt64_;
+      }
+      /**
+       * <code>optional int64 optional_int64 = 2;</code>
+       * @param value The optionalInt64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalInt64(long value) {
+
+        optionalInt64_ = value;
+        bitField0_ |= 0x00000002;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional int64 optional_int64 = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalInt64() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        optionalInt64_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private int optionalUint32_ ;
+      /**
+       * <code>optional uint32 optional_uint32 = 3;</code>
+       * @return Whether the optionalUint32 field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalUint32() {
+        return ((bitField0_ & 0x00000004) != 0);
+      }
+      /**
+       * <code>optional uint32 optional_uint32 = 3;</code>
+       * @return The optionalUint32.
+       */
+      @java.lang.Override
+      public int getOptionalUint32() {
+        return optionalUint32_;
+      }
+      /**
+       * <code>optional uint32 optional_uint32 = 3;</code>
+       * @param value The optionalUint32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalUint32(int value) {
+
+        optionalUint32_ = value;
+        bitField0_ |= 0x00000004;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional uint32 optional_uint32 = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalUint32() {
+        bitField0_ = (bitField0_ & ~0x00000004);
+        optionalUint32_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private long optionalUint64_ ;
+      /**
+       * <code>optional uint64 optional_uint64 = 4;</code>
+       * @return Whether the optionalUint64 field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalUint64() {
+        return ((bitField0_ & 0x00000008) != 0);
+      }
+      /**
+       * <code>optional uint64 optional_uint64 = 4;</code>
+       * @return The optionalUint64.
+       */
+      @java.lang.Override
+      public long getOptionalUint64() {
+        return optionalUint64_;
+      }
+      /**
+       * <code>optional uint64 optional_uint64 = 4;</code>
+       * @param value The optionalUint64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalUint64(long value) {
+
+        optionalUint64_ = value;
+        bitField0_ |= 0x00000008;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional uint64 optional_uint64 = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalUint64() {
+        bitField0_ = (bitField0_ & ~0x00000008);
+        optionalUint64_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private int optionalSint32_ ;
+      /**
+       * <code>optional sint32 optional_sint32 = 5;</code>
+       * @return Whether the optionalSint32 field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalSint32() {
+        return ((bitField0_ & 0x00000010) != 0);
+      }
+      /**
+       * <code>optional sint32 optional_sint32 = 5;</code>
+       * @return The optionalSint32.
+       */
+      @java.lang.Override
+      public int getOptionalSint32() {
+        return optionalSint32_;
+      }
+      /**
+       * <code>optional sint32 optional_sint32 = 5;</code>
+       * @param value The optionalSint32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalSint32(int value) {
+
+        optionalSint32_ = value;
+        bitField0_ |= 0x00000010;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional sint32 optional_sint32 = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalSint32() {
+        bitField0_ = (bitField0_ & ~0x00000010);
+        optionalSint32_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private long optionalSint64_ ;
+      /**
+       * <code>optional sint64 optional_sint64 = 6;</code>
+       * @return Whether the optionalSint64 field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalSint64() {
+        return ((bitField0_ & 0x00000020) != 0);
+      }
+      /**
+       * <code>optional sint64 optional_sint64 = 6;</code>
+       * @return The optionalSint64.
+       */
+      @java.lang.Override
+      public long getOptionalSint64() {
+        return optionalSint64_;
+      }
+      /**
+       * <code>optional sint64 optional_sint64 = 6;</code>
+       * @param value The optionalSint64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalSint64(long value) {
+
+        optionalSint64_ = value;
+        bitField0_ |= 0x00000020;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional sint64 optional_sint64 = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalSint64() {
+        bitField0_ = (bitField0_ & ~0x00000020);
+        optionalSint64_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private int optionalFixed32_ ;
+      /**
+       * <code>optional fixed32 optional_fixed32 = 7;</code>
+       * @return Whether the optionalFixed32 field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalFixed32() {
+        return ((bitField0_ & 0x00000040) != 0);
+      }
+      /**
+       * <code>optional fixed32 optional_fixed32 = 7;</code>
+       * @return The optionalFixed32.
+       */
+      @java.lang.Override
+      public int getOptionalFixed32() {
+        return optionalFixed32_;
+      }
+      /**
+       * <code>optional fixed32 optional_fixed32 = 7;</code>
+       * @param value The optionalFixed32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalFixed32(int value) {
+
+        optionalFixed32_ = value;
+        bitField0_ |= 0x00000040;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional fixed32 optional_fixed32 = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalFixed32() {
+        bitField0_ = (bitField0_ & ~0x00000040);
+        optionalFixed32_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private long optionalFixed64_ ;
+      /**
+       * <code>optional fixed64 optional_fixed64 = 8;</code>
+       * @return Whether the optionalFixed64 field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalFixed64() {
+        return ((bitField0_ & 0x00000080) != 0);
+      }
+      /**
+       * <code>optional fixed64 optional_fixed64 = 8;</code>
+       * @return The optionalFixed64.
+       */
+      @java.lang.Override
+      public long getOptionalFixed64() {
+        return optionalFixed64_;
+      }
+      /**
+       * <code>optional fixed64 optional_fixed64 = 8;</code>
+       * @param value The optionalFixed64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalFixed64(long value) {
+
+        optionalFixed64_ = value;
+        bitField0_ |= 0x00000080;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional fixed64 optional_fixed64 = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalFixed64() {
+        bitField0_ = (bitField0_ & ~0x00000080);
+        optionalFixed64_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private int optionalSfixed32_ ;
+      /**
+       * <code>optional sfixed32 optional_sfixed32 = 9;</code>
+       * @return Whether the optionalSfixed32 field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalSfixed32() {
+        return ((bitField0_ & 0x00000100) != 0);
+      }
+      /**
+       * <code>optional sfixed32 optional_sfixed32 = 9;</code>
+       * @return The optionalSfixed32.
+       */
+      @java.lang.Override
+      public int getOptionalSfixed32() {
+        return optionalSfixed32_;
+      }
+      /**
+       * <code>optional sfixed32 optional_sfixed32 = 9;</code>
+       * @param value The optionalSfixed32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalSfixed32(int value) {
+
+        optionalSfixed32_ = value;
+        bitField0_ |= 0x00000100;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional sfixed32 optional_sfixed32 = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalSfixed32() {
+        bitField0_ = (bitField0_ & ~0x00000100);
+        optionalSfixed32_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private long optionalSfixed64_ ;
+      /**
+       * <code>optional sfixed64 optional_sfixed64 = 10;</code>
+       * @return Whether the optionalSfixed64 field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalSfixed64() {
+        return ((bitField0_ & 0x00000200) != 0);
+      }
+      /**
+       * <code>optional sfixed64 optional_sfixed64 = 10;</code>
+       * @return The optionalSfixed64.
+       */
+      @java.lang.Override
+      public long getOptionalSfixed64() {
+        return optionalSfixed64_;
+      }
+      /**
+       * <code>optional sfixed64 optional_sfixed64 = 10;</code>
+       * @param value The optionalSfixed64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalSfixed64(long value) {
+
+        optionalSfixed64_ = value;
+        bitField0_ |= 0x00000200;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional sfixed64 optional_sfixed64 = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalSfixed64() {
+        bitField0_ = (bitField0_ & ~0x00000200);
+        optionalSfixed64_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private float optionalFloat_ ;
+      /**
+       * <code>optional float optional_float = 11;</code>
+       * @return Whether the optionalFloat field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalFloat() {
+        return ((bitField0_ & 0x00000400) != 0);
+      }
+      /**
+       * <code>optional float optional_float = 11;</code>
+       * @return The optionalFloat.
+       */
+      @java.lang.Override
+      public float getOptionalFloat() {
+        return optionalFloat_;
+      }
+      /**
+       * <code>optional float optional_float = 11;</code>
+       * @param value The optionalFloat to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalFloat(float value) {
+
+        optionalFloat_ = value;
+        bitField0_ |= 0x00000400;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional float optional_float = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalFloat() {
+        bitField0_ = (bitField0_ & ~0x00000400);
+        optionalFloat_ = 0F;
+        onChanged();
+        return this;
+      }
+
+      private double optionalDouble_ ;
+      /**
+       * <code>optional double optional_double = 12;</code>
+       * @return Whether the optionalDouble field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalDouble() {
+        return ((bitField0_ & 0x00000800) != 0);
+      }
+      /**
+       * <code>optional double optional_double = 12;</code>
+       * @return The optionalDouble.
+       */
+      @java.lang.Override
+      public double getOptionalDouble() {
+        return optionalDouble_;
+      }
+      /**
+       * <code>optional double optional_double = 12;</code>
+       * @param value The optionalDouble to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalDouble(double value) {
+
+        optionalDouble_ = value;
+        bitField0_ |= 0x00000800;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional double optional_double = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalDouble() {
+        bitField0_ = (bitField0_ & ~0x00000800);
+        optionalDouble_ = 0D;
+        onChanged();
+        return this;
+      }
+
+      private boolean optionalBool_ ;
+      /**
+       * <code>optional bool optional_bool = 13;</code>
+       * @return Whether the optionalBool field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalBool() {
+        return ((bitField0_ & 0x00001000) != 0);
+      }
+      /**
+       * <code>optional bool optional_bool = 13;</code>
+       * @return The optionalBool.
+       */
+      @java.lang.Override
+      public boolean getOptionalBool() {
+        return optionalBool_;
+      }
+      /**
+       * <code>optional bool optional_bool = 13;</code>
+       * @param value The optionalBool to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalBool(boolean value) {
+
+        optionalBool_ = value;
+        bitField0_ |= 0x00001000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional bool optional_bool = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalBool() {
+        bitField0_ = (bitField0_ & ~0x00001000);
+        optionalBool_ = false;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object optionalString_ = "";
+      /**
+       * <code>optional string optional_string = 14;</code>
+       * @return Whether the optionalString field is set.
+       */
+      public boolean hasOptionalString() {
+        return ((bitField0_ & 0x00002000) != 0);
+      }
+      /**
+       * <code>optional string optional_string = 14;</code>
+       * @return The optionalString.
+       */
+      public java.lang.String getOptionalString() {
+        java.lang.Object ref = optionalString_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          if (bs.isValidUtf8()) {
+            optionalString_ = s;
+          }
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>optional string optional_string = 14;</code>
+       * @return The bytes for optionalString.
+       */
+      public com.google.protobuf.ByteString
+          getOptionalStringBytes() {
+        java.lang.Object ref = optionalString_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          optionalString_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>optional string optional_string = 14;</code>
+       * @param value The optionalString to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalString(
+          java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
+        optionalString_ = value;
+        bitField0_ |= 0x00002000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string optional_string = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalString() {
+        optionalString_ = getDefaultInstance().getOptionalString();
+        bitField0_ = (bitField0_ & ~0x00002000);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string optional_string = 14;</code>
+       * @param value The bytes for optionalString to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalStringBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
+        optionalString_ = value;
+        bitField0_ |= 0x00002000;
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.ByteString optionalBytes_ = com.google.protobuf.ByteString.EMPTY;
+      /**
+       * <code>optional bytes optional_bytes = 15;</code>
+       * @return Whether the optionalBytes field is set.
+       */
+      @java.lang.Override
+      public boolean hasOptionalBytes() {
+        return ((bitField0_ & 0x00004000) != 0);
+      }
+      /**
+       * <code>optional bytes optional_bytes = 15;</code>
+       * @return The optionalBytes.
+       */
+      @java.lang.Override
+      public com.google.protobuf.ByteString getOptionalBytes() {
+        return optionalBytes_;
+      }
+      /**
+       * <code>optional bytes optional_bytes = 15;</code>
+       * @param value The optionalBytes to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalBytes(com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
+        optionalBytes_ = value;
+        bitField0_ |= 0x00004000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional bytes optional_bytes = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalBytes() {
+        bitField0_ = (bitField0_ & ~0x00004000);
+        optionalBytes_ = getDefaultInstance().getOptionalBytes();
+        onChanged();
+        return this;
+      }
+
+      private legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage optionalNestedMessage_;
+      private com.google.protobuf.SingleFieldBuilder<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> optionalNestedMessageBuilder_;
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+       * @return Whether the optionalNestedMessage field is set.
+       */
+      public boolean hasOptionalNestedMessage() {
+        return ((bitField0_ & 0x00008000) != 0);
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+       * @return The optionalNestedMessage.
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getOptionalNestedMessage() {
+        if (optionalNestedMessageBuilder_ == null) {
+          return optionalNestedMessage_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance() : optionalNestedMessage_;
+        } else {
+          return optionalNestedMessageBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+       */
+      public Builder setOptionalNestedMessage(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage value) {
+        if (optionalNestedMessageBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          optionalNestedMessage_ = value;
+        } else {
+          optionalNestedMessageBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00008000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+       */
+      public Builder setOptionalNestedMessage(
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder builderForValue) {
+        if (optionalNestedMessageBuilder_ == null) {
+          optionalNestedMessage_ = builderForValue.build();
+        } else {
+          optionalNestedMessageBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00008000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+       */
+      public Builder mergeOptionalNestedMessage(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage value) {
+        if (optionalNestedMessageBuilder_ == null) {
+          if (((bitField0_ & 0x00008000) != 0) &&
+            optionalNestedMessage_ != null &&
+            optionalNestedMessage_ != legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance()) {
+            getOptionalNestedMessageBuilder().mergeFrom(value);
+          } else {
+            optionalNestedMessage_ = value;
+          }
+        } else {
+          optionalNestedMessageBuilder_.mergeFrom(value);
+        }
+        if (optionalNestedMessage_ != null) {
+          bitField0_ |= 0x00008000;
+          onChanged();
+        }
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+       */
+      public Builder clearOptionalNestedMessage() {
+        bitField0_ = (bitField0_ & ~0x00008000);
+        optionalNestedMessage_ = null;
+        if (optionalNestedMessageBuilder_ != null) {
+          optionalNestedMessageBuilder_.dispose();
+          optionalNestedMessageBuilder_ = null;
+        }
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder getOptionalNestedMessageBuilder() {
+        bitField0_ |= 0x00008000;
+        onChanged();
+        return internalGetOptionalNestedMessageFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder getOptionalNestedMessageOrBuilder() {
+        if (optionalNestedMessageBuilder_ != null) {
+          return optionalNestedMessageBuilder_.getMessageOrBuilder();
+        } else {
+          return optionalNestedMessage_ == null ?
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance() : optionalNestedMessage_;
+        }
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage optional_nested_message = 18;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilder<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> 
+          internalGetOptionalNestedMessageFieldBuilder() {
+        if (optionalNestedMessageBuilder_ == null) {
+          optionalNestedMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder>(
+                  getOptionalNestedMessage(),
+                  getParentForChildren(),
+                  isClean());
+          optionalNestedMessage_ = null;
+        }
+        return optionalNestedMessageBuilder_;
+      }
+
+      private legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage optionalForeignMessage_;
+      private com.google.protobuf.SingleFieldBuilder<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder> optionalForeignMessageBuilder_;
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+       * @return Whether the optionalForeignMessage field is set.
+       */
+      public boolean hasOptionalForeignMessage() {
+        return ((bitField0_ & 0x00010000) != 0);
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+       * @return The optionalForeignMessage.
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getOptionalForeignMessage() {
+        if (optionalForeignMessageBuilder_ == null) {
+          return optionalForeignMessage_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.getDefaultInstance() : optionalForeignMessage_;
+        } else {
+          return optionalForeignMessageBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+       */
+      public Builder setOptionalForeignMessage(legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage value) {
+        if (optionalForeignMessageBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          optionalForeignMessage_ = value;
+        } else {
+          optionalForeignMessageBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00010000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+       */
+      public Builder setOptionalForeignMessage(
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder builderForValue) {
+        if (optionalForeignMessageBuilder_ == null) {
+          optionalForeignMessage_ = builderForValue.build();
+        } else {
+          optionalForeignMessageBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00010000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+       */
+      public Builder mergeOptionalForeignMessage(legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage value) {
+        if (optionalForeignMessageBuilder_ == null) {
+          if (((bitField0_ & 0x00010000) != 0) &&
+            optionalForeignMessage_ != null &&
+            optionalForeignMessage_ != legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.getDefaultInstance()) {
+            getOptionalForeignMessageBuilder().mergeFrom(value);
+          } else {
+            optionalForeignMessage_ = value;
+          }
+        } else {
+          optionalForeignMessageBuilder_.mergeFrom(value);
+        }
+        if (optionalForeignMessage_ != null) {
+          bitField0_ |= 0x00010000;
+          onChanged();
+        }
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+       */
+      public Builder clearOptionalForeignMessage() {
+        bitField0_ = (bitField0_ & ~0x00010000);
+        optionalForeignMessage_ = null;
+        if (optionalForeignMessageBuilder_ != null) {
+          optionalForeignMessageBuilder_.dispose();
+          optionalForeignMessageBuilder_ = null;
+        }
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder getOptionalForeignMessageBuilder() {
+        bitField0_ |= 0x00010000;
+        onChanged();
+        return internalGetOptionalForeignMessageFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder getOptionalForeignMessageOrBuilder() {
+        if (optionalForeignMessageBuilder_ != null) {
+          return optionalForeignMessageBuilder_.getMessageOrBuilder();
+        } else {
+          return optionalForeignMessage_ == null ?
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.getDefaultInstance() : optionalForeignMessage_;
+        }
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignMessage optional_foreign_message = 19;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilder<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder> 
+          internalGetOptionalForeignMessageFieldBuilder() {
+        if (optionalForeignMessageBuilder_ == null) {
+          optionalForeignMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder>(
+                  getOptionalForeignMessage(),
+                  getParentForChildren(),
+                  isClean());
+          optionalForeignMessage_ = null;
+        }
+        return optionalForeignMessageBuilder_;
+      }
+
+      private int optionalNestedEnum_ = 0;
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum optional_nested_enum = 21;</code>
+       * @return Whether the optionalNestedEnum field is set.
+       */
+      @java.lang.Override public boolean hasOptionalNestedEnum() {
+        return ((bitField0_ & 0x00020000) != 0);
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum optional_nested_enum = 21;</code>
+       * @return The optionalNestedEnum.
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getOptionalNestedEnum() {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(optionalNestedEnum_);
+        return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.FOO : result;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum optional_nested_enum = 21;</code>
+       * @param value The optionalNestedEnum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalNestedEnum(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value) {
+        if (value == null) { throw new NullPointerException(); }
+        bitField0_ |= 0x00020000;
+        optionalNestedEnum_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum optional_nested_enum = 21;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalNestedEnum() {
+        bitField0_ = (bitField0_ & ~0x00020000);
+        optionalNestedEnum_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int optionalForeignEnum_ = 0;
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignEnum optional_foreign_enum = 22;</code>
+       * @return Whether the optionalForeignEnum field is set.
+       */
+      @java.lang.Override public boolean hasOptionalForeignEnum() {
+        return ((bitField0_ & 0x00040000) != 0);
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignEnum optional_foreign_enum = 22;</code>
+       * @return The optionalForeignEnum.
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getOptionalForeignEnum() {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.forNumber(optionalForeignEnum_);
+        return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum.FOREIGN_FOO : result;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignEnum optional_foreign_enum = 22;</code>
+       * @param value The optionalForeignEnum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalForeignEnum(legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum value) {
+        if (value == null) { throw new NullPointerException(); }
+        bitField0_ |= 0x00040000;
+        optionalForeignEnum_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.ForeignEnum optional_foreign_enum = 22;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalForeignEnum() {
+        bitField0_ = (bitField0_ & ~0x00040000);
+        optionalForeignEnum_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int optionalAliasedEnum_ = 0;
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.AliasedEnum optional_aliased_enum = 23;</code>
+       * @return Whether the optionalAliasedEnum field is set.
+       */
+      @java.lang.Override public boolean hasOptionalAliasedEnum() {
+        return ((bitField0_ & 0x00080000) != 0);
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.AliasedEnum optional_aliased_enum = 23;</code>
+       * @return The optionalAliasedEnum.
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum getOptionalAliasedEnum() {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum.forNumber(optionalAliasedEnum_);
+        return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum.ALIAS_FOO : result;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.AliasedEnum optional_aliased_enum = 23;</code>
+       * @param value The optionalAliasedEnum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionalAliasedEnum(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.AliasedEnum value) {
+        if (value == null) { throw new NullPointerException(); }
+        bitField0_ |= 0x00080000;
+        optionalAliasedEnum_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2.AliasedEnum optional_aliased_enum = 23;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionalAliasedEnum() {
+        bitField0_ = (bitField0_ & ~0x00080000);
+        optionalAliasedEnum_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 recursiveMessage_;
+      private com.google.protobuf.SingleFieldBuilder<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder> recursiveMessageBuilder_;
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+       * @return Whether the recursiveMessage field is set.
+       */
+      public boolean hasRecursiveMessage() {
+        return ((bitField0_ & 0x00100000) != 0);
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+       * @return The recursiveMessage.
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 getRecursiveMessage() {
+        if (recursiveMessageBuilder_ == null) {
+          return recursiveMessage_ == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance() : recursiveMessage_;
+        } else {
+          return recursiveMessageBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+       */
+      public Builder setRecursiveMessage(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 value) {
+        if (recursiveMessageBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          recursiveMessage_ = value;
+        } else {
+          recursiveMessageBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00100000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+       */
+      public Builder setRecursiveMessage(
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder builderForValue) {
+        if (recursiveMessageBuilder_ == null) {
+          recursiveMessage_ = builderForValue.build();
+        } else {
+          recursiveMessageBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00100000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+       */
+      public Builder mergeRecursiveMessage(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 value) {
+        if (recursiveMessageBuilder_ == null) {
+          if (((bitField0_ & 0x00100000) != 0) &&
+            recursiveMessage_ != null &&
+            recursiveMessage_ != legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance()) {
+            getRecursiveMessageBuilder().mergeFrom(value);
+          } else {
+            recursiveMessage_ = value;
+          }
+        } else {
+          recursiveMessageBuilder_.mergeFrom(value);
+        }
+        if (recursiveMessage_ != null) {
+          bitField0_ |= 0x00100000;
+          onChanged();
+        }
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+       */
+      public Builder clearRecursiveMessage() {
+        bitField0_ = (bitField0_ & ~0x00100000);
+        recursiveMessage_ = null;
+        if (recursiveMessageBuilder_ != null) {
+          recursiveMessageBuilder_.dispose();
+          recursiveMessageBuilder_ = null;
+        }
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder getRecursiveMessageBuilder() {
+        bitField0_ |= 0x00100000;
+        onChanged();
+        return internalGetRecursiveMessageFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder getRecursiveMessageOrBuilder() {
+        if (recursiveMessageBuilder_ != null) {
+          return recursiveMessageBuilder_.getMessageOrBuilder();
+        } else {
+          return recursiveMessage_ == null ?
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.getDefaultInstance() : recursiveMessage_;
+        }
+      }
+      /**
+       * <code>optional .legacy_gencode_test.proto2.TestMostTypesProto2 recursive_message = 27;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilder<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder> 
+          internalGetRecursiveMessageFieldBuilder() {
+        if (recursiveMessageBuilder_ == null) {
+          recursiveMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2OrBuilder>(
+                  getRecursiveMessage(),
+                  getParentForChildren(),
+                  isClean());
+          recursiveMessage_ = null;
+        }
+        return recursiveMessageBuilder_;
+      }
+
+      private com.google.protobuf.Internal.IntList repeatedInt32_ = emptyIntList();
+      private void ensureRepeatedInt32IsMutable() {
+        if (!repeatedInt32_.isModifiable()) {
+          repeatedInt32_ = makeMutableCopy(repeatedInt32_);
+        }
+        bitField0_ |= 0x00200000;
+      }
+      /**
+       * <pre>
+       * Repeated
+       * </pre>
+       *
+       * <code>repeated int32 repeated_int32 = 31;</code>
+       * @return A list containing the repeatedInt32.
+       */
+      public java.util.List<java.lang.Integer>
+          getRepeatedInt32List() {
+        repeatedInt32_.makeImmutable();
+        return repeatedInt32_;
+      }
+      /**
+       * <pre>
+       * Repeated
+       * </pre>
+       *
+       * <code>repeated int32 repeated_int32 = 31;</code>
+       * @return The count of repeatedInt32.
+       */
+      public int getRepeatedInt32Count() {
+        return repeatedInt32_.size();
+      }
+      /**
+       * <pre>
+       * Repeated
+       * </pre>
+       *
+       * <code>repeated int32 repeated_int32 = 31;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedInt32 at the given index.
+       */
+      public int getRepeatedInt32(int index) {
+        return repeatedInt32_.getInt(index);
+      }
+      /**
+       * <pre>
+       * Repeated
+       * </pre>
+       *
+       * <code>repeated int32 repeated_int32 = 31;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedInt32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedInt32(
+          int index, int value) {
+
+        ensureRepeatedInt32IsMutable();
+        repeatedInt32_.setInt(index, value);
+        bitField0_ |= 0x00200000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Repeated
+       * </pre>
+       *
+       * <code>repeated int32 repeated_int32 = 31;</code>
+       * @param value The repeatedInt32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedInt32(int value) {
+
+        ensureRepeatedInt32IsMutable();
+        repeatedInt32_.addInt(value);
+        bitField0_ |= 0x00200000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Repeated
+       * </pre>
+       *
+       * <code>repeated int32 repeated_int32 = 31;</code>
+       * @param values The repeatedInt32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedInt32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureRepeatedInt32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedInt32_);
+        bitField0_ |= 0x00200000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Repeated
+       * </pre>
+       *
+       * <code>repeated int32 repeated_int32 = 31;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedInt32() {
+        repeatedInt32_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00200000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList repeatedInt64_ = emptyLongList();
+      private void ensureRepeatedInt64IsMutable() {
+        if (!repeatedInt64_.isModifiable()) {
+          repeatedInt64_ = makeMutableCopy(repeatedInt64_);
+        }
+        bitField0_ |= 0x00400000;
+      }
+      /**
+       * <code>repeated int64 repeated_int64 = 32;</code>
+       * @return A list containing the repeatedInt64.
+       */
+      public java.util.List<java.lang.Long>
+          getRepeatedInt64List() {
+        repeatedInt64_.makeImmutable();
+        return repeatedInt64_;
+      }
+      /**
+       * <code>repeated int64 repeated_int64 = 32;</code>
+       * @return The count of repeatedInt64.
+       */
+      public int getRepeatedInt64Count() {
+        return repeatedInt64_.size();
+      }
+      /**
+       * <code>repeated int64 repeated_int64 = 32;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedInt64 at the given index.
+       */
+      public long getRepeatedInt64(int index) {
+        return repeatedInt64_.getLong(index);
+      }
+      /**
+       * <code>repeated int64 repeated_int64 = 32;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedInt64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedInt64(
+          int index, long value) {
+
+        ensureRepeatedInt64IsMutable();
+        repeatedInt64_.setLong(index, value);
+        bitField0_ |= 0x00400000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int64 repeated_int64 = 32;</code>
+       * @param value The repeatedInt64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedInt64(long value) {
+
+        ensureRepeatedInt64IsMutable();
+        repeatedInt64_.addLong(value);
+        bitField0_ |= 0x00400000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int64 repeated_int64 = 32;</code>
+       * @param values The repeatedInt64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedInt64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureRepeatedInt64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedInt64_);
+        bitField0_ |= 0x00400000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int64 repeated_int64 = 32;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedInt64() {
+        repeatedInt64_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x00400000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList repeatedUint32_ = emptyIntList();
+      private void ensureRepeatedUint32IsMutable() {
+        if (!repeatedUint32_.isModifiable()) {
+          repeatedUint32_ = makeMutableCopy(repeatedUint32_);
+        }
+        bitField0_ |= 0x00800000;
+      }
+      /**
+       * <code>repeated uint32 repeated_uint32 = 33;</code>
+       * @return A list containing the repeatedUint32.
+       */
+      public java.util.List<java.lang.Integer>
+          getRepeatedUint32List() {
+        repeatedUint32_.makeImmutable();
+        return repeatedUint32_;
+      }
+      /**
+       * <code>repeated uint32 repeated_uint32 = 33;</code>
+       * @return The count of repeatedUint32.
+       */
+      public int getRepeatedUint32Count() {
+        return repeatedUint32_.size();
+      }
+      /**
+       * <code>repeated uint32 repeated_uint32 = 33;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedUint32 at the given index.
+       */
+      public int getRepeatedUint32(int index) {
+        return repeatedUint32_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 repeated_uint32 = 33;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedUint32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedUint32(
+          int index, int value) {
+
+        ensureRepeatedUint32IsMutable();
+        repeatedUint32_.setInt(index, value);
+        bitField0_ |= 0x00800000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 repeated_uint32 = 33;</code>
+       * @param value The repeatedUint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedUint32(int value) {
+
+        ensureRepeatedUint32IsMutable();
+        repeatedUint32_.addInt(value);
+        bitField0_ |= 0x00800000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 repeated_uint32 = 33;</code>
+       * @param values The repeatedUint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedUint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureRepeatedUint32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedUint32_);
+        bitField0_ |= 0x00800000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 repeated_uint32 = 33;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedUint32() {
+        repeatedUint32_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00800000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList repeatedUint64_ = emptyLongList();
+      private void ensureRepeatedUint64IsMutable() {
+        if (!repeatedUint64_.isModifiable()) {
+          repeatedUint64_ = makeMutableCopy(repeatedUint64_);
+        }
+        bitField0_ |= 0x01000000;
+      }
+      /**
+       * <code>repeated uint64 repeated_uint64 = 34;</code>
+       * @return A list containing the repeatedUint64.
+       */
+      public java.util.List<java.lang.Long>
+          getRepeatedUint64List() {
+        repeatedUint64_.makeImmutable();
+        return repeatedUint64_;
+      }
+      /**
+       * <code>repeated uint64 repeated_uint64 = 34;</code>
+       * @return The count of repeatedUint64.
+       */
+      public int getRepeatedUint64Count() {
+        return repeatedUint64_.size();
+      }
+      /**
+       * <code>repeated uint64 repeated_uint64 = 34;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedUint64 at the given index.
+       */
+      public long getRepeatedUint64(int index) {
+        return repeatedUint64_.getLong(index);
+      }
+      /**
+       * <code>repeated uint64 repeated_uint64 = 34;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedUint64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedUint64(
+          int index, long value) {
+
+        ensureRepeatedUint64IsMutable();
+        repeatedUint64_.setLong(index, value);
+        bitField0_ |= 0x01000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 repeated_uint64 = 34;</code>
+       * @param value The repeatedUint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedUint64(long value) {
+
+        ensureRepeatedUint64IsMutable();
+        repeatedUint64_.addLong(value);
+        bitField0_ |= 0x01000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 repeated_uint64 = 34;</code>
+       * @param values The repeatedUint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedUint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureRepeatedUint64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedUint64_);
+        bitField0_ |= 0x01000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 repeated_uint64 = 34;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedUint64() {
+        repeatedUint64_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x01000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList repeatedSint32_ = emptyIntList();
+      private void ensureRepeatedSint32IsMutable() {
+        if (!repeatedSint32_.isModifiable()) {
+          repeatedSint32_ = makeMutableCopy(repeatedSint32_);
+        }
+        bitField0_ |= 0x02000000;
+      }
+      /**
+       * <code>repeated sint32 repeated_sint32 = 35;</code>
+       * @return A list containing the repeatedSint32.
+       */
+      public java.util.List<java.lang.Integer>
+          getRepeatedSint32List() {
+        repeatedSint32_.makeImmutable();
+        return repeatedSint32_;
+      }
+      /**
+       * <code>repeated sint32 repeated_sint32 = 35;</code>
+       * @return The count of repeatedSint32.
+       */
+      public int getRepeatedSint32Count() {
+        return repeatedSint32_.size();
+      }
+      /**
+       * <code>repeated sint32 repeated_sint32 = 35;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedSint32 at the given index.
+       */
+      public int getRepeatedSint32(int index) {
+        return repeatedSint32_.getInt(index);
+      }
+      /**
+       * <code>repeated sint32 repeated_sint32 = 35;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedSint32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedSint32(
+          int index, int value) {
+
+        ensureRepeatedSint32IsMutable();
+        repeatedSint32_.setInt(index, value);
+        bitField0_ |= 0x02000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint32 repeated_sint32 = 35;</code>
+       * @param value The repeatedSint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedSint32(int value) {
+
+        ensureRepeatedSint32IsMutable();
+        repeatedSint32_.addInt(value);
+        bitField0_ |= 0x02000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint32 repeated_sint32 = 35;</code>
+       * @param values The repeatedSint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedSint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureRepeatedSint32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedSint32_);
+        bitField0_ |= 0x02000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint32 repeated_sint32 = 35;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedSint32() {
+        repeatedSint32_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x02000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList repeatedSint64_ = emptyLongList();
+      private void ensureRepeatedSint64IsMutable() {
+        if (!repeatedSint64_.isModifiable()) {
+          repeatedSint64_ = makeMutableCopy(repeatedSint64_);
+        }
+        bitField0_ |= 0x04000000;
+      }
+      /**
+       * <code>repeated sint64 repeated_sint64 = 36;</code>
+       * @return A list containing the repeatedSint64.
+       */
+      public java.util.List<java.lang.Long>
+          getRepeatedSint64List() {
+        repeatedSint64_.makeImmutable();
+        return repeatedSint64_;
+      }
+      /**
+       * <code>repeated sint64 repeated_sint64 = 36;</code>
+       * @return The count of repeatedSint64.
+       */
+      public int getRepeatedSint64Count() {
+        return repeatedSint64_.size();
+      }
+      /**
+       * <code>repeated sint64 repeated_sint64 = 36;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedSint64 at the given index.
+       */
+      public long getRepeatedSint64(int index) {
+        return repeatedSint64_.getLong(index);
+      }
+      /**
+       * <code>repeated sint64 repeated_sint64 = 36;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedSint64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedSint64(
+          int index, long value) {
+
+        ensureRepeatedSint64IsMutable();
+        repeatedSint64_.setLong(index, value);
+        bitField0_ |= 0x04000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint64 repeated_sint64 = 36;</code>
+       * @param value The repeatedSint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedSint64(long value) {
+
+        ensureRepeatedSint64IsMutable();
+        repeatedSint64_.addLong(value);
+        bitField0_ |= 0x04000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint64 repeated_sint64 = 36;</code>
+       * @param values The repeatedSint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedSint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureRepeatedSint64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedSint64_);
+        bitField0_ |= 0x04000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint64 repeated_sint64 = 36;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedSint64() {
+        repeatedSint64_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x04000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList repeatedFixed32_ = emptyIntList();
+      private void ensureRepeatedFixed32IsMutable() {
+        if (!repeatedFixed32_.isModifiable()) {
+          repeatedFixed32_ = makeMutableCopy(repeatedFixed32_);
+        }
+        bitField0_ |= 0x08000000;
+      }
+      private void ensureRepeatedFixed32IsMutable(int capacity) {
+        if (!repeatedFixed32_.isModifiable()) {
+          repeatedFixed32_ = makeMutableCopy(repeatedFixed32_, capacity);
+        }
+        bitField0_ |= 0x08000000;
+      }
+      /**
+       * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+       * @return A list containing the repeatedFixed32.
+       */
+      public java.util.List<java.lang.Integer>
+          getRepeatedFixed32List() {
+        repeatedFixed32_.makeImmutable();
+        return repeatedFixed32_;
+      }
+      /**
+       * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+       * @return The count of repeatedFixed32.
+       */
+      public int getRepeatedFixed32Count() {
+        return repeatedFixed32_.size();
+      }
+      /**
+       * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedFixed32 at the given index.
+       */
+      public int getRepeatedFixed32(int index) {
+        return repeatedFixed32_.getInt(index);
+      }
+      /**
+       * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedFixed32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedFixed32(
+          int index, int value) {
+
+        ensureRepeatedFixed32IsMutable();
+        repeatedFixed32_.setInt(index, value);
+        bitField0_ |= 0x08000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+       * @param value The repeatedFixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedFixed32(int value) {
+
+        ensureRepeatedFixed32IsMutable();
+        repeatedFixed32_.addInt(value);
+        bitField0_ |= 0x08000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+       * @param values The repeatedFixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedFixed32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureRepeatedFixed32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedFixed32_);
+        bitField0_ |= 0x08000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed32 repeated_fixed32 = 37;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedFixed32() {
+        repeatedFixed32_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x08000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList repeatedFixed64_ = emptyLongList();
+      private void ensureRepeatedFixed64IsMutable() {
+        if (!repeatedFixed64_.isModifiable()) {
+          repeatedFixed64_ = makeMutableCopy(repeatedFixed64_);
+        }
+        bitField0_ |= 0x10000000;
+      }
+      private void ensureRepeatedFixed64IsMutable(int capacity) {
+        if (!repeatedFixed64_.isModifiable()) {
+          repeatedFixed64_ = makeMutableCopy(repeatedFixed64_, capacity);
+        }
+        bitField0_ |= 0x10000000;
+      }
+      /**
+       * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+       * @return A list containing the repeatedFixed64.
+       */
+      public java.util.List<java.lang.Long>
+          getRepeatedFixed64List() {
+        repeatedFixed64_.makeImmutable();
+        return repeatedFixed64_;
+      }
+      /**
+       * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+       * @return The count of repeatedFixed64.
+       */
+      public int getRepeatedFixed64Count() {
+        return repeatedFixed64_.size();
+      }
+      /**
+       * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedFixed64 at the given index.
+       */
+      public long getRepeatedFixed64(int index) {
+        return repeatedFixed64_.getLong(index);
+      }
+      /**
+       * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedFixed64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedFixed64(
+          int index, long value) {
+
+        ensureRepeatedFixed64IsMutable();
+        repeatedFixed64_.setLong(index, value);
+        bitField0_ |= 0x10000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+       * @param value The repeatedFixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedFixed64(long value) {
+
+        ensureRepeatedFixed64IsMutable();
+        repeatedFixed64_.addLong(value);
+        bitField0_ |= 0x10000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+       * @param values The repeatedFixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedFixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureRepeatedFixed64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedFixed64_);
+        bitField0_ |= 0x10000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed64 repeated_fixed64 = 38;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedFixed64() {
+        repeatedFixed64_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x10000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList repeatedSfixed32_ = emptyIntList();
+      private void ensureRepeatedSfixed32IsMutable() {
+        if (!repeatedSfixed32_.isModifiable()) {
+          repeatedSfixed32_ = makeMutableCopy(repeatedSfixed32_);
+        }
+        bitField0_ |= 0x20000000;
+      }
+      private void ensureRepeatedSfixed32IsMutable(int capacity) {
+        if (!repeatedSfixed32_.isModifiable()) {
+          repeatedSfixed32_ = makeMutableCopy(repeatedSfixed32_, capacity);
+        }
+        bitField0_ |= 0x20000000;
+      }
+      /**
+       * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+       * @return A list containing the repeatedSfixed32.
+       */
+      public java.util.List<java.lang.Integer>
+          getRepeatedSfixed32List() {
+        repeatedSfixed32_.makeImmutable();
+        return repeatedSfixed32_;
+      }
+      /**
+       * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+       * @return The count of repeatedSfixed32.
+       */
+      public int getRepeatedSfixed32Count() {
+        return repeatedSfixed32_.size();
+      }
+      /**
+       * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedSfixed32 at the given index.
+       */
+      public int getRepeatedSfixed32(int index) {
+        return repeatedSfixed32_.getInt(index);
+      }
+      /**
+       * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedSfixed32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedSfixed32(
+          int index, int value) {
+
+        ensureRepeatedSfixed32IsMutable();
+        repeatedSfixed32_.setInt(index, value);
+        bitField0_ |= 0x20000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+       * @param value The repeatedSfixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedSfixed32(int value) {
+
+        ensureRepeatedSfixed32IsMutable();
+        repeatedSfixed32_.addInt(value);
+        bitField0_ |= 0x20000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+       * @param values The repeatedSfixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedSfixed32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureRepeatedSfixed32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedSfixed32_);
+        bitField0_ |= 0x20000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedSfixed32() {
+        repeatedSfixed32_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x20000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList repeatedSfixed64_ = emptyLongList();
+      private void ensureRepeatedSfixed64IsMutable() {
+        if (!repeatedSfixed64_.isModifiable()) {
+          repeatedSfixed64_ = makeMutableCopy(repeatedSfixed64_);
+        }
+        bitField0_ |= 0x40000000;
+      }
+      private void ensureRepeatedSfixed64IsMutable(int capacity) {
+        if (!repeatedSfixed64_.isModifiable()) {
+          repeatedSfixed64_ = makeMutableCopy(repeatedSfixed64_, capacity);
+        }
+        bitField0_ |= 0x40000000;
+      }
+      /**
+       * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+       * @return A list containing the repeatedSfixed64.
+       */
+      public java.util.List<java.lang.Long>
+          getRepeatedSfixed64List() {
+        repeatedSfixed64_.makeImmutable();
+        return repeatedSfixed64_;
+      }
+      /**
+       * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+       * @return The count of repeatedSfixed64.
+       */
+      public int getRepeatedSfixed64Count() {
+        return repeatedSfixed64_.size();
+      }
+      /**
+       * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedSfixed64 at the given index.
+       */
+      public long getRepeatedSfixed64(int index) {
+        return repeatedSfixed64_.getLong(index);
+      }
+      /**
+       * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedSfixed64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedSfixed64(
+          int index, long value) {
+
+        ensureRepeatedSfixed64IsMutable();
+        repeatedSfixed64_.setLong(index, value);
+        bitField0_ |= 0x40000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+       * @param value The repeatedSfixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedSfixed64(long value) {
+
+        ensureRepeatedSfixed64IsMutable();
+        repeatedSfixed64_.addLong(value);
+        bitField0_ |= 0x40000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+       * @param values The repeatedSfixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedSfixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureRepeatedSfixed64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedSfixed64_);
+        bitField0_ |= 0x40000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedSfixed64() {
+        repeatedSfixed64_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x40000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.FloatList repeatedFloat_ = emptyFloatList();
+      private void ensureRepeatedFloatIsMutable() {
+        if (!repeatedFloat_.isModifiable()) {
+          repeatedFloat_ = makeMutableCopy(repeatedFloat_);
+        }
+        bitField0_ |= 0x80000000;
+      }
+      private void ensureRepeatedFloatIsMutable(int capacity) {
+        if (!repeatedFloat_.isModifiable()) {
+          repeatedFloat_ = makeMutableCopy(repeatedFloat_, capacity);
+        }
+        bitField0_ |= 0x80000000;
+      }
+      /**
+       * <code>repeated float repeated_float = 41;</code>
+       * @return A list containing the repeatedFloat.
+       */
+      public java.util.List<java.lang.Float>
+          getRepeatedFloatList() {
+        repeatedFloat_.makeImmutable();
+        return repeatedFloat_;
+      }
+      /**
+       * <code>repeated float repeated_float = 41;</code>
+       * @return The count of repeatedFloat.
+       */
+      public int getRepeatedFloatCount() {
+        return repeatedFloat_.size();
+      }
+      /**
+       * <code>repeated float repeated_float = 41;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedFloat at the given index.
+       */
+      public float getRepeatedFloat(int index) {
+        return repeatedFloat_.getFloat(index);
+      }
+      /**
+       * <code>repeated float repeated_float = 41;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedFloat to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedFloat(
+          int index, float value) {
+
+        ensureRepeatedFloatIsMutable();
+        repeatedFloat_.setFloat(index, value);
+        bitField0_ |= 0x80000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated float repeated_float = 41;</code>
+       * @param value The repeatedFloat to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedFloat(float value) {
+
+        ensureRepeatedFloatIsMutable();
+        repeatedFloat_.addFloat(value);
+        bitField0_ |= 0x80000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated float repeated_float = 41;</code>
+       * @param values The repeatedFloat to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedFloat(
+          java.lang.Iterable<? extends java.lang.Float> values) {
+        ensureRepeatedFloatIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedFloat_);
+        bitField0_ |= 0x80000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated float repeated_float = 41;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedFloat() {
+        repeatedFloat_ = emptyFloatList();
+        bitField0_ = (bitField0_ & ~0x80000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.DoubleList repeatedDouble_ = emptyDoubleList();
+      private void ensureRepeatedDoubleIsMutable() {
+        if (!repeatedDouble_.isModifiable()) {
+          repeatedDouble_ = makeMutableCopy(repeatedDouble_);
+        }
+        bitField1_ |= 0x00000001;
+      }
+      private void ensureRepeatedDoubleIsMutable(int capacity) {
+        if (!repeatedDouble_.isModifiable()) {
+          repeatedDouble_ = makeMutableCopy(repeatedDouble_, capacity);
+        }
+        bitField1_ |= 0x00000001;
+      }
+      /**
+       * <code>repeated double repeated_double = 42;</code>
+       * @return A list containing the repeatedDouble.
+       */
+      public java.util.List<java.lang.Double>
+          getRepeatedDoubleList() {
+        repeatedDouble_.makeImmutable();
+        return repeatedDouble_;
+      }
+      /**
+       * <code>repeated double repeated_double = 42;</code>
+       * @return The count of repeatedDouble.
+       */
+      public int getRepeatedDoubleCount() {
+        return repeatedDouble_.size();
+      }
+      /**
+       * <code>repeated double repeated_double = 42;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedDouble at the given index.
+       */
+      public double getRepeatedDouble(int index) {
+        return repeatedDouble_.getDouble(index);
+      }
+      /**
+       * <code>repeated double repeated_double = 42;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedDouble to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedDouble(
+          int index, double value) {
+
+        ensureRepeatedDoubleIsMutable();
+        repeatedDouble_.setDouble(index, value);
+        bitField1_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated double repeated_double = 42;</code>
+       * @param value The repeatedDouble to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedDouble(double value) {
+
+        ensureRepeatedDoubleIsMutable();
+        repeatedDouble_.addDouble(value);
+        bitField1_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated double repeated_double = 42;</code>
+       * @param values The repeatedDouble to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedDouble(
+          java.lang.Iterable<? extends java.lang.Double> values) {
+        ensureRepeatedDoubleIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedDouble_);
+        bitField1_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated double repeated_double = 42;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedDouble() {
+        repeatedDouble_ = emptyDoubleList();
+        bitField1_ = (bitField1_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.BooleanList repeatedBool_ = emptyBooleanList();
+      private void ensureRepeatedBoolIsMutable() {
+        if (!repeatedBool_.isModifiable()) {
+          repeatedBool_ = makeMutableCopy(repeatedBool_);
+        }
+        bitField1_ |= 0x00000002;
+      }
+      private void ensureRepeatedBoolIsMutable(int capacity) {
+        if (!repeatedBool_.isModifiable()) {
+          repeatedBool_ = makeMutableCopy(repeatedBool_, capacity);
+        }
+        bitField1_ |= 0x00000002;
+      }
+      /**
+       * <code>repeated bool repeated_bool = 43;</code>
+       * @return A list containing the repeatedBool.
+       */
+      public java.util.List<java.lang.Boolean>
+          getRepeatedBoolList() {
+        repeatedBool_.makeImmutable();
+        return repeatedBool_;
+      }
+      /**
+       * <code>repeated bool repeated_bool = 43;</code>
+       * @return The count of repeatedBool.
+       */
+      public int getRepeatedBoolCount() {
+        return repeatedBool_.size();
+      }
+      /**
+       * <code>repeated bool repeated_bool = 43;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedBool at the given index.
+       */
+      public boolean getRepeatedBool(int index) {
+        return repeatedBool_.getBoolean(index);
+      }
+      /**
+       * <code>repeated bool repeated_bool = 43;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedBool to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedBool(
+          int index, boolean value) {
+
+        ensureRepeatedBoolIsMutable();
+        repeatedBool_.setBoolean(index, value);
+        bitField1_ |= 0x00000002;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bool repeated_bool = 43;</code>
+       * @param value The repeatedBool to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedBool(boolean value) {
+
+        ensureRepeatedBoolIsMutable();
+        repeatedBool_.addBoolean(value);
+        bitField1_ |= 0x00000002;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bool repeated_bool = 43;</code>
+       * @param values The repeatedBool to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedBool(
+          java.lang.Iterable<? extends java.lang.Boolean> values) {
+        ensureRepeatedBoolIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedBool_);
+        bitField1_ |= 0x00000002;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bool repeated_bool = 43;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedBool() {
+        repeatedBool_ = emptyBooleanList();
+        bitField1_ = (bitField1_ & ~0x00000002);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.LazyStringArrayList repeatedString_ =
+          com.google.protobuf.LazyStringArrayList.emptyList();
+      private void ensureRepeatedStringIsMutable() {
+        if (!repeatedString_.isModifiable()) {
+          repeatedString_ = new com.google.protobuf.LazyStringArrayList(repeatedString_);
+        }
+        bitField1_ |= 0x00000004;
+      }
+      /**
+       * <code>repeated string repeated_string = 44;</code>
+       * @return A list containing the repeatedString.
+       */
+      public com.google.protobuf.ProtocolStringList
+          getRepeatedStringList() {
+        repeatedString_.makeImmutable();
+        return repeatedString_;
+      }
+      /**
+       * <code>repeated string repeated_string = 44;</code>
+       * @return The count of repeatedString.
+       */
+      public int getRepeatedStringCount() {
+        return repeatedString_.size();
+      }
+      /**
+       * <code>repeated string repeated_string = 44;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedString at the given index.
+       */
+      public java.lang.String getRepeatedString(int index) {
+        return repeatedString_.get(index);
+      }
+      /**
+       * <code>repeated string repeated_string = 44;</code>
+       * @param index The index of the value to return.
+       * @return The bytes of the repeatedString at the given index.
+       */
+      public com.google.protobuf.ByteString
+          getRepeatedStringBytes(int index) {
+        return repeatedString_.getByteString(index);
+      }
+      /**
+       * <code>repeated string repeated_string = 44;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedString to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedString(
+          int index, java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
+        ensureRepeatedStringIsMutable();
+        repeatedString_.set(index, value);
+        bitField1_ |= 0x00000004;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated string repeated_string = 44;</code>
+       * @param value The repeatedString to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedString(
+          java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
+        ensureRepeatedStringIsMutable();
+        repeatedString_.add(value);
+        bitField1_ |= 0x00000004;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated string repeated_string = 44;</code>
+       * @param values The repeatedString to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedString(
+          java.lang.Iterable<java.lang.String> values) {
+        ensureRepeatedStringIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedString_);
+        bitField1_ |= 0x00000004;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated string repeated_string = 44;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedString() {
+        repeatedString_ =
+          com.google.protobuf.LazyStringArrayList.emptyList();
+        bitField1_ = (bitField1_ & ~0x00000004);;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated string repeated_string = 44;</code>
+       * @param value The bytes of the repeatedString to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedStringBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
+        ensureRepeatedStringIsMutable();
+        repeatedString_.add(value);
+        bitField1_ |= 0x00000004;
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.ProtobufList<com.google.protobuf.ByteString> repeatedBytes_ = emptyList(com.google.protobuf.ByteString.class);
+      private void ensureRepeatedBytesIsMutable() {
+        if (!repeatedBytes_.isModifiable()) {
+          repeatedBytes_ = makeMutableCopy(repeatedBytes_);
+        }
+        bitField1_ |= 0x00000008;
+      }
+      /**
+       * <code>repeated bytes repeated_bytes = 45;</code>
+       * @return A list containing the repeatedBytes.
+       */
+      public java.util.List<com.google.protobuf.ByteString>
+          getRepeatedBytesList() {
+        repeatedBytes_.makeImmutable();
+        return repeatedBytes_;
+      }
+      /**
+       * <code>repeated bytes repeated_bytes = 45;</code>
+       * @return The count of repeatedBytes.
+       */
+      public int getRepeatedBytesCount() {
+        return repeatedBytes_.size();
+      }
+      /**
+       * <code>repeated bytes repeated_bytes = 45;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedBytes at the given index.
+       */
+      public com.google.protobuf.ByteString getRepeatedBytes(int index) {
+        return repeatedBytes_.get(index);
+      }
+      /**
+       * <code>repeated bytes repeated_bytes = 45;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedBytes to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedBytes(
+          int index, com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
+        ensureRepeatedBytesIsMutable();
+        repeatedBytes_.set(index, value);
+        bitField1_ |= 0x00000008;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bytes repeated_bytes = 45;</code>
+       * @param value The repeatedBytes to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedBytes(com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
+        ensureRepeatedBytesIsMutable();
+        repeatedBytes_.add(value);
+        bitField1_ |= 0x00000008;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bytes repeated_bytes = 45;</code>
+       * @param values The repeatedBytes to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedBytes(
+          java.lang.Iterable<? extends com.google.protobuf.ByteString> values) {
+        ensureRepeatedBytesIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedBytes_);
+        bitField1_ |= 0x00000008;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bytes repeated_bytes = 45;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedBytes() {
+        repeatedBytes_ = emptyList(com.google.protobuf.ByteString.class);
+        bitField1_ = (bitField1_ & ~0x00000008);
+        onChanged();
+        return this;
+      }
+
+      private java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> repeatedNestedMessage_ =
+        java.util.Collections.emptyList();
+      private void ensureRepeatedNestedMessageIsMutable() {
+        if (!((bitField1_ & 0x00000010) != 0)) {
+          repeatedNestedMessage_ = new java.util.ArrayList<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage>(repeatedNestedMessage_);
+          bitField1_ |= 0x00000010;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilder<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> repeatedNestedMessageBuilder_;
+
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> getRepeatedNestedMessageList() {
+        if (repeatedNestedMessageBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(repeatedNestedMessage_);
+        } else {
+          return repeatedNestedMessageBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public int getRepeatedNestedMessageCount() {
+        if (repeatedNestedMessageBuilder_ == null) {
+          return repeatedNestedMessage_.size();
+        } else {
+          return repeatedNestedMessageBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getRepeatedNestedMessage(int index) {
+        if (repeatedNestedMessageBuilder_ == null) {
+          return repeatedNestedMessage_.get(index);
+        } else {
+          return repeatedNestedMessageBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public Builder setRepeatedNestedMessage(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage value) {
+        if (repeatedNestedMessageBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureRepeatedNestedMessageIsMutable();
+          repeatedNestedMessage_.set(index, value);
+          onChanged();
+        } else {
+          repeatedNestedMessageBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public Builder setRepeatedNestedMessage(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder builderForValue) {
+        if (repeatedNestedMessageBuilder_ == null) {
+          ensureRepeatedNestedMessageIsMutable();
+          repeatedNestedMessage_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          repeatedNestedMessageBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public Builder addRepeatedNestedMessage(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage value) {
+        if (repeatedNestedMessageBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureRepeatedNestedMessageIsMutable();
+          repeatedNestedMessage_.add(value);
+          onChanged();
+        } else {
+          repeatedNestedMessageBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public Builder addRepeatedNestedMessage(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage value) {
+        if (repeatedNestedMessageBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureRepeatedNestedMessageIsMutable();
+          repeatedNestedMessage_.add(index, value);
+          onChanged();
+        } else {
+          repeatedNestedMessageBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public Builder addRepeatedNestedMessage(
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder builderForValue) {
+        if (repeatedNestedMessageBuilder_ == null) {
+          ensureRepeatedNestedMessageIsMutable();
+          repeatedNestedMessage_.add(builderForValue.build());
+          onChanged();
+        } else {
+          repeatedNestedMessageBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public Builder addRepeatedNestedMessage(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder builderForValue) {
+        if (repeatedNestedMessageBuilder_ == null) {
+          ensureRepeatedNestedMessageIsMutable();
+          repeatedNestedMessage_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          repeatedNestedMessageBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public Builder addAllRepeatedNestedMessage(
+          java.lang.Iterable<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> values) {
+        if (repeatedNestedMessageBuilder_ == null) {
+          ensureRepeatedNestedMessageIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, repeatedNestedMessage_);
+          onChanged();
+        } else {
+          repeatedNestedMessageBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public Builder clearRepeatedNestedMessage() {
+        if (repeatedNestedMessageBuilder_ == null) {
+          repeatedNestedMessage_ = java.util.Collections.emptyList();
+          bitField1_ = (bitField1_ & ~0x00000010);
+          onChanged();
+        } else {
+          repeatedNestedMessageBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public Builder removeRepeatedNestedMessage(int index) {
+        if (repeatedNestedMessageBuilder_ == null) {
+          ensureRepeatedNestedMessageIsMutable();
+          repeatedNestedMessage_.remove(index);
+          onChanged();
+        } else {
+          repeatedNestedMessageBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder getRepeatedNestedMessageBuilder(
+          int index) {
+        return internalGetRepeatedNestedMessageFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder getRepeatedNestedMessageOrBuilder(
+          int index) {
+        if (repeatedNestedMessageBuilder_ == null) {
+          return repeatedNestedMessage_.get(index);  } else {
+          return repeatedNestedMessageBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public java.util.List<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> 
+           getRepeatedNestedMessageOrBuilderList() {
+        if (repeatedNestedMessageBuilder_ != null) {
+          return repeatedNestedMessageBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(repeatedNestedMessage_);
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder addRepeatedNestedMessageBuilder() {
+        return internalGetRepeatedNestedMessageFieldBuilder().addBuilder(
+            legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder addRepeatedNestedMessageBuilder(
+          int index) {
+        return internalGetRepeatedNestedMessageFieldBuilder().addBuilder(
+            index, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage repeated_nested_message = 48;</code>
+       */
+      public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder> 
+           getRepeatedNestedMessageBuilderList() {
+        return internalGetRepeatedNestedMessageFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilder<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> 
+          internalGetRepeatedNestedMessageFieldBuilder() {
+        if (repeatedNestedMessageBuilder_ == null) {
+          repeatedNestedMessageBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder>(
+                  repeatedNestedMessage_,
+                  ((bitField1_ & 0x00000010) != 0),
+                  getParentForChildren(),
+                  isClean());
+          repeatedNestedMessage_ = null;
+        }
+        return repeatedNestedMessageBuilder_;
+      }
+
+      private java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> repeatedForeignMessage_ =
+        java.util.Collections.emptyList();
+      private void ensureRepeatedForeignMessageIsMutable() {
+        if (!((bitField1_ & 0x00000020) != 0)) {
+          repeatedForeignMessage_ = new java.util.ArrayList<legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage>(repeatedForeignMessage_);
+          bitField1_ |= 0x00000020;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilder<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder> repeatedForeignMessageBuilder_;
+
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> getRepeatedForeignMessageList() {
+        if (repeatedForeignMessageBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(repeatedForeignMessage_);
+        } else {
+          return repeatedForeignMessageBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public int getRepeatedForeignMessageCount() {
+        if (repeatedForeignMessageBuilder_ == null) {
+          return repeatedForeignMessage_.size();
+        } else {
+          return repeatedForeignMessageBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getRepeatedForeignMessage(int index) {
+        if (repeatedForeignMessageBuilder_ == null) {
+          return repeatedForeignMessage_.get(index);
+        } else {
+          return repeatedForeignMessageBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public Builder setRepeatedForeignMessage(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage value) {
+        if (repeatedForeignMessageBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureRepeatedForeignMessageIsMutable();
+          repeatedForeignMessage_.set(index, value);
+          onChanged();
+        } else {
+          repeatedForeignMessageBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public Builder setRepeatedForeignMessage(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder builderForValue) {
+        if (repeatedForeignMessageBuilder_ == null) {
+          ensureRepeatedForeignMessageIsMutable();
+          repeatedForeignMessage_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          repeatedForeignMessageBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public Builder addRepeatedForeignMessage(legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage value) {
+        if (repeatedForeignMessageBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureRepeatedForeignMessageIsMutable();
+          repeatedForeignMessage_.add(value);
+          onChanged();
+        } else {
+          repeatedForeignMessageBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public Builder addRepeatedForeignMessage(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage value) {
+        if (repeatedForeignMessageBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureRepeatedForeignMessageIsMutable();
+          repeatedForeignMessage_.add(index, value);
+          onChanged();
+        } else {
+          repeatedForeignMessageBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public Builder addRepeatedForeignMessage(
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder builderForValue) {
+        if (repeatedForeignMessageBuilder_ == null) {
+          ensureRepeatedForeignMessageIsMutable();
+          repeatedForeignMessage_.add(builderForValue.build());
+          onChanged();
+        } else {
+          repeatedForeignMessageBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public Builder addRepeatedForeignMessage(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder builderForValue) {
+        if (repeatedForeignMessageBuilder_ == null) {
+          ensureRepeatedForeignMessageIsMutable();
+          repeatedForeignMessage_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          repeatedForeignMessageBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public Builder addAllRepeatedForeignMessage(
+          java.lang.Iterable<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> values) {
+        if (repeatedForeignMessageBuilder_ == null) {
+          ensureRepeatedForeignMessageIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, repeatedForeignMessage_);
+          onChanged();
+        } else {
+          repeatedForeignMessageBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public Builder clearRepeatedForeignMessage() {
+        if (repeatedForeignMessageBuilder_ == null) {
+          repeatedForeignMessage_ = java.util.Collections.emptyList();
+          bitField1_ = (bitField1_ & ~0x00000020);
+          onChanged();
+        } else {
+          repeatedForeignMessageBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public Builder removeRepeatedForeignMessage(int index) {
+        if (repeatedForeignMessageBuilder_ == null) {
+          ensureRepeatedForeignMessageIsMutable();
+          repeatedForeignMessage_.remove(index);
+          onChanged();
+        } else {
+          repeatedForeignMessageBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder getRepeatedForeignMessageBuilder(
+          int index) {
+        return internalGetRepeatedForeignMessageFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder getRepeatedForeignMessageOrBuilder(
+          int index) {
+        if (repeatedForeignMessageBuilder_ == null) {
+          return repeatedForeignMessage_.get(index);  } else {
+          return repeatedForeignMessageBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public java.util.List<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder> 
+           getRepeatedForeignMessageOrBuilderList() {
+        if (repeatedForeignMessageBuilder_ != null) {
+          return repeatedForeignMessageBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(repeatedForeignMessage_);
+        }
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder addRepeatedForeignMessageBuilder() {
+        return internalGetRepeatedForeignMessageFieldBuilder().addBuilder(
+            legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder addRepeatedForeignMessageBuilder(
+          int index) {
+        return internalGetRepeatedForeignMessageFieldBuilder().addBuilder(
+            index, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignMessage repeated_foreign_message = 49;</code>
+       */
+      public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder> 
+           getRepeatedForeignMessageBuilderList() {
+        return internalGetRepeatedForeignMessageFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilder<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder> 
+          internalGetRepeatedForeignMessageFieldBuilder() {
+        if (repeatedForeignMessageBuilder_ == null) {
+          repeatedForeignMessageBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder>(
+                  repeatedForeignMessage_,
+                  ((bitField1_ & 0x00000020) != 0),
+                  getParentForChildren(),
+                  isClean());
+          repeatedForeignMessage_ = null;
+        }
+        return repeatedForeignMessageBuilder_;
+      }
+
+      private com.google.protobuf.Internal.IntList repeatedNestedEnum_ = emptyIntList();
+      private void ensureRepeatedNestedEnumIsMutable() {
+        if (!repeatedNestedEnum_.isModifiable()) {
+          repeatedNestedEnum_ = makeMutableCopy(repeatedNestedEnum_);
+        }
+        bitField1_ |= 0x00000040;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+       * @return A list containing the repeatedNestedEnum.
+       */
+      public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> getRepeatedNestedEnumList() {
+        return new com.google.protobuf.Internal.IntListAdapter<
+            legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>(repeatedNestedEnum_, repeatedNestedEnum_converter_);
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+       * @return The count of repeatedNestedEnum.
+       */
+      public int getRepeatedNestedEnumCount() {
+        return repeatedNestedEnum_.size();
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedNestedEnum at the given index.
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getRepeatedNestedEnum(int index) {
+        return repeatedNestedEnum_converter_.convert(repeatedNestedEnum_.getInt(index));
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedNestedEnum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedNestedEnum(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value) {
+        if (value == null) { throw new NullPointerException(); }
+        ensureRepeatedNestedEnumIsMutable();
+        repeatedNestedEnum_.setInt(index, value.getNumber());
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+       * @param value The repeatedNestedEnum to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedNestedEnum(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value) {
+        if (value == null) { throw new NullPointerException(); }
+        ensureRepeatedNestedEnumIsMutable();
+        repeatedNestedEnum_.addInt(value.getNumber());
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+       * @param values The repeatedNestedEnum to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedNestedEnum(
+          java.lang.Iterable<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> values) {
+        ensureRepeatedNestedEnumIsMutable();
+        for (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value : values) {
+          repeatedNestedEnum_.addInt(value.getNumber());
+        }
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum repeated_nested_enum = 51;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedNestedEnum() {
+        repeatedNestedEnum_ = emptyIntList();
+        bitField1_ = (bitField1_ & ~0x00000040);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList repeatedForeignEnum_ = emptyIntList();
+      private void ensureRepeatedForeignEnumIsMutable() {
+        if (!repeatedForeignEnum_.isModifiable()) {
+          repeatedForeignEnum_ = makeMutableCopy(repeatedForeignEnum_);
+        }
+        bitField1_ |= 0x00000080;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+       * @return A list containing the repeatedForeignEnum.
+       */
+      public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum> getRepeatedForeignEnumList() {
+        return new com.google.protobuf.Internal.IntListAdapter<
+            legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum>(repeatedForeignEnum_, repeatedForeignEnum_converter_);
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+       * @return The count of repeatedForeignEnum.
+       */
+      public int getRepeatedForeignEnumCount() {
+        return repeatedForeignEnum_.size();
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+       * @param index The index of the element to return.
+       * @return The repeatedForeignEnum at the given index.
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getRepeatedForeignEnum(int index) {
+        return repeatedForeignEnum_converter_.convert(repeatedForeignEnum_.getInt(index));
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+       * @param index The index to set the value at.
+       * @param value The repeatedForeignEnum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRepeatedForeignEnum(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum value) {
+        if (value == null) { throw new NullPointerException(); }
+        ensureRepeatedForeignEnumIsMutable();
+        repeatedForeignEnum_.setInt(index, value.getNumber());
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+       * @param value The repeatedForeignEnum to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRepeatedForeignEnum(legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum value) {
+        if (value == null) { throw new NullPointerException(); }
+        ensureRepeatedForeignEnumIsMutable();
+        repeatedForeignEnum_.addInt(value.getNumber());
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+       * @param values The repeatedForeignEnum to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRepeatedForeignEnum(
+          java.lang.Iterable<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum> values) {
+        ensureRepeatedForeignEnumIsMutable();
+        for (legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum value : values) {
+          repeatedForeignEnum_.addInt(value.getNumber());
+        }
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.ForeignEnum repeated_foreign_enum = 52;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRepeatedForeignEnum() {
+        repeatedForeignEnum_ = emptyIntList();
+        bitField1_ = (bitField1_ & ~0x00000080);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList packedInt32_ = emptyIntList();
+      private void ensurePackedInt32IsMutable() {
+        if (!packedInt32_.isModifiable()) {
+          packedInt32_ = makeMutableCopy(packedInt32_);
+        }
+        bitField1_ |= 0x00000100;
+      }
+      /**
+       * <pre>
+       * Packed
+       * </pre>
+       *
+       * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+       * @return A list containing the packedInt32.
+       */
+      public java.util.List<java.lang.Integer>
+          getPackedInt32List() {
+        packedInt32_.makeImmutable();
+        return packedInt32_;
+      }
+      /**
+       * <pre>
+       * Packed
+       * </pre>
+       *
+       * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+       * @return The count of packedInt32.
+       */
+      public int getPackedInt32Count() {
+        return packedInt32_.size();
+      }
+      /**
+       * <pre>
+       * Packed
+       * </pre>
+       *
+       * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedInt32 at the given index.
+       */
+      public int getPackedInt32(int index) {
+        return packedInt32_.getInt(index);
+      }
+      /**
+       * <pre>
+       * Packed
+       * </pre>
+       *
+       * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedInt32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedInt32(
+          int index, int value) {
+
+        ensurePackedInt32IsMutable();
+        packedInt32_.setInt(index, value);
+        bitField1_ |= 0x00000100;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Packed
+       * </pre>
+       *
+       * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+       * @param value The packedInt32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedInt32(int value) {
+
+        ensurePackedInt32IsMutable();
+        packedInt32_.addInt(value);
+        bitField1_ |= 0x00000100;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Packed
+       * </pre>
+       *
+       * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+       * @param values The packedInt32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedInt32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensurePackedInt32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedInt32_);
+        bitField1_ |= 0x00000100;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Packed
+       * </pre>
+       *
+       * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedInt32() {
+        packedInt32_ = emptyIntList();
+        bitField1_ = (bitField1_ & ~0x00000100);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList packedInt64_ = emptyLongList();
+      private void ensurePackedInt64IsMutable() {
+        if (!packedInt64_.isModifiable()) {
+          packedInt64_ = makeMutableCopy(packedInt64_);
+        }
+        bitField1_ |= 0x00000200;
+      }
+      /**
+       * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+       * @return A list containing the packedInt64.
+       */
+      public java.util.List<java.lang.Long>
+          getPackedInt64List() {
+        packedInt64_.makeImmutable();
+        return packedInt64_;
+      }
+      /**
+       * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+       * @return The count of packedInt64.
+       */
+      public int getPackedInt64Count() {
+        return packedInt64_.size();
+      }
+      /**
+       * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedInt64 at the given index.
+       */
+      public long getPackedInt64(int index) {
+        return packedInt64_.getLong(index);
+      }
+      /**
+       * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedInt64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedInt64(
+          int index, long value) {
+
+        ensurePackedInt64IsMutable();
+        packedInt64_.setLong(index, value);
+        bitField1_ |= 0x00000200;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+       * @param value The packedInt64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedInt64(long value) {
+
+        ensurePackedInt64IsMutable();
+        packedInt64_.addLong(value);
+        bitField1_ |= 0x00000200;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+       * @param values The packedInt64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedInt64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensurePackedInt64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedInt64_);
+        bitField1_ |= 0x00000200;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedInt64() {
+        packedInt64_ = emptyLongList();
+        bitField1_ = (bitField1_ & ~0x00000200);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList packedUint32_ = emptyIntList();
+      private void ensurePackedUint32IsMutable() {
+        if (!packedUint32_.isModifiable()) {
+          packedUint32_ = makeMutableCopy(packedUint32_);
+        }
+        bitField1_ |= 0x00000400;
+      }
+      /**
+       * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+       * @return A list containing the packedUint32.
+       */
+      public java.util.List<java.lang.Integer>
+          getPackedUint32List() {
+        packedUint32_.makeImmutable();
+        return packedUint32_;
+      }
+      /**
+       * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+       * @return The count of packedUint32.
+       */
+      public int getPackedUint32Count() {
+        return packedUint32_.size();
+      }
+      /**
+       * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedUint32 at the given index.
+       */
+      public int getPackedUint32(int index) {
+        return packedUint32_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedUint32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedUint32(
+          int index, int value) {
+
+        ensurePackedUint32IsMutable();
+        packedUint32_.setInt(index, value);
+        bitField1_ |= 0x00000400;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+       * @param value The packedUint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedUint32(int value) {
+
+        ensurePackedUint32IsMutable();
+        packedUint32_.addInt(value);
+        bitField1_ |= 0x00000400;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+       * @param values The packedUint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedUint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensurePackedUint32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedUint32_);
+        bitField1_ |= 0x00000400;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedUint32() {
+        packedUint32_ = emptyIntList();
+        bitField1_ = (bitField1_ & ~0x00000400);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList packedUint64_ = emptyLongList();
+      private void ensurePackedUint64IsMutable() {
+        if (!packedUint64_.isModifiable()) {
+          packedUint64_ = makeMutableCopy(packedUint64_);
+        }
+        bitField1_ |= 0x00000800;
+      }
+      /**
+       * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+       * @return A list containing the packedUint64.
+       */
+      public java.util.List<java.lang.Long>
+          getPackedUint64List() {
+        packedUint64_.makeImmutable();
+        return packedUint64_;
+      }
+      /**
+       * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+       * @return The count of packedUint64.
+       */
+      public int getPackedUint64Count() {
+        return packedUint64_.size();
+      }
+      /**
+       * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedUint64 at the given index.
+       */
+      public long getPackedUint64(int index) {
+        return packedUint64_.getLong(index);
+      }
+      /**
+       * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedUint64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedUint64(
+          int index, long value) {
+
+        ensurePackedUint64IsMutable();
+        packedUint64_.setLong(index, value);
+        bitField1_ |= 0x00000800;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+       * @param value The packedUint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedUint64(long value) {
+
+        ensurePackedUint64IsMutable();
+        packedUint64_.addLong(value);
+        bitField1_ |= 0x00000800;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+       * @param values The packedUint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedUint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensurePackedUint64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedUint64_);
+        bitField1_ |= 0x00000800;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedUint64() {
+        packedUint64_ = emptyLongList();
+        bitField1_ = (bitField1_ & ~0x00000800);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList packedSint32_ = emptyIntList();
+      private void ensurePackedSint32IsMutable() {
+        if (!packedSint32_.isModifiable()) {
+          packedSint32_ = makeMutableCopy(packedSint32_);
+        }
+        bitField1_ |= 0x00001000;
+      }
+      /**
+       * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+       * @return A list containing the packedSint32.
+       */
+      public java.util.List<java.lang.Integer>
+          getPackedSint32List() {
+        packedSint32_.makeImmutable();
+        return packedSint32_;
+      }
+      /**
+       * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+       * @return The count of packedSint32.
+       */
+      public int getPackedSint32Count() {
+        return packedSint32_.size();
+      }
+      /**
+       * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedSint32 at the given index.
+       */
+      public int getPackedSint32(int index) {
+        return packedSint32_.getInt(index);
+      }
+      /**
+       * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedSint32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedSint32(
+          int index, int value) {
+
+        ensurePackedSint32IsMutable();
+        packedSint32_.setInt(index, value);
+        bitField1_ |= 0x00001000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+       * @param value The packedSint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedSint32(int value) {
+
+        ensurePackedSint32IsMutable();
+        packedSint32_.addInt(value);
+        bitField1_ |= 0x00001000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+       * @param values The packedSint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedSint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensurePackedSint32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedSint32_);
+        bitField1_ |= 0x00001000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedSint32() {
+        packedSint32_ = emptyIntList();
+        bitField1_ = (bitField1_ & ~0x00001000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList packedSint64_ = emptyLongList();
+      private void ensurePackedSint64IsMutable() {
+        if (!packedSint64_.isModifiable()) {
+          packedSint64_ = makeMutableCopy(packedSint64_);
+        }
+        bitField1_ |= 0x00002000;
+      }
+      /**
+       * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+       * @return A list containing the packedSint64.
+       */
+      public java.util.List<java.lang.Long>
+          getPackedSint64List() {
+        packedSint64_.makeImmutable();
+        return packedSint64_;
+      }
+      /**
+       * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+       * @return The count of packedSint64.
+       */
+      public int getPackedSint64Count() {
+        return packedSint64_.size();
+      }
+      /**
+       * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedSint64 at the given index.
+       */
+      public long getPackedSint64(int index) {
+        return packedSint64_.getLong(index);
+      }
+      /**
+       * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedSint64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedSint64(
+          int index, long value) {
+
+        ensurePackedSint64IsMutable();
+        packedSint64_.setLong(index, value);
+        bitField1_ |= 0x00002000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+       * @param value The packedSint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedSint64(long value) {
+
+        ensurePackedSint64IsMutable();
+        packedSint64_.addLong(value);
+        bitField1_ |= 0x00002000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+       * @param values The packedSint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedSint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensurePackedSint64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedSint64_);
+        bitField1_ |= 0x00002000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedSint64() {
+        packedSint64_ = emptyLongList();
+        bitField1_ = (bitField1_ & ~0x00002000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList packedFixed32_ = emptyIntList();
+      private void ensurePackedFixed32IsMutable() {
+        if (!packedFixed32_.isModifiable()) {
+          packedFixed32_ = makeMutableCopy(packedFixed32_);
+        }
+        bitField1_ |= 0x00004000;
+      }
+      private void ensurePackedFixed32IsMutable(int capacity) {
+        if (!packedFixed32_.isModifiable()) {
+          packedFixed32_ = makeMutableCopy(packedFixed32_, capacity);
+        }
+        bitField1_ |= 0x00004000;
+      }
+      /**
+       * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+       * @return A list containing the packedFixed32.
+       */
+      public java.util.List<java.lang.Integer>
+          getPackedFixed32List() {
+        packedFixed32_.makeImmutable();
+        return packedFixed32_;
+      }
+      /**
+       * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+       * @return The count of packedFixed32.
+       */
+      public int getPackedFixed32Count() {
+        return packedFixed32_.size();
+      }
+      /**
+       * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedFixed32 at the given index.
+       */
+      public int getPackedFixed32(int index) {
+        return packedFixed32_.getInt(index);
+      }
+      /**
+       * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedFixed32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedFixed32(
+          int index, int value) {
+
+        ensurePackedFixed32IsMutable();
+        packedFixed32_.setInt(index, value);
+        bitField1_ |= 0x00004000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+       * @param value The packedFixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedFixed32(int value) {
+
+        ensurePackedFixed32IsMutable();
+        packedFixed32_.addInt(value);
+        bitField1_ |= 0x00004000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+       * @param values The packedFixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedFixed32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensurePackedFixed32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedFixed32_);
+        bitField1_ |= 0x00004000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedFixed32() {
+        packedFixed32_ = emptyIntList();
+        bitField1_ = (bitField1_ & ~0x00004000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList packedFixed64_ = emptyLongList();
+      private void ensurePackedFixed64IsMutable() {
+        if (!packedFixed64_.isModifiable()) {
+          packedFixed64_ = makeMutableCopy(packedFixed64_);
+        }
+        bitField1_ |= 0x00008000;
+      }
+      private void ensurePackedFixed64IsMutable(int capacity) {
+        if (!packedFixed64_.isModifiable()) {
+          packedFixed64_ = makeMutableCopy(packedFixed64_, capacity);
+        }
+        bitField1_ |= 0x00008000;
+      }
+      /**
+       * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+       * @return A list containing the packedFixed64.
+       */
+      public java.util.List<java.lang.Long>
+          getPackedFixed64List() {
+        packedFixed64_.makeImmutable();
+        return packedFixed64_;
+      }
+      /**
+       * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+       * @return The count of packedFixed64.
+       */
+      public int getPackedFixed64Count() {
+        return packedFixed64_.size();
+      }
+      /**
+       * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedFixed64 at the given index.
+       */
+      public long getPackedFixed64(int index) {
+        return packedFixed64_.getLong(index);
+      }
+      /**
+       * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedFixed64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedFixed64(
+          int index, long value) {
+
+        ensurePackedFixed64IsMutable();
+        packedFixed64_.setLong(index, value);
+        bitField1_ |= 0x00008000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+       * @param value The packedFixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedFixed64(long value) {
+
+        ensurePackedFixed64IsMutable();
+        packedFixed64_.addLong(value);
+        bitField1_ |= 0x00008000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+       * @param values The packedFixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedFixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensurePackedFixed64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedFixed64_);
+        bitField1_ |= 0x00008000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedFixed64() {
+        packedFixed64_ = emptyLongList();
+        bitField1_ = (bitField1_ & ~0x00008000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList packedSfixed32_ = emptyIntList();
+      private void ensurePackedSfixed32IsMutable() {
+        if (!packedSfixed32_.isModifiable()) {
+          packedSfixed32_ = makeMutableCopy(packedSfixed32_);
+        }
+        bitField1_ |= 0x00010000;
+      }
+      private void ensurePackedSfixed32IsMutable(int capacity) {
+        if (!packedSfixed32_.isModifiable()) {
+          packedSfixed32_ = makeMutableCopy(packedSfixed32_, capacity);
+        }
+        bitField1_ |= 0x00010000;
+      }
+      /**
+       * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+       * @return A list containing the packedSfixed32.
+       */
+      public java.util.List<java.lang.Integer>
+          getPackedSfixed32List() {
+        packedSfixed32_.makeImmutable();
+        return packedSfixed32_;
+      }
+      /**
+       * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+       * @return The count of packedSfixed32.
+       */
+      public int getPackedSfixed32Count() {
+        return packedSfixed32_.size();
+      }
+      /**
+       * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedSfixed32 at the given index.
+       */
+      public int getPackedSfixed32(int index) {
+        return packedSfixed32_.getInt(index);
+      }
+      /**
+       * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedSfixed32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedSfixed32(
+          int index, int value) {
+
+        ensurePackedSfixed32IsMutable();
+        packedSfixed32_.setInt(index, value);
+        bitField1_ |= 0x00010000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+       * @param value The packedSfixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedSfixed32(int value) {
+
+        ensurePackedSfixed32IsMutable();
+        packedSfixed32_.addInt(value);
+        bitField1_ |= 0x00010000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+       * @param values The packedSfixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedSfixed32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensurePackedSfixed32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedSfixed32_);
+        bitField1_ |= 0x00010000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedSfixed32() {
+        packedSfixed32_ = emptyIntList();
+        bitField1_ = (bitField1_ & ~0x00010000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList packedSfixed64_ = emptyLongList();
+      private void ensurePackedSfixed64IsMutable() {
+        if (!packedSfixed64_.isModifiable()) {
+          packedSfixed64_ = makeMutableCopy(packedSfixed64_);
+        }
+        bitField1_ |= 0x00020000;
+      }
+      private void ensurePackedSfixed64IsMutable(int capacity) {
+        if (!packedSfixed64_.isModifiable()) {
+          packedSfixed64_ = makeMutableCopy(packedSfixed64_, capacity);
+        }
+        bitField1_ |= 0x00020000;
+      }
+      /**
+       * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+       * @return A list containing the packedSfixed64.
+       */
+      public java.util.List<java.lang.Long>
+          getPackedSfixed64List() {
+        packedSfixed64_.makeImmutable();
+        return packedSfixed64_;
+      }
+      /**
+       * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+       * @return The count of packedSfixed64.
+       */
+      public int getPackedSfixed64Count() {
+        return packedSfixed64_.size();
+      }
+      /**
+       * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedSfixed64 at the given index.
+       */
+      public long getPackedSfixed64(int index) {
+        return packedSfixed64_.getLong(index);
+      }
+      /**
+       * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedSfixed64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedSfixed64(
+          int index, long value) {
+
+        ensurePackedSfixed64IsMutable();
+        packedSfixed64_.setLong(index, value);
+        bitField1_ |= 0x00020000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+       * @param value The packedSfixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedSfixed64(long value) {
+
+        ensurePackedSfixed64IsMutable();
+        packedSfixed64_.addLong(value);
+        bitField1_ |= 0x00020000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+       * @param values The packedSfixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedSfixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensurePackedSfixed64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedSfixed64_);
+        bitField1_ |= 0x00020000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedSfixed64() {
+        packedSfixed64_ = emptyLongList();
+        bitField1_ = (bitField1_ & ~0x00020000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.FloatList packedFloat_ = emptyFloatList();
+      private void ensurePackedFloatIsMutable() {
+        if (!packedFloat_.isModifiable()) {
+          packedFloat_ = makeMutableCopy(packedFloat_);
+        }
+        bitField1_ |= 0x00040000;
+      }
+      private void ensurePackedFloatIsMutable(int capacity) {
+        if (!packedFloat_.isModifiable()) {
+          packedFloat_ = makeMutableCopy(packedFloat_, capacity);
+        }
+        bitField1_ |= 0x00040000;
+      }
+      /**
+       * <code>repeated float packed_float = 85 [packed = true];</code>
+       * @return A list containing the packedFloat.
+       */
+      public java.util.List<java.lang.Float>
+          getPackedFloatList() {
+        packedFloat_.makeImmutable();
+        return packedFloat_;
+      }
+      /**
+       * <code>repeated float packed_float = 85 [packed = true];</code>
+       * @return The count of packedFloat.
+       */
+      public int getPackedFloatCount() {
+        return packedFloat_.size();
+      }
+      /**
+       * <code>repeated float packed_float = 85 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedFloat at the given index.
+       */
+      public float getPackedFloat(int index) {
+        return packedFloat_.getFloat(index);
+      }
+      /**
+       * <code>repeated float packed_float = 85 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedFloat to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedFloat(
+          int index, float value) {
+
+        ensurePackedFloatIsMutable();
+        packedFloat_.setFloat(index, value);
+        bitField1_ |= 0x00040000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated float packed_float = 85 [packed = true];</code>
+       * @param value The packedFloat to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedFloat(float value) {
+
+        ensurePackedFloatIsMutable();
+        packedFloat_.addFloat(value);
+        bitField1_ |= 0x00040000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated float packed_float = 85 [packed = true];</code>
+       * @param values The packedFloat to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedFloat(
+          java.lang.Iterable<? extends java.lang.Float> values) {
+        ensurePackedFloatIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedFloat_);
+        bitField1_ |= 0x00040000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated float packed_float = 85 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedFloat() {
+        packedFloat_ = emptyFloatList();
+        bitField1_ = (bitField1_ & ~0x00040000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.DoubleList packedDouble_ = emptyDoubleList();
+      private void ensurePackedDoubleIsMutable() {
+        if (!packedDouble_.isModifiable()) {
+          packedDouble_ = makeMutableCopy(packedDouble_);
+        }
+        bitField1_ |= 0x00080000;
+      }
+      private void ensurePackedDoubleIsMutable(int capacity) {
+        if (!packedDouble_.isModifiable()) {
+          packedDouble_ = makeMutableCopy(packedDouble_, capacity);
+        }
+        bitField1_ |= 0x00080000;
+      }
+      /**
+       * <code>repeated double packed_double = 86 [packed = true];</code>
+       * @return A list containing the packedDouble.
+       */
+      public java.util.List<java.lang.Double>
+          getPackedDoubleList() {
+        packedDouble_.makeImmutable();
+        return packedDouble_;
+      }
+      /**
+       * <code>repeated double packed_double = 86 [packed = true];</code>
+       * @return The count of packedDouble.
+       */
+      public int getPackedDoubleCount() {
+        return packedDouble_.size();
+      }
+      /**
+       * <code>repeated double packed_double = 86 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedDouble at the given index.
+       */
+      public double getPackedDouble(int index) {
+        return packedDouble_.getDouble(index);
+      }
+      /**
+       * <code>repeated double packed_double = 86 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedDouble to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedDouble(
+          int index, double value) {
+
+        ensurePackedDoubleIsMutable();
+        packedDouble_.setDouble(index, value);
+        bitField1_ |= 0x00080000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated double packed_double = 86 [packed = true];</code>
+       * @param value The packedDouble to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedDouble(double value) {
+
+        ensurePackedDoubleIsMutable();
+        packedDouble_.addDouble(value);
+        bitField1_ |= 0x00080000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated double packed_double = 86 [packed = true];</code>
+       * @param values The packedDouble to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedDouble(
+          java.lang.Iterable<? extends java.lang.Double> values) {
+        ensurePackedDoubleIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedDouble_);
+        bitField1_ |= 0x00080000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated double packed_double = 86 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedDouble() {
+        packedDouble_ = emptyDoubleList();
+        bitField1_ = (bitField1_ & ~0x00080000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.BooleanList packedBool_ = emptyBooleanList();
+      private void ensurePackedBoolIsMutable() {
+        if (!packedBool_.isModifiable()) {
+          packedBool_ = makeMutableCopy(packedBool_);
+        }
+        bitField1_ |= 0x00100000;
+      }
+      private void ensurePackedBoolIsMutable(int capacity) {
+        if (!packedBool_.isModifiable()) {
+          packedBool_ = makeMutableCopy(packedBool_, capacity);
+        }
+        bitField1_ |= 0x00100000;
+      }
+      /**
+       * <code>repeated bool packed_bool = 87 [packed = true];</code>
+       * @return A list containing the packedBool.
+       */
+      public java.util.List<java.lang.Boolean>
+          getPackedBoolList() {
+        packedBool_.makeImmutable();
+        return packedBool_;
+      }
+      /**
+       * <code>repeated bool packed_bool = 87 [packed = true];</code>
+       * @return The count of packedBool.
+       */
+      public int getPackedBoolCount() {
+        return packedBool_.size();
+      }
+      /**
+       * <code>repeated bool packed_bool = 87 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedBool at the given index.
+       */
+      public boolean getPackedBool(int index) {
+        return packedBool_.getBoolean(index);
+      }
+      /**
+       * <code>repeated bool packed_bool = 87 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedBool to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedBool(
+          int index, boolean value) {
+
+        ensurePackedBoolIsMutable();
+        packedBool_.setBoolean(index, value);
+        bitField1_ |= 0x00100000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bool packed_bool = 87 [packed = true];</code>
+       * @param value The packedBool to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedBool(boolean value) {
+
+        ensurePackedBoolIsMutable();
+        packedBool_.addBoolean(value);
+        bitField1_ |= 0x00100000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bool packed_bool = 87 [packed = true];</code>
+       * @param values The packedBool to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedBool(
+          java.lang.Iterable<? extends java.lang.Boolean> values) {
+        ensurePackedBoolIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedBool_);
+        bitField1_ |= 0x00100000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bool packed_bool = 87 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedBool() {
+        packedBool_ = emptyBooleanList();
+        bitField1_ = (bitField1_ & ~0x00100000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList packedNestedEnum_ = emptyIntList();
+      private void ensurePackedNestedEnumIsMutable() {
+        if (!packedNestedEnum_.isModifiable()) {
+          packedNestedEnum_ = makeMutableCopy(packedNestedEnum_);
+        }
+        bitField1_ |= 0x00200000;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+       * @return A list containing the packedNestedEnum.
+       */
+      public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> getPackedNestedEnumList() {
+        return new com.google.protobuf.Internal.IntListAdapter<
+            legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>(packedNestedEnum_, packedNestedEnum_converter_);
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+       * @return The count of packedNestedEnum.
+       */
+      public int getPackedNestedEnumCount() {
+        return packedNestedEnum_.size();
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+       * @param index The index of the element to return.
+       * @return The packedNestedEnum at the given index.
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getPackedNestedEnum(int index) {
+        return packedNestedEnum_converter_.convert(packedNestedEnum_.getInt(index));
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+       * @param index The index to set the value at.
+       * @param value The packedNestedEnum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPackedNestedEnum(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value) {
+        if (value == null) { throw new NullPointerException(); }
+        ensurePackedNestedEnumIsMutable();
+        packedNestedEnum_.setInt(index, value.getNumber());
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+       * @param value The packedNestedEnum to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPackedNestedEnum(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value) {
+        if (value == null) { throw new NullPointerException(); }
+        ensurePackedNestedEnumIsMutable();
+        packedNestedEnum_.addInt(value.getNumber());
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+       * @param values The packedNestedEnum to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPackedNestedEnum(
+          java.lang.Iterable<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> values) {
+        ensurePackedNestedEnumIsMutable();
+        for (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value : values) {
+          packedNestedEnum_.addInt(value.getNumber());
+        }
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum packed_nested_enum = 88 [packed = true];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPackedNestedEnum() {
+        packedNestedEnum_ = emptyIntList();
+        bitField1_ = (bitField1_ & ~0x00200000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList unpackedInt32_ = emptyIntList();
+      private void ensureUnpackedInt32IsMutable() {
+        if (!unpackedInt32_.isModifiable()) {
+          unpackedInt32_ = makeMutableCopy(unpackedInt32_);
+        }
+        bitField1_ |= 0x00400000;
+      }
+      /**
+       * <pre>
+       * Unpacked
+       * </pre>
+       *
+       * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+       * @return A list containing the unpackedInt32.
+       */
+      public java.util.List<java.lang.Integer>
+          getUnpackedInt32List() {
+        unpackedInt32_.makeImmutable();
+        return unpackedInt32_;
+      }
+      /**
+       * <pre>
+       * Unpacked
+       * </pre>
+       *
+       * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+       * @return The count of unpackedInt32.
+       */
+      public int getUnpackedInt32Count() {
+        return unpackedInt32_.size();
+      }
+      /**
+       * <pre>
+       * Unpacked
+       * </pre>
+       *
+       * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedInt32 at the given index.
+       */
+      public int getUnpackedInt32(int index) {
+        return unpackedInt32_.getInt(index);
+      }
+      /**
+       * <pre>
+       * Unpacked
+       * </pre>
+       *
+       * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedInt32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedInt32(
+          int index, int value) {
+
+        ensureUnpackedInt32IsMutable();
+        unpackedInt32_.setInt(index, value);
+        bitField1_ |= 0x00400000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Unpacked
+       * </pre>
+       *
+       * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+       * @param value The unpackedInt32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedInt32(int value) {
+
+        ensureUnpackedInt32IsMutable();
+        unpackedInt32_.addInt(value);
+        bitField1_ |= 0x00400000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Unpacked
+       * </pre>
+       *
+       * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+       * @param values The unpackedInt32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedInt32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureUnpackedInt32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedInt32_);
+        bitField1_ |= 0x00400000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Unpacked
+       * </pre>
+       *
+       * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedInt32() {
+        unpackedInt32_ = emptyIntList();
+        bitField1_ = (bitField1_ & ~0x00400000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList unpackedInt64_ = emptyLongList();
+      private void ensureUnpackedInt64IsMutable() {
+        if (!unpackedInt64_.isModifiable()) {
+          unpackedInt64_ = makeMutableCopy(unpackedInt64_);
+        }
+        bitField1_ |= 0x00800000;
+      }
+      /**
+       * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+       * @return A list containing the unpackedInt64.
+       */
+      public java.util.List<java.lang.Long>
+          getUnpackedInt64List() {
+        unpackedInt64_.makeImmutable();
+        return unpackedInt64_;
+      }
+      /**
+       * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+       * @return The count of unpackedInt64.
+       */
+      public int getUnpackedInt64Count() {
+        return unpackedInt64_.size();
+      }
+      /**
+       * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedInt64 at the given index.
+       */
+      public long getUnpackedInt64(int index) {
+        return unpackedInt64_.getLong(index);
+      }
+      /**
+       * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedInt64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedInt64(
+          int index, long value) {
+
+        ensureUnpackedInt64IsMutable();
+        unpackedInt64_.setLong(index, value);
+        bitField1_ |= 0x00800000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+       * @param value The unpackedInt64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedInt64(long value) {
+
+        ensureUnpackedInt64IsMutable();
+        unpackedInt64_.addLong(value);
+        bitField1_ |= 0x00800000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+       * @param values The unpackedInt64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedInt64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureUnpackedInt64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedInt64_);
+        bitField1_ |= 0x00800000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedInt64() {
+        unpackedInt64_ = emptyLongList();
+        bitField1_ = (bitField1_ & ~0x00800000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList unpackedUint32_ = emptyIntList();
+      private void ensureUnpackedUint32IsMutable() {
+        if (!unpackedUint32_.isModifiable()) {
+          unpackedUint32_ = makeMutableCopy(unpackedUint32_);
+        }
+        bitField1_ |= 0x01000000;
+      }
+      /**
+       * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+       * @return A list containing the unpackedUint32.
+       */
+      public java.util.List<java.lang.Integer>
+          getUnpackedUint32List() {
+        unpackedUint32_.makeImmutable();
+        return unpackedUint32_;
+      }
+      /**
+       * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+       * @return The count of unpackedUint32.
+       */
+      public int getUnpackedUint32Count() {
+        return unpackedUint32_.size();
+      }
+      /**
+       * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedUint32 at the given index.
+       */
+      public int getUnpackedUint32(int index) {
+        return unpackedUint32_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedUint32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedUint32(
+          int index, int value) {
+
+        ensureUnpackedUint32IsMutable();
+        unpackedUint32_.setInt(index, value);
+        bitField1_ |= 0x01000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+       * @param value The unpackedUint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedUint32(int value) {
+
+        ensureUnpackedUint32IsMutable();
+        unpackedUint32_.addInt(value);
+        bitField1_ |= 0x01000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+       * @param values The unpackedUint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedUint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureUnpackedUint32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedUint32_);
+        bitField1_ |= 0x01000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedUint32() {
+        unpackedUint32_ = emptyIntList();
+        bitField1_ = (bitField1_ & ~0x01000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList unpackedUint64_ = emptyLongList();
+      private void ensureUnpackedUint64IsMutable() {
+        if (!unpackedUint64_.isModifiable()) {
+          unpackedUint64_ = makeMutableCopy(unpackedUint64_);
+        }
+        bitField1_ |= 0x02000000;
+      }
+      /**
+       * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+       * @return A list containing the unpackedUint64.
+       */
+      public java.util.List<java.lang.Long>
+          getUnpackedUint64List() {
+        unpackedUint64_.makeImmutable();
+        return unpackedUint64_;
+      }
+      /**
+       * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+       * @return The count of unpackedUint64.
+       */
+      public int getUnpackedUint64Count() {
+        return unpackedUint64_.size();
+      }
+      /**
+       * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedUint64 at the given index.
+       */
+      public long getUnpackedUint64(int index) {
+        return unpackedUint64_.getLong(index);
+      }
+      /**
+       * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedUint64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedUint64(
+          int index, long value) {
+
+        ensureUnpackedUint64IsMutable();
+        unpackedUint64_.setLong(index, value);
+        bitField1_ |= 0x02000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+       * @param value The unpackedUint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedUint64(long value) {
+
+        ensureUnpackedUint64IsMutable();
+        unpackedUint64_.addLong(value);
+        bitField1_ |= 0x02000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+       * @param values The unpackedUint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedUint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureUnpackedUint64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedUint64_);
+        bitField1_ |= 0x02000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedUint64() {
+        unpackedUint64_ = emptyLongList();
+        bitField1_ = (bitField1_ & ~0x02000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList unpackedSint32_ = emptyIntList();
+      private void ensureUnpackedSint32IsMutable() {
+        if (!unpackedSint32_.isModifiable()) {
+          unpackedSint32_ = makeMutableCopy(unpackedSint32_);
+        }
+        bitField1_ |= 0x04000000;
+      }
+      /**
+       * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+       * @return A list containing the unpackedSint32.
+       */
+      public java.util.List<java.lang.Integer>
+          getUnpackedSint32List() {
+        unpackedSint32_.makeImmutable();
+        return unpackedSint32_;
+      }
+      /**
+       * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+       * @return The count of unpackedSint32.
+       */
+      public int getUnpackedSint32Count() {
+        return unpackedSint32_.size();
+      }
+      /**
+       * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedSint32 at the given index.
+       */
+      public int getUnpackedSint32(int index) {
+        return unpackedSint32_.getInt(index);
+      }
+      /**
+       * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedSint32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedSint32(
+          int index, int value) {
+
+        ensureUnpackedSint32IsMutable();
+        unpackedSint32_.setInt(index, value);
+        bitField1_ |= 0x04000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+       * @param value The unpackedSint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedSint32(int value) {
+
+        ensureUnpackedSint32IsMutable();
+        unpackedSint32_.addInt(value);
+        bitField1_ |= 0x04000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+       * @param values The unpackedSint32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedSint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureUnpackedSint32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedSint32_);
+        bitField1_ |= 0x04000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedSint32() {
+        unpackedSint32_ = emptyIntList();
+        bitField1_ = (bitField1_ & ~0x04000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList unpackedSint64_ = emptyLongList();
+      private void ensureUnpackedSint64IsMutable() {
+        if (!unpackedSint64_.isModifiable()) {
+          unpackedSint64_ = makeMutableCopy(unpackedSint64_);
+        }
+        bitField1_ |= 0x08000000;
+      }
+      /**
+       * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+       * @return A list containing the unpackedSint64.
+       */
+      public java.util.List<java.lang.Long>
+          getUnpackedSint64List() {
+        unpackedSint64_.makeImmutable();
+        return unpackedSint64_;
+      }
+      /**
+       * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+       * @return The count of unpackedSint64.
+       */
+      public int getUnpackedSint64Count() {
+        return unpackedSint64_.size();
+      }
+      /**
+       * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedSint64 at the given index.
+       */
+      public long getUnpackedSint64(int index) {
+        return unpackedSint64_.getLong(index);
+      }
+      /**
+       * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedSint64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedSint64(
+          int index, long value) {
+
+        ensureUnpackedSint64IsMutable();
+        unpackedSint64_.setLong(index, value);
+        bitField1_ |= 0x08000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+       * @param value The unpackedSint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedSint64(long value) {
+
+        ensureUnpackedSint64IsMutable();
+        unpackedSint64_.addLong(value);
+        bitField1_ |= 0x08000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+       * @param values The unpackedSint64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedSint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureUnpackedSint64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedSint64_);
+        bitField1_ |= 0x08000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedSint64() {
+        unpackedSint64_ = emptyLongList();
+        bitField1_ = (bitField1_ & ~0x08000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList unpackedFixed32_ = emptyIntList();
+      private void ensureUnpackedFixed32IsMutable() {
+        if (!unpackedFixed32_.isModifiable()) {
+          unpackedFixed32_ = makeMutableCopy(unpackedFixed32_);
+        }
+        bitField1_ |= 0x10000000;
+      }
+      private void ensureUnpackedFixed32IsMutable(int capacity) {
+        if (!unpackedFixed32_.isModifiable()) {
+          unpackedFixed32_ = makeMutableCopy(unpackedFixed32_, capacity);
+        }
+        bitField1_ |= 0x10000000;
+      }
+      /**
+       * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+       * @return A list containing the unpackedFixed32.
+       */
+      public java.util.List<java.lang.Integer>
+          getUnpackedFixed32List() {
+        unpackedFixed32_.makeImmutable();
+        return unpackedFixed32_;
+      }
+      /**
+       * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+       * @return The count of unpackedFixed32.
+       */
+      public int getUnpackedFixed32Count() {
+        return unpackedFixed32_.size();
+      }
+      /**
+       * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedFixed32 at the given index.
+       */
+      public int getUnpackedFixed32(int index) {
+        return unpackedFixed32_.getInt(index);
+      }
+      /**
+       * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedFixed32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedFixed32(
+          int index, int value) {
+
+        ensureUnpackedFixed32IsMutable();
+        unpackedFixed32_.setInt(index, value);
+        bitField1_ |= 0x10000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+       * @param value The unpackedFixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedFixed32(int value) {
+
+        ensureUnpackedFixed32IsMutable();
+        unpackedFixed32_.addInt(value);
+        bitField1_ |= 0x10000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+       * @param values The unpackedFixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedFixed32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureUnpackedFixed32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedFixed32_);
+        bitField1_ |= 0x10000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedFixed32() {
+        unpackedFixed32_ = emptyIntList();
+        bitField1_ = (bitField1_ & ~0x10000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList unpackedFixed64_ = emptyLongList();
+      private void ensureUnpackedFixed64IsMutable() {
+        if (!unpackedFixed64_.isModifiable()) {
+          unpackedFixed64_ = makeMutableCopy(unpackedFixed64_);
+        }
+        bitField1_ |= 0x20000000;
+      }
+      private void ensureUnpackedFixed64IsMutable(int capacity) {
+        if (!unpackedFixed64_.isModifiable()) {
+          unpackedFixed64_ = makeMutableCopy(unpackedFixed64_, capacity);
+        }
+        bitField1_ |= 0x20000000;
+      }
+      /**
+       * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+       * @return A list containing the unpackedFixed64.
+       */
+      public java.util.List<java.lang.Long>
+          getUnpackedFixed64List() {
+        unpackedFixed64_.makeImmutable();
+        return unpackedFixed64_;
+      }
+      /**
+       * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+       * @return The count of unpackedFixed64.
+       */
+      public int getUnpackedFixed64Count() {
+        return unpackedFixed64_.size();
+      }
+      /**
+       * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedFixed64 at the given index.
+       */
+      public long getUnpackedFixed64(int index) {
+        return unpackedFixed64_.getLong(index);
+      }
+      /**
+       * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedFixed64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedFixed64(
+          int index, long value) {
+
+        ensureUnpackedFixed64IsMutable();
+        unpackedFixed64_.setLong(index, value);
+        bitField1_ |= 0x20000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+       * @param value The unpackedFixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedFixed64(long value) {
+
+        ensureUnpackedFixed64IsMutable();
+        unpackedFixed64_.addLong(value);
+        bitField1_ |= 0x20000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+       * @param values The unpackedFixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedFixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureUnpackedFixed64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedFixed64_);
+        bitField1_ |= 0x20000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedFixed64() {
+        unpackedFixed64_ = emptyLongList();
+        bitField1_ = (bitField1_ & ~0x20000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList unpackedSfixed32_ = emptyIntList();
+      private void ensureUnpackedSfixed32IsMutable() {
+        if (!unpackedSfixed32_.isModifiable()) {
+          unpackedSfixed32_ = makeMutableCopy(unpackedSfixed32_);
+        }
+        bitField1_ |= 0x40000000;
+      }
+      private void ensureUnpackedSfixed32IsMutable(int capacity) {
+        if (!unpackedSfixed32_.isModifiable()) {
+          unpackedSfixed32_ = makeMutableCopy(unpackedSfixed32_, capacity);
+        }
+        bitField1_ |= 0x40000000;
+      }
+      /**
+       * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+       * @return A list containing the unpackedSfixed32.
+       */
+      public java.util.List<java.lang.Integer>
+          getUnpackedSfixed32List() {
+        unpackedSfixed32_.makeImmutable();
+        return unpackedSfixed32_;
+      }
+      /**
+       * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+       * @return The count of unpackedSfixed32.
+       */
+      public int getUnpackedSfixed32Count() {
+        return unpackedSfixed32_.size();
+      }
+      /**
+       * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedSfixed32 at the given index.
+       */
+      public int getUnpackedSfixed32(int index) {
+        return unpackedSfixed32_.getInt(index);
+      }
+      /**
+       * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedSfixed32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedSfixed32(
+          int index, int value) {
+
+        ensureUnpackedSfixed32IsMutable();
+        unpackedSfixed32_.setInt(index, value);
+        bitField1_ |= 0x40000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+       * @param value The unpackedSfixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedSfixed32(int value) {
+
+        ensureUnpackedSfixed32IsMutable();
+        unpackedSfixed32_.addInt(value);
+        bitField1_ |= 0x40000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+       * @param values The unpackedSfixed32 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedSfixed32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureUnpackedSfixed32IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedSfixed32_);
+        bitField1_ |= 0x40000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedSfixed32() {
+        unpackedSfixed32_ = emptyIntList();
+        bitField1_ = (bitField1_ & ~0x40000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList unpackedSfixed64_ = emptyLongList();
+      private void ensureUnpackedSfixed64IsMutable() {
+        if (!unpackedSfixed64_.isModifiable()) {
+          unpackedSfixed64_ = makeMutableCopy(unpackedSfixed64_);
+        }
+        bitField1_ |= 0x80000000;
+      }
+      private void ensureUnpackedSfixed64IsMutable(int capacity) {
+        if (!unpackedSfixed64_.isModifiable()) {
+          unpackedSfixed64_ = makeMutableCopy(unpackedSfixed64_, capacity);
+        }
+        bitField1_ |= 0x80000000;
+      }
+      /**
+       * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+       * @return A list containing the unpackedSfixed64.
+       */
+      public java.util.List<java.lang.Long>
+          getUnpackedSfixed64List() {
+        unpackedSfixed64_.makeImmutable();
+        return unpackedSfixed64_;
+      }
+      /**
+       * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+       * @return The count of unpackedSfixed64.
+       */
+      public int getUnpackedSfixed64Count() {
+        return unpackedSfixed64_.size();
+      }
+      /**
+       * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedSfixed64 at the given index.
+       */
+      public long getUnpackedSfixed64(int index) {
+        return unpackedSfixed64_.getLong(index);
+      }
+      /**
+       * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedSfixed64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedSfixed64(
+          int index, long value) {
+
+        ensureUnpackedSfixed64IsMutable();
+        unpackedSfixed64_.setLong(index, value);
+        bitField1_ |= 0x80000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+       * @param value The unpackedSfixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedSfixed64(long value) {
+
+        ensureUnpackedSfixed64IsMutable();
+        unpackedSfixed64_.addLong(value);
+        bitField1_ |= 0x80000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+       * @param values The unpackedSfixed64 to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedSfixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureUnpackedSfixed64IsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedSfixed64_);
+        bitField1_ |= 0x80000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedSfixed64() {
+        unpackedSfixed64_ = emptyLongList();
+        bitField1_ = (bitField1_ & ~0x80000000);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.FloatList unpackedFloat_ = emptyFloatList();
+      private void ensureUnpackedFloatIsMutable() {
+        if (!unpackedFloat_.isModifiable()) {
+          unpackedFloat_ = makeMutableCopy(unpackedFloat_);
+        }
+        bitField2_ |= 0x00000001;
+      }
+      private void ensureUnpackedFloatIsMutable(int capacity) {
+        if (!unpackedFloat_.isModifiable()) {
+          unpackedFloat_ = makeMutableCopy(unpackedFloat_, capacity);
+        }
+        bitField2_ |= 0x00000001;
+      }
+      /**
+       * <code>repeated float unpacked_float = 99 [packed = false];</code>
+       * @return A list containing the unpackedFloat.
+       */
+      public java.util.List<java.lang.Float>
+          getUnpackedFloatList() {
+        unpackedFloat_.makeImmutable();
+        return unpackedFloat_;
+      }
+      /**
+       * <code>repeated float unpacked_float = 99 [packed = false];</code>
+       * @return The count of unpackedFloat.
+       */
+      public int getUnpackedFloatCount() {
+        return unpackedFloat_.size();
+      }
+      /**
+       * <code>repeated float unpacked_float = 99 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedFloat at the given index.
+       */
+      public float getUnpackedFloat(int index) {
+        return unpackedFloat_.getFloat(index);
+      }
+      /**
+       * <code>repeated float unpacked_float = 99 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedFloat to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedFloat(
+          int index, float value) {
+
+        ensureUnpackedFloatIsMutable();
+        unpackedFloat_.setFloat(index, value);
+        bitField2_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated float unpacked_float = 99 [packed = false];</code>
+       * @param value The unpackedFloat to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedFloat(float value) {
+
+        ensureUnpackedFloatIsMutable();
+        unpackedFloat_.addFloat(value);
+        bitField2_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated float unpacked_float = 99 [packed = false];</code>
+       * @param values The unpackedFloat to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedFloat(
+          java.lang.Iterable<? extends java.lang.Float> values) {
+        ensureUnpackedFloatIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedFloat_);
+        bitField2_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated float unpacked_float = 99 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedFloat() {
+        unpackedFloat_ = emptyFloatList();
+        bitField2_ = (bitField2_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.DoubleList unpackedDouble_ = emptyDoubleList();
+      private void ensureUnpackedDoubleIsMutable() {
+        if (!unpackedDouble_.isModifiable()) {
+          unpackedDouble_ = makeMutableCopy(unpackedDouble_);
+        }
+        bitField2_ |= 0x00000002;
+      }
+      private void ensureUnpackedDoubleIsMutable(int capacity) {
+        if (!unpackedDouble_.isModifiable()) {
+          unpackedDouble_ = makeMutableCopy(unpackedDouble_, capacity);
+        }
+        bitField2_ |= 0x00000002;
+      }
+      /**
+       * <code>repeated double unpacked_double = 100 [packed = false];</code>
+       * @return A list containing the unpackedDouble.
+       */
+      public java.util.List<java.lang.Double>
+          getUnpackedDoubleList() {
+        unpackedDouble_.makeImmutable();
+        return unpackedDouble_;
+      }
+      /**
+       * <code>repeated double unpacked_double = 100 [packed = false];</code>
+       * @return The count of unpackedDouble.
+       */
+      public int getUnpackedDoubleCount() {
+        return unpackedDouble_.size();
+      }
+      /**
+       * <code>repeated double unpacked_double = 100 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedDouble at the given index.
+       */
+      public double getUnpackedDouble(int index) {
+        return unpackedDouble_.getDouble(index);
+      }
+      /**
+       * <code>repeated double unpacked_double = 100 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedDouble to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedDouble(
+          int index, double value) {
+
+        ensureUnpackedDoubleIsMutable();
+        unpackedDouble_.setDouble(index, value);
+        bitField2_ |= 0x00000002;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated double unpacked_double = 100 [packed = false];</code>
+       * @param value The unpackedDouble to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedDouble(double value) {
+
+        ensureUnpackedDoubleIsMutable();
+        unpackedDouble_.addDouble(value);
+        bitField2_ |= 0x00000002;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated double unpacked_double = 100 [packed = false];</code>
+       * @param values The unpackedDouble to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedDouble(
+          java.lang.Iterable<? extends java.lang.Double> values) {
+        ensureUnpackedDoubleIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedDouble_);
+        bitField2_ |= 0x00000002;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated double unpacked_double = 100 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedDouble() {
+        unpackedDouble_ = emptyDoubleList();
+        bitField2_ = (bitField2_ & ~0x00000002);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.BooleanList unpackedBool_ = emptyBooleanList();
+      private void ensureUnpackedBoolIsMutable() {
+        if (!unpackedBool_.isModifiable()) {
+          unpackedBool_ = makeMutableCopy(unpackedBool_);
+        }
+        bitField2_ |= 0x00000004;
+      }
+      private void ensureUnpackedBoolIsMutable(int capacity) {
+        if (!unpackedBool_.isModifiable()) {
+          unpackedBool_ = makeMutableCopy(unpackedBool_, capacity);
+        }
+        bitField2_ |= 0x00000004;
+      }
+      /**
+       * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+       * @return A list containing the unpackedBool.
+       */
+      public java.util.List<java.lang.Boolean>
+          getUnpackedBoolList() {
+        unpackedBool_.makeImmutable();
+        return unpackedBool_;
+      }
+      /**
+       * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+       * @return The count of unpackedBool.
+       */
+      public int getUnpackedBoolCount() {
+        return unpackedBool_.size();
+      }
+      /**
+       * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedBool at the given index.
+       */
+      public boolean getUnpackedBool(int index) {
+        return unpackedBool_.getBoolean(index);
+      }
+      /**
+       * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedBool to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedBool(
+          int index, boolean value) {
+
+        ensureUnpackedBoolIsMutable();
+        unpackedBool_.setBoolean(index, value);
+        bitField2_ |= 0x00000004;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+       * @param value The unpackedBool to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedBool(boolean value) {
+
+        ensureUnpackedBoolIsMutable();
+        unpackedBool_.addBoolean(value);
+        bitField2_ |= 0x00000004;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+       * @param values The unpackedBool to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedBool(
+          java.lang.Iterable<? extends java.lang.Boolean> values) {
+        ensureUnpackedBoolIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedBool_);
+        bitField2_ |= 0x00000004;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedBool() {
+        unpackedBool_ = emptyBooleanList();
+        bitField2_ = (bitField2_ & ~0x00000004);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList unpackedNestedEnum_ = emptyIntList();
+      private void ensureUnpackedNestedEnumIsMutable() {
+        if (!unpackedNestedEnum_.isModifiable()) {
+          unpackedNestedEnum_ = makeMutableCopy(unpackedNestedEnum_);
+        }
+        bitField2_ |= 0x00000008;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+       * @return A list containing the unpackedNestedEnum.
+       */
+      public java.util.List<legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> getUnpackedNestedEnumList() {
+        return new com.google.protobuf.Internal.IntListAdapter<
+            legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>(unpackedNestedEnum_, unpackedNestedEnum_converter_);
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+       * @return The count of unpackedNestedEnum.
+       */
+      public int getUnpackedNestedEnumCount() {
+        return unpackedNestedEnum_.size();
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+       * @param index The index of the element to return.
+       * @return The unpackedNestedEnum at the given index.
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getUnpackedNestedEnum(int index) {
+        return unpackedNestedEnum_converter_.convert(unpackedNestedEnum_.getInt(index));
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+       * @param index The index to set the value at.
+       * @param value The unpackedNestedEnum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnpackedNestedEnum(
+          int index, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value) {
+        if (value == null) { throw new NullPointerException(); }
+        ensureUnpackedNestedEnumIsMutable();
+        unpackedNestedEnum_.setInt(index, value.getNumber());
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+       * @param value The unpackedNestedEnum to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnpackedNestedEnum(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value) {
+        if (value == null) { throw new NullPointerException(); }
+        ensureUnpackedNestedEnumIsMutable();
+        unpackedNestedEnum_.addInt(value.getNumber());
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+       * @param values The unpackedNestedEnum to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnpackedNestedEnum(
+          java.lang.Iterable<? extends legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> values) {
+        ensureUnpackedNestedEnumIsMutable();
+        for (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value : values) {
+          unpackedNestedEnum_.addInt(value.getNumber());
+        }
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnpackedNestedEnum() {
+        unpackedNestedEnum_ = emptyIntList();
+        bitField2_ = (bitField2_ & ~0x00000008);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> mapInt32Int32_;
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+          internalGetMapInt32Int32() {
+        if (mapInt32Int32_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapInt32Int32DefaultEntryHolder.defaultEntry);
+        }
+        return mapInt32Int32_;
+      }
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+          internalGetMutableMapInt32Int32() {
+        if (mapInt32Int32_ == null) {
+          mapInt32Int32_ = com.google.protobuf.MapField.newMapField(
+              MapInt32Int32DefaultEntryHolder.defaultEntry);
+        }
+        if (!mapInt32Int32_.isMutable()) {
+          mapInt32Int32_ = mapInt32Int32_.copy();
+        }
+        bitField2_ |= 0x00000010;
+        onChanged();
+        return mapInt32Int32_;
+      }
+      public int getMapInt32Int32Count() {
+        return internalGetMapInt32Int32().getMap().size();
+      }
+      /**
+       * <pre>
+       * Map
+       * </pre>
+       *
+       * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapInt32Int32(
+          int key) {
+
+        return internalGetMapInt32Int32().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapInt32Int32Map()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32() {
+        return getMapInt32Int32Map();
+      }
+      /**
+       * <pre>
+       * Map
+       * </pre>
+       *
+       * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32Map() {
+        return internalGetMapInt32Int32().getMap();
+      }
+      /**
+       * <pre>
+       * Map
+       * </pre>
+       *
+       * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+       */
+      @java.lang.Override
+      public int getMapInt32Int32OrDefault(
+          int key,
+          int defaultValue) {
+
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetMapInt32Int32().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <pre>
+       * Map
+       * </pre>
+       *
+       * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+       */
+      @java.lang.Override
+      public int getMapInt32Int32OrThrow(
+          int key) {
+
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetMapInt32Int32().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapInt32Int32() {
+        bitField2_ = (bitField2_ & ~0x00000010);
+        internalGetMutableMapInt32Int32().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <pre>
+       * Map
+       * </pre>
+       *
+       * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+       */
+      public Builder removeMapInt32Int32(
+          int key) {
+
+        internalGetMutableMapInt32Int32().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+          getMutableMapInt32Int32() {
+        bitField2_ |= 0x00000010;
+        return internalGetMutableMapInt32Int32().getMutableMap();
+      }
+      /**
+       * <pre>
+       * Map
+       * </pre>
+       *
+       * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+       */
+      public Builder putMapInt32Int32(
+          int key,
+          int value) {
+
+
+        internalGetMutableMapInt32Int32().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00000010;
+        return this;
+      }
+      /**
+       * <pre>
+       * Map
+       * </pre>
+       *
+       * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
+       */
+      public Builder putAllMapInt32Int32(
+          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
+        internalGetMutableMapInt32Int32().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00000010;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Long, java.lang.Long> mapInt64Int64_;
+      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+          internalGetMapInt64Int64() {
+        if (mapInt64Int64_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapInt64Int64DefaultEntryHolder.defaultEntry);
+        }
+        return mapInt64Int64_;
+      }
+      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+          internalGetMutableMapInt64Int64() {
+        if (mapInt64Int64_ == null) {
+          mapInt64Int64_ = com.google.protobuf.MapField.newMapField(
+              MapInt64Int64DefaultEntryHolder.defaultEntry);
+        }
+        if (!mapInt64Int64_.isMutable()) {
+          mapInt64Int64_ = mapInt64Int64_.copy();
+        }
+        bitField2_ |= 0x00000020;
+        onChanged();
+        return mapInt64Int64_;
+      }
+      public int getMapInt64Int64Count() {
+        return internalGetMapInt64Int64().getMap().size();
+      }
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapInt64Int64(
+          long key) {
+
+        return internalGetMapInt64Int64().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapInt64Int64Map()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Long, java.lang.Long> getMapInt64Int64() {
+        return getMapInt64Int64Map();
+      }
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Long, java.lang.Long> getMapInt64Int64Map() {
+        return internalGetMapInt64Int64().getMap();
+      }
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
+      @java.lang.Override
+      public long getMapInt64Int64OrDefault(
+          long key,
+          long defaultValue) {
+
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapInt64Int64().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
+      @java.lang.Override
+      public long getMapInt64Int64OrThrow(
+          long key) {
+
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapInt64Int64().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapInt64Int64() {
+        bitField2_ = (bitField2_ & ~0x00000020);
+        internalGetMutableMapInt64Int64().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
+      public Builder removeMapInt64Int64(
+          long key) {
+
+        internalGetMutableMapInt64Int64().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Long, java.lang.Long>
+          getMutableMapInt64Int64() {
+        bitField2_ |= 0x00000020;
+        return internalGetMutableMapInt64Int64().getMutableMap();
+      }
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
+      public Builder putMapInt64Int64(
+          long key,
+          long value) {
+
+
+        internalGetMutableMapInt64Int64().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00000020;
+        return this;
+      }
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
+      public Builder putAllMapInt64Int64(
+          java.util.Map<java.lang.Long, java.lang.Long> values) {
+        internalGetMutableMapInt64Int64().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00000020;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> mapUint32Uint32_;
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+          internalGetMapUint32Uint32() {
+        if (mapUint32Uint32_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapUint32Uint32DefaultEntryHolder.defaultEntry);
+        }
+        return mapUint32Uint32_;
+      }
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+          internalGetMutableMapUint32Uint32() {
+        if (mapUint32Uint32_ == null) {
+          mapUint32Uint32_ = com.google.protobuf.MapField.newMapField(
+              MapUint32Uint32DefaultEntryHolder.defaultEntry);
+        }
+        if (!mapUint32Uint32_.isMutable()) {
+          mapUint32Uint32_ = mapUint32Uint32_.copy();
+        }
+        bitField2_ |= 0x00000040;
+        onChanged();
+        return mapUint32Uint32_;
+      }
+      public int getMapUint32Uint32Count() {
+        return internalGetMapUint32Uint32().getMap().size();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapUint32Uint32(
+          int key) {
+
+        return internalGetMapUint32Uint32().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapUint32Uint32Map()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getMapUint32Uint32() {
+        return getMapUint32Uint32Map();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getMapUint32Uint32Map() {
+        return internalGetMapUint32Uint32().getMap();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
+      @java.lang.Override
+      public int getMapUint32Uint32OrDefault(
+          int key,
+          int defaultValue) {
+
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetMapUint32Uint32().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
+      @java.lang.Override
+      public int getMapUint32Uint32OrThrow(
+          int key) {
+
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetMapUint32Uint32().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapUint32Uint32() {
+        bitField2_ = (bitField2_ & ~0x00000040);
+        internalGetMutableMapUint32Uint32().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
+      public Builder removeMapUint32Uint32(
+          int key) {
+
+        internalGetMutableMapUint32Uint32().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+          getMutableMapUint32Uint32() {
+        bitField2_ |= 0x00000040;
+        return internalGetMutableMapUint32Uint32().getMutableMap();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
+      public Builder putMapUint32Uint32(
+          int key,
+          int value) {
+
+
+        internalGetMutableMapUint32Uint32().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00000040;
+        return this;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
+      public Builder putAllMapUint32Uint32(
+          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
+        internalGetMutableMapUint32Uint32().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00000040;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Long, java.lang.Long> mapUint64Uint64_;
+      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+          internalGetMapUint64Uint64() {
+        if (mapUint64Uint64_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapUint64Uint64DefaultEntryHolder.defaultEntry);
+        }
+        return mapUint64Uint64_;
+      }
+      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+          internalGetMutableMapUint64Uint64() {
+        if (mapUint64Uint64_ == null) {
+          mapUint64Uint64_ = com.google.protobuf.MapField.newMapField(
+              MapUint64Uint64DefaultEntryHolder.defaultEntry);
+        }
+        if (!mapUint64Uint64_.isMutable()) {
+          mapUint64Uint64_ = mapUint64Uint64_.copy();
+        }
+        bitField2_ |= 0x00000080;
+        onChanged();
+        return mapUint64Uint64_;
+      }
+      public int getMapUint64Uint64Count() {
+        return internalGetMapUint64Uint64().getMap().size();
+      }
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapUint64Uint64(
+          long key) {
+
+        return internalGetMapUint64Uint64().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapUint64Uint64Map()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Long, java.lang.Long> getMapUint64Uint64() {
+        return getMapUint64Uint64Map();
+      }
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Long, java.lang.Long> getMapUint64Uint64Map() {
+        return internalGetMapUint64Uint64().getMap();
+      }
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
+      @java.lang.Override
+      public long getMapUint64Uint64OrDefault(
+          long key,
+          long defaultValue) {
+
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapUint64Uint64().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
+      @java.lang.Override
+      public long getMapUint64Uint64OrThrow(
+          long key) {
+
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapUint64Uint64().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapUint64Uint64() {
+        bitField2_ = (bitField2_ & ~0x00000080);
+        internalGetMutableMapUint64Uint64().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
+      public Builder removeMapUint64Uint64(
+          long key) {
+
+        internalGetMutableMapUint64Uint64().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Long, java.lang.Long>
+          getMutableMapUint64Uint64() {
+        bitField2_ |= 0x00000080;
+        return internalGetMutableMapUint64Uint64().getMutableMap();
+      }
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
+      public Builder putMapUint64Uint64(
+          long key,
+          long value) {
+
+
+        internalGetMutableMapUint64Uint64().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00000080;
+        return this;
+      }
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
+      public Builder putAllMapUint64Uint64(
+          java.util.Map<java.lang.Long, java.lang.Long> values) {
+        internalGetMutableMapUint64Uint64().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00000080;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> mapSint32Sint32_;
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+          internalGetMapSint32Sint32() {
+        if (mapSint32Sint32_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapSint32Sint32DefaultEntryHolder.defaultEntry);
+        }
+        return mapSint32Sint32_;
+      }
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+          internalGetMutableMapSint32Sint32() {
+        if (mapSint32Sint32_ == null) {
+          mapSint32Sint32_ = com.google.protobuf.MapField.newMapField(
+              MapSint32Sint32DefaultEntryHolder.defaultEntry);
+        }
+        if (!mapSint32Sint32_.isMutable()) {
+          mapSint32Sint32_ = mapSint32Sint32_.copy();
+        }
+        bitField2_ |= 0x00000100;
+        onChanged();
+        return mapSint32Sint32_;
+      }
+      public int getMapSint32Sint32Count() {
+        return internalGetMapSint32Sint32().getMap().size();
+      }
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapSint32Sint32(
+          int key) {
+
+        return internalGetMapSint32Sint32().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapSint32Sint32Map()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSint32Sint32() {
+        return getMapSint32Sint32Map();
+      }
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSint32Sint32Map() {
+        return internalGetMapSint32Sint32().getMap();
+      }
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
+      @java.lang.Override
+      public int getMapSint32Sint32OrDefault(
+          int key,
+          int defaultValue) {
+
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetMapSint32Sint32().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
+      @java.lang.Override
+      public int getMapSint32Sint32OrThrow(
+          int key) {
+
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetMapSint32Sint32().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapSint32Sint32() {
+        bitField2_ = (bitField2_ & ~0x00000100);
+        internalGetMutableMapSint32Sint32().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
+      public Builder removeMapSint32Sint32(
+          int key) {
+
+        internalGetMutableMapSint32Sint32().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+          getMutableMapSint32Sint32() {
+        bitField2_ |= 0x00000100;
+        return internalGetMutableMapSint32Sint32().getMutableMap();
+      }
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
+      public Builder putMapSint32Sint32(
+          int key,
+          int value) {
+
+
+        internalGetMutableMapSint32Sint32().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00000100;
+        return this;
+      }
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
+      public Builder putAllMapSint32Sint32(
+          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
+        internalGetMutableMapSint32Sint32().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00000100;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Long, java.lang.Long> mapSint64Sint64_;
+      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+          internalGetMapSint64Sint64() {
+        if (mapSint64Sint64_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapSint64Sint64DefaultEntryHolder.defaultEntry);
+        }
+        return mapSint64Sint64_;
+      }
+      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+          internalGetMutableMapSint64Sint64() {
+        if (mapSint64Sint64_ == null) {
+          mapSint64Sint64_ = com.google.protobuf.MapField.newMapField(
+              MapSint64Sint64DefaultEntryHolder.defaultEntry);
+        }
+        if (!mapSint64Sint64_.isMutable()) {
+          mapSint64Sint64_ = mapSint64Sint64_.copy();
+        }
+        bitField2_ |= 0x00000200;
+        onChanged();
+        return mapSint64Sint64_;
+      }
+      public int getMapSint64Sint64Count() {
+        return internalGetMapSint64Sint64().getMap().size();
+      }
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapSint64Sint64(
+          long key) {
+
+        return internalGetMapSint64Sint64().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapSint64Sint64Map()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Long, java.lang.Long> getMapSint64Sint64() {
+        return getMapSint64Sint64Map();
+      }
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Long, java.lang.Long> getMapSint64Sint64Map() {
+        return internalGetMapSint64Sint64().getMap();
+      }
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
+      @java.lang.Override
+      public long getMapSint64Sint64OrDefault(
+          long key,
+          long defaultValue) {
+
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapSint64Sint64().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
+      @java.lang.Override
+      public long getMapSint64Sint64OrThrow(
+          long key) {
+
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapSint64Sint64().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapSint64Sint64() {
+        bitField2_ = (bitField2_ & ~0x00000200);
+        internalGetMutableMapSint64Sint64().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
+      public Builder removeMapSint64Sint64(
+          long key) {
+
+        internalGetMutableMapSint64Sint64().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Long, java.lang.Long>
+          getMutableMapSint64Sint64() {
+        bitField2_ |= 0x00000200;
+        return internalGetMutableMapSint64Sint64().getMutableMap();
+      }
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
+      public Builder putMapSint64Sint64(
+          long key,
+          long value) {
+
+
+        internalGetMutableMapSint64Sint64().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00000200;
+        return this;
+      }
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
+      public Builder putAllMapSint64Sint64(
+          java.util.Map<java.lang.Long, java.lang.Long> values) {
+        internalGetMutableMapSint64Sint64().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00000200;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> mapFixed32Fixed32_;
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+          internalGetMapFixed32Fixed32() {
+        if (mapFixed32Fixed32_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapFixed32Fixed32DefaultEntryHolder.defaultEntry);
+        }
+        return mapFixed32Fixed32_;
+      }
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+          internalGetMutableMapFixed32Fixed32() {
+        if (mapFixed32Fixed32_ == null) {
+          mapFixed32Fixed32_ = com.google.protobuf.MapField.newMapField(
+              MapFixed32Fixed32DefaultEntryHolder.defaultEntry);
+        }
+        if (!mapFixed32Fixed32_.isMutable()) {
+          mapFixed32Fixed32_ = mapFixed32Fixed32_.copy();
+        }
+        bitField2_ |= 0x00000400;
+        onChanged();
+        return mapFixed32Fixed32_;
+      }
+      public int getMapFixed32Fixed32Count() {
+        return internalGetMapFixed32Fixed32().getMap().size();
+      }
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapFixed32Fixed32(
+          int key) {
+
+        return internalGetMapFixed32Fixed32().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapFixed32Fixed32Map()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getMapFixed32Fixed32() {
+        return getMapFixed32Fixed32Map();
+      }
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getMapFixed32Fixed32Map() {
+        return internalGetMapFixed32Fixed32().getMap();
+      }
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
+      @java.lang.Override
+      public int getMapFixed32Fixed32OrDefault(
+          int key,
+          int defaultValue) {
+
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetMapFixed32Fixed32().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
+      @java.lang.Override
+      public int getMapFixed32Fixed32OrThrow(
+          int key) {
+
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetMapFixed32Fixed32().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapFixed32Fixed32() {
+        bitField2_ = (bitField2_ & ~0x00000400);
+        internalGetMutableMapFixed32Fixed32().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
+      public Builder removeMapFixed32Fixed32(
+          int key) {
+
+        internalGetMutableMapFixed32Fixed32().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+          getMutableMapFixed32Fixed32() {
+        bitField2_ |= 0x00000400;
+        return internalGetMutableMapFixed32Fixed32().getMutableMap();
+      }
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
+      public Builder putMapFixed32Fixed32(
+          int key,
+          int value) {
+
+
+        internalGetMutableMapFixed32Fixed32().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00000400;
+        return this;
+      }
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
+      public Builder putAllMapFixed32Fixed32(
+          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
+        internalGetMutableMapFixed32Fixed32().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00000400;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Long, java.lang.Long> mapFixed64Fixed64_;
+      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+          internalGetMapFixed64Fixed64() {
+        if (mapFixed64Fixed64_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapFixed64Fixed64DefaultEntryHolder.defaultEntry);
+        }
+        return mapFixed64Fixed64_;
+      }
+      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+          internalGetMutableMapFixed64Fixed64() {
+        if (mapFixed64Fixed64_ == null) {
+          mapFixed64Fixed64_ = com.google.protobuf.MapField.newMapField(
+              MapFixed64Fixed64DefaultEntryHolder.defaultEntry);
+        }
+        if (!mapFixed64Fixed64_.isMutable()) {
+          mapFixed64Fixed64_ = mapFixed64Fixed64_.copy();
+        }
+        bitField2_ |= 0x00000800;
+        onChanged();
+        return mapFixed64Fixed64_;
+      }
+      public int getMapFixed64Fixed64Count() {
+        return internalGetMapFixed64Fixed64().getMap().size();
+      }
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapFixed64Fixed64(
+          long key) {
+
+        return internalGetMapFixed64Fixed64().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapFixed64Fixed64Map()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Long, java.lang.Long> getMapFixed64Fixed64() {
+        return getMapFixed64Fixed64Map();
+      }
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Long, java.lang.Long> getMapFixed64Fixed64Map() {
+        return internalGetMapFixed64Fixed64().getMap();
+      }
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
+      @java.lang.Override
+      public long getMapFixed64Fixed64OrDefault(
+          long key,
+          long defaultValue) {
+
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapFixed64Fixed64().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
+      @java.lang.Override
+      public long getMapFixed64Fixed64OrThrow(
+          long key) {
+
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapFixed64Fixed64().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapFixed64Fixed64() {
+        bitField2_ = (bitField2_ & ~0x00000800);
+        internalGetMutableMapFixed64Fixed64().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
+      public Builder removeMapFixed64Fixed64(
+          long key) {
+
+        internalGetMutableMapFixed64Fixed64().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Long, java.lang.Long>
+          getMutableMapFixed64Fixed64() {
+        bitField2_ |= 0x00000800;
+        return internalGetMutableMapFixed64Fixed64().getMutableMap();
+      }
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
+      public Builder putMapFixed64Fixed64(
+          long key,
+          long value) {
+
+
+        internalGetMutableMapFixed64Fixed64().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00000800;
+        return this;
+      }
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
+      public Builder putAllMapFixed64Fixed64(
+          java.util.Map<java.lang.Long, java.lang.Long> values) {
+        internalGetMutableMapFixed64Fixed64().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00000800;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> mapSfixed32Sfixed32_;
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+          internalGetMapSfixed32Sfixed32() {
+        if (mapSfixed32Sfixed32_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry);
+        }
+        return mapSfixed32Sfixed32_;
+      }
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+          internalGetMutableMapSfixed32Sfixed32() {
+        if (mapSfixed32Sfixed32_ == null) {
+          mapSfixed32Sfixed32_ = com.google.protobuf.MapField.newMapField(
+              MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry);
+        }
+        if (!mapSfixed32Sfixed32_.isMutable()) {
+          mapSfixed32Sfixed32_ = mapSfixed32Sfixed32_.copy();
+        }
+        bitField2_ |= 0x00001000;
+        onChanged();
+        return mapSfixed32Sfixed32_;
+      }
+      public int getMapSfixed32Sfixed32Count() {
+        return internalGetMapSfixed32Sfixed32().getMap().size();
+      }
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapSfixed32Sfixed32(
+          int key) {
+
+        return internalGetMapSfixed32Sfixed32().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapSfixed32Sfixed32Map()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSfixed32Sfixed32() {
+        return getMapSfixed32Sfixed32Map();
+      }
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSfixed32Sfixed32Map() {
+        return internalGetMapSfixed32Sfixed32().getMap();
+      }
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
+      @java.lang.Override
+      public int getMapSfixed32Sfixed32OrDefault(
+          int key,
+          int defaultValue) {
+
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetMapSfixed32Sfixed32().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
+      @java.lang.Override
+      public int getMapSfixed32Sfixed32OrThrow(
+          int key) {
+
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetMapSfixed32Sfixed32().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapSfixed32Sfixed32() {
+        bitField2_ = (bitField2_ & ~0x00001000);
+        internalGetMutableMapSfixed32Sfixed32().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
+      public Builder removeMapSfixed32Sfixed32(
+          int key) {
+
+        internalGetMutableMapSfixed32Sfixed32().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+          getMutableMapSfixed32Sfixed32() {
+        bitField2_ |= 0x00001000;
+        return internalGetMutableMapSfixed32Sfixed32().getMutableMap();
+      }
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
+      public Builder putMapSfixed32Sfixed32(
+          int key,
+          int value) {
+
+
+        internalGetMutableMapSfixed32Sfixed32().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00001000;
+        return this;
+      }
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
+      public Builder putAllMapSfixed32Sfixed32(
+          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
+        internalGetMutableMapSfixed32Sfixed32().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00001000;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Long, java.lang.Long> mapSfixed64Sfixed64_;
+      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+          internalGetMapSfixed64Sfixed64() {
+        if (mapSfixed64Sfixed64_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry);
+        }
+        return mapSfixed64Sfixed64_;
+      }
+      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
+          internalGetMutableMapSfixed64Sfixed64() {
+        if (mapSfixed64Sfixed64_ == null) {
+          mapSfixed64Sfixed64_ = com.google.protobuf.MapField.newMapField(
+              MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry);
+        }
+        if (!mapSfixed64Sfixed64_.isMutable()) {
+          mapSfixed64Sfixed64_ = mapSfixed64Sfixed64_.copy();
+        }
+        bitField2_ |= 0x00002000;
+        onChanged();
+        return mapSfixed64Sfixed64_;
+      }
+      public int getMapSfixed64Sfixed64Count() {
+        return internalGetMapSfixed64Sfixed64().getMap().size();
+      }
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapSfixed64Sfixed64(
+          long key) {
+
+        return internalGetMapSfixed64Sfixed64().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapSfixed64Sfixed64Map()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Long, java.lang.Long> getMapSfixed64Sfixed64() {
+        return getMapSfixed64Sfixed64Map();
+      }
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Long, java.lang.Long> getMapSfixed64Sfixed64Map() {
+        return internalGetMapSfixed64Sfixed64().getMap();
+      }
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
+      @java.lang.Override
+      public long getMapSfixed64Sfixed64OrDefault(
+          long key,
+          long defaultValue) {
+
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapSfixed64Sfixed64().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
+      @java.lang.Override
+      public long getMapSfixed64Sfixed64OrThrow(
+          long key) {
+
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapSfixed64Sfixed64().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapSfixed64Sfixed64() {
+        bitField2_ = (bitField2_ & ~0x00002000);
+        internalGetMutableMapSfixed64Sfixed64().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
+      public Builder removeMapSfixed64Sfixed64(
+          long key) {
+
+        internalGetMutableMapSfixed64Sfixed64().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Long, java.lang.Long>
+          getMutableMapSfixed64Sfixed64() {
+        bitField2_ |= 0x00002000;
+        return internalGetMutableMapSfixed64Sfixed64().getMutableMap();
+      }
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
+      public Builder putMapSfixed64Sfixed64(
+          long key,
+          long value) {
+
+
+        internalGetMutableMapSfixed64Sfixed64().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00002000;
+        return this;
+      }
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
+      public Builder putAllMapSfixed64Sfixed64(
+          java.util.Map<java.lang.Long, java.lang.Long> values) {
+        internalGetMutableMapSfixed64Sfixed64().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00002000;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Float> mapInt32Float_;
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float>
+          internalGetMapInt32Float() {
+        if (mapInt32Float_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapInt32FloatDefaultEntryHolder.defaultEntry);
+        }
+        return mapInt32Float_;
+      }
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float>
+          internalGetMutableMapInt32Float() {
+        if (mapInt32Float_ == null) {
+          mapInt32Float_ = com.google.protobuf.MapField.newMapField(
+              MapInt32FloatDefaultEntryHolder.defaultEntry);
+        }
+        if (!mapInt32Float_.isMutable()) {
+          mapInt32Float_ = mapInt32Float_.copy();
+        }
+        bitField2_ |= 0x00004000;
+        onChanged();
+        return mapInt32Float_;
+      }
+      public int getMapInt32FloatCount() {
+        return internalGetMapInt32Float().getMap().size();
+      }
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapInt32Float(
+          int key) {
+
+        return internalGetMapInt32Float().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapInt32FloatMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Float> getMapInt32Float() {
+        return getMapInt32FloatMap();
+      }
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Integer, java.lang.Float> getMapInt32FloatMap() {
+        return internalGetMapInt32Float().getMap();
+      }
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
+      @java.lang.Override
+      public float getMapInt32FloatOrDefault(
+          int key,
+          float defaultValue) {
+
+        java.util.Map<java.lang.Integer, java.lang.Float> map =
+            internalGetMapInt32Float().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
+      @java.lang.Override
+      public float getMapInt32FloatOrThrow(
+          int key) {
+
+        java.util.Map<java.lang.Integer, java.lang.Float> map =
+            internalGetMapInt32Float().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapInt32Float() {
+        bitField2_ = (bitField2_ & ~0x00004000);
+        internalGetMutableMapInt32Float().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
+      public Builder removeMapInt32Float(
+          int key) {
+
+        internalGetMutableMapInt32Float().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Float>
+          getMutableMapInt32Float() {
+        bitField2_ |= 0x00004000;
+        return internalGetMutableMapInt32Float().getMutableMap();
+      }
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
+      public Builder putMapInt32Float(
+          int key,
+          float value) {
+
+
+        internalGetMutableMapInt32Float().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00004000;
+        return this;
+      }
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
+      public Builder putAllMapInt32Float(
+          java.util.Map<java.lang.Integer, java.lang.Float> values) {
+        internalGetMutableMapInt32Float().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00004000;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Double> mapInt32Double_;
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Double>
+          internalGetMapInt32Double() {
+        if (mapInt32Double_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapInt32DoubleDefaultEntryHolder.defaultEntry);
+        }
+        return mapInt32Double_;
+      }
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Double>
+          internalGetMutableMapInt32Double() {
+        if (mapInt32Double_ == null) {
+          mapInt32Double_ = com.google.protobuf.MapField.newMapField(
+              MapInt32DoubleDefaultEntryHolder.defaultEntry);
+        }
+        if (!mapInt32Double_.isMutable()) {
+          mapInt32Double_ = mapInt32Double_.copy();
+        }
+        bitField2_ |= 0x00008000;
+        onChanged();
+        return mapInt32Double_;
+      }
+      public int getMapInt32DoubleCount() {
+        return internalGetMapInt32Double().getMap().size();
+      }
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapInt32Double(
+          int key) {
+
+        return internalGetMapInt32Double().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapInt32DoubleMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Double> getMapInt32Double() {
+        return getMapInt32DoubleMap();
+      }
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Integer, java.lang.Double> getMapInt32DoubleMap() {
+        return internalGetMapInt32Double().getMap();
+      }
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
+      @java.lang.Override
+      public double getMapInt32DoubleOrDefault(
+          int key,
+          double defaultValue) {
+
+        java.util.Map<java.lang.Integer, java.lang.Double> map =
+            internalGetMapInt32Double().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
+      @java.lang.Override
+      public double getMapInt32DoubleOrThrow(
+          int key) {
+
+        java.util.Map<java.lang.Integer, java.lang.Double> map =
+            internalGetMapInt32Double().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapInt32Double() {
+        bitField2_ = (bitField2_ & ~0x00008000);
+        internalGetMutableMapInt32Double().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
+      public Builder removeMapInt32Double(
+          int key) {
+
+        internalGetMutableMapInt32Double().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Double>
+          getMutableMapInt32Double() {
+        bitField2_ |= 0x00008000;
+        return internalGetMutableMapInt32Double().getMutableMap();
+      }
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
+      public Builder putMapInt32Double(
+          int key,
+          double value) {
+
+
+        internalGetMutableMapInt32Double().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00008000;
+        return this;
+      }
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
+      public Builder putAllMapInt32Double(
+          java.util.Map<java.lang.Integer, java.lang.Double> values) {
+        internalGetMutableMapInt32Double().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00008000;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Boolean, java.lang.Boolean> mapBoolBool_;
+      private com.google.protobuf.MapField<java.lang.Boolean, java.lang.Boolean>
+          internalGetMapBoolBool() {
+        if (mapBoolBool_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapBoolBoolDefaultEntryHolder.defaultEntry);
+        }
+        return mapBoolBool_;
+      }
+      private com.google.protobuf.MapField<java.lang.Boolean, java.lang.Boolean>
+          internalGetMutableMapBoolBool() {
+        if (mapBoolBool_ == null) {
+          mapBoolBool_ = com.google.protobuf.MapField.newMapField(
+              MapBoolBoolDefaultEntryHolder.defaultEntry);
+        }
+        if (!mapBoolBool_.isMutable()) {
+          mapBoolBool_ = mapBoolBool_.copy();
+        }
+        bitField2_ |= 0x00010000;
+        onChanged();
+        return mapBoolBool_;
+      }
+      public int getMapBoolBoolCount() {
+        return internalGetMapBoolBool().getMap().size();
+      }
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapBoolBool(
+          boolean key) {
+
+        return internalGetMapBoolBool().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapBoolBoolMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Boolean, java.lang.Boolean> getMapBoolBool() {
+        return getMapBoolBoolMap();
+      }
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.Boolean, java.lang.Boolean> getMapBoolBoolMap() {
+        return internalGetMapBoolBool().getMap();
+      }
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
+      @java.lang.Override
+      public boolean getMapBoolBoolOrDefault(
+          boolean key,
+          boolean defaultValue) {
+
+        java.util.Map<java.lang.Boolean, java.lang.Boolean> map =
+            internalGetMapBoolBool().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
+      @java.lang.Override
+      public boolean getMapBoolBoolOrThrow(
+          boolean key) {
+
+        java.util.Map<java.lang.Boolean, java.lang.Boolean> map =
+            internalGetMapBoolBool().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapBoolBool() {
+        bitField2_ = (bitField2_ & ~0x00010000);
+        internalGetMutableMapBoolBool().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
+      public Builder removeMapBoolBool(
+          boolean key) {
+
+        internalGetMutableMapBoolBool().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Boolean, java.lang.Boolean>
+          getMutableMapBoolBool() {
+        bitField2_ |= 0x00010000;
+        return internalGetMutableMapBoolBool().getMutableMap();
+      }
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
+      public Builder putMapBoolBool(
+          boolean key,
+          boolean value) {
+
+
+        internalGetMutableMapBoolBool().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00010000;
+        return this;
+      }
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
+      public Builder putAllMapBoolBool(
+          java.util.Map<java.lang.Boolean, java.lang.Boolean> values) {
+        internalGetMutableMapBoolBool().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00010000;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.String, java.lang.String> mapStringString_;
+      private com.google.protobuf.MapField<java.lang.String, java.lang.String>
+          internalGetMapStringString() {
+        if (mapStringString_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapStringStringDefaultEntryHolder.defaultEntry);
+        }
+        return mapStringString_;
+      }
+      private com.google.protobuf.MapField<java.lang.String, java.lang.String>
+          internalGetMutableMapStringString() {
+        if (mapStringString_ == null) {
+          mapStringString_ = com.google.protobuf.MapField.newMapField(
+              MapStringStringDefaultEntryHolder.defaultEntry);
+        }
+        if (!mapStringString_.isMutable()) {
+          mapStringString_ = mapStringString_.copy();
+        }
+        bitField2_ |= 0x00020000;
+        onChanged();
+        return mapStringString_;
+      }
+      public int getMapStringStringCount() {
+        return internalGetMapStringString().getMap().size();
+      }
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapStringString(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        return internalGetMapStringString().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapStringStringMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, java.lang.String> getMapStringString() {
+        return getMapStringStringMap();
+      }
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.String, java.lang.String> getMapStringStringMap() {
+        return internalGetMapStringString().getMap();
+      }
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
+      @java.lang.Override
+      public /* nullable */
+java.lang.String getMapStringStringOrDefault(
+          java.lang.String key,
+          /* nullable */
+java.lang.String defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, java.lang.String> map =
+            internalGetMapStringString().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
+      @java.lang.Override
+      public java.lang.String getMapStringStringOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, java.lang.String> map =
+            internalGetMapStringString().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapStringString() {
+        bitField2_ = (bitField2_ & ~0x00020000);
+        internalGetMutableMapStringString().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
+      public Builder removeMapStringString(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringString().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, java.lang.String>
+          getMutableMapStringString() {
+        bitField2_ |= 0x00020000;
+        return internalGetMutableMapStringString().getMutableMap();
+      }
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
+      public Builder putMapStringString(
+          java.lang.String key,
+          java.lang.String value) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        if (value == null) { throw new NullPointerException("map value"); }
+        internalGetMutableMapStringString().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00020000;
+        return this;
+      }
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
+      public Builder putAllMapStringString(
+          java.util.Map<java.lang.String, java.lang.String> values) {
+        internalGetMutableMapStringString().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00020000;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.String, com.google.protobuf.ByteString> mapStringBytes_;
+      private com.google.protobuf.MapField<java.lang.String, com.google.protobuf.ByteString>
+          internalGetMapStringBytes() {
+        if (mapStringBytes_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapStringBytesDefaultEntryHolder.defaultEntry);
+        }
+        return mapStringBytes_;
+      }
+      private com.google.protobuf.MapField<java.lang.String, com.google.protobuf.ByteString>
+          internalGetMutableMapStringBytes() {
+        if (mapStringBytes_ == null) {
+          mapStringBytes_ = com.google.protobuf.MapField.newMapField(
+              MapStringBytesDefaultEntryHolder.defaultEntry);
+        }
+        if (!mapStringBytes_.isMutable()) {
+          mapStringBytes_ = mapStringBytes_.copy();
+        }
+        bitField2_ |= 0x00040000;
+        onChanged();
+        return mapStringBytes_;
+      }
+      public int getMapStringBytesCount() {
+        return internalGetMapStringBytes().getMap().size();
+      }
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapStringBytes(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        return internalGetMapStringBytes().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapStringBytesMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, com.google.protobuf.ByteString> getMapStringBytes() {
+        return getMapStringBytesMap();
+      }
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.String, com.google.protobuf.ByteString> getMapStringBytesMap() {
+        return internalGetMapStringBytes().getMap();
+      }
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
+      @java.lang.Override
+      public /* nullable */
+com.google.protobuf.ByteString getMapStringBytesOrDefault(
+          java.lang.String key,
+          /* nullable */
+com.google.protobuf.ByteString defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, com.google.protobuf.ByteString> map =
+            internalGetMapStringBytes().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
+      @java.lang.Override
+      public com.google.protobuf.ByteString getMapStringBytesOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, com.google.protobuf.ByteString> map =
+            internalGetMapStringBytes().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+      public Builder clearMapStringBytes() {
+        bitField2_ = (bitField2_ & ~0x00040000);
+        internalGetMutableMapStringBytes().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
+      public Builder removeMapStringBytes(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringBytes().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, com.google.protobuf.ByteString>
+          getMutableMapStringBytes() {
+        bitField2_ |= 0x00040000;
+        return internalGetMutableMapStringBytes().getMutableMap();
+      }
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
+      public Builder putMapStringBytes(
+          java.lang.String key,
+          com.google.protobuf.ByteString value) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        if (value == null) { throw new NullPointerException("map value"); }
+        internalGetMutableMapStringBytes().getMutableMap()
+            .put(key, value);
+        bitField2_ |= 0x00040000;
+        return this;
+      }
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
+      public Builder putAllMapStringBytes(
+          java.util.Map<java.lang.String, com.google.protobuf.ByteString> values) {
+        internalGetMutableMapStringBytes().getMutableMap()
+            .putAll(values);
+        bitField2_ |= 0x00040000;
+        return this;
+      }
+
+      private static final class MapStringNestedMessageConverter implements com.google.protobuf.MapFieldBuilder.Converter<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> {
+        @java.lang.Override
+        public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage build(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder val) {
+          if (val instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) { return (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) val; }
+          return ((legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder) val).build();
+        }
+
+        @java.lang.Override
+        public com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> defaultEntry() {
+          return MapStringNestedMessageDefaultEntryHolder.defaultEntry;
+        }
+      };
+      private static final MapStringNestedMessageConverter mapStringNestedMessageConverter = new MapStringNestedMessageConverter();
+
+      private com.google.protobuf.MapFieldBuilder<
+          java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder> mapStringNestedMessage_;
+      private com.google.protobuf.MapFieldBuilder<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder>
+          internalGetMapStringNestedMessage() {
+        if (mapStringNestedMessage_ == null) {
+          return new com.google.protobuf.MapFieldBuilder<>(mapStringNestedMessageConverter);
+        }
+        return mapStringNestedMessage_;
+      }
+      private com.google.protobuf.MapFieldBuilder<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder>
+          internalGetMutableMapStringNestedMessage() {
+        if (mapStringNestedMessage_ == null) {
+          mapStringNestedMessage_ = new com.google.protobuf.MapFieldBuilder<>(mapStringNestedMessageConverter);
+        }
+        bitField2_ |= 0x00080000;
+        onChanged();
+        return mapStringNestedMessage_;
+      }
+      public int getMapStringNestedMessageCount() {
+        return internalGetMapStringNestedMessage().ensureBuilderMap().size();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapStringNestedMessage(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        return internalGetMapStringNestedMessage().ensureBuilderMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapStringNestedMessageMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> getMapStringNestedMessage() {
+        return getMapStringNestedMessageMap();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> getMapStringNestedMessageMap() {
+        return internalGetMapStringNestedMessage().getImmutableMap();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+       */
+      @java.lang.Override
+      public /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getMapStringNestedMessageOrDefault(
+          java.lang.String key,
+          /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> map = internalGetMutableMapStringNestedMessage().ensureBuilderMap();
+        return map.containsKey(key) ? mapStringNestedMessageConverter.build(map.get(key)) : defaultValue;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getMapStringNestedMessageOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> map = internalGetMutableMapStringNestedMessage().ensureBuilderMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return mapStringNestedMessageConverter.build(map.get(key));
+      }
+      public Builder clearMapStringNestedMessage() {
+        bitField2_ = (bitField2_ & ~0x00080000);
+        internalGetMutableMapStringNestedMessage().clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+       */
+      public Builder removeMapStringNestedMessage(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringNestedMessage().ensureBuilderMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage>
+          getMutableMapStringNestedMessage() {
+        bitField2_ |= 0x00080000;
+        return internalGetMutableMapStringNestedMessage().ensureMessageMap();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+       */
+      public Builder putMapStringNestedMessage(
+          java.lang.String key,
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage value) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        if (value == null) { throw new NullPointerException("map value"); }
+        internalGetMutableMapStringNestedMessage().ensureBuilderMap()
+            .put(key, value);
+        bitField2_ |= 0x00080000;
+        return this;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+       */
+      public Builder putAllMapStringNestedMessage(
+          java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> values) {
+        for (java.util.Map.Entry<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage> e : values.entrySet()) {
+          if (e.getKey() == null || e.getValue() == null) {
+            throw new NullPointerException();
+          }
+        }
+        internalGetMutableMapStringNestedMessage().ensureBuilderMap()
+            .putAll(values);
+        bitField2_ |= 0x00080000;
+        return this;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage&gt; map_string_nested_message = 71;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder putMapStringNestedMessageBuilderIfAbsent(
+          java.lang.String key) {
+        java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> builderMap = internalGetMutableMapStringNestedMessage().ensureBuilderMap();
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder entry = builderMap.get(key);
+        if (entry == null) {
+          entry = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.newBuilder();
+          builderMap.put(key, entry);
+        }
+        if (entry instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) {
+          entry = ((legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) entry).toBuilder();
+          builderMap.put(key, entry);
+        }
+        return (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder) entry;
+      }
+
+      private static final class MapStringForeignMessageConverter implements com.google.protobuf.MapFieldBuilder.Converter<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> {
+        @java.lang.Override
+        public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage build(legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder val) {
+          if (val instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage) { return (legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage) val; }
+          return ((legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder) val).build();
+        }
+
+        @java.lang.Override
+        public com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> defaultEntry() {
+          return MapStringForeignMessageDefaultEntryHolder.defaultEntry;
+        }
+      };
+      private static final MapStringForeignMessageConverter mapStringForeignMessageConverter = new MapStringForeignMessageConverter();
+
+      private com.google.protobuf.MapFieldBuilder<
+          java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder> mapStringForeignMessage_;
+      private com.google.protobuf.MapFieldBuilder<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder>
+          internalGetMapStringForeignMessage() {
+        if (mapStringForeignMessage_ == null) {
+          return new com.google.protobuf.MapFieldBuilder<>(mapStringForeignMessageConverter);
+        }
+        return mapStringForeignMessage_;
+      }
+      private com.google.protobuf.MapFieldBuilder<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder>
+          internalGetMutableMapStringForeignMessage() {
+        if (mapStringForeignMessage_ == null) {
+          mapStringForeignMessage_ = new com.google.protobuf.MapFieldBuilder<>(mapStringForeignMessageConverter);
+        }
+        bitField2_ |= 0x00100000;
+        onChanged();
+        return mapStringForeignMessage_;
+      }
+      public int getMapStringForeignMessageCount() {
+        return internalGetMapStringForeignMessage().ensureBuilderMap().size();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapStringForeignMessage(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        return internalGetMapStringForeignMessage().ensureBuilderMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapStringForeignMessageMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> getMapStringForeignMessage() {
+        return getMapStringForeignMessageMap();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> getMapStringForeignMessageMap() {
+        return internalGetMapStringForeignMessage().getImmutableMap();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+       */
+      @java.lang.Override
+      public /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getMapStringForeignMessageOrDefault(
+          java.lang.String key,
+          /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder> map = internalGetMutableMapStringForeignMessage().ensureBuilderMap();
+        return map.containsKey(key) ? mapStringForeignMessageConverter.build(map.get(key)) : defaultValue;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getMapStringForeignMessageOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder> map = internalGetMutableMapStringForeignMessage().ensureBuilderMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return mapStringForeignMessageConverter.build(map.get(key));
+      }
+      public Builder clearMapStringForeignMessage() {
+        bitField2_ = (bitField2_ & ~0x00100000);
+        internalGetMutableMapStringForeignMessage().clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+       */
+      public Builder removeMapStringForeignMessage(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringForeignMessage().ensureBuilderMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage>
+          getMutableMapStringForeignMessage() {
+        bitField2_ |= 0x00100000;
+        return internalGetMutableMapStringForeignMessage().ensureMessageMap();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+       */
+      public Builder putMapStringForeignMessage(
+          java.lang.String key,
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage value) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        if (value == null) { throw new NullPointerException("map value"); }
+        internalGetMutableMapStringForeignMessage().ensureBuilderMap()
+            .put(key, value);
+        bitField2_ |= 0x00100000;
+        return this;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+       */
+      public Builder putAllMapStringForeignMessage(
+          java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> values) {
+        for (java.util.Map.Entry<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> e : values.entrySet()) {
+          if (e.getKey() == null || e.getValue() == null) {
+            throw new NullPointerException();
+          }
+        }
+        internalGetMutableMapStringForeignMessage().ensureBuilderMap()
+            .putAll(values);
+        bitField2_ |= 0x00100000;
+        return this;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder putMapStringForeignMessageBuilderIfAbsent(
+          java.lang.String key) {
+        java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder> builderMap = internalGetMutableMapStringForeignMessage().ensureBuilderMap();
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder entry = builderMap.get(key);
+        if (entry == null) {
+          entry = legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.newBuilder();
+          builderMap.put(key, entry);
+        }
+        if (entry instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage) {
+          entry = ((legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage) entry).toBuilder();
+          builderMap.put(key, entry);
+        }
+        return (legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder) entry;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.String, java.lang.Integer> mapStringNestedEnum_;
+      private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
+          internalGetMapStringNestedEnum() {
+        if (mapStringNestedEnum_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapStringNestedEnumDefaultEntryHolder.defaultEntry);
+        }
+        return mapStringNestedEnum_;
+      }
+      private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
+          internalGetMutableMapStringNestedEnum() {
+        if (mapStringNestedEnum_ == null) {
+          mapStringNestedEnum_ = com.google.protobuf.MapField.newMapField(
+              MapStringNestedEnumDefaultEntryHolder.defaultEntry);
+        }
+        if (!mapStringNestedEnum_.isMutable()) {
+          mapStringNestedEnum_ = mapStringNestedEnum_.copy();
+        }
+        bitField2_ |= 0x00200000;
+        onChanged();
+        return mapStringNestedEnum_;
+      }
+      public int getMapStringNestedEnumCount() {
+        return internalGetMapStringNestedEnum().getMap().size();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapStringNestedEnum(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        return internalGetMapStringNestedEnum().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapStringNestedEnumMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>
+      getMapStringNestedEnum() {
+        return getMapStringNestedEnumMap();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>
+      getMapStringNestedEnumMap() {
+        return internalGetAdaptedMapStringNestedEnumMap(
+            internalGetMapStringNestedEnum().getMap());}
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+       */
+      @java.lang.Override
+      public /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getMapStringNestedEnumOrDefault(
+          java.lang.String key,
+          /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, java.lang.Integer> map =
+            internalGetMapStringNestedEnum().getMap();
+        return map.containsKey(key)
+               ? mapStringNestedEnumValueConverter.doForward(map.get(key))
+               : defaultValue;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getMapStringNestedEnumOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, java.lang.Integer> map =
+            internalGetMapStringNestedEnum().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return mapStringNestedEnumValueConverter.doForward(map.get(key));
+      }
+      public Builder clearMapStringNestedEnum() {
+        bitField2_ = (bitField2_ & ~0x00200000);
+        internalGetMutableMapStringNestedEnum().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+       */
+      public Builder removeMapStringNestedEnum(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringNestedEnum().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum>
+          getMutableMapStringNestedEnum() {
+        bitField2_ |= 0x00200000;
+        return internalGetAdaptedMapStringNestedEnumMap(
+             internalGetMutableMapStringNestedEnum().getMutableMap());
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+       */
+      public Builder putMapStringNestedEnum(
+          java.lang.String key,
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value) {
+        if (key == null) { throw new NullPointerException("map key"); }
+
+        internalGetMutableMapStringNestedEnum().getMutableMap()
+            .put(key, mapStringNestedEnumValueConverter.doBackward(value));
+        bitField2_ |= 0x00200000;
+        return this;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum&gt; map_string_nested_enum = 73;</code>
+       */
+      public Builder putAllMapStringNestedEnum(
+          java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum> values) {
+        internalGetAdaptedMapStringNestedEnumMap(
+            internalGetMutableMapStringNestedEnum().getMutableMap())
+                .putAll(values);
+        bitField2_ |= 0x00200000;
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.String, java.lang.Integer> mapStringForeignEnum_;
+      private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
+          internalGetMapStringForeignEnum() {
+        if (mapStringForeignEnum_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              MapStringForeignEnumDefaultEntryHolder.defaultEntry);
+        }
+        return mapStringForeignEnum_;
+      }
+      private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
+          internalGetMutableMapStringForeignEnum() {
+        if (mapStringForeignEnum_ == null) {
+          mapStringForeignEnum_ = com.google.protobuf.MapField.newMapField(
+              MapStringForeignEnumDefaultEntryHolder.defaultEntry);
+        }
+        if (!mapStringForeignEnum_.isMutable()) {
+          mapStringForeignEnum_ = mapStringForeignEnum_.copy();
+        }
+        bitField2_ |= 0x00400000;
+        onChanged();
+        return mapStringForeignEnum_;
+      }
+      public int getMapStringForeignEnumCount() {
+        return internalGetMapStringForeignEnum().getMap().size();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+       */
+      @java.lang.Override
+      public boolean containsMapStringForeignEnum(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        return internalGetMapStringForeignEnum().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getMapStringForeignEnumMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum>
+      getMapStringForeignEnum() {
+        return getMapStringForeignEnumMap();
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum>
+      getMapStringForeignEnumMap() {
+        return internalGetAdaptedMapStringForeignEnumMap(
+            internalGetMapStringForeignEnum().getMap());}
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+       */
+      @java.lang.Override
+      public /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getMapStringForeignEnumOrDefault(
+          java.lang.String key,
+          /* nullable */
+legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, java.lang.Integer> map =
+            internalGetMapStringForeignEnum().getMap();
+        return map.containsKey(key)
+               ? mapStringForeignEnumValueConverter.doForward(map.get(key))
+               : defaultValue;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum getMapStringForeignEnumOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, java.lang.Integer> map =
+            internalGetMapStringForeignEnum().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return mapStringForeignEnumValueConverter.doForward(map.get(key));
+      }
+      public Builder clearMapStringForeignEnum() {
+        bitField2_ = (bitField2_ & ~0x00400000);
+        internalGetMutableMapStringForeignEnum().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+       */
+      public Builder removeMapStringForeignEnum(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringForeignEnum().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum>
+          getMutableMapStringForeignEnum() {
+        bitField2_ |= 0x00400000;
+        return internalGetAdaptedMapStringForeignEnumMap(
+             internalGetMutableMapStringForeignEnum().getMutableMap());
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+       */
+      public Builder putMapStringForeignEnum(
+          java.lang.String key,
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum value) {
+        if (key == null) { throw new NullPointerException("map key"); }
+
+        internalGetMutableMapStringForeignEnum().getMutableMap()
+            .put(key, mapStringForeignEnumValueConverter.doBackward(value));
+        bitField2_ |= 0x00400000;
+        return this;
+      }
+      /**
+       * <code>map&lt;string, .legacy_gencode_test.proto2.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+       */
+      public Builder putAllMapStringForeignEnum(
+          java.util.Map<java.lang.String, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignEnum> values) {
+        internalGetAdaptedMapStringForeignEnumMap(
+            internalGetMutableMapStringForeignEnum().getMutableMap())
+                .putAll(values);
+        bitField2_ |= 0x00400000;
+        return this;
+      }
+
+      /**
+       * <code>uint32 oneof_uint32 = 111;</code>
+       * @return Whether the oneofUint32 field is set.
+       */
+      public boolean hasOneofUint32() {
+        return oneofFieldCase_ == 111;
+      }
+      /**
+       * <code>uint32 oneof_uint32 = 111;</code>
+       * @return The oneofUint32.
+       */
+      public int getOneofUint32() {
+        if (oneofFieldCase_ == 111) {
+          return (java.lang.Integer) oneofField_;
+        }
+        return 0;
+      }
+      /**
+       * <code>uint32 oneof_uint32 = 111;</code>
+       * @param value The oneofUint32 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOneofUint32(int value) {
+
+        oneofFieldCase_ = 111;
+        oneofField_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 oneof_uint32 = 111;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOneofUint32() {
+        if (oneofFieldCase_ == 111) {
+          oneofFieldCase_ = 0;
+          oneofField_ = null;
+          onChanged();
+        }
+        return this;
+      }
+
+      private com.google.protobuf.SingleFieldBuilder<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> oneofNestedMessageBuilder_;
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+       * @return Whether the oneofNestedMessage field is set.
+       */
+      @java.lang.Override
+      public boolean hasOneofNestedMessage() {
+        return oneofFieldCase_ == 112;
+      }
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+       * @return The oneofNestedMessage.
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage getOneofNestedMessage() {
+        if (oneofNestedMessageBuilder_ == null) {
+          if (oneofFieldCase_ == 112) {
+            return (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) oneofField_;
+          }
+          return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance();
+        } else {
+          if (oneofFieldCase_ == 112) {
+            return oneofNestedMessageBuilder_.getMessage();
+          }
+          return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance();
+        }
+      }
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+       */
+      public Builder setOneofNestedMessage(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage value) {
+        if (oneofNestedMessageBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          oneofField_ = value;
+          onChanged();
+        } else {
+          oneofNestedMessageBuilder_.setMessage(value);
+        }
+        oneofFieldCase_ = 112;
+        return this;
+      }
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+       */
+      public Builder setOneofNestedMessage(
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder builderForValue) {
+        if (oneofNestedMessageBuilder_ == null) {
+          oneofField_ = builderForValue.build();
+          onChanged();
+        } else {
+          oneofNestedMessageBuilder_.setMessage(builderForValue.build());
+        }
+        oneofFieldCase_ = 112;
+        return this;
+      }
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+       */
+      public Builder mergeOneofNestedMessage(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage value) {
+        if (oneofNestedMessageBuilder_ == null) {
+          if (oneofFieldCase_ == 112 &&
+              oneofField_ != legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance()) {
+            oneofField_ = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.newBuilder((legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) oneofField_)
+                .mergeFrom(value).buildPartial();
+          } else {
+            oneofField_ = value;
+          }
+          onChanged();
+        } else {
+          if (oneofFieldCase_ == 112) {
+            oneofNestedMessageBuilder_.mergeFrom(value);
+          } else {
+            oneofNestedMessageBuilder_.setMessage(value);
+          }
+        }
+        oneofFieldCase_ = 112;
+        return this;
+      }
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+       */
+      public Builder clearOneofNestedMessage() {
+        if (oneofNestedMessageBuilder_ == null) {
+          if (oneofFieldCase_ == 112) {
+            oneofFieldCase_ = 0;
+            oneofField_ = null;
+            onChanged();
+          }
+        } else {
+          if (oneofFieldCase_ == 112) {
+            oneofFieldCase_ = 0;
+            oneofField_ = null;
+          }
+          oneofNestedMessageBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+       */
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder getOneofNestedMessageBuilder() {
+        return internalGetOneofNestedMessageFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder getOneofNestedMessageOrBuilder() {
+        if ((oneofFieldCase_ == 112) && (oneofNestedMessageBuilder_ != null)) {
+          return oneofNestedMessageBuilder_.getMessageOrBuilder();
+        } else {
+          if (oneofFieldCase_ == 112) {
+            return (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) oneofField_;
+          }
+          return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance();
+        }
+      }
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedMessage oneof_nested_message = 112;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilder<
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder> 
+          internalGetOneofNestedMessageFieldBuilder() {
+        if (oneofNestedMessageBuilder_ == null) {
+          if (!(oneofFieldCase_ == 112)) {
+            oneofField_ = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.getDefaultInstance();
+          }
+          oneofNestedMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage.Builder, legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessageOrBuilder>(
+                  (legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedMessage) oneofField_,
+                  getParentForChildren(),
+                  isClean());
+          oneofField_ = null;
+        }
+        oneofFieldCase_ = 112;
+        onChanged();
+        return oneofNestedMessageBuilder_;
+      }
+
+      /**
+       * <code>string oneof_string = 113;</code>
+       * @return Whether the oneofString field is set.
+       */
+      @java.lang.Override
+      public boolean hasOneofString() {
+        return oneofFieldCase_ == 113;
+      }
+      /**
+       * <code>string oneof_string = 113;</code>
+       * @return The oneofString.
+       */
+      @java.lang.Override
+      public java.lang.String getOneofString() {
+        java.lang.Object ref = "";
+        if (oneofFieldCase_ == 113) {
+          ref = oneofField_;
+        }
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          if (oneofFieldCase_ == 113) {
+            if (bs.isValidUtf8()) {
+              oneofField_ = s;
+            }
+          }
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string oneof_string = 113;</code>
+       * @return The bytes for oneofString.
+       */
+      @java.lang.Override
+      public com.google.protobuf.ByteString
+          getOneofStringBytes() {
+        java.lang.Object ref = "";
+        if (oneofFieldCase_ == 113) {
+          ref = oneofField_;
+        }
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          if (oneofFieldCase_ == 113) {
+            oneofField_ = b;
+          }
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string oneof_string = 113;</code>
+       * @param value The oneofString to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOneofString(
+          java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
+        oneofFieldCase_ = 113;
+        oneofField_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string oneof_string = 113;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOneofString() {
+        if (oneofFieldCase_ == 113) {
+          oneofFieldCase_ = 0;
+          oneofField_ = null;
+          onChanged();
+        }
+        return this;
+      }
+      /**
+       * <code>string oneof_string = 113;</code>
+       * @param value The bytes for oneofString to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOneofStringBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
+        oneofFieldCase_ = 113;
+        oneofField_ = value;
+        onChanged();
+        return this;
+      }
+
+      /**
+       * <code>bytes oneof_bytes = 114;</code>
+       * @return Whether the oneofBytes field is set.
+       */
+      public boolean hasOneofBytes() {
+        return oneofFieldCase_ == 114;
+      }
+      /**
+       * <code>bytes oneof_bytes = 114;</code>
+       * @return The oneofBytes.
+       */
+      public com.google.protobuf.ByteString getOneofBytes() {
+        if (oneofFieldCase_ == 114) {
+          return (com.google.protobuf.ByteString) oneofField_;
+        }
+        return com.google.protobuf.ByteString.EMPTY;
+      }
+      /**
+       * <code>bytes oneof_bytes = 114;</code>
+       * @param value The oneofBytes to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOneofBytes(com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
+        oneofFieldCase_ = 114;
+        oneofField_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bytes oneof_bytes = 114;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOneofBytes() {
+        if (oneofFieldCase_ == 114) {
+          oneofFieldCase_ = 0;
+          oneofField_ = null;
+          onChanged();
+        }
+        return this;
+      }
+
+      /**
+       * <code>bool oneof_bool = 115;</code>
+       * @return Whether the oneofBool field is set.
+       */
+      public boolean hasOneofBool() {
+        return oneofFieldCase_ == 115;
+      }
+      /**
+       * <code>bool oneof_bool = 115;</code>
+       * @return The oneofBool.
+       */
+      public boolean getOneofBool() {
+        if (oneofFieldCase_ == 115) {
+          return (java.lang.Boolean) oneofField_;
+        }
+        return false;
+      }
+      /**
+       * <code>bool oneof_bool = 115;</code>
+       * @param value The oneofBool to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOneofBool(boolean value) {
+
+        oneofFieldCase_ = 115;
+        oneofField_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool oneof_bool = 115;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOneofBool() {
+        if (oneofFieldCase_ == 115) {
+          oneofFieldCase_ = 0;
+          oneofField_ = null;
+          onChanged();
+        }
+        return this;
+      }
+
+      /**
+       * <code>uint64 oneof_uint64 = 116;</code>
+       * @return Whether the oneofUint64 field is set.
+       */
+      public boolean hasOneofUint64() {
+        return oneofFieldCase_ == 116;
+      }
+      /**
+       * <code>uint64 oneof_uint64 = 116;</code>
+       * @return The oneofUint64.
+       */
+      public long getOneofUint64() {
+        if (oneofFieldCase_ == 116) {
+          return (java.lang.Long) oneofField_;
+        }
+        return 0L;
+      }
+      /**
+       * <code>uint64 oneof_uint64 = 116;</code>
+       * @param value The oneofUint64 to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOneofUint64(long value) {
+
+        oneofFieldCase_ = 116;
+        oneofField_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 oneof_uint64 = 116;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOneofUint64() {
+        if (oneofFieldCase_ == 116) {
+          oneofFieldCase_ = 0;
+          oneofField_ = null;
+          onChanged();
+        }
+        return this;
+      }
+
+      /**
+       * <code>float oneof_float = 117;</code>
+       * @return Whether the oneofFloat field is set.
+       */
+      public boolean hasOneofFloat() {
+        return oneofFieldCase_ == 117;
+      }
+      /**
+       * <code>float oneof_float = 117;</code>
+       * @return The oneofFloat.
+       */
+      public float getOneofFloat() {
+        if (oneofFieldCase_ == 117) {
+          return (java.lang.Float) oneofField_;
+        }
+        return 0F;
+      }
+      /**
+       * <code>float oneof_float = 117;</code>
+       * @param value The oneofFloat to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOneofFloat(float value) {
+
+        oneofFieldCase_ = 117;
+        oneofField_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>float oneof_float = 117;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOneofFloat() {
+        if (oneofFieldCase_ == 117) {
+          oneofFieldCase_ = 0;
+          oneofField_ = null;
+          onChanged();
+        }
+        return this;
+      }
+
+      /**
+       * <code>double oneof_double = 118;</code>
+       * @return Whether the oneofDouble field is set.
+       */
+      public boolean hasOneofDouble() {
+        return oneofFieldCase_ == 118;
+      }
+      /**
+       * <code>double oneof_double = 118;</code>
+       * @return The oneofDouble.
+       */
+      public double getOneofDouble() {
+        if (oneofFieldCase_ == 118) {
+          return (java.lang.Double) oneofField_;
+        }
+        return 0D;
+      }
+      /**
+       * <code>double oneof_double = 118;</code>
+       * @param value The oneofDouble to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOneofDouble(double value) {
+
+        oneofFieldCase_ = 118;
+        oneofField_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>double oneof_double = 118;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOneofDouble() {
+        if (oneofFieldCase_ == 118) {
+          oneofFieldCase_ = 0;
+          oneofField_ = null;
+          onChanged();
+        }
+        return this;
+      }
+
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum oneof_enum = 119;</code>
+       * @return Whether the oneofEnum field is set.
+       */
+      @java.lang.Override
+      public boolean hasOneofEnum() {
+        return oneofFieldCase_ == 119;
+      }
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum oneof_enum = 119;</code>
+       * @return The oneofEnum.
+       */
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum getOneofEnum() {
+        if (oneofFieldCase_ == 119) {
+          legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum result = legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.forNumber(
+              (java.lang.Integer) oneofField_);
+          return result == null ? legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.FOO : result;
+        }
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum.FOO;
+      }
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum oneof_enum = 119;</code>
+       * @param value The oneofEnum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOneofEnum(legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2.NestedEnum value) {
+        if (value == null) { throw new NullPointerException(); }
+        oneofFieldCase_ = 119;
+        oneofField_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.legacy_gencode_test.proto2.TestMostTypesProto2.NestedEnum oneof_enum = 119;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOneofEnum() {
+        if (oneofFieldCase_ == 119) {
+          oneofFieldCase_ = 0;
+          oneofField_ = null;
+          onChanged();
+        }
+        return this;
+      }
+
+      // @@protoc_insertion_point(builder_scope:legacy_gencode_test.proto2.TestMostTypesProto2)
+    }
+
+    // @@protoc_insertion_point(class_scope:legacy_gencode_test.proto2.TestMostTypesProto2)
+    private static final legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2();
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<TestMostTypesProto2>
+        PARSER = new com.google.protobuf.AbstractParser<TestMostTypesProto2>() {
+      @java.lang.Override
+      public TestMostTypesProto2 parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (com.google.protobuf.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new com.google.protobuf.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
+      }
+    };
+
+    public static com.google.protobuf.Parser<TestMostTypesProto2> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<TestMostTypesProto2> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2 getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  public interface ForeignMessageOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:legacy_gencode_test.proto2.ForeignMessage)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>optional int32 c = 1;</code>
+     * @return Whether the c field is set.
+     */
+    boolean hasC();
+    /**
+     * <code>optional int32 c = 1;</code>
+     * @return The c.
+     */
+    int getC();
+  }
+  /**
+   * Protobuf type {@code legacy_gencode_test.proto2.ForeignMessage}
+   */
+  public static final class ForeignMessage extends
+      com.google.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:legacy_gencode_test.proto2.ForeignMessage)
+      ForeignMessageOrBuilder {
+  private static final long serialVersionUID = 0L;
+    static {
+      com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
+        com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+        /* major= */ 4,
+        /* minor= */ 32,
+        /* patch= */ 1,
+        /* suffix= */ "",
+        ForeignMessage.class.getName());
+    }
+    // Use ForeignMessage.newBuilder() to construct.
+    private ForeignMessage(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      super(builder);
+    }
+    private ForeignMessage() {
+    }
+
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_ForeignMessage_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_ForeignMessage_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.class, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder.class);
+    }
+
+    private int bitField0_;
+    public static final int C_FIELD_NUMBER = 1;
+    private int c_ = 0;
+    /**
+     * <code>optional int32 c = 1;</code>
+     * @return Whether the c field is set.
+     */
+    @java.lang.Override
+    public boolean hasC() {
+      return ((bitField0_ & 0x00000001) != 0);
+    }
+    /**
+     * <code>optional int32 c = 1;</code>
+     * @return The c.
+     */
+    @java.lang.Override
+    public int getC() {
+      return c_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (((bitField0_ & 0x00000001) != 0)) {
+        output.writeInt32(1, c_);
+      }
+      getUnknownFields().writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(1, c_);
+      }
+      size += getUnknownFields().getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage)) {
+        return super.equals(obj);
+      }
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage other = (legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage) obj;
+
+      if (hasC() != other.hasC()) return false;
+      if (hasC()) {
+        if (getC()
+            != other.getC()) return false;
+      }
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasC()) {
+        hash = (37 * hash) + C_FIELD_NUMBER;
+        hash = (53 * hash) + getC();
+      }
+      hash = (29 * hash) + getUnknownFields().hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input);
+    }
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code legacy_gencode_test.proto2.ForeignMessage}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:legacy_gencode_test.proto2.ForeignMessage)
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessageOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_ForeignMessage_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_ForeignMessage_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.class, legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.Builder.class);
+      }
+
+      // Construct using legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.newBuilder()
+      private Builder() {
+
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        super(parent);
+
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        bitField0_ = 0;
+        c_ = 0;
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.internal_static_legacy_gencode_test_proto2_ForeignMessage_descriptor;
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getDefaultInstanceForType() {
+        return legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage build() {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage buildPartial() {
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage result = new legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage result) {
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.c_ = c_;
+          to_bitField0_ |= 0x00000001;
+        }
+        result.bitField0_ |= to_bitField0_;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage) {
+          return mergeFrom((legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage other) {
+        if (other == legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.getDefaultInstance()) return this;
+        if (other.hasC()) {
+          setC(other.getC());
+        }
+        this.mergeUnknownFields(other.getUnknownFields());
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
+        try {
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                c_ = input.readInt32();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.unwrapIOException();
+        } finally {
+          onChanged();
+        } // finally
+        return this;
+      }
+      private int bitField0_;
+
+      private int c_ ;
+      /**
+       * <code>optional int32 c = 1;</code>
+       * @return Whether the c field is set.
+       */
+      @java.lang.Override
+      public boolean hasC() {
+        return ((bitField0_ & 0x00000001) != 0);
+      }
+      /**
+       * <code>optional int32 c = 1;</code>
+       * @return The c.
+       */
+      @java.lang.Override
+      public int getC() {
+        return c_;
+      }
+      /**
+       * <code>optional int32 c = 1;</code>
+       * @param value The c to set.
+       * @return This builder for chaining.
+       */
+      public Builder setC(int value) {
+
+        c_ = value;
+        bitField0_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional int32 c = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearC() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        c_ = 0;
+        onChanged();
+        return this;
+      }
+
+      // @@protoc_insertion_point(builder_scope:legacy_gencode_test.proto2.ForeignMessage)
+    }
+
+    // @@protoc_insertion_point(class_scope:legacy_gencode_test.proto2.ForeignMessage)
+    private static final legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage();
+    }
+
+    public static legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<ForeignMessage>
+        PARSER = new com.google.protobuf.AbstractParser<ForeignMessage>() {
+      @java.lang.Override
+      public ForeignMessage parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (com.google.protobuf.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new com.google.protobuf.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
+      }
+    };
+
+    public static com.google.protobuf.Parser<ForeignMessage> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<ForeignMessage> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  public static final int EXTENSION_INT32_FIELD_NUMBER = 1001;
+  /**
+   * <code>extend .legacy_gencode_test.proto2.TestMostTypesProto2 { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2,
+      java.lang.Integer> extensionInt32 = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        java.lang.Integer.class,
+        null);
+  public static final int EXTENSION_MESSAGE_FIELD_NUMBER = 1002;
+  /**
+   * <code>extend .legacy_gencode_test.proto2.TestMostTypesProto2 { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.TestMostTypesProto2,
+      legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage> extensionMessage = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.class,
+        legacy_gencode_test.proto2.Proto2GencodeTestProto.ForeignMessage.getDefaultInstance());
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMessage_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMessage_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_NestedTestMessage_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_NestedTestMessage_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_NestedMessage_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_NestedMessage_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32Int32Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32Int32Entry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt64Int64Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt64Int64Entry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint32Uint32Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint32Uint32Entry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint64Uint64Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint64Uint64Entry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint32Sint32Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint32Sint32Entry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint64Sint64Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint64Sint64Entry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed32Fixed32Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed32Fixed32Entry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed64Fixed64Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed64Fixed64Entry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed32Sfixed32Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed32Sfixed32Entry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed64Sfixed64Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed64Sfixed64Entry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32FloatEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32FloatEntry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32DoubleEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32DoubleEntry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapBoolBoolEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapBoolBoolEntry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringStringEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringStringEntry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringBytesEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringBytesEntry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedMessageEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedMessageEntry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignMessageEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignMessageEntry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedEnumEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedEnumEntry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignEnumEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignEnumEntry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_legacy_gencode_test_proto2_ForeignMessage_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_legacy_gencode_test_proto2_ForeignMessage_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\031proto2_gencode_test.proto\022\032legacy_genc" +
+      "ode_test.proto2\"R\n\013TestMessage\022\t\n\001x\030\002 \001(" +
+      "\t\0228\n\001y\030\003 \001(\0132-.legacy_gencode_test.proto" +
+      "2.NestedTestMessage\"\036\n\021NestedTestMessage" +
+      "\022\t\n\001z\030\001 \003(\005\"\2751\n\023TestMostTypesProto2\022\026\n\016o" +
+      "ptional_int32\030\001 \001(\005\022\026\n\016optional_int64\030\002 " +
+      "\001(\003\022\027\n\017optional_uint32\030\003 \001(\r\022\027\n\017optional" +
+      "_uint64\030\004 \001(\004\022\027\n\017optional_sint32\030\005 \001(\021\022\027" +
+      "\n\017optional_sint64\030\006 \001(\022\022\030\n\020optional_fixe" +
+      "d32\030\007 \001(\007\022\030\n\020optional_fixed64\030\010 \001(\006\022\031\n\021o" +
+      "ptional_sfixed32\030\t \001(\017\022\031\n\021optional_sfixe" +
+      "d64\030\n \001(\020\022\026\n\016optional_float\030\013 \001(\002\022\027\n\017opt" +
+      "ional_double\030\014 \001(\001\022\025\n\roptional_bool\030\r \001(" +
+      "\010\022\027\n\017optional_string\030\016 \001(\t\022\026\n\016optional_b" +
+      "ytes\030\017 \001(\014\022^\n\027optional_nested_message\030\022 " +
+      "\001(\0132=.legacy_gencode_test.proto2.TestMos" +
+      "tTypesProto2.NestedMessage\022L\n\030optional_f" +
+      "oreign_message\030\023 \001(\0132*.legacy_gencode_te" +
+      "st.proto2.ForeignMessage\022X\n\024optional_nes" +
+      "ted_enum\030\025 \001(\0162:.legacy_gencode_test.pro" +
+      "to2.TestMostTypesProto2.NestedEnum\022F\n\025op" +
+      "tional_foreign_enum\030\026 \001(\0162\'.legacy_genco" +
+      "de_test.proto2.ForeignEnum\022Z\n\025optional_a" +
+      "liased_enum\030\027 \001(\0162;.legacy_gencode_test." +
+      "proto2.TestMostTypesProto2.AliasedEnum\022J" +
+      "\n\021recursive_message\030\033 \001(\0132/.legacy_genco" +
+      "de_test.proto2.TestMostTypesProto2\022\026\n\016re" +
+      "peated_int32\030\037 \003(\005\022\026\n\016repeated_int64\030  \003" +
+      "(\003\022\027\n\017repeated_uint32\030! \003(\r\022\027\n\017repeated_" +
+      "uint64\030\" \003(\004\022\027\n\017repeated_sint32\030# \003(\021\022\027\n" +
+      "\017repeated_sint64\030$ \003(\022\022\030\n\020repeated_fixed" +
+      "32\030% \003(\007\022\030\n\020repeated_fixed64\030& \003(\006\022\031\n\021re" +
+      "peated_sfixed32\030\' \003(\017\022\031\n\021repeated_sfixed" +
+      "64\030( \003(\020\022\026\n\016repeated_float\030) \003(\002\022\027\n\017repe" +
+      "ated_double\030* \003(\001\022\025\n\rrepeated_bool\030+ \003(\010" +
+      "\022\027\n\017repeated_string\030, \003(\t\022\026\n\016repeated_by" +
+      "tes\030- \003(\014\022^\n\027repeated_nested_message\0300 \003" +
+      "(\0132=.legacy_gencode_test.proto2.TestMost" +
+      "TypesProto2.NestedMessage\022L\n\030repeated_fo" +
+      "reign_message\0301 \003(\0132*.legacy_gencode_tes" +
+      "t.proto2.ForeignMessage\022X\n\024repeated_nest" +
+      "ed_enum\0303 \003(\0162:.legacy_gencode_test.prot" +
+      "o2.TestMostTypesProto2.NestedEnum\022F\n\025rep" +
+      "eated_foreign_enum\0304 \003(\0162\'.legacy_gencod" +
+      "e_test.proto2.ForeignEnum\022\030\n\014packed_int3" +
+      "2\030K \003(\005B\002\020\001\022\030\n\014packed_int64\030L \003(\003B\002\020\001\022\031\n" +
+      "\rpacked_uint32\030M \003(\rB\002\020\001\022\031\n\rpacked_uint6" +
+      "4\030N \003(\004B\002\020\001\022\031\n\rpacked_sint32\030O \003(\021B\002\020\001\022\031" +
+      "\n\rpacked_sint64\030P \003(\022B\002\020\001\022\032\n\016packed_fixe" +
+      "d32\030Q \003(\007B\002\020\001\022\032\n\016packed_fixed64\030R \003(\006B\002\020" +
+      "\001\022\033\n\017packed_sfixed32\030S \003(\017B\002\020\001\022\033\n\017packed" +
+      "_sfixed64\030T \003(\020B\002\020\001\022\030\n\014packed_float\030U \003(" +
+      "\002B\002\020\001\022\031\n\rpacked_double\030V \003(\001B\002\020\001\022\027\n\013pack" +
+      "ed_bool\030W \003(\010B\002\020\001\022Z\n\022packed_nested_enum\030" +
+      "X \003(\0162:.legacy_gencode_test.proto2.TestM" +
+      "ostTypesProto2.NestedEnumB\002\020\001\022\032\n\016unpacke" +
+      "d_int32\030Y \003(\005B\002\020\000\022\032\n\016unpacked_int64\030Z \003(" +
+      "\003B\002\020\000\022\033\n\017unpacked_uint32\030[ \003(\rB\002\020\000\022\033\n\017un" +
+      "packed_uint64\030\\ \003(\004B\002\020\000\022\033\n\017unpacked_sint" +
+      "32\030] \003(\021B\002\020\000\022\033\n\017unpacked_sint64\030^ \003(\022B\002\020" +
+      "\000\022\034\n\020unpacked_fixed32\030_ \003(\007B\002\020\000\022\034\n\020unpac" +
+      "ked_fixed64\030` \003(\006B\002\020\000\022\035\n\021unpacked_sfixed" +
+      "32\030a \003(\017B\002\020\000\022\035\n\021unpacked_sfixed64\030b \003(\020B" +
+      "\002\020\000\022\032\n\016unpacked_float\030c \003(\002B\002\020\000\022\033\n\017unpac" +
+      "ked_double\030d \003(\001B\002\020\000\022\031\n\runpacked_bool\030e " +
+      "\003(\010B\002\020\000\022\\\n\024unpacked_nested_enum\030f \003(\0162:." +
+      "legacy_gencode_test.proto2.TestMostTypes" +
+      "Proto2.NestedEnumB\002\020\000\022[\n\017map_int32_int32" +
+      "\0308 \003(\0132B.legacy_gencode_test.proto2.Test" +
+      "MostTypesProto2.MapInt32Int32Entry\022[\n\017ma" +
+      "p_int64_int64\0309 \003(\0132B.legacy_gencode_tes" +
+      "t.proto2.TestMostTypesProto2.MapInt64Int" +
+      "64Entry\022_\n\021map_uint32_uint32\030: \003(\0132D.leg" +
+      "acy_gencode_test.proto2.TestMostTypesPro" +
+      "to2.MapUint32Uint32Entry\022_\n\021map_uint64_u" +
+      "int64\030; \003(\0132D.legacy_gencode_test.proto2" +
+      ".TestMostTypesProto2.MapUint64Uint64Entr" +
+      "y\022_\n\021map_sint32_sint32\030< \003(\0132D.legacy_ge" +
+      "ncode_test.proto2.TestMostTypesProto2.Ma" +
+      "pSint32Sint32Entry\022_\n\021map_sint64_sint64\030" +
+      "= \003(\0132D.legacy_gencode_test.proto2.TestM" +
+      "ostTypesProto2.MapSint64Sint64Entry\022c\n\023m" +
+      "ap_fixed32_fixed32\030> \003(\0132F.legacy_gencod" +
+      "e_test.proto2.TestMostTypesProto2.MapFix" +
+      "ed32Fixed32Entry\022c\n\023map_fixed64_fixed64\030" +
+      "? \003(\0132F.legacy_gencode_test.proto2.TestM" +
+      "ostTypesProto2.MapFixed64Fixed64Entry\022g\n" +
+      "\025map_sfixed32_sfixed32\030@ \003(\0132H.legacy_ge" +
+      "ncode_test.proto2.TestMostTypesProto2.Ma" +
+      "pSfixed32Sfixed32Entry\022g\n\025map_sfixed64_s" +
+      "fixed64\030A \003(\0132H.legacy_gencode_test.prot" +
+      "o2.TestMostTypesProto2.MapSfixed64Sfixed" +
+      "64Entry\022[\n\017map_int32_float\030B \003(\0132B.legac" +
+      "y_gencode_test.proto2.TestMostTypesProto" +
+      "2.MapInt32FloatEntry\022]\n\020map_int32_double" +
+      "\030C \003(\0132C.legacy_gencode_test.proto2.Test" +
+      "MostTypesProto2.MapInt32DoubleEntry\022W\n\rm" +
+      "ap_bool_bool\030D \003(\0132@.legacy_gencode_test" +
+      ".proto2.TestMostTypesProto2.MapBoolBoolE" +
+      "ntry\022_\n\021map_string_string\030E \003(\0132D.legacy" +
+      "_gencode_test.proto2.TestMostTypesProto2" +
+      ".MapStringStringEntry\022]\n\020map_string_byte" +
+      "s\030F \003(\0132C.legacy_gencode_test.proto2.Tes" +
+      "tMostTypesProto2.MapStringBytesEntry\022n\n\031" +
+      "map_string_nested_message\030G \003(\0132K.legacy" +
+      "_gencode_test.proto2.TestMostTypesProto2" +
+      ".MapStringNestedMessageEntry\022p\n\032map_stri" +
+      "ng_foreign_message\030H \003(\0132L.legacy_gencod" +
+      "e_test.proto2.TestMostTypesProto2.MapStr" +
+      "ingForeignMessageEntry\022h\n\026map_string_nes" +
+      "ted_enum\030I \003(\0132H.legacy_gencode_test.pro" +
+      "to2.TestMostTypesProto2.MapStringNestedE" +
+      "numEntry\022j\n\027map_string_foreign_enum\030J \003(" +
+      "\0132I.legacy_gencode_test.proto2.TestMostT" +
+      "ypesProto2.MapStringForeignEnumEntry\022\026\n\014" +
+      "oneof_uint32\030o \001(\rH\000\022]\n\024oneof_nested_mes" +
+      "sage\030p \001(\0132=.legacy_gencode_test.proto2." +
+      "TestMostTypesProto2.NestedMessageH\000\022\026\n\014o" +
+      "neof_string\030q \001(\tH\000\022\025\n\013oneof_bytes\030r \001(\014" +
+      "H\000\022\024\n\noneof_bool\030s \001(\010H\000\022\026\n\014oneof_uint64" +
+      "\030t \001(\004H\000\022\025\n\013oneof_float\030u \001(\002H\000\022\026\n\014oneof" +
+      "_double\030v \001(\001H\000\022P\n\noneof_enum\030w \001(\0162:.le" +
+      "gacy_gencode_test.proto2.TestMostTypesPr" +
+      "oto2.NestedEnumH\000\032`\n\rNestedMessage\022\t\n\001a\030" +
+      "\001 \001(\005\022D\n\013corecursive\030\002 \001(\0132/.legacy_genc" +
+      "ode_test.proto2.TestMostTypesProto2\0324\n\022M" +
+      "apInt32Int32Entry\022\013\n\003key\030\001 \001(\005\022\r\n\005value\030" +
+      "\002 \001(\005:\0028\001\0324\n\022MapInt64Int64Entry\022\013\n\003key\030\001" +
+      " \001(\003\022\r\n\005value\030\002 \001(\003:\0028\001\0326\n\024MapUint32Uint" +
+      "32Entry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001\032" +
+      "6\n\024MapUint64Uint64Entry\022\013\n\003key\030\001 \001(\004\022\r\n\005" +
+      "value\030\002 \001(\004:\0028\001\0326\n\024MapSint32Sint32Entry\022" +
+      "\013\n\003key\030\001 \001(\021\022\r\n\005value\030\002 \001(\021:\0028\001\0326\n\024MapSi" +
+      "nt64Sint64Entry\022\013\n\003key\030\001 \001(\022\022\r\n\005value\030\002 " +
+      "\001(\022:\0028\001\0328\n\026MapFixed32Fixed32Entry\022\013\n\003key" +
+      "\030\001 \001(\007\022\r\n\005value\030\002 \001(\007:\0028\001\0328\n\026MapFixed64F" +
+      "ixed64Entry\022\013\n\003key\030\001 \001(\006\022\r\n\005value\030\002 \001(\006:" +
+      "\0028\001\032:\n\030MapSfixed32Sfixed32Entry\022\013\n\003key\030\001" +
+      " \001(\017\022\r\n\005value\030\002 \001(\017:\0028\001\032:\n\030MapSfixed64Sf" +
+      "ixed64Entry\022\013\n\003key\030\001 \001(\020\022\r\n\005value\030\002 \001(\020:" +
+      "\0028\001\0324\n\022MapInt32FloatEntry\022\013\n\003key\030\001 \001(\005\022\r" +
+      "\n\005value\030\002 \001(\002:\0028\001\0325\n\023MapInt32DoubleEntry" +
+      "\022\013\n\003key\030\001 \001(\005\022\r\n\005value\030\002 \001(\001:\0028\001\0322\n\020MapB" +
+      "oolBoolEntry\022\013\n\003key\030\001 \001(\010\022\r\n\005value\030\002 \001(\010" +
+      ":\0028\001\0326\n\024MapStringStringEntry\022\013\n\003key\030\001 \001(" +
+      "\t\022\r\n\005value\030\002 \001(\t:\0028\001\0325\n\023MapStringBytesEn" +
+      "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\014:\0028\001\032|\n\033M" +
+      "apStringNestedMessageEntry\022\013\n\003key\030\001 \001(\t\022" +
+      "L\n\005value\030\002 \001(\0132=.legacy_gencode_test.pro" +
+      "to2.TestMostTypesProto2.NestedMessage:\0028" +
+      "\001\032j\n\034MapStringForeignMessageEntry\022\013\n\003key" +
+      "\030\001 \001(\t\0229\n\005value\030\002 \001(\0132*.legacy_gencode_t" +
+      "est.proto2.ForeignMessage:\0028\001\032v\n\030MapStri" +
+      "ngNestedEnumEntry\022\013\n\003key\030\001 \001(\t\022I\n\005value\030" +
+      "\002 \001(\0162:.legacy_gencode_test.proto2.TestM" +
+      "ostTypesProto2.NestedEnum:\0028\001\032d\n\031MapStri" +
+      "ngForeignEnumEntry\022\013\n\003key\030\001 \001(\t\0226\n\005value" +
+      "\030\002 \001(\0162\'.legacy_gencode_test.proto2.Fore" +
+      "ignEnum:\0028\001\"9\n\nNestedEnum\022\007\n\003FOO\020\000\022\007\n\003BA" +
+      "R\020\001\022\007\n\003BAZ\020\002\022\020\n\003NEG\020\377\377\377\377\377\377\377\377\377\001\"Y\n\013Aliase" +
+      "dEnum\022\r\n\tALIAS_FOO\020\000\022\r\n\tALIAS_BAR\020\001\022\r\n\tA" +
+      "LIAS_BAZ\020\002\022\007\n\003MOO\020\002\022\007\n\003moo\020\002\022\007\n\003bAz\020\002\032\002\020" +
+      "\001*\t\010\350\007\020\200\200\200\200\002B\r\n\013oneof_field\"\033\n\016ForeignMe" +
+      "ssage\022\t\n\001c\030\001 \001(\005*@\n\013ForeignEnum\022\017\n\013FOREI" +
+      "GN_FOO\020\000\022\017\n\013FOREIGN_BAR\020\001\022\017\n\013FOREIGN_BAZ" +
+      "\020\002:I\n\017extension_int32\022/.legacy_gencode_t" +
+      "est.proto2.TestMostTypesProto2\030\351\007 \001(\005:w\n" +
+      "\021extension_message\022/.legacy_gencode_test" +
+      ".proto2.TestMostTypesProto2\030\352\007 \001(\0132*.leg" +
+      "acy_gencode_test.proto2.ForeignMessageB\030" +
+      "B\026Proto2GencodeTestProto"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_legacy_gencode_test_proto2_TestMessage_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_legacy_gencode_test_proto2_TestMessage_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMessage_descriptor,
+        new java.lang.String[] { "X", "Y", });
+    internal_static_legacy_gencode_test_proto2_NestedTestMessage_descriptor =
+      getDescriptor().getMessageTypes().get(1);
+    internal_static_legacy_gencode_test_proto2_NestedTestMessage_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_NestedTestMessage_descriptor,
+        new java.lang.String[] { "Z", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor =
+      getDescriptor().getMessageTypes().get(2);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor,
+        new java.lang.String[] { "OptionalInt32", "OptionalInt64", "OptionalUint32", "OptionalUint64", "OptionalSint32", "OptionalSint64", "OptionalFixed32", "OptionalFixed64", "OptionalSfixed32", "OptionalSfixed64", "OptionalFloat", "OptionalDouble", "OptionalBool", "OptionalString", "OptionalBytes", "OptionalNestedMessage", "OptionalForeignMessage", "OptionalNestedEnum", "OptionalForeignEnum", "OptionalAliasedEnum", "RecursiveMessage", "RepeatedInt32", "RepeatedInt64", "RepeatedUint32", "RepeatedUint64", "RepeatedSint32", "RepeatedSint64", "RepeatedFixed32", "RepeatedFixed64", "RepeatedSfixed32", "RepeatedSfixed64", "RepeatedFloat", "RepeatedDouble", "RepeatedBool", "RepeatedString", "RepeatedBytes", "RepeatedNestedMessage", "RepeatedForeignMessage", "RepeatedNestedEnum", "RepeatedForeignEnum", "PackedInt32", "PackedInt64", "PackedUint32", "PackedUint64", "PackedSint32", "PackedSint64", "PackedFixed32", "PackedFixed64", "PackedSfixed32", "PackedSfixed64", "PackedFloat", "PackedDouble", "PackedBool", "PackedNestedEnum", "UnpackedInt32", "UnpackedInt64", "UnpackedUint32", "UnpackedUint64", "UnpackedSint32", "UnpackedSint64", "UnpackedFixed32", "UnpackedFixed64", "UnpackedSfixed32", "UnpackedSfixed64", "UnpackedFloat", "UnpackedDouble", "UnpackedBool", "UnpackedNestedEnum", "MapInt32Int32", "MapInt64Int64", "MapUint32Uint32", "MapUint64Uint64", "MapSint32Sint32", "MapSint64Sint64", "MapFixed32Fixed32", "MapFixed64Fixed64", "MapSfixed32Sfixed32", "MapSfixed64Sfixed64", "MapInt32Float", "MapInt32Double", "MapBoolBool", "MapStringString", "MapStringBytes", "MapStringNestedMessage", "MapStringForeignMessage", "MapStringNestedEnum", "MapStringForeignEnum", "OneofUint32", "OneofNestedMessage", "OneofString", "OneofBytes", "OneofBool", "OneofUint64", "OneofFloat", "OneofDouble", "OneofEnum", "OneofField", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_NestedMessage_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(0);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_NestedMessage_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_NestedMessage_descriptor,
+        new java.lang.String[] { "A", "Corecursive", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32Int32Entry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(1);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32Int32Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32Int32Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt64Int64Entry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(2);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt64Int64Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt64Int64Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint32Uint32Entry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(3);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint32Uint32Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint32Uint32Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint64Uint64Entry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(4);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint64Uint64Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapUint64Uint64Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint32Sint32Entry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(5);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint32Sint32Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint32Sint32Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint64Sint64Entry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(6);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint64Sint64Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSint64Sint64Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed32Fixed32Entry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(7);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed32Fixed32Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed32Fixed32Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed64Fixed64Entry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(8);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed64Fixed64Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapFixed64Fixed64Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed32Sfixed32Entry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(9);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed32Sfixed32Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed32Sfixed32Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed64Sfixed64Entry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(10);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed64Sfixed64Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapSfixed64Sfixed64Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32FloatEntry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(11);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32FloatEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32FloatEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32DoubleEntry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(12);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32DoubleEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapInt32DoubleEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapBoolBoolEntry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(13);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapBoolBoolEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapBoolBoolEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringStringEntry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(14);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringStringEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringStringEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringBytesEntry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(15);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringBytesEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringBytesEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedMessageEntry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(16);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedMessageEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedMessageEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignMessageEntry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(17);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignMessageEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignMessageEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedEnumEntry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(18);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedEnumEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringNestedEnumEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignEnumEntry_descriptor =
+      internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_descriptor.getNestedTypes().get(19);
+    internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignEnumEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_TestMostTypesProto2_MapStringForeignEnumEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_legacy_gencode_test_proto2_ForeignMessage_descriptor =
+      getDescriptor().getMessageTypes().get(3);
+    internal_static_legacy_gencode_test_proto2_ForeignMessage_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto2_ForeignMessage_descriptor,
+        new java.lang.String[] { "C", });
+    extensionInt32.internalInit(descriptor.getExtensions().get(0));
+    extensionMessage.internalInit(descriptor.getExtensions().get(1));
+    descriptor.resolveAllFeaturesImmutable();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/compatibility/smoke/v32.1/legacy_gencode_test/proto3/Proto3GencodeTestProto.java b/compatibility/smoke/v32.1/legacy_gencode_test/proto3/Proto3GencodeTestProto.java
index fb299d1fb7b5b..fa94d6f1d15f9 100644
--- a/compatibility/smoke/v32.1/legacy_gencode_test/proto3/Proto3GencodeTestProto.java
+++ b/compatibility/smoke/v32.1/legacy_gencode_test/proto3/Proto3GencodeTestProto.java
@@ -10,50 +10,65 @@ public final class Proto3GencodeTestProto extends com.google.protobuf.GeneratedF
   private Proto3GencodeTestProto() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
-        com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
-        /* major= */ 4,
-        /* minor= */ 32,
-        /* patch= */ 1,
-        /* suffix= */ "",
-        Proto3GencodeTestProto.class.getName());
+      com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+      /* major= */ 4,
+      /* minor= */ 32,
+      /* patch= */ 1,
+      /* suffix= */ "",
+      Proto3GencodeTestProto.class.getName());
   }
-
-  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {}
-
-  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
   }
 
-  /** Protobuf enum {@code legacy_gencode_test.proto3.ForeignEnum} */
-  public enum ForeignEnum implements com.google.protobuf.ProtocolMessageEnum {
-    /** <code>FOREIGN_FOO = 0;</code> */
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  /**
+   * Protobuf enum {@code legacy_gencode_test.proto3.ForeignEnum}
+   */
+  public enum ForeignEnum
+      implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     * <code>FOREIGN_FOO = 0;</code>
+     */
     FOREIGN_FOO(0),
-    /** <code>FOREIGN_BAR = 1;</code> */
+    /**
+     * <code>FOREIGN_BAR = 1;</code>
+     */
     FOREIGN_BAR(1),
-    /** <code>FOREIGN_BAZ = 2;</code> */
+    /**
+     * <code>FOREIGN_BAZ = 2;</code>
+     */
     FOREIGN_BAZ(2),
     UNRECOGNIZED(-1),
     ;
 
     static {
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
-          com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
-          /* major= */ 4,
-          /* minor= */ 32,
-          /* patch= */ 1,
-          /* suffix= */ "",
-          ForeignEnum.class.getName());
+        com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+        /* major= */ 4,
+        /* minor= */ 32,
+        /* patch= */ 1,
+        /* suffix= */ "",
+        ForeignEnum.class.getName());
     }
-
-    /** <code>FOREIGN_FOO = 0;</code> */
+    /**
+     * <code>FOREIGN_FOO = 0;</code>
+     */
     public static final int FOREIGN_FOO_VALUE = 0;
-
-    /** <code>FOREIGN_BAR = 1;</code> */
+    /**
+     * <code>FOREIGN_BAR = 1;</code>
+     */
     public static final int FOREIGN_BAR_VALUE = 1;
-
-    /** <code>FOREIGN_BAZ = 2;</code> */
+    /**
+     * <code>FOREIGN_BAZ = 2;</code>
+     */
     public static final int FOREIGN_BAZ_VALUE = 2;
 
+
     public final int getNumber() {
       if (this == UNRECOGNIZED) {
         throw new java.lang.IllegalArgumentException(
@@ -78,51 +93,49 @@ public static ForeignEnum valueOf(int value) {
      */
     public static ForeignEnum forNumber(int value) {
       switch (value) {
-        case 0:
-          return FOREIGN_FOO;
-        case 1:
-          return FOREIGN_BAR;
-        case 2:
-          return FOREIGN_BAZ;
-        default:
-          return null;
+        case 0: return FOREIGN_FOO;
+        case 1: return FOREIGN_BAR;
+        case 2: return FOREIGN_BAZ;
+        default: return null;
       }
     }
 
-    public static com.google.protobuf.Internal.EnumLiteMap<ForeignEnum> internalGetValueMap() {
+    public static com.google.protobuf.Internal.EnumLiteMap<ForeignEnum>
+        internalGetValueMap() {
       return internalValueMap;
     }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        ForeignEnum> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap<ForeignEnum>() {
+            public ForeignEnum findValueByNumber(int number) {
+              return ForeignEnum.forNumber(number);
+            }
+          };
 
-    private static final com.google.protobuf.Internal.EnumLiteMap<ForeignEnum> internalValueMap =
-        new com.google.protobuf.Internal.EnumLiteMap<ForeignEnum>() {
-          public ForeignEnum findValueByNumber(int number) {
-            return ForeignEnum.forNumber(number);
-          }
-        };
-
-    public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
       if (this == UNRECOGNIZED) {
         throw new java.lang.IllegalStateException(
             "Can't get the descriptor of an unrecognized enum value.");
       }
       return getDescriptor().getValues().get(ordinal());
     }
-
-    public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
       return getDescriptor();
     }
-
-    public static com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
-      return legacy_gencode_test.proto3.Proto3GencodeTestProto.getDescriptor()
-          .getEnumTypes()
-          .get(0);
+    public static com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
+      return legacy_gencode_test.proto3.Proto3GencodeTestProto.getDescriptor().getEnumTypes().get(0);
     }
 
     private static final ForeignEnum[] VALUES = values();
 
-    public static ForeignEnum valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+    public static ForeignEnum valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
       if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
       }
       if (desc.getIndex() == -1) {
         return UNRECOGNIZED;
@@ -139,8 +152,7 @@ private ForeignEnum(int value) {
     // @@protoc_insertion_point(enum_scope:legacy_gencode_test.proto3.ForeignEnum)
   }
 
-  public interface TestMessageOrBuilder
-      extends
+  public interface TestMessageOrBuilder extends
       // @@protoc_insertion_point(interface_extends:legacy_gencode_test.proto3.TestMessage)
       com.google.protobuf.MessageOrBuilder {
 
@@ -149,13 +161,12 @@ public interface TestMessageOrBuilder
      * @return The x.
      */
     java.lang.String getX();
-
     /**
      * <code>string x = 2;</code>
-     *
      * @return The bytes for x.
      */
-    com.google.protobuf.ByteString getXBytes();
+    com.google.protobuf.ByteString
+        getXBytes();
 
     /**
      * <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code>
@@ -167,26 +178,27 @@ public interface TestMessageOrBuilder
      * @return The y.
      */
     legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage getY();
-
-    /** <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code> */
+    /**
+     * <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code>
+     */
     legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder getYOrBuilder();
   }
-
-  /** Protobuf type {@code legacy_gencode_test.proto3.TestMessage} */
-  public static final class TestMessage extends com.google.protobuf.GeneratedMessage
-      implements
+  /**
+   * Protobuf type {@code legacy_gencode_test.proto3.TestMessage}
+   */
+  public static final class TestMessage extends
+      com.google.protobuf.GeneratedMessage implements
       // @@protoc_insertion_point(message_implements:legacy_gencode_test.proto3.TestMessage)
       TestMessageOrBuilder {
-    private static final long serialVersionUID = 0L;
-
+  private static final long serialVersionUID = 0L;
     static {
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
-          com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
-          /* major= */ 4,
-          /* minor= */ 32,
-          /* patch= */ 1,
-          /* suffix= */ "",
-          TestMessage.class.getName());
+        com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+        /* major= */ 4,
+        /* minor= */ 32,
+        /* patch= */ 1,
+        /* suffix= */ "",
+        TestMessage.class.getName());
     }
     // Use TestMessage.newBuilder() to construct.
     private TestMessage(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
@@ -196,19 +208,17 @@ private TestMessage() {
       x_ = "";
     }
 
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return legacy_gencode_test.proto3.Proto3GencodeTestProto
-          .internal_static_legacy_gencode_test_proto3_TestMessage_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMessage_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return legacy_gencode_test.proto3.Proto3GencodeTestProto
-          .internal_static_legacy_gencode_test_proto3_TestMessage_fieldAccessorTable
+      return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMessage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.class,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.Builder.class);
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.class, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.Builder.class);
     }
 
     private int bitField0_;
@@ -225,24 +235,25 @@ public java.lang.String getX() {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         x_ = s;
         return s;
       }
     }
-
     /**
      * <code>string x = 2;</code>
-     *
      * @return The bytes for x.
      */
     @java.lang.Override
-    public com.google.protobuf.ByteString getXBytes() {
+    public com.google.protobuf.ByteString
+        getXBytes() {
       java.lang.Object ref = x_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
         x_ = b;
         return b;
       } else {
@@ -266,18 +277,14 @@ public boolean hasY() {
      */
     @java.lang.Override
     public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage getY() {
-      return y_ == null
-          ? legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.getDefaultInstance()
-          : y_;
+      return y_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.getDefaultInstance() : y_;
     }
-
-    /** <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code> */
+    /**
+     * <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code>
+     */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder
-        getYOrBuilder() {
-      return y_ == null
-          ? legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.getDefaultInstance()
-          : y_;
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder getYOrBuilder() {
+      return y_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.getDefaultInstance() : y_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -292,7 +299,8 @@ public final boolean isInitialized() {
     }
 
     @java.lang.Override
-    public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
       if (!com.google.protobuf.GeneratedMessage.isStringEmpty(x_)) {
         com.google.protobuf.GeneratedMessage.writeString(output, 2, x_);
       }
@@ -312,7 +320,8 @@ public int getSerializedSize() {
         size += com.google.protobuf.GeneratedMessage.computeStringSize(2, x_);
       }
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getY());
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(3, getY());
       }
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
@@ -322,18 +331,19 @@ public int getSerializedSize() {
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
-        return true;
+       return true;
       }
       if (!(obj instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage)) {
         return super.equals(obj);
       }
-      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage other =
-          (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage) obj;
+      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage other = (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage) obj;
 
-      if (!getX().equals(other.getX())) return false;
+      if (!getX()
+          .equals(other.getX())) return false;
       if (hasY() != other.hasY()) return false;
       if (hasY()) {
-        if (!getY().equals(other.getY())) return false;
+        if (!getY()
+            .equals(other.getY())) return false;
       }
       if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
@@ -358,12 +368,13 @@ public int hashCode() {
     }
 
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseFrom(
-        java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseFrom(
-        java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
@@ -378,96 +389,94 @@ public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage pars
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseFrom(
-        byte[] data) throws com.google.protobuf.InvalidProtocolBufferException {
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseFrom(
-        byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseFrom(
-        java.io.InputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input);
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseFrom(
-        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseDelimitedFrom(
-        java.io.InputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseDelimitedWithIOException(PARSER, input);
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseDelimitedWithIOException(PARSER, input);
     }
 
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseDelimitedFrom(
-        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseDelimitedWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessage
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseFrom(
-        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input);
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input);
     }
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
     @java.lang.Override
-    public Builder newBuilderForType() {
-      return newBuilder();
-    }
-
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-
-    public static Builder newBuilder(
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage prototype) {
+    public static Builder newBuilder(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
     public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
 
     @java.lang.Override
-    protected Builder newBuilderForType(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
-
-    /** Protobuf type {@code legacy_gencode_test.proto3.TestMessage} */
-    public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder<Builder>
-        implements
+    /**
+     * Protobuf type {@code legacy_gencode_test.proto3.TestMessage}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:legacy_gencode_test.proto3.TestMessage)
         legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessageOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_TestMessage_descriptor;
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMessage_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_TestMessage_fieldAccessorTable
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.class,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.Builder.class);
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.class, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.Builder.class);
       }
 
       // Construct using legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.newBuilder()
@@ -475,12 +484,14 @@ private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessage
+                .alwaysUseFieldBuilders) {
           internalGetYFieldBuilder();
         }
       }
@@ -498,14 +509,13 @@ public Builder clear() {
       }
 
       @java.lang.Override
-      public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_TestMessage_descriptor;
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMessage_descriptor;
       }
 
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage
-          getDefaultInstanceForType() {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage getDefaultInstanceForType() {
         return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.getDefaultInstance();
       }
 
@@ -520,24 +530,22 @@ public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage build() {
 
       @java.lang.Override
       public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage buildPartial() {
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage result =
-            new legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage result = new legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage result) {
+      private void buildPartial0(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.x_ = x_;
         }
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.y_ = yBuilder_ == null ? y_ : yBuilder_.build();
+          result.y_ = yBuilder_ == null
+              ? y_
+              : yBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         result.bitField0_ |= to_bitField0_;
@@ -546,18 +554,15 @@ private void buildPartial0(
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage) {
-          return mergeFrom((legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage) other);
+          return mergeFrom((legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage other) {
-        if (other
-            == legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.getDefaultInstance())
-          return this;
+      public Builder mergeFrom(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage other) {
+        if (other == legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage.getDefaultInstance()) return this;
         if (!other.getX().isEmpty()) {
           x_ = other.x_;
           bitField0_ |= 0x00000001;
@@ -592,25 +597,24 @@ public Builder mergeFrom(
               case 0:
                 done = true;
                 break;
-              case 18:
-                {
-                  x_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000001;
-                  break;
-                } // case 18
-              case 26:
-                {
-                  input.readMessage(internalGetYFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000002;
-                  break;
-                } // case 26
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
+              case 18: {
+                x_ = input.readStringRequireUtf8();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 18
+              case 26: {
+                input.readMessage(
+                    internalGetYFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 26
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
             } // switch (tag)
           } // while (!done)
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -630,7 +634,8 @@ public Builder mergeFrom(
       public java.lang.String getX() {
         java.lang.Object ref = x_;
         if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           x_ = s;
           return s;
@@ -638,34 +643,31 @@ public java.lang.String getX() {
           return (java.lang.String) ref;
         }
       }
-
       /**
        * <code>string x = 2;</code>
-       *
        * @return The bytes for x.
        */
-      public com.google.protobuf.ByteString getXBytes() {
+      public com.google.protobuf.ByteString
+          getXBytes() {
         java.lang.Object ref = x_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
-              com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
           x_ = b;
           return b;
         } else {
           return (com.google.protobuf.ByteString) ref;
         }
       }
-
       /**
        * <code>string x = 2;</code>
-       *
        * @param value The x to set.
        * @return This builder for chaining.
        */
-      public Builder setX(java.lang.String value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setX(
+          java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
         x_ = value;
         bitField0_ |= 0x00000001;
         onChanged();
@@ -681,17 +683,14 @@ public Builder clearX() {
         onChanged();
         return this;
       }
-
       /**
        * <code>string x = 2;</code>
-       *
        * @param value The bytes for x to set.
        * @return This builder for chaining.
        */
-      public Builder setXBytes(com.google.protobuf.ByteString value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setXBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
         checkByteStringIsUtf8(value);
         x_ = value;
         bitField0_ |= 0x00000001;
@@ -701,11 +700,7 @@ public Builder setXBytes(com.google.protobuf.ByteString value) {
 
       private legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage y_;
       private com.google.protobuf.SingleFieldBuilder<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder>
-          yBuilder_;
-
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder> yBuilder_;
       /**
        * <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code>
        * @return Whether the y field is set.
@@ -719,18 +714,15 @@ public boolean hasY() {
        */
       public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage getY() {
         if (yBuilder_ == null) {
-          return y_ == null
-              ? legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage
-                  .getDefaultInstance()
-              : y_;
+          return y_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.getDefaultInstance() : y_;
         } else {
           return yBuilder_.getMessage();
         }
       }
-
-      /** <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code> */
-      public Builder setY(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage value) {
+      /**
+       * <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code>
+       */
+      public Builder setY(legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage value) {
         if (yBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -743,11 +735,11 @@ public Builder setY(
         onChanged();
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code> */
+      /**
+       * <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code>
+       */
       public Builder setY(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder
-              builderForValue) {
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder builderForValue) {
         if (yBuilder_ == null) {
           y_ = builderForValue.build();
         } else {
@@ -757,16 +749,14 @@ public Builder setY(
         onChanged();
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code> */
-      public Builder mergeY(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage value) {
+      /**
+       * <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code>
+       */
+      public Builder mergeY(legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage value) {
         if (yBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) != 0)
-              && y_ != null
-              && y_
-                  != legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage
-                      .getDefaultInstance()) {
+          if (((bitField0_ & 0x00000002) != 0) &&
+            y_ != null &&
+            y_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.getDefaultInstance()) {
             getYBuilder().mergeFrom(value);
           } else {
             y_ = value;
@@ -780,8 +770,9 @@ public Builder mergeY(
         }
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code> */
+      /**
+       * <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code>
+       */
       public Builder clearY() {
         bitField0_ = (bitField0_ & ~0x00000002);
         y_ = null;
@@ -792,41 +783,37 @@ public Builder clearY() {
         onChanged();
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code> */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder
-          getYBuilder() {
+      /**
+       * <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code>
+       */
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder getYBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return internalGetYFieldBuilder().getBuilder();
       }
-
-      /** <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code> */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder
-          getYOrBuilder() {
+      /**
+       * <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code>
+       */
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder getYOrBuilder() {
         if (yBuilder_ != null) {
           return yBuilder_.getMessageOrBuilder();
         } else {
-          return y_ == null
-              ? legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage
-                  .getDefaultInstance()
-              : y_;
+          return y_ == null ?
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.getDefaultInstance() : y_;
         }
       }
-
-      /** <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code> */
+      /**
+       * <code>.legacy_gencode_test.proto3.NestedTestMessage y = 3;</code>
+       */
       private com.google.protobuf.SingleFieldBuilder<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder>
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder> 
           internalGetYFieldBuilder() {
         if (yBuilder_ == null) {
-          yBuilder_ =
-              new com.google.protobuf.SingleFieldBuilder<
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder>(
-                  getY(), getParentForChildren(), isClean());
+          yBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder>(
+                  getY(),
+                  getParentForChildren(),
+                  isClean());
           y_ = null;
         }
         return yBuilder_;
@@ -836,40 +823,36 @@ public Builder clearY() {
     }
 
     // @@protoc_insertion_point(class_scope:legacy_gencode_test.proto3.TestMessage)
-    private static final legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage
-        DEFAULT_INSTANCE;
-
+    private static final legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage DEFAULT_INSTANCE;
     static {
       DEFAULT_INSTANCE = new legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage();
     }
 
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage
-        getDefaultInstance() {
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    private static final com.google.protobuf.Parser<TestMessage> PARSER =
-        new com.google.protobuf.AbstractParser<TestMessage>() {
-          @java.lang.Override
-          public TestMessage parsePartialFrom(
-              com.google.protobuf.CodedInputStream input,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
-          }
-        };
+    private static final com.google.protobuf.Parser<TestMessage>
+        PARSER = new com.google.protobuf.AbstractParser<TestMessage>() {
+      @java.lang.Override
+      public TestMessage parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (com.google.protobuf.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new com.google.protobuf.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
+      }
+    };
 
     public static com.google.protobuf.Parser<TestMessage> parser() {
       return PARSER;
@@ -881,15 +864,13 @@ public com.google.protobuf.Parser<TestMessage> getParserForType() {
     }
 
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage
-        getDefaultInstanceForType() {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMessage getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
-  public interface NestedTestMessageOrBuilder
-      extends
+  public interface NestedTestMessageOrBuilder extends
       // @@protoc_insertion_point(interface_extends:legacy_gencode_test.proto3.NestedTestMessage)
       com.google.protobuf.MessageOrBuilder {
 
@@ -910,22 +891,22 @@ public interface NestedTestMessageOrBuilder
      */
     int getZ(int index);
   }
-
-  /** Protobuf type {@code legacy_gencode_test.proto3.NestedTestMessage} */
-  public static final class NestedTestMessage extends com.google.protobuf.GeneratedMessage
-      implements
+  /**
+   * Protobuf type {@code legacy_gencode_test.proto3.NestedTestMessage}
+   */
+  public static final class NestedTestMessage extends
+      com.google.protobuf.GeneratedMessage implements
       // @@protoc_insertion_point(message_implements:legacy_gencode_test.proto3.NestedTestMessage)
       NestedTestMessageOrBuilder {
-    private static final long serialVersionUID = 0L;
-
+  private static final long serialVersionUID = 0L;
     static {
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
-          com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
-          /* major= */ 4,
-          /* minor= */ 32,
-          /* patch= */ 1,
-          /* suffix= */ "",
-          NestedTestMessage.class.getName());
+        com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+        /* major= */ 4,
+        /* minor= */ 32,
+        /* patch= */ 1,
+        /* suffix= */ "",
+        NestedTestMessage.class.getName());
     }
     // Use NestedTestMessage.newBuilder() to construct.
     private NestedTestMessage(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
@@ -935,33 +916,30 @@ private NestedTestMessage() {
       z_ = emptyIntList();
     }
 
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return legacy_gencode_test.proto3.Proto3GencodeTestProto
-          .internal_static_legacy_gencode_test_proto3_NestedTestMessage_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_NestedTestMessage_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return legacy_gencode_test.proto3.Proto3GencodeTestProto
-          .internal_static_legacy_gencode_test_proto3_NestedTestMessage_fieldAccessorTable
+      return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_NestedTestMessage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.class,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder.class);
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.class, legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder.class);
     }
 
     public static final int Z_FIELD_NUMBER = 1;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList z_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList z_ =
+        emptyIntList();
     /**
      * <code>repeated int32 z = 1;</code>
-     *
      * @return A list containing the z.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getZList() {
+    public java.util.List<java.lang.Integer>
+        getZList() {
       return z_;
     }
     /**
@@ -993,7 +971,8 @@ public final boolean isInitialized() {
     }
 
     @java.lang.Override
-    public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
       getSerializedSize();
       if (getZList().size() > 0) {
         output.writeUInt32NoTag(10);
@@ -1014,12 +993,14 @@ public int getSerializedSize() {
       {
         int dataSize = 0;
         for (int i = 0; i < z_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(z_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt32SizeNoTag(z_.getInt(i));
         }
         size += dataSize;
         if (!getZList().isEmpty()) {
           size += 1;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         zMemoizedSerializedSize = dataSize;
       }
@@ -1031,15 +1012,15 @@ public int getSerializedSize() {
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
-        return true;
+       return true;
       }
       if (!(obj instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage)) {
         return super.equals(obj);
       }
-      legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage other =
-          (legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage) obj;
+      legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage other = (legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage) obj;
 
-      if (!getZList().equals(other.getZList())) return false;
+      if (!getZList()
+          .equals(other.getZList())) return false;
       if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
@@ -1061,12 +1042,13 @@ public int hashCode() {
     }
 
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseFrom(
-        java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseFrom(
-        java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
@@ -1081,104 +1063,103 @@ public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessag
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseFrom(
-        byte[] data) throws com.google.protobuf.InvalidProtocolBufferException {
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseFrom(
-        byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseFrom(
-        java.io.InputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input);
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseFrom(
-        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage
-        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseDelimitedWithIOException(PARSER, input);
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage
-        parseDelimitedFrom(
-            java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseDelimitedWithIOException(
-          PARSER, input, extensionRegistry);
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseFrom(
-        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input);
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input);
     }
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
     @java.lang.Override
-    public Builder newBuilderForType() {
-      return newBuilder();
-    }
-
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-
-    public static Builder newBuilder(
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage prototype) {
+    public static Builder newBuilder(legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
     public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
 
     @java.lang.Override
-    protected Builder newBuilderForType(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
-
-    /** Protobuf type {@code legacy_gencode_test.proto3.NestedTestMessage} */
-    public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder<Builder>
-        implements
+    /**
+     * Protobuf type {@code legacy_gencode_test.proto3.NestedTestMessage}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:legacy_gencode_test.proto3.NestedTestMessage)
         legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessageOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_NestedTestMessage_descriptor;
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_NestedTestMessage_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_NestedTestMessage_fieldAccessorTable
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_NestedTestMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.class,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder.class);
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.class, legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.Builder.class);
       }
 
-      // Construct using
-      // legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.newBuilder()
-      private Builder() {}
+      // Construct using legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.newBuilder()
+      private Builder() {
+
+      }
 
-      private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
 
       }
@@ -1191,16 +1172,14 @@ public Builder clear() {
       }
 
       @java.lang.Override
-      public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_NestedTestMessage_descriptor;
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_NestedTestMessage_descriptor;
       }
 
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage
-          getDefaultInstanceForType() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage
-            .getDefaultInstance();
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage getDefaultInstanceForType() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.getDefaultInstance();
       }
 
       @java.lang.Override
@@ -1214,17 +1193,13 @@ public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage build
 
       @java.lang.Override
       public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage buildPartial() {
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage result =
-            new legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage result = new legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage result) {
+      private void buildPartial0(legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           z_.makeImmutable();
@@ -1235,19 +1210,15 @@ private void buildPartial0(
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage) {
-          return mergeFrom(
-              (legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage) other);
+          return mergeFrom((legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage other) {
-        if (other
-            == legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage
-                .getDefaultInstance()) return this;
+      public Builder mergeFrom(legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage other) {
+        if (other == legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage.getDefaultInstance()) return this;
         if (!other.z_.isEmpty()) {
           if (z_.isEmpty()) {
             z_ = other.z_;
@@ -1285,31 +1256,28 @@ public Builder mergeFrom(
               case 0:
                 done = true;
                 break;
-              case 8:
-                {
-                  int v = input.readInt32();
-                  ensureZIsMutable();
-                  z_.addInt(v);
-                  break;
-                } // case 8
-              case 10:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureZIsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    z_.addInt(input.readInt32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 10
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
+              case 8: {
+                int v = input.readInt32();
+                ensureZIsMutable();
+                z_.addInt(v);
+                break;
+              } // case 8
+              case 10: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureZIsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  z_.addInt(input.readInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
             } // switch (tag)
           } // while (!done)
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1328,13 +1296,12 @@ private void ensureZIsMutable() {
         }
         bitField0_ |= 0x00000001;
       }
-
       /**
        * <code>repeated int32 z = 1;</code>
-       *
        * @return A list containing the z.
        */
-      public java.util.List<java.lang.Integer> getZList() {
+      public java.util.List<java.lang.Integer>
+          getZList() {
         z_.makeImmutable();
         return z_;
       }
@@ -1353,15 +1320,14 @@ public int getZCount() {
       public int getZ(int index) {
         return z_.getInt(index);
       }
-
       /**
        * <code>repeated int32 z = 1;</code>
-       *
        * @param index The index to set the value at.
        * @param value The z to set.
        * @return This builder for chaining.
        */
-      public Builder setZ(int index, int value) {
+      public Builder setZ(
+          int index, int value) {
 
         ensureZIsMutable();
         z_.setInt(index, value);
@@ -1382,16 +1348,16 @@ public Builder addZ(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated int32 z = 1;</code>
-       *
        * @param values The z to add.
        * @return This builder for chaining.
        */
-      public Builder addAllZ(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllZ(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureZIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, z_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, z_);
         bitField0_ |= 0x00000001;
         onChanged();
         return this;
@@ -1411,40 +1377,36 @@ public Builder clearZ() {
     }
 
     // @@protoc_insertion_point(class_scope:legacy_gencode_test.proto3.NestedTestMessage)
-    private static final legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage
-        DEFAULT_INSTANCE;
-
+    private static final legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage DEFAULT_INSTANCE;
     static {
       DEFAULT_INSTANCE = new legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage();
     }
 
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage
-        getDefaultInstance() {
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    private static final com.google.protobuf.Parser<NestedTestMessage> PARSER =
-        new com.google.protobuf.AbstractParser<NestedTestMessage>() {
-          @java.lang.Override
-          public NestedTestMessage parsePartialFrom(
-              com.google.protobuf.CodedInputStream input,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
-          }
-        };
+    private static final com.google.protobuf.Parser<NestedTestMessage>
+        PARSER = new com.google.protobuf.AbstractParser<NestedTestMessage>() {
+      @java.lang.Override
+      public NestedTestMessage parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (com.google.protobuf.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new com.google.protobuf.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
+      }
+    };
 
     public static com.google.protobuf.Parser<NestedTestMessage> parser() {
       return PARSER;
@@ -1456,275 +1418,214 @@ public com.google.protobuf.Parser<NestedTestMessage> getParserForType() {
     }
 
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage
-        getDefaultInstanceForType() {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.NestedTestMessage getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
+
   }
 
-  public interface TestMostTypesProto3OrBuilder
-      extends
+  public interface TestMostTypesProto3OrBuilder extends
       // @@protoc_insertion_point(interface_extends:legacy_gencode_test.proto3.TestMostTypesProto3)
       com.google.protobuf.MessageOrBuilder {
 
     /**
      * <code>int32 optional_int32 = 1;</code>
-     *
      * @return The optionalInt32.
      */
     int getOptionalInt32();
 
     /**
      * <code>int64 optional_int64 = 2;</code>
-     *
      * @return The optionalInt64.
      */
     long getOptionalInt64();
 
     /**
      * <code>uint32 optional_uint32 = 3;</code>
-     *
      * @return The optionalUint32.
      */
     int getOptionalUint32();
 
     /**
      * <code>uint64 optional_uint64 = 4;</code>
-     *
      * @return The optionalUint64.
      */
     long getOptionalUint64();
 
     /**
      * <code>sint32 optional_sint32 = 5;</code>
-     *
      * @return The optionalSint32.
      */
     int getOptionalSint32();
 
     /**
      * <code>sint64 optional_sint64 = 6;</code>
-     *
      * @return The optionalSint64.
      */
     long getOptionalSint64();
 
     /**
      * <code>fixed32 optional_fixed32 = 7;</code>
-     *
      * @return The optionalFixed32.
      */
     int getOptionalFixed32();
 
     /**
      * <code>fixed64 optional_fixed64 = 8;</code>
-     *
      * @return The optionalFixed64.
      */
     long getOptionalFixed64();
 
     /**
      * <code>sfixed32 optional_sfixed32 = 9;</code>
-     *
      * @return The optionalSfixed32.
      */
     int getOptionalSfixed32();
 
     /**
      * <code>sfixed64 optional_sfixed64 = 10;</code>
-     *
      * @return The optionalSfixed64.
      */
     long getOptionalSfixed64();
 
     /**
      * <code>float optional_float = 11;</code>
-     *
      * @return The optionalFloat.
      */
     float getOptionalFloat();
 
     /**
      * <code>double optional_double = 12;</code>
-     *
      * @return The optionalDouble.
      */
     double getOptionalDouble();
 
     /**
      * <code>bool optional_bool = 13;</code>
-     *
      * @return The optionalBool.
      */
     boolean getOptionalBool();
 
     /**
      * <code>string optional_string = 14;</code>
-     *
      * @return The optionalString.
      */
     java.lang.String getOptionalString();
-
     /**
      * <code>string optional_string = 14;</code>
-     *
      * @return The bytes for optionalString.
      */
-    com.google.protobuf.ByteString getOptionalStringBytes();
+    com.google.protobuf.ByteString
+        getOptionalStringBytes();
 
     /**
      * <code>bytes optional_bytes = 15;</code>
-     *
      * @return The optionalBytes.
      */
     com.google.protobuf.ByteString getOptionalBytes();
 
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
      * @return Whether the optionalNestedMessage field is set.
      */
     boolean hasOptionalNestedMessage();
-
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
      * @return The optionalNestedMessage.
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-        getOptionalNestedMessage();
-
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getOptionalNestedMessage();
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-     * </code>
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder
-        getOptionalNestedMessageOrBuilder();
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder getOptionalNestedMessageOrBuilder();
 
     /**
      * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
-     *
      * @return Whether the optionalForeignMessage field is set.
      */
     boolean hasOptionalForeignMessage();
-
     /**
      * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
-     *
      * @return The optionalForeignMessage.
      */
     legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getOptionalForeignMessage();
-
-    /** <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code> */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder
-        getOptionalForeignMessageOrBuilder();
+    /**
+     * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
+     */
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder getOptionalForeignMessageOrBuilder();
 
     /**
-     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;</code>
      * @return The enum numeric value on the wire for optionalNestedEnum.
      */
     int getOptionalNestedEnumValue();
-
     /**
-     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;</code>
      * @return The optionalNestedEnum.
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getOptionalNestedEnum();
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getOptionalNestedEnum();
 
     /**
      * <code>.legacy_gencode_test.proto3.ForeignEnum optional_foreign_enum = 22;</code>
-     *
      * @return The enum numeric value on the wire for optionalForeignEnum.
      */
     int getOptionalForeignEnumValue();
-
     /**
      * <code>.legacy_gencode_test.proto3.ForeignEnum optional_foreign_enum = 22;</code>
-     *
      * @return The optionalForeignEnum.
      */
     legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getOptionalForeignEnum();
 
     /**
-     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;</code>
      * @return The enum numeric value on the wire for optionalAliasedEnum.
      */
     int getOptionalAliasedEnumValue();
-
     /**
-     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;</code>
      * @return The optionalAliasedEnum.
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum
-        getOptionalAliasedEnum();
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum getOptionalAliasedEnum();
 
     /**
      * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
-     *
      * @return Whether the recursiveMessage field is set.
      */
     boolean hasRecursiveMessage();
-
     /**
      * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
-     *
      * @return The recursiveMessage.
      */
     legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 getRecursiveMessage();
-
-    /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code> */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder
-        getRecursiveMessageOrBuilder();
+    /**
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
+     */
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder getRecursiveMessageOrBuilder();
 
     /**
-     *
-     *
      * <pre>
      * Repeated
      * </pre>
      *
      * <code>repeated int32 repeated_int32 = 31;</code>
-     *
      * @return A list containing the repeatedInt32.
      */
     java.util.List<java.lang.Integer> getRepeatedInt32List();
-
     /**
-     *
-     *
      * <pre>
      * Repeated
      * </pre>
      *
      * <code>repeated int32 repeated_int32 = 31;</code>
-     *
      * @return The count of repeatedInt32.
      */
     int getRepeatedInt32Count();
-
     /**
-     *
-     *
      * <pre>
      * Repeated
      * </pre>
      *
      * <code>repeated int32 repeated_int32 = 31;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedInt32 at the given index.
      */
@@ -1732,21 +1633,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated int64 repeated_int64 = 32;</code>
-     *
      * @return A list containing the repeatedInt64.
      */
     java.util.List<java.lang.Long> getRepeatedInt64List();
-
     /**
      * <code>repeated int64 repeated_int64 = 32;</code>
-     *
      * @return The count of repeatedInt64.
      */
     int getRepeatedInt64Count();
-
     /**
      * <code>repeated int64 repeated_int64 = 32;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedInt64 at the given index.
      */
@@ -1754,21 +1650,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated uint32 repeated_uint32 = 33;</code>
-     *
      * @return A list containing the repeatedUint32.
      */
     java.util.List<java.lang.Integer> getRepeatedUint32List();
-
     /**
      * <code>repeated uint32 repeated_uint32 = 33;</code>
-     *
      * @return The count of repeatedUint32.
      */
     int getRepeatedUint32Count();
-
     /**
      * <code>repeated uint32 repeated_uint32 = 33;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedUint32 at the given index.
      */
@@ -1776,21 +1667,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated uint64 repeated_uint64 = 34;</code>
-     *
      * @return A list containing the repeatedUint64.
      */
     java.util.List<java.lang.Long> getRepeatedUint64List();
-
     /**
      * <code>repeated uint64 repeated_uint64 = 34;</code>
-     *
      * @return The count of repeatedUint64.
      */
     int getRepeatedUint64Count();
-
     /**
      * <code>repeated uint64 repeated_uint64 = 34;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedUint64 at the given index.
      */
@@ -1798,21 +1684,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated sint32 repeated_sint32 = 35;</code>
-     *
      * @return A list containing the repeatedSint32.
      */
     java.util.List<java.lang.Integer> getRepeatedSint32List();
-
     /**
      * <code>repeated sint32 repeated_sint32 = 35;</code>
-     *
      * @return The count of repeatedSint32.
      */
     int getRepeatedSint32Count();
-
     /**
      * <code>repeated sint32 repeated_sint32 = 35;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedSint32 at the given index.
      */
@@ -1820,21 +1701,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated sint64 repeated_sint64 = 36;</code>
-     *
      * @return A list containing the repeatedSint64.
      */
     java.util.List<java.lang.Long> getRepeatedSint64List();
-
     /**
      * <code>repeated sint64 repeated_sint64 = 36;</code>
-     *
      * @return The count of repeatedSint64.
      */
     int getRepeatedSint64Count();
-
     /**
      * <code>repeated sint64 repeated_sint64 = 36;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedSint64 at the given index.
      */
@@ -1842,21 +1718,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-     *
      * @return A list containing the repeatedFixed32.
      */
     java.util.List<java.lang.Integer> getRepeatedFixed32List();
-
     /**
      * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-     *
      * @return The count of repeatedFixed32.
      */
     int getRepeatedFixed32Count();
-
     /**
      * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedFixed32 at the given index.
      */
@@ -1864,21 +1735,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-     *
      * @return A list containing the repeatedFixed64.
      */
     java.util.List<java.lang.Long> getRepeatedFixed64List();
-
     /**
      * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-     *
      * @return The count of repeatedFixed64.
      */
     int getRepeatedFixed64Count();
-
     /**
      * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedFixed64 at the given index.
      */
@@ -1886,21 +1752,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-     *
      * @return A list containing the repeatedSfixed32.
      */
     java.util.List<java.lang.Integer> getRepeatedSfixed32List();
-
     /**
      * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-     *
      * @return The count of repeatedSfixed32.
      */
     int getRepeatedSfixed32Count();
-
     /**
      * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedSfixed32 at the given index.
      */
@@ -1908,21 +1769,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-     *
      * @return A list containing the repeatedSfixed64.
      */
     java.util.List<java.lang.Long> getRepeatedSfixed64List();
-
     /**
      * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-     *
      * @return The count of repeatedSfixed64.
      */
     int getRepeatedSfixed64Count();
-
     /**
      * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedSfixed64 at the given index.
      */
@@ -1930,21 +1786,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated float repeated_float = 41;</code>
-     *
      * @return A list containing the repeatedFloat.
      */
     java.util.List<java.lang.Float> getRepeatedFloatList();
-
     /**
      * <code>repeated float repeated_float = 41;</code>
-     *
      * @return The count of repeatedFloat.
      */
     int getRepeatedFloatCount();
-
     /**
      * <code>repeated float repeated_float = 41;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedFloat at the given index.
      */
@@ -1952,21 +1803,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated double repeated_double = 42;</code>
-     *
      * @return A list containing the repeatedDouble.
      */
     java.util.List<java.lang.Double> getRepeatedDoubleList();
-
     /**
      * <code>repeated double repeated_double = 42;</code>
-     *
      * @return The count of repeatedDouble.
      */
     int getRepeatedDoubleCount();
-
     /**
      * <code>repeated double repeated_double = 42;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedDouble at the given index.
      */
@@ -1974,21 +1820,16 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated bool repeated_bool = 43;</code>
-     *
      * @return A list containing the repeatedBool.
      */
     java.util.List<java.lang.Boolean> getRepeatedBoolList();
-
     /**
      * <code>repeated bool repeated_bool = 43;</code>
-     *
      * @return The count of repeatedBool.
      */
     int getRepeatedBoolCount();
-
     /**
      * <code>repeated bool repeated_bool = 43;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedBool at the given index.
      */
@@ -1996,178 +1837,118 @@ public interface TestMostTypesProto3OrBuilder
 
     /**
      * <code>repeated string repeated_string = 44;</code>
-     *
      * @return A list containing the repeatedString.
      */
-    java.util.List<java.lang.String> getRepeatedStringList();
-
+    java.util.List<java.lang.String>
+        getRepeatedStringList();
     /**
      * <code>repeated string repeated_string = 44;</code>
-     *
      * @return The count of repeatedString.
      */
     int getRepeatedStringCount();
-
     /**
      * <code>repeated string repeated_string = 44;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedString at the given index.
      */
     java.lang.String getRepeatedString(int index);
-
     /**
      * <code>repeated string repeated_string = 44;</code>
-     *
      * @param index The index of the value to return.
      * @return The bytes of the repeatedString at the given index.
      */
-    com.google.protobuf.ByteString getRepeatedStringBytes(int index);
+    com.google.protobuf.ByteString
+        getRepeatedStringBytes(int index);
 
     /**
      * <code>repeated bytes repeated_bytes = 45;</code>
-     *
      * @return A list containing the repeatedBytes.
      */
     java.util.List<com.google.protobuf.ByteString> getRepeatedBytesList();
-
     /**
      * <code>repeated bytes repeated_bytes = 45;</code>
-     *
      * @return The count of repeatedBytes.
      */
     int getRepeatedBytesCount();
-
     /**
      * <code>repeated bytes repeated_bytes = 45;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedBytes at the given index.
      */
     com.google.protobuf.ByteString getRepeatedBytes(int index);
 
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
      */
-    java.util.List<
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
+    java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> 
         getRepeatedNestedMessageList();
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-        getRepeatedNestedMessage(int index);
-
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getRepeatedNestedMessage(int index);
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
      */
     int getRepeatedNestedMessageCount();
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
      */
-    java.util.List<
-            ? extends
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .NestedMessageOrBuilder>
+    java.util.List<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> 
         getRepeatedNestedMessageOrBuilderList();
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder
-        getRepeatedNestedMessageOrBuilder(int index);
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder getRepeatedNestedMessageOrBuilder(
+        int index);
 
     /**
-     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
      */
-    java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
+    java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> 
         getRepeatedForeignMessageList();
-
     /**
-     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedForeignMessage(
-        int index);
-
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedForeignMessage(int index);
     /**
-     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
      */
     int getRepeatedForeignMessageCount();
-
     /**
-     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
      */
-    java.util.List<
-            ? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>
+    java.util.List<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder> 
         getRepeatedForeignMessageOrBuilderList();
-
     /**
-     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder
-        getRepeatedForeignMessageOrBuilder(int index);
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder getRepeatedForeignMessageOrBuilder(
+        int index);
 
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
      * @return A list containing the repeatedNestedEnum.
      */
-    java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        getRepeatedNestedEnumList();
-
+    java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> getRepeatedNestedEnumList();
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
      * @return The count of repeatedNestedEnum.
      */
     int getRepeatedNestedEnumCount();
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
      * @param index The index of the element to return.
      * @return The repeatedNestedEnum at the given index.
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getRepeatedNestedEnum(int index);
-
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getRepeatedNestedEnum(int index);
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
      * @return A list containing the enum numeric values on the wire for repeatedNestedEnum.
      */
-    java.util.List<java.lang.Integer> getRepeatedNestedEnumValueList();
-
+    java.util.List<java.lang.Integer>
+    getRepeatedNestedEnumValueList();
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
      * @param index The index of the value to return.
      * @return The enum numeric value on the wire of repeatedNestedEnum at the given index.
      */
@@ -2175,77 +1956,57 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-     *
      * @return A list containing the repeatedForeignEnum.
      */
-    java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-        getRepeatedForeignEnumList();
-
+    java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum> getRepeatedForeignEnumList();
     /**
      * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-     *
      * @return The count of repeatedForeignEnum.
      */
     int getRepeatedForeignEnumCount();
-
     /**
      * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedForeignEnum at the given index.
      */
     legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getRepeatedForeignEnum(int index);
-
     /**
      * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-     *
      * @return A list containing the enum numeric values on the wire for repeatedForeignEnum.
      */
-    java.util.List<java.lang.Integer> getRepeatedForeignEnumValueList();
-
+    java.util.List<java.lang.Integer>
+    getRepeatedForeignEnumValueList();
     /**
      * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-     *
      * @param index The index of the value to return.
      * @return The enum numeric value on the wire of repeatedForeignEnum at the given index.
      */
     int getRepeatedForeignEnumValue(int index);
 
     /**
-     *
-     *
      * <pre>
      * Packed
      * </pre>
      *
      * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-     *
      * @return A list containing the packedInt32.
      */
     java.util.List<java.lang.Integer> getPackedInt32List();
-
     /**
-     *
-     *
      * <pre>
      * Packed
      * </pre>
      *
      * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-     *
      * @return The count of packedInt32.
      */
     int getPackedInt32Count();
-
     /**
-     *
-     *
      * <pre>
      * Packed
      * </pre>
      *
      * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedInt32 at the given index.
      */
@@ -2253,21 +2014,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-     *
      * @return A list containing the packedInt64.
      */
     java.util.List<java.lang.Long> getPackedInt64List();
-
     /**
      * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-     *
      * @return The count of packedInt64.
      */
     int getPackedInt64Count();
-
     /**
      * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedInt64 at the given index.
      */
@@ -2275,21 +2031,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-     *
      * @return A list containing the packedUint32.
      */
     java.util.List<java.lang.Integer> getPackedUint32List();
-
     /**
      * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-     *
      * @return The count of packedUint32.
      */
     int getPackedUint32Count();
-
     /**
      * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedUint32 at the given index.
      */
@@ -2297,21 +2048,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-     *
      * @return A list containing the packedUint64.
      */
     java.util.List<java.lang.Long> getPackedUint64List();
-
     /**
      * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-     *
      * @return The count of packedUint64.
      */
     int getPackedUint64Count();
-
     /**
      * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedUint64 at the given index.
      */
@@ -2319,21 +2065,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-     *
      * @return A list containing the packedSint32.
      */
     java.util.List<java.lang.Integer> getPackedSint32List();
-
     /**
      * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-     *
      * @return The count of packedSint32.
      */
     int getPackedSint32Count();
-
     /**
      * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedSint32 at the given index.
      */
@@ -2341,21 +2082,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-     *
      * @return A list containing the packedSint64.
      */
     java.util.List<java.lang.Long> getPackedSint64List();
-
     /**
      * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-     *
      * @return The count of packedSint64.
      */
     int getPackedSint64Count();
-
     /**
      * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedSint64 at the given index.
      */
@@ -2363,21 +2099,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-     *
      * @return A list containing the packedFixed32.
      */
     java.util.List<java.lang.Integer> getPackedFixed32List();
-
     /**
      * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-     *
      * @return The count of packedFixed32.
      */
     int getPackedFixed32Count();
-
     /**
      * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedFixed32 at the given index.
      */
@@ -2385,21 +2116,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-     *
      * @return A list containing the packedFixed64.
      */
     java.util.List<java.lang.Long> getPackedFixed64List();
-
     /**
      * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-     *
      * @return The count of packedFixed64.
      */
     int getPackedFixed64Count();
-
     /**
      * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedFixed64 at the given index.
      */
@@ -2407,21 +2133,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-     *
      * @return A list containing the packedSfixed32.
      */
     java.util.List<java.lang.Integer> getPackedSfixed32List();
-
     /**
      * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-     *
      * @return The count of packedSfixed32.
      */
     int getPackedSfixed32Count();
-
     /**
      * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedSfixed32 at the given index.
      */
@@ -2429,21 +2150,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-     *
      * @return A list containing the packedSfixed64.
      */
     java.util.List<java.lang.Long> getPackedSfixed64List();
-
     /**
      * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-     *
      * @return The count of packedSfixed64.
      */
     int getPackedSfixed64Count();
-
     /**
      * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedSfixed64 at the given index.
      */
@@ -2451,21 +2167,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated float packed_float = 85 [packed = true];</code>
-     *
      * @return A list containing the packedFloat.
      */
     java.util.List<java.lang.Float> getPackedFloatList();
-
     /**
      * <code>repeated float packed_float = 85 [packed = true];</code>
-     *
      * @return The count of packedFloat.
      */
     int getPackedFloatCount();
-
     /**
      * <code>repeated float packed_float = 85 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedFloat at the given index.
      */
@@ -2473,21 +2184,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated double packed_double = 86 [packed = true];</code>
-     *
      * @return A list containing the packedDouble.
      */
     java.util.List<java.lang.Double> getPackedDoubleList();
-
     /**
      * <code>repeated double packed_double = 86 [packed = true];</code>
-     *
      * @return The count of packedDouble.
      */
     int getPackedDoubleCount();
-
     /**
      * <code>repeated double packed_double = 86 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedDouble at the given index.
      */
@@ -2495,110 +2201,74 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated bool packed_bool = 87 [packed = true];</code>
-     *
      * @return A list containing the packedBool.
      */
     java.util.List<java.lang.Boolean> getPackedBoolList();
-
     /**
      * <code>repeated bool packed_bool = 87 [packed = true];</code>
-     *
      * @return The count of packedBool.
      */
     int getPackedBoolCount();
-
     /**
      * <code>repeated bool packed_bool = 87 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedBool at the given index.
      */
     boolean getPackedBool(int index);
 
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
      * @return A list containing the packedNestedEnum.
      */
-    java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        getPackedNestedEnumList();
-
+    java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> getPackedNestedEnumList();
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
      * @return The count of packedNestedEnum.
      */
     int getPackedNestedEnumCount();
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
      * @param index The index of the element to return.
      * @return The packedNestedEnum at the given index.
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getPackedNestedEnum(int index);
-
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getPackedNestedEnum(int index);
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
      * @return A list containing the enum numeric values on the wire for packedNestedEnum.
      */
-    java.util.List<java.lang.Integer> getPackedNestedEnumValueList();
-
+    java.util.List<java.lang.Integer>
+    getPackedNestedEnumValueList();
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
      * @param index The index of the value to return.
      * @return The enum numeric value on the wire of packedNestedEnum at the given index.
      */
     int getPackedNestedEnumValue(int index);
 
     /**
-     *
-     *
      * <pre>
      * Unpacked
      * </pre>
      *
      * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-     *
      * @return A list containing the unpackedInt32.
      */
     java.util.List<java.lang.Integer> getUnpackedInt32List();
-
     /**
-     *
-     *
      * <pre>
      * Unpacked
      * </pre>
      *
      * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-     *
      * @return The count of unpackedInt32.
      */
     int getUnpackedInt32Count();
-
     /**
-     *
-     *
      * <pre>
      * Unpacked
      * </pre>
      *
      * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedInt32 at the given index.
      */
@@ -2606,21 +2276,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-     *
      * @return A list containing the unpackedInt64.
      */
     java.util.List<java.lang.Long> getUnpackedInt64List();
-
     /**
      * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-     *
      * @return The count of unpackedInt64.
      */
     int getUnpackedInt64Count();
-
     /**
      * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedInt64 at the given index.
      */
@@ -2628,21 +2293,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-     *
      * @return A list containing the unpackedUint32.
      */
     java.util.List<java.lang.Integer> getUnpackedUint32List();
-
     /**
      * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-     *
      * @return The count of unpackedUint32.
      */
     int getUnpackedUint32Count();
-
     /**
      * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedUint32 at the given index.
      */
@@ -2650,21 +2310,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-     *
      * @return A list containing the unpackedUint64.
      */
     java.util.List<java.lang.Long> getUnpackedUint64List();
-
     /**
      * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-     *
      * @return The count of unpackedUint64.
      */
     int getUnpackedUint64Count();
-
     /**
      * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedUint64 at the given index.
      */
@@ -2672,21 +2327,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-     *
      * @return A list containing the unpackedSint32.
      */
     java.util.List<java.lang.Integer> getUnpackedSint32List();
-
     /**
      * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-     *
      * @return The count of unpackedSint32.
      */
     int getUnpackedSint32Count();
-
     /**
      * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedSint32 at the given index.
      */
@@ -2694,21 +2344,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-     *
      * @return A list containing the unpackedSint64.
      */
     java.util.List<java.lang.Long> getUnpackedSint64List();
-
     /**
      * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-     *
      * @return The count of unpackedSint64.
      */
     int getUnpackedSint64Count();
-
     /**
      * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedSint64 at the given index.
      */
@@ -2716,21 +2361,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-     *
      * @return A list containing the unpackedFixed32.
      */
     java.util.List<java.lang.Integer> getUnpackedFixed32List();
-
     /**
      * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-     *
      * @return The count of unpackedFixed32.
      */
     int getUnpackedFixed32Count();
-
     /**
      * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedFixed32 at the given index.
      */
@@ -2738,21 +2378,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-     *
      * @return A list containing the unpackedFixed64.
      */
     java.util.List<java.lang.Long> getUnpackedFixed64List();
-
     /**
      * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-     *
      * @return The count of unpackedFixed64.
      */
     int getUnpackedFixed64Count();
-
     /**
      * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedFixed64 at the given index.
      */
@@ -2760,21 +2395,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-     *
      * @return A list containing the unpackedSfixed32.
      */
     java.util.List<java.lang.Integer> getUnpackedSfixed32List();
-
     /**
      * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-     *
      * @return The count of unpackedSfixed32.
      */
     int getUnpackedSfixed32Count();
-
     /**
      * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedSfixed32 at the given index.
      */
@@ -2782,21 +2412,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-     *
      * @return A list containing the unpackedSfixed64.
      */
     java.util.List<java.lang.Long> getUnpackedSfixed64List();
-
     /**
      * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-     *
      * @return The count of unpackedSfixed64.
      */
     int getUnpackedSfixed64Count();
-
     /**
      * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedSfixed64 at the given index.
      */
@@ -2804,21 +2429,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated float unpacked_float = 99 [packed = false];</code>
-     *
      * @return A list containing the unpackedFloat.
      */
     java.util.List<java.lang.Float> getUnpackedFloatList();
-
     /**
      * <code>repeated float unpacked_float = 99 [packed = false];</code>
-     *
      * @return The count of unpackedFloat.
      */
     int getUnpackedFloatCount();
-
     /**
      * <code>repeated float unpacked_float = 99 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedFloat at the given index.
      */
@@ -2826,21 +2446,16 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated double unpacked_double = 100 [packed = false];</code>
-     *
      * @return A list containing the unpackedDouble.
      */
     java.util.List<java.lang.Double> getUnpackedDoubleList();
-
     /**
      * <code>repeated double unpacked_double = 100 [packed = false];</code>
-     *
      * @return The count of unpackedDouble.
      */
     int getUnpackedDoubleCount();
-
     /**
      * <code>repeated double unpacked_double = 100 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedDouble at the given index.
      */
@@ -2848,78 +2463,51 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
 
     /**
      * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-     *
      * @return A list containing the unpackedBool.
      */
     java.util.List<java.lang.Boolean> getUnpackedBoolList();
-
     /**
      * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-     *
      * @return The count of unpackedBool.
      */
     int getUnpackedBoolCount();
-
     /**
      * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedBool at the given index.
      */
     boolean getUnpackedBool(int index);
 
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
      * @return A list containing the unpackedNestedEnum.
      */
-    java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        getUnpackedNestedEnumList();
-
+    java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> getUnpackedNestedEnumList();
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
      * @return The count of unpackedNestedEnum.
      */
     int getUnpackedNestedEnumCount();
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
      * @param index The index of the element to return.
      * @return The unpackedNestedEnum at the given index.
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getUnpackedNestedEnum(int index);
-
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getUnpackedNestedEnum(int index);
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
      * @return A list containing the enum numeric values on the wire for unpackedNestedEnum.
      */
-    java.util.List<java.lang.Integer> getUnpackedNestedEnumValueList();
-
+    java.util.List<java.lang.Integer>
+    getUnpackedNestedEnumValueList();
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
      * @param index The index of the value to return.
      * @return The enum numeric value on the wire of unpackedNestedEnum at the given index.
      */
     int getUnpackedNestedEnumValue(int index);
 
     /**
-     *
-     *
      * <pre>
      * Map
      * </pre>
@@ -2927,766 +2515,824 @@ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedFore
      * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
      */
     int getMapInt32Int32Count();
-
     /**
-     *
-     *
      * <pre>
      * Map
      * </pre>
      *
      * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
      */
-    boolean containsMapInt32Int32(int key);
-
-    /** Use {@link #getMapInt32Int32Map()} instead. */
+    boolean containsMapInt32Int32(
+        int key);
+    /**
+     * Use {@link #getMapInt32Int32Map()} instead.
+     */
     @java.lang.Deprecated
-    java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32();
-
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapInt32Int32();
     /**
-     *
-     *
      * <pre>
      * Map
      * </pre>
      *
      * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
      */
-    java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32Map();
-
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapInt32Int32Map();
     /**
-     *
-     *
      * <pre>
      * Map
      * </pre>
      *
      * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
      */
-    int getMapInt32Int32OrDefault(int key, int defaultValue);
-
+    int getMapInt32Int32OrDefault(
+        int key,
+        int defaultValue);
     /**
-     *
-     *
      * <pre>
      * Map
      * </pre>
      *
      * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
      */
-    int getMapInt32Int32OrThrow(int key);
+    int getMapInt32Int32OrThrow(
+        int key);
 
-    /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
     int getMapInt64Int64Count();
-
-    /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
-    boolean containsMapInt64Int64(long key);
-
-    /** Use {@link #getMapInt64Int64Map()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Long, java.lang.Long> getMapInt64Int64();
-
-    /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
-    java.util.Map<java.lang.Long, java.lang.Long> getMapInt64Int64Map();
-
-    /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
-    long getMapInt64Int64OrDefault(long key, long defaultValue);
-
-    /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
-    long getMapInt64Int64OrThrow(long key);
-
-    /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
-    int getMapUint32Uint32Count();
-
-    /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
-    boolean containsMapUint32Uint32(int key);
-
-    /** Use {@link #getMapUint32Uint32Map()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Integer, java.lang.Integer> getMapUint32Uint32();
-
-    /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
-    java.util.Map<java.lang.Integer, java.lang.Integer> getMapUint32Uint32Map();
-
-    /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
-    int getMapUint32Uint32OrDefault(int key, int defaultValue);
-
-    /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
-    int getMapUint32Uint32OrThrow(int key);
-
-    /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
-    int getMapUint64Uint64Count();
-
-    /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
-    boolean containsMapUint64Uint64(long key);
-
-    /** Use {@link #getMapUint64Uint64Map()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Long, java.lang.Long> getMapUint64Uint64();
-
-    /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
-    java.util.Map<java.lang.Long, java.lang.Long> getMapUint64Uint64Map();
-
-    /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
-    long getMapUint64Uint64OrDefault(long key, long defaultValue);
-
-    /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
-    long getMapUint64Uint64OrThrow(long key);
-
-    /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
-    int getMapSint32Sint32Count();
-
-    /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
-    boolean containsMapSint32Sint32(int key);
-
-    /** Use {@link #getMapSint32Sint32Map()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Integer, java.lang.Integer> getMapSint32Sint32();
-
-    /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
-    java.util.Map<java.lang.Integer, java.lang.Integer> getMapSint32Sint32Map();
-
-    /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
-    int getMapSint32Sint32OrDefault(int key, int defaultValue);
-
-    /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
-    int getMapSint32Sint32OrThrow(int key);
-
-    /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
-    int getMapSint64Sint64Count();
-
-    /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
-    boolean containsMapSint64Sint64(long key);
-
-    /** Use {@link #getMapSint64Sint64Map()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Long, java.lang.Long> getMapSint64Sint64();
-
-    /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
-    java.util.Map<java.lang.Long, java.lang.Long> getMapSint64Sint64Map();
-
-    /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
-    long getMapSint64Sint64OrDefault(long key, long defaultValue);
-
-    /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
-    long getMapSint64Sint64OrThrow(long key);
-
-    /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
-    int getMapFixed32Fixed32Count();
-
-    /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
-    boolean containsMapFixed32Fixed32(int key);
-
-    /** Use {@link #getMapFixed32Fixed32Map()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Integer, java.lang.Integer> getMapFixed32Fixed32();
-
-    /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
-    java.util.Map<java.lang.Integer, java.lang.Integer> getMapFixed32Fixed32Map();
-
-    /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
-    int getMapFixed32Fixed32OrDefault(int key, int defaultValue);
-
-    /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
-    int getMapFixed32Fixed32OrThrow(int key);
-
-    /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
-    int getMapFixed64Fixed64Count();
-
-    /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
-    boolean containsMapFixed64Fixed64(long key);
-
-    /** Use {@link #getMapFixed64Fixed64Map()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Long, java.lang.Long> getMapFixed64Fixed64();
-
-    /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
-    java.util.Map<java.lang.Long, java.lang.Long> getMapFixed64Fixed64Map();
-
-    /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
-    long getMapFixed64Fixed64OrDefault(long key, long defaultValue);
-
-    /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
-    long getMapFixed64Fixed64OrThrow(long key);
-
-    /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
-    int getMapSfixed32Sfixed32Count();
-
-    /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
-    boolean containsMapSfixed32Sfixed32(int key);
-
-    /** Use {@link #getMapSfixed32Sfixed32Map()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Integer, java.lang.Integer> getMapSfixed32Sfixed32();
-
-    /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
-    java.util.Map<java.lang.Integer, java.lang.Integer> getMapSfixed32Sfixed32Map();
-
-    /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
-    int getMapSfixed32Sfixed32OrDefault(int key, int defaultValue);
-
-    /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
-    int getMapSfixed32Sfixed32OrThrow(int key);
-
-    /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
-    int getMapSfixed64Sfixed64Count();
-
-    /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
-    boolean containsMapSfixed64Sfixed64(long key);
-
-    /** Use {@link #getMapSfixed64Sfixed64Map()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Long, java.lang.Long> getMapSfixed64Sfixed64();
-
-    /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
-    java.util.Map<java.lang.Long, java.lang.Long> getMapSfixed64Sfixed64Map();
-
-    /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
-    long getMapSfixed64Sfixed64OrDefault(long key, long defaultValue);
-
-    /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
-    long getMapSfixed64Sfixed64OrThrow(long key);
-
-    /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
-    int getMapInt32FloatCount();
-
-    /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
-    boolean containsMapInt32Float(int key);
-
-    /** Use {@link #getMapInt32FloatMap()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Integer, java.lang.Float> getMapInt32Float();
-
-    /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
-    java.util.Map<java.lang.Integer, java.lang.Float> getMapInt32FloatMap();
-
-    /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
-    float getMapInt32FloatOrDefault(int key, float defaultValue);
-
-    /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
-    float getMapInt32FloatOrThrow(int key);
-
-    /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
-    int getMapInt32DoubleCount();
-
-    /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
-    boolean containsMapInt32Double(int key);
-
-    /** Use {@link #getMapInt32DoubleMap()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Integer, java.lang.Double> getMapInt32Double();
-
-    /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
-    java.util.Map<java.lang.Integer, java.lang.Double> getMapInt32DoubleMap();
-
-    /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
-    double getMapInt32DoubleOrDefault(int key, double defaultValue);
-
-    /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
-    double getMapInt32DoubleOrThrow(int key);
-
-    /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
-    int getMapBoolBoolCount();
-
-    /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
-    boolean containsMapBoolBool(boolean key);
-
-    /** Use {@link #getMapBoolBoolMap()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Boolean, java.lang.Boolean> getMapBoolBool();
-
-    /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
-    java.util.Map<java.lang.Boolean, java.lang.Boolean> getMapBoolBoolMap();
-
-    /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
-    boolean getMapBoolBoolOrDefault(boolean key, boolean defaultValue);
-
-    /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
-    boolean getMapBoolBoolOrThrow(boolean key);
-
-    /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
-    int getMapStringStringCount();
-
-    /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
-    boolean containsMapStringString(java.lang.String key);
-
-    /** Use {@link #getMapStringStringMap()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.String, java.lang.String> getMapStringString();
-
-    /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
-    java.util.Map<java.lang.String, java.lang.String> getMapStringStringMap();
-
-    /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
-    /* nullable */
-    java.lang.String getMapStringStringOrDefault(
-        java.lang.String key,
-        /* nullable */
-        java.lang.String defaultValue);
-
-    /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
-    java.lang.String getMapStringStringOrThrow(java.lang.String key);
-
-    /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
-    int getMapStringBytesCount();
-
-    /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
-    boolean containsMapStringBytes(java.lang.String key);
-
-    /** Use {@link #getMapStringBytesMap()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.String, com.google.protobuf.ByteString> getMapStringBytes();
-
-    /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
-    java.util.Map<java.lang.String, com.google.protobuf.ByteString> getMapStringBytesMap();
-
-    /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
-    /* nullable */
-    com.google.protobuf.ByteString getMapStringBytesOrDefault(
-        java.lang.String key,
-        /* nullable */
-        com.google.protobuf.ByteString defaultValue);
-
-    /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
-    com.google.protobuf.ByteString getMapStringBytesOrThrow(java.lang.String key);
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-     * </code>
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
      */
-    int getMapStringNestedMessageCount();
-
+    boolean containsMapInt64Int64(
+        long key);
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-     * </code>
+     * Use {@link #getMapInt64Int64Map()} instead.
      */
-    boolean containsMapStringNestedMessage(java.lang.String key);
-
-    /** Use {@link #getMapStringNestedMessageMap()} instead. */
     @java.lang.Deprecated
-    java.util.Map<
-            java.lang.String,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-        getMapStringNestedMessage();
-
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapInt64Int64();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-     * </code>
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
      */
-    java.util.Map<
-            java.lang.String,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-        getMapStringNestedMessageMap();
-
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapInt64Int64Map();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-     * </code>
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
      */
-    /* nullable */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-        getMapStringNestedMessageOrDefault(
-            java.lang.String key,
-            /* nullable */
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                defaultValue);
-
+    long getMapInt64Int64OrDefault(
+        long key,
+        long defaultValue);
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-     * </code>
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-        getMapStringNestedMessageOrThrow(java.lang.String key);
+    long getMapInt64Int64OrThrow(
+        long key);
 
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-     * </code>
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
      */
-    int getMapStringForeignMessageCount();
-
+    int getMapUint32Uint32Count();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-     * </code>
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
+    boolean containsMapUint32Uint32(
+        int key);
+    /**
+     * Use {@link #getMapUint32Uint32Map()} instead.
      */
-    boolean containsMapStringForeignMessage(java.lang.String key);
-
-    /** Use {@link #getMapStringForeignMessageMap()} instead. */
     @java.lang.Deprecated
-    java.util.Map<
-            java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-        getMapStringForeignMessage();
-
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapUint32Uint32();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-     * </code>
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
      */
-    java.util.Map<
-            java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-        getMapStringForeignMessageMap();
-
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapUint32Uint32Map();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-     * </code>
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
      */
-    /* nullable */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        getMapStringForeignMessageOrDefault(
-            java.lang.String key,
-            /* nullable */
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage defaultValue);
-
+    int getMapUint32Uint32OrDefault(
+        int key,
+        int defaultValue);
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-     * </code>
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        getMapStringForeignMessageOrThrow(java.lang.String key);
+    int getMapUint32Uint32OrThrow(
+        int key);
 
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
      */
-    int getMapStringNestedEnumCount();
-
+    int getMapUint64Uint64Count();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
+    boolean containsMapUint64Uint64(
+        long key);
+    /**
+     * Use {@link #getMapUint64Uint64Map()} instead.
      */
-    boolean containsMapStringNestedEnum(java.lang.String key);
-
-    /** Use {@link #getMapStringNestedEnumMap()} instead. */
     @java.lang.Deprecated
-    java.util.Map<
-            java.lang.String,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        getMapStringNestedEnum();
-
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapUint64Uint64();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
      */
-    java.util.Map<
-            java.lang.String,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        getMapStringNestedEnumMap();
-
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapUint64Uint64Map();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
      */
-    /* nullable */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getMapStringNestedEnumOrDefault(
-            java.lang.String key,
-            /* nullable */
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                defaultValue);
-
+    long getMapUint64Uint64OrDefault(
+        long key,
+        long defaultValue);
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getMapStringNestedEnumOrThrow(java.lang.String key);
-
-    /** Use {@link #getMapStringNestedEnumValueMap()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.String, java.lang.Integer> getMapStringNestedEnumValue();
+    long getMapUint64Uint64OrThrow(
+        long key);
 
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
      */
-    java.util.Map<java.lang.String, java.lang.Integer> getMapStringNestedEnumValueMap();
-
+    int getMapSint32Sint32Count();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
      */
-    int getMapStringNestedEnumValueOrDefault(java.lang.String key, int defaultValue);
-
+    boolean containsMapSint32Sint32(
+        int key);
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * Use {@link #getMapSint32Sint32Map()} instead.
      */
-    int getMapStringNestedEnumValueOrThrow(java.lang.String key);
-
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapSint32Sint32();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
      */
-    int getMapStringForeignEnumCount();
-
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapSint32Sint32Map();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
      */
-    boolean containsMapStringForeignEnum(java.lang.String key);
-
-    /** Use {@link #getMapStringForeignEnumMap()} instead. */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-        getMapStringForeignEnum();
-
+    int getMapSint32Sint32OrDefault(
+        int key,
+        int defaultValue);
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
      */
-    java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-        getMapStringForeignEnumMap();
+    int getMapSint32Sint32OrThrow(
+        int key);
 
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
      */
-    /* nullable */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getMapStringForeignEnumOrDefault(
-        java.lang.String key,
-        /* nullable */
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum defaultValue);
-
+    int getMapSint64Sint64Count();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
+    boolean containsMapSint64Sint64(
+        long key);
+    /**
+     * Use {@link #getMapSint64Sint64Map()} instead.
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getMapStringForeignEnumOrThrow(
-        java.lang.String key);
-
-    /** Use {@link #getMapStringForeignEnumValueMap()} instead. */
     @java.lang.Deprecated
-    java.util.Map<java.lang.String, java.lang.Integer> getMapStringForeignEnumValue();
-
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapSint64Sint64();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
      */
-    java.util.Map<java.lang.String, java.lang.Integer> getMapStringForeignEnumValueMap();
-
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapSint64Sint64Map();
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
      */
-    int getMapStringForeignEnumValueOrDefault(java.lang.String key, int defaultValue);
-
+    long getMapSint64Sint64OrDefault(
+        long key,
+        long defaultValue);
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
      */
-    int getMapStringForeignEnumValueOrThrow(java.lang.String key);
+    long getMapSint64Sint64OrThrow(
+        long key);
 
     /**
-     * <code>uint32 oneof_uint32 = 111;</code>
-     *
-     * @return Whether the oneofUint32 field is set.
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
      */
-    boolean hasOneofUint32();
-
+    int getMapFixed32Fixed32Count();
     /**
-     * <code>uint32 oneof_uint32 = 111;</code>
-     *
-     * @return The oneofUint32.
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
      */
-    int getOneofUint32();
-
+    boolean containsMapFixed32Fixed32(
+        int key);
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-     * </code>
-     *
-     * @return Whether the oneofNestedMessage field is set.
+     * Use {@link #getMapFixed32Fixed32Map()} instead.
      */
-    boolean hasOneofNestedMessage();
-
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapFixed32Fixed32();
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-     * </code>
-     *
-     * @return The oneofNestedMessage.
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-        getOneofNestedMessage();
-
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapFixed32Fixed32Map();
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-     * </code>
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder
-        getOneofNestedMessageOrBuilder();
-
+    int getMapFixed32Fixed32OrDefault(
+        int key,
+        int defaultValue);
     /**
-     * <code>string oneof_string = 113;</code>
-     *
-     * @return Whether the oneofString field is set.
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
      */
-    boolean hasOneofString();
+    int getMapFixed32Fixed32OrThrow(
+        int key);
 
     /**
-     * <code>string oneof_string = 113;</code>
-     *
-     * @return The oneofString.
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
      */
-    java.lang.String getOneofString();
-
+    int getMapFixed64Fixed64Count();
     /**
-     * <code>string oneof_string = 113;</code>
-     *
-     * @return The bytes for oneofString.
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
      */
-    com.google.protobuf.ByteString getOneofStringBytes();
-
+    boolean containsMapFixed64Fixed64(
+        long key);
     /**
-     * <code>bytes oneof_bytes = 114;</code>
-     *
-     * @return Whether the oneofBytes field is set.
+     * Use {@link #getMapFixed64Fixed64Map()} instead.
      */
-    boolean hasOneofBytes();
-
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapFixed64Fixed64();
     /**
-     * <code>bytes oneof_bytes = 114;</code>
-     *
-     * @return The oneofBytes.
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
      */
-    com.google.protobuf.ByteString getOneofBytes();
-
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapFixed64Fixed64Map();
     /**
-     * <code>bool oneof_bool = 115;</code>
-     *
-     * @return Whether the oneofBool field is set.
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
      */
-    boolean hasOneofBool();
-
+    long getMapFixed64Fixed64OrDefault(
+        long key,
+        long defaultValue);
     /**
-     * <code>bool oneof_bool = 115;</code>
-     *
-     * @return The oneofBool.
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
      */
-    boolean getOneofBool();
+    long getMapFixed64Fixed64OrThrow(
+        long key);
 
     /**
-     * <code>uint64 oneof_uint64 = 116;</code>
-     *
-     * @return Whether the oneofUint64 field is set.
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
      */
-    boolean hasOneofUint64();
-
+    int getMapSfixed32Sfixed32Count();
     /**
-     * <code>uint64 oneof_uint64 = 116;</code>
-     *
-     * @return The oneofUint64.
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
      */
-    long getOneofUint64();
+    boolean containsMapSfixed32Sfixed32(
+        int key);
+    /**
+     * Use {@link #getMapSfixed32Sfixed32Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapSfixed32Sfixed32();
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getMapSfixed32Sfixed32Map();
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    int getMapSfixed32Sfixed32OrDefault(
+        int key,
+        int defaultValue);
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
+    int getMapSfixed32Sfixed32OrThrow(
+        int key);
 
     /**
-     * <code>float oneof_float = 117;</code>
-     *
-     * @return Whether the oneofFloat field is set.
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
      */
-    boolean hasOneofFloat();
+    int getMapSfixed64Sfixed64Count();
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    boolean containsMapSfixed64Sfixed64(
+        long key);
+    /**
+     * Use {@link #getMapSfixed64Sfixed64Map()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapSfixed64Sfixed64();
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    java.util.Map<java.lang.Long, java.lang.Long>
+    getMapSfixed64Sfixed64Map();
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    long getMapSfixed64Sfixed64OrDefault(
+        long key,
+        long defaultValue);
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
+    long getMapSfixed64Sfixed64OrThrow(
+        long key);
 
     /**
-     * <code>float oneof_float = 117;</code>
-     *
-     * @return The oneofFloat.
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
      */
-    float getOneofFloat();
+    int getMapInt32FloatCount();
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    boolean containsMapInt32Float(
+        int key);
+    /**
+     * Use {@link #getMapInt32FloatMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Float>
+    getMapInt32Float();
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Float>
+    getMapInt32FloatMap();
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    float getMapInt32FloatOrDefault(
+        int key,
+        float defaultValue);
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
+    float getMapInt32FloatOrThrow(
+        int key);
 
     /**
-     * <code>double oneof_double = 118;</code>
-     *
-     * @return Whether the oneofDouble field is set.
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
      */
-    boolean hasOneofDouble();
+    int getMapInt32DoubleCount();
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    boolean containsMapInt32Double(
+        int key);
+    /**
+     * Use {@link #getMapInt32DoubleMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Double>
+    getMapInt32Double();
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Double>
+    getMapInt32DoubleMap();
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    double getMapInt32DoubleOrDefault(
+        int key,
+        double defaultValue);
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
+    double getMapInt32DoubleOrThrow(
+        int key);
 
     /**
-     * <code>double oneof_double = 118;</code>
-     *
-     * @return The oneofDouble.
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
      */
-    double getOneofDouble();
+    int getMapBoolBoolCount();
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    boolean containsMapBoolBool(
+        boolean key);
+    /**
+     * Use {@link #getMapBoolBoolMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Boolean, java.lang.Boolean>
+    getMapBoolBool();
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    java.util.Map<java.lang.Boolean, java.lang.Boolean>
+    getMapBoolBoolMap();
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    boolean getMapBoolBoolOrDefault(
+        boolean key,
+        boolean defaultValue);
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
+    boolean getMapBoolBoolOrThrow(
+        boolean key);
 
     /**
-     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-     *
-     * @return Whether the oneofEnum field is set.
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
      */
-    boolean hasOneofEnum();
+    int getMapStringStringCount();
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    boolean containsMapStringString(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringStringMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, java.lang.String>
+    getMapStringString();
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    java.util.Map<java.lang.String, java.lang.String>
+    getMapStringStringMap();
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    /* nullable */
+java.lang.String getMapStringStringOrDefault(
+        java.lang.String key,
+        /* nullable */
+java.lang.String defaultValue);
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
+    java.lang.String getMapStringStringOrThrow(
+        java.lang.String key);
 
     /**
-     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-     *
-     * @return The enum numeric value on the wire for oneofEnum.
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
      */
-    int getOneofEnumValue();
+    int getMapStringBytesCount();
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    boolean containsMapStringBytes(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringBytesMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, com.google.protobuf.ByteString>
+    getMapStringBytes();
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    java.util.Map<java.lang.String, com.google.protobuf.ByteString>
+    getMapStringBytesMap();
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    /* nullable */
+com.google.protobuf.ByteString getMapStringBytesOrDefault(
+        java.lang.String key,
+        /* nullable */
+com.google.protobuf.ByteString defaultValue);
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
+    com.google.protobuf.ByteString getMapStringBytesOrThrow(
+        java.lang.String key);
 
     /**
-     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-     *
-     * @return The oneofEnum.
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
      */
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getOneofEnum();
+    int getMapStringNestedMessageCount();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    boolean containsMapStringNestedMessage(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringNestedMessageMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
+    getMapStringNestedMessage();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
+    getMapStringNestedMessageMap();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getMapStringNestedMessageOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage defaultValue);
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
+     */
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getMapStringNestedMessageOrThrow(
+        java.lang.String key);
 
-    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.OneofFieldCase
-        getOneofFieldCase();
-  }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    int getMapStringForeignMessageCount();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    boolean containsMapStringForeignMessage(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringForeignMessageMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
+    getMapStringForeignMessage();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
+    getMapStringForeignMessageMap();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getMapStringForeignMessageOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage defaultValue);
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
+     */
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getMapStringForeignMessageOrThrow(
+        java.lang.String key);
 
-  /**
-   *
-   *
-   * <pre>
-   * This is a slightly trimmed-down version of TestAllTypesProto3 from
-   * google/protobuf/test_messages_proto3.proto but without imports/ctypes.
-   * </pre>
-   *
-   * Protobuf type {@code legacy_gencode_test.proto3.TestMostTypesProto3}
-   */
-  public static final class TestMostTypesProto3 extends com.google.protobuf.GeneratedMessage
-      implements
-      // @@protoc_insertion_point(message_implements:legacy_gencode_test.proto3.TestMostTypesProto3)
-      TestMostTypesProto3OrBuilder {
-    private static final long serialVersionUID = 0L;
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    int getMapStringNestedEnumCount();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    boolean containsMapStringNestedEnum(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringNestedEnumMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
+    getMapStringNestedEnum();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
+    getMapStringNestedEnumMap();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getMapStringNestedEnumOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum         defaultValue);
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getMapStringNestedEnumOrThrow(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringNestedEnumValueMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, java.lang.Integer>
+    getMapStringNestedEnumValue();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    java.util.Map<java.lang.String, java.lang.Integer>
+    getMapStringNestedEnumValueMap();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    int getMapStringNestedEnumValueOrDefault(
+        java.lang.String key,
+        int defaultValue);
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
+     */
+    int getMapStringNestedEnumValueOrThrow(
+        java.lang.String key);
 
-    static {
-      com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
-          com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
-          /* major= */ 4,
-          /* minor= */ 32,
-          /* patch= */ 1,
-          /* suffix= */ "",
-          TestMostTypesProto3.class.getName());
-    }
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    int getMapStringForeignEnumCount();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    boolean containsMapStringForeignEnum(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringForeignEnumMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
+    getMapStringForeignEnum();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
+    getMapStringForeignEnumMap();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getMapStringForeignEnumOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum         defaultValue);
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getMapStringForeignEnumOrThrow(
+        java.lang.String key);
+    /**
+     * Use {@link #getMapStringForeignEnumValueMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, java.lang.Integer>
+    getMapStringForeignEnumValue();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    java.util.Map<java.lang.String, java.lang.Integer>
+    getMapStringForeignEnumValueMap();
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    int getMapStringForeignEnumValueOrDefault(
+        java.lang.String key,
+        int defaultValue);
+    /**
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
+     */
+    int getMapStringForeignEnumValueOrThrow(
+        java.lang.String key);
+
+    /**
+     * <code>uint32 oneof_uint32 = 111;</code>
+     * @return Whether the oneofUint32 field is set.
+     */
+    boolean hasOneofUint32();
+    /**
+     * <code>uint32 oneof_uint32 = 111;</code>
+     * @return The oneofUint32.
+     */
+    int getOneofUint32();
+
+    /**
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
+     * @return Whether the oneofNestedMessage field is set.
+     */
+    boolean hasOneofNestedMessage();
+    /**
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
+     * @return The oneofNestedMessage.
+     */
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getOneofNestedMessage();
+    /**
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
+     */
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder getOneofNestedMessageOrBuilder();
+
+    /**
+     * <code>string oneof_string = 113;</code>
+     * @return Whether the oneofString field is set.
+     */
+    boolean hasOneofString();
+    /**
+     * <code>string oneof_string = 113;</code>
+     * @return The oneofString.
+     */
+    java.lang.String getOneofString();
+    /**
+     * <code>string oneof_string = 113;</code>
+     * @return The bytes for oneofString.
+     */
+    com.google.protobuf.ByteString
+        getOneofStringBytes();
+
+    /**
+     * <code>bytes oneof_bytes = 114;</code>
+     * @return Whether the oneofBytes field is set.
+     */
+    boolean hasOneofBytes();
+    /**
+     * <code>bytes oneof_bytes = 114;</code>
+     * @return The oneofBytes.
+     */
+    com.google.protobuf.ByteString getOneofBytes();
+
+    /**
+     * <code>bool oneof_bool = 115;</code>
+     * @return Whether the oneofBool field is set.
+     */
+    boolean hasOneofBool();
+    /**
+     * <code>bool oneof_bool = 115;</code>
+     * @return The oneofBool.
+     */
+    boolean getOneofBool();
+
+    /**
+     * <code>uint64 oneof_uint64 = 116;</code>
+     * @return Whether the oneofUint64 field is set.
+     */
+    boolean hasOneofUint64();
+    /**
+     * <code>uint64 oneof_uint64 = 116;</code>
+     * @return The oneofUint64.
+     */
+    long getOneofUint64();
+
+    /**
+     * <code>float oneof_float = 117;</code>
+     * @return Whether the oneofFloat field is set.
+     */
+    boolean hasOneofFloat();
+    /**
+     * <code>float oneof_float = 117;</code>
+     * @return The oneofFloat.
+     */
+    float getOneofFloat();
+
+    /**
+     * <code>double oneof_double = 118;</code>
+     * @return Whether the oneofDouble field is set.
+     */
+    boolean hasOneofDouble();
+    /**
+     * <code>double oneof_double = 118;</code>
+     * @return The oneofDouble.
+     */
+    double getOneofDouble();
+
+    /**
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
+     * @return Whether the oneofEnum field is set.
+     */
+    boolean hasOneofEnum();
+    /**
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
+     * @return The enum numeric value on the wire for oneofEnum.
+     */
+    int getOneofEnumValue();
+    /**
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
+     * @return The oneofEnum.
+     */
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getOneofEnum();
 
+    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.OneofFieldCase getOneofFieldCase();
+  }
+  /**
+   * <pre>
+   * This is a slightly trimmed-down version of TestAllTypesProto3 from
+   * google/protobuf/test_messages_proto3.proto but without imports/ctypes.
+   * </pre>
+   *
+   * Protobuf type {@code legacy_gencode_test.proto3.TestMostTypesProto3}
+   */
+  public static final class TestMostTypesProto3 extends
+      com.google.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:legacy_gencode_test.proto3.TestMostTypesProto3)
+      TestMostTypesProto3OrBuilder {
+  private static final long serialVersionUID = 0L;
+    static {
+      com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
+        com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+        /* major= */ 4,
+        /* minor= */ 32,
+        /* patch= */ 1,
+        /* suffix= */ "",
+        TestMostTypesProto3.class.getName());
+    }
     // Use TestMostTypesProto3.newBuilder() to construct.
     private TestMostTypesProto3(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
     }
-
     private TestMostTypesProto3() {
       optionalString_ = "";
       optionalBytes_ = com.google.protobuf.ByteString.EMPTY;
@@ -3706,7 +3352,8 @@ private TestMostTypesProto3() {
       repeatedFloat_ = emptyFloatList();
       repeatedDouble_ = emptyDoubleList();
       repeatedBool_ = emptyBooleanList();
-      repeatedString_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      repeatedString_ =
+          com.google.protobuf.LazyStringArrayList.emptyList();
       repeatedBytes_ = emptyList(com.google.protobuf.ByteString.class);
       repeatedNestedMessage_ = java.util.Collections.emptyList();
       repeatedForeignMessage_ = java.util.Collections.emptyList();
@@ -3742,9 +3389,9 @@ private TestMostTypesProto3() {
       unpackedNestedEnum_ = emptyIntList();
     }
 
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return legacy_gencode_test.proto3.Proto3GencodeTestProto
-          .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor;
     }
 
     @SuppressWarnings({"rawtypes"})
@@ -3791,31 +3438,36 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
         case 74:
           return internalGetMapStringForeignEnum();
         default:
-          throw new RuntimeException("Invalid map field number: " + number);
+          throw new RuntimeException(
+              "Invalid map field number: " + number);
       }
     }
-
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return legacy_gencode_test.proto3.Proto3GencodeTestProto
-          .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_fieldAccessorTable
+      return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.class,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder.class);
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.class, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder.class);
     }
 
-    /** Protobuf enum {@code legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum} */
-    public enum NestedEnum implements com.google.protobuf.ProtocolMessageEnum {
-      /** <code>FOO = 0;</code> */
+    /**
+     * Protobuf enum {@code legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum}
+     */
+    public enum NestedEnum
+        implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * <code>FOO = 0;</code>
+       */
       FOO(0),
-      /** <code>BAR = 1;</code> */
+      /**
+       * <code>BAR = 1;</code>
+       */
       BAR(1),
-      /** <code>BAZ = 2;</code> */
+      /**
+       * <code>BAZ = 2;</code>
+       */
       BAZ(2),
       /**
-       *
-       *
        * <pre>
        * Intentionally negative.
        * </pre>
@@ -3828,26 +3480,26 @@ public enum NestedEnum implements com.google.protobuf.ProtocolMessageEnum {
 
       static {
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
-            com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
-            /* major= */ 4,
-            /* minor= */ 32,
-            /* patch= */ 1,
-            /* suffix= */ "",
-            NestedEnum.class.getName());
+          com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+          /* major= */ 4,
+          /* minor= */ 32,
+          /* patch= */ 1,
+          /* suffix= */ "",
+          NestedEnum.class.getName());
       }
-
-      /** <code>FOO = 0;</code> */
+      /**
+       * <code>FOO = 0;</code>
+       */
       public static final int FOO_VALUE = 0;
-
-      /** <code>BAR = 1;</code> */
+      /**
+       * <code>BAR = 1;</code>
+       */
       public static final int BAR_VALUE = 1;
-
-      /** <code>BAZ = 2;</code> */
+      /**
+       * <code>BAZ = 2;</code>
+       */
       public static final int BAZ_VALUE = 2;
-
       /**
-       *
-       *
        * <pre>
        * Intentionally negative.
        * </pre>
@@ -3856,6 +3508,7 @@ public enum NestedEnum implements com.google.protobuf.ProtocolMessageEnum {
        */
       public static final int NEG_VALUE = -1;
 
+
       public final int getNumber() {
         if (this == UNRECOGNIZED) {
           throw new java.lang.IllegalArgumentException(
@@ -3880,53 +3533,50 @@ public static NestedEnum valueOf(int value) {
        */
       public static NestedEnum forNumber(int value) {
         switch (value) {
-          case 0:
-            return FOO;
-          case 1:
-            return BAR;
-          case 2:
-            return BAZ;
-          case -1:
-            return NEG;
-          default:
-            return null;
+          case 0: return FOO;
+          case 1: return BAR;
+          case 2: return BAZ;
+          case -1: return NEG;
+          default: return null;
         }
       }
 
-      public static com.google.protobuf.Internal.EnumLiteMap<NestedEnum> internalGetValueMap() {
+      public static com.google.protobuf.Internal.EnumLiteMap<NestedEnum>
+          internalGetValueMap() {
         return internalValueMap;
       }
+      private static final com.google.protobuf.Internal.EnumLiteMap<
+          NestedEnum> internalValueMap =
+            new com.google.protobuf.Internal.EnumLiteMap<NestedEnum>() {
+              public NestedEnum findValueByNumber(int number) {
+                return NestedEnum.forNumber(number);
+              }
+            };
 
-      private static final com.google.protobuf.Internal.EnumLiteMap<NestedEnum> internalValueMap =
-          new com.google.protobuf.Internal.EnumLiteMap<NestedEnum>() {
-            public NestedEnum findValueByNumber(int number) {
-              return NestedEnum.forNumber(number);
-            }
-          };
-
-      public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+      public final com.google.protobuf.Descriptors.EnumValueDescriptor
+          getValueDescriptor() {
         if (this == UNRECOGNIZED) {
           throw new java.lang.IllegalStateException(
               "Can't get the descriptor of an unrecognized enum value.");
         }
         return getDescriptor().getValues().get(ordinal());
       }
-
-      public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
+      public final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptorForType() {
         return getDescriptor();
       }
-
-      public static com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDescriptor()
-            .getEnumTypes()
-            .get(0);
+      public static com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDescriptor().getEnumTypes().get(0);
       }
 
       private static final NestedEnum[] VALUES = values();
 
-      public static NestedEnum valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      public static NestedEnum valueOf(
+          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
         if (desc.getType() != getDescriptor()) {
-          throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
+          throw new java.lang.IllegalArgumentException(
+            "EnumValueDescriptor is not for this type.");
         }
         if (desc.getIndex() == -1) {
           return UNRECOGNIZED;
@@ -3943,54 +3593,73 @@ private NestedEnum(int value) {
       // @@protoc_insertion_point(enum_scope:legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum)
     }
 
-    /** Protobuf enum {@code legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum} */
-    public enum AliasedEnum implements com.google.protobuf.ProtocolMessageEnum {
-      /** <code>ALIAS_FOO = 0;</code> */
+    /**
+     * Protobuf enum {@code legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum}
+     */
+    public enum AliasedEnum
+        implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * <code>ALIAS_FOO = 0;</code>
+       */
       ALIAS_FOO(0),
-      /** <code>ALIAS_BAR = 1;</code> */
+      /**
+       * <code>ALIAS_BAR = 1;</code>
+       */
       ALIAS_BAR(1),
-      /** <code>ALIAS_BAZ = 2;</code> */
+      /**
+       * <code>ALIAS_BAZ = 2;</code>
+       */
       ALIAS_BAZ(2),
       UNRECOGNIZED(-1),
       ;
 
       static {
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
-            com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
-            /* major= */ 4,
-            /* minor= */ 32,
-            /* patch= */ 1,
-            /* suffix= */ "",
-            AliasedEnum.class.getName());
+          com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+          /* major= */ 4,
+          /* minor= */ 32,
+          /* patch= */ 1,
+          /* suffix= */ "",
+          AliasedEnum.class.getName());
       }
-
-      /** <code>MOO = 2;</code> */
+      /**
+       * <code>MOO = 2;</code>
+       */
       public static final AliasedEnum MOO = ALIAS_BAZ;
-
-      /** <code>moo = 2;</code> */
+      /**
+       * <code>moo = 2;</code>
+       */
       public static final AliasedEnum moo = ALIAS_BAZ;
-
-      /** <code>bAz = 2;</code> */
+      /**
+       * <code>bAz = 2;</code>
+       */
       public static final AliasedEnum bAz = ALIAS_BAZ;
-
-      /** <code>ALIAS_FOO = 0;</code> */
+      /**
+       * <code>ALIAS_FOO = 0;</code>
+       */
       public static final int ALIAS_FOO_VALUE = 0;
-
-      /** <code>ALIAS_BAR = 1;</code> */
+      /**
+       * <code>ALIAS_BAR = 1;</code>
+       */
       public static final int ALIAS_BAR_VALUE = 1;
-
-      /** <code>ALIAS_BAZ = 2;</code> */
+      /**
+       * <code>ALIAS_BAZ = 2;</code>
+       */
       public static final int ALIAS_BAZ_VALUE = 2;
-
-      /** <code>MOO = 2;</code> */
+      /**
+       * <code>MOO = 2;</code>
+       */
       public static final int MOO_VALUE = 2;
-
-      /** <code>moo = 2;</code> */
+      /**
+       * <code>moo = 2;</code>
+       */
       public static final int moo_VALUE = 2;
-
-      /** <code>bAz = 2;</code> */
+      /**
+       * <code>bAz = 2;</code>
+       */
       public static final int bAz_VALUE = 2;
 
+
       public final int getNumber() {
         if (this == UNRECOGNIZED) {
           throw new java.lang.IllegalArgumentException(
@@ -4015,57 +3684,53 @@ public static AliasedEnum valueOf(int value) {
        */
       public static AliasedEnum forNumber(int value) {
         switch (value) {
-          case 0:
-            return ALIAS_FOO;
-          case 1:
-            return ALIAS_BAR;
-          case 2:
-            return ALIAS_BAZ;
-          default:
-            return null;
+          case 0: return ALIAS_FOO;
+          case 1: return ALIAS_BAR;
+          case 2: return ALIAS_BAZ;
+          default: return null;
         }
       }
 
-      public static com.google.protobuf.Internal.EnumLiteMap<AliasedEnum> internalGetValueMap() {
+      public static com.google.protobuf.Internal.EnumLiteMap<AliasedEnum>
+          internalGetValueMap() {
         return internalValueMap;
       }
+      private static final com.google.protobuf.Internal.EnumLiteMap<
+          AliasedEnum> internalValueMap =
+            new com.google.protobuf.Internal.EnumLiteMap<AliasedEnum>() {
+              public AliasedEnum findValueByNumber(int number) {
+                return AliasedEnum.forNumber(number);
+              }
+            };
 
-      private static final com.google.protobuf.Internal.EnumLiteMap<AliasedEnum> internalValueMap =
-          new com.google.protobuf.Internal.EnumLiteMap<AliasedEnum>() {
-            public AliasedEnum findValueByNumber(int number) {
-              return AliasedEnum.forNumber(number);
-            }
-          };
-
-      public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+      public final com.google.protobuf.Descriptors.EnumValueDescriptor
+          getValueDescriptor() {
         if (this == UNRECOGNIZED) {
           throw new java.lang.IllegalStateException(
               "Can't get the descriptor of an unrecognized enum value.");
         }
         return getDescriptor().getValues().get(ordinal());
       }
-
-      public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
+      public final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptorForType() {
         return getDescriptor();
       }
-
-      public static com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDescriptor()
-            .getEnumTypes()
-            .get(1);
+      public static com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDescriptor().getEnumTypes().get(1);
       }
 
       private static final AliasedEnum[] VALUES = getStaticValuesArray();
-
       private static AliasedEnum[] getStaticValuesArray() {
         return new AliasedEnum[] {
-          ALIAS_FOO, ALIAS_BAR, ALIAS_BAZ, MOO, moo, bAz,
+        ALIAS_FOO, ALIAS_BAR, ALIAS_BAZ, MOO, moo, bAz, 
         };
       }
-
-      public static AliasedEnum valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      public static AliasedEnum valueOf(
+          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
         if (desc.getType() != getDescriptor()) {
-          throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
+          throw new java.lang.IllegalArgumentException(
+            "EnumValueDescriptor is not for this type.");
         }
         if (desc.getIndex() == -1) {
           return UNRECOGNIZED;
@@ -4082,85 +3747,73 @@ private AliasedEnum(int value) {
       // @@protoc_insertion_point(enum_scope:legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum)
     }
 
-    public interface NestedMessageOrBuilder
-        extends
+    public interface NestedMessageOrBuilder extends
         // @@protoc_insertion_point(interface_extends:legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage)
         com.google.protobuf.MessageOrBuilder {
 
       /**
        * <code>int32 a = 1;</code>
-       *
        * @return The a.
        */
       int getA();
 
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
-       *
        * @return Whether the corecursive field is set.
        */
       boolean hasCorecursive();
-
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
-       *
        * @return The corecursive.
        */
       legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 getCorecursive();
-
-      /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code> */
-      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder
-          getCorecursiveOrBuilder();
+      /**
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
+       */
+      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder getCorecursiveOrBuilder();
     }
-
-    /** Protobuf type {@code legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage} */
-    public static final class NestedMessage extends com.google.protobuf.GeneratedMessage
-        implements
+    /**
+     * Protobuf type {@code legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage}
+     */
+    public static final class NestedMessage extends
+        com.google.protobuf.GeneratedMessage implements
         // @@protoc_insertion_point(message_implements:legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage)
         NestedMessageOrBuilder {
-      private static final long serialVersionUID = 0L;
-
+    private static final long serialVersionUID = 0L;
       static {
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
-            com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
-            /* major= */ 4,
-            /* minor= */ 32,
-            /* patch= */ 1,
-            /* suffix= */ "",
-            NestedMessage.class.getName());
+          com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+          /* major= */ 4,
+          /* minor= */ 32,
+          /* patch= */ 1,
+          /* suffix= */ "",
+          NestedMessage.class.getName());
       }
-
       // Use NestedMessage.newBuilder() to construct.
       private NestedMessage(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
         super(builder);
       }
+      private NestedMessage() {
+      }
 
-      private NestedMessage() {}
-
-      public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_descriptor;
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_fieldAccessorTable
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                    .class,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                    .Builder.class);
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.class, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder.class);
       }
 
       private int bitField0_;
       public static final int A_FIELD_NUMBER = 1;
       private int a_ = 0;
-
       /**
        * <code>int32 a = 1;</code>
-       *
        * @return The a.
        */
       @java.lang.Override
@@ -4170,43 +3823,31 @@ public int getA() {
 
       public static final int CORECURSIVE_FIELD_NUMBER = 2;
       private legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 corecursive_;
-
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
-       *
        * @return Whether the corecursive field is set.
        */
       @java.lang.Override
       public boolean hasCorecursive() {
         return ((bitField0_ & 0x00000001) != 0);
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
-       *
        * @return The corecursive.
        */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-          getCorecursive() {
-        return corecursive_ == null
-            ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                .getDefaultInstance()
-            : corecursive_;
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 getCorecursive() {
+        return corecursive_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance() : corecursive_;
       }
-
-      /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code> */
+      /**
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
+       */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder
-          getCorecursiveOrBuilder() {
-        return corecursive_ == null
-            ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                .getDefaultInstance()
-            : corecursive_;
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder getCorecursiveOrBuilder() {
+        return corecursive_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance() : corecursive_;
       }
 
       private byte memoizedIsInitialized = -1;
-
       @java.lang.Override
       public final boolean isInitialized() {
         byte isInitialized = memoizedIsInitialized;
@@ -4218,7 +3859,8 @@ public final boolean isInitialized() {
       }
 
       @java.lang.Override
-      public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+      public void writeTo(com.google.protobuf.CodedOutputStream output)
+                          throws java.io.IOException {
         if (a_ != 0) {
           output.writeInt32(1, a_);
         }
@@ -4235,10 +3877,12 @@ public int getSerializedSize() {
 
         size = 0;
         if (a_ != 0) {
-          size += com.google.protobuf.CodedOutputStream.computeInt32Size(1, a_);
+          size += com.google.protobuf.CodedOutputStream
+            .computeInt32Size(1, a_);
         }
         if (((bitField0_ & 0x00000001) != 0)) {
-          size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getCorecursive());
+          size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(2, getCorecursive());
         }
         size += getUnknownFields().getSerializedSize();
         memoizedSize = size;
@@ -4248,21 +3892,19 @@ public int getSerializedSize() {
       @java.lang.Override
       public boolean equals(final java.lang.Object obj) {
         if (obj == this) {
-          return true;
+         return true;
         }
-        if (!(obj
-            instanceof
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage)) {
+        if (!(obj instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage)) {
           return super.equals(obj);
         }
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage other =
-            (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage)
-                obj;
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage other = (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) obj;
 
-        if (getA() != other.getA()) return false;
+        if (getA()
+            != other.getA()) return false;
         if (hasCorecursive() != other.hasCorecursive()) return false;
         if (hasCorecursive()) {
-          if (!getCorecursive().equals(other.getCorecursive())) return false;
+          if (!getCorecursive()
+              .equals(other.getCorecursive())) return false;
         }
         if (!getUnknownFields().equals(other.getUnknownFields())) return false;
         return true;
@@ -4286,116 +3928,90 @@ public int hashCode() {
         return hash;
       }
 
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseFrom(java.nio.ByteBuffer data)
-              throws com.google.protobuf.InvalidProtocolBufferException {
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseFrom(
+          java.nio.ByteBuffer data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseFrom(
-              java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws com.google.protobuf.InvalidProtocolBufferException {
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseFrom(
+          java.nio.ByteBuffer data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseFrom(com.google.protobuf.ByteString data)
-              throws com.google.protobuf.InvalidProtocolBufferException {
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseFrom(
+          com.google.protobuf.ByteString data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseFrom(
-              com.google.protobuf.ByteString data,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws com.google.protobuf.InvalidProtocolBufferException {
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseFrom(
+          com.google.protobuf.ByteString data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException {
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseFrom(byte[] data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseFrom(byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws com.google.protobuf.InvalidProtocolBufferException {
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseFrom(
+          byte[] data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseFrom(java.io.InputStream input) throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input);
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseFrom(java.io.InputStream input)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessage
+            .parseWithIOException(PARSER, input);
       }
-
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseFrom(
-              java.io.InputStream input,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessage.parseWithIOException(
-            PARSER, input, extensionRegistry);
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseFrom(
+          java.io.InputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessage
+            .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessage.parseDelimitedWithIOException(PARSER, input);
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseDelimitedFrom(java.io.InputStream input)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessage
+            .parseDelimitedWithIOException(PARSER, input);
       }
 
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseDelimitedFrom(
-              java.io.InputStream input,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessage.parseDelimitedWithIOException(
-            PARSER, input, extensionRegistry);
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseDelimitedFrom(
+          java.io.InputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessage
+            .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
       }
-
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseFrom(com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input);
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseFrom(
+          com.google.protobuf.CodedInputStream input)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessage
+            .parseWithIOException(PARSER, input);
       }
-
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          parseFrom(
-              com.google.protobuf.CodedInputStream input,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessage.parseWithIOException(
-            PARSER, input, extensionRegistry);
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage parseFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessage
+            .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
       @java.lang.Override
-      public Builder newBuilderForType() {
-        return newBuilder();
-      }
-
+      public Builder newBuilderForType() { return newBuilder(); }
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
       }
-
-      public static Builder newBuilder(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              prototype) {
+      public static Builder newBuilder(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
-
       @java.lang.Override
       public Builder toBuilder() {
-        return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+        return this == DEFAULT_INSTANCE
+            ? new Builder() : new Builder().mergeFrom(this);
       }
 
       @java.lang.Override
@@ -4404,48 +4020,42 @@ protected Builder newBuilderForType(
         Builder builder = new Builder(parent);
         return builder;
       }
-
-      /** Protobuf type {@code legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage} */
-      public static final class Builder
-          extends com.google.protobuf.GeneratedMessage.Builder<Builder>
-          implements
+      /**
+       * Protobuf type {@code legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage}
+       */
+      public static final class Builder extends
+          com.google.protobuf.GeneratedMessage.Builder<Builder> implements
           // @@protoc_insertion_point(builder_implements:legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage)
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessageOrBuilder {
-        public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-          return legacy_gencode_test.proto3.Proto3GencodeTestProto
-              .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_descriptor;
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder {
+        public static final com.google.protobuf.Descriptors.Descriptor
+            getDescriptor() {
+          return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_descriptor;
         }
 
         @java.lang.Override
         protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return legacy_gencode_test.proto3.Proto3GencodeTestProto
-              .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_fieldAccessorTable
+          return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage.class,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage.Builder.class);
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.class, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder.class);
         }
 
-        // Construct using
-        // legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.newBuilder()
+        // Construct using legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
 
-        private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        private Builder(
+            com.google.protobuf.GeneratedMessage.BuilderParent parent) {
           super(parent);
           maybeForceBuilderInitialization();
         }
-
         private void maybeForceBuilderInitialization() {
-          if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+          if (com.google.protobuf.GeneratedMessage
+                  .alwaysUseFieldBuilders) {
             internalGetCorecursiveFieldBuilder();
           }
         }
-
         @java.lang.Override
         public Builder clear() {
           super.clear();
@@ -4460,23 +4070,19 @@ public Builder clear() {
         }
 
         @java.lang.Override
-        public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-          return legacy_gencode_test.proto3.Proto3GencodeTestProto
-              .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_descriptor;
+        public com.google.protobuf.Descriptors.Descriptor
+            getDescriptorForType() {
+          return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_descriptor;
         }
 
         @java.lang.Override
-        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-            getDefaultInstanceForType() {
-          return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .getDefaultInstance();
+        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getDefaultInstanceForType() {
+          return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance();
         }
 
         @java.lang.Override
-        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-            build() {
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              result = buildPartial();
+        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage build() {
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
@@ -4484,30 +4090,23 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
         }
 
         @java.lang.Override
-        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-            buildPartial() {
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              result =
-                  new legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage(this);
-          if (bitField0_ != 0) {
-            buildPartial0(result);
-          }
+        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage buildPartial() {
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage result = new legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage(this);
+          if (bitField0_ != 0) { buildPartial0(result); }
           onBuilt();
           return result;
         }
 
-        private void buildPartial0(
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                result) {
+        private void buildPartial0(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage result) {
           int from_bitField0_ = bitField0_;
           if (((from_bitField0_ & 0x00000001) != 0)) {
             result.a_ = a_;
           }
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000002) != 0)) {
-            result.corecursive_ =
-                corecursiveBuilder_ == null ? corecursive_ : corecursiveBuilder_.build();
+            result.corecursive_ = corecursiveBuilder_ == null
+                ? corecursive_
+                : corecursiveBuilder_.build();
             to_bitField0_ |= 0x00000001;
           }
           result.bitField0_ |= to_bitField0_;
@@ -4515,25 +4114,16 @@ private void buildPartial0(
 
         @java.lang.Override
         public Builder mergeFrom(com.google.protobuf.Message other) {
-          if (other
-              instanceof
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) {
-            return mergeFrom(
-                (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                        .NestedMessage)
-                    other);
+          if (other instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) {
+            return mergeFrom((legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                other) {
-          if (other
-              == legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .getDefaultInstance()) return this;
+        public Builder mergeFrom(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage other) {
+          if (other == legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance()) return this;
           if (other.getA() != 0) {
             setA(other.getA());
           }
@@ -4566,26 +4156,24 @@ public Builder mergeFrom(
                 case 0:
                   done = true;
                   break;
-                case 8:
-                  {
-                    a_ = input.readInt32();
-                    bitField0_ |= 0x00000001;
-                    break;
-                  } // case 8
-                case 18:
-                  {
-                    input.readMessage(
-                        internalGetCorecursiveFieldBuilder().getBuilder(), extensionRegistry);
-                    bitField0_ |= 0x00000002;
-                    break;
-                  } // case 18
-                default:
-                  {
-                    if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                      done = true; // was an endgroup tag
-                    }
-                    break;
-                  } // default:
+                case 8: {
+                  a_ = input.readInt32();
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 8
+                case 18: {
+                  input.readMessage(
+                      internalGetCorecursiveFieldBuilder().getBuilder(),
+                      extensionRegistry);
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 18
+                default: {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
               } // switch (tag)
             } // while (!done)
           } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -4595,24 +4183,19 @@ public Builder mergeFrom(
           } // finally
           return this;
         }
-
         private int bitField0_;
 
-        private int a_;
-
+        private int a_ ;
         /**
          * <code>int32 a = 1;</code>
-         *
          * @return The a.
          */
         @java.lang.Override
         public int getA() {
           return a_;
         }
-
         /**
          * <code>int32 a = 1;</code>
-         *
          * @param value The a to set.
          * @return This builder for chaining.
          */
@@ -4623,10 +4206,8 @@ public Builder setA(int value) {
           onChanged();
           return this;
         }
-
         /**
          * <code>int32 a = 1;</code>
-         *
          * @return This builder for chaining.
          */
         public Builder clearA() {
@@ -4638,40 +4219,29 @@ public Builder clearA() {
 
         private legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 corecursive_;
         private com.google.protobuf.SingleFieldBuilder<
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder>
-            corecursiveBuilder_;
-
+            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder> corecursiveBuilder_;
         /**
          * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
-         *
          * @return Whether the corecursive field is set.
          */
         public boolean hasCorecursive() {
           return ((bitField0_ & 0x00000002) != 0);
         }
-
         /**
          * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
-         *
          * @return The corecursive.
          */
-        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-            getCorecursive() {
+        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 getCorecursive() {
           if (corecursiveBuilder_ == null) {
-            return corecursive_ == null
-                ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .getDefaultInstance()
-                : corecursive_;
+            return corecursive_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance() : corecursive_;
           } else {
             return corecursiveBuilder_.getMessage();
           }
         }
-
-        /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code> */
-        public Builder setCorecursive(
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 value) {
+        /**
+         * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
+         */
+        public Builder setCorecursive(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 value) {
           if (corecursiveBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -4684,11 +4254,11 @@ public Builder setCorecursive(
           onChanged();
           return this;
         }
-
-        /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code> */
+        /**
+         * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
+         */
         public Builder setCorecursive(
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder
-                builderForValue) {
+            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder builderForValue) {
           if (corecursiveBuilder_ == null) {
             corecursive_ = builderForValue.build();
           } else {
@@ -4698,16 +4268,14 @@ public Builder setCorecursive(
           onChanged();
           return this;
         }
-
-        /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code> */
-        public Builder mergeCorecursive(
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 value) {
+        /**
+         * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
+         */
+        public Builder mergeCorecursive(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 value) {
           if (corecursiveBuilder_ == null) {
-            if (((bitField0_ & 0x00000002) != 0)
-                && corecursive_ != null
-                && corecursive_
-                    != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                        .getDefaultInstance()) {
+            if (((bitField0_ & 0x00000002) != 0) &&
+              corecursive_ != null &&
+              corecursive_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance()) {
               getCorecursiveBuilder().mergeFrom(value);
             } else {
               corecursive_ = value;
@@ -4721,8 +4289,9 @@ public Builder mergeCorecursive(
           }
           return this;
         }
-
-        /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code> */
+        /**
+         * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
+         */
         public Builder clearCorecursive() {
           bitField0_ = (bitField0_ & ~0x00000002);
           corecursive_ = null;
@@ -4733,41 +4302,37 @@ public Builder clearCorecursive() {
           onChanged();
           return this;
         }
-
-        /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code> */
-        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder
-            getCorecursiveBuilder() {
+        /**
+         * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
+         */
+        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder getCorecursiveBuilder() {
           bitField0_ |= 0x00000002;
           onChanged();
           return internalGetCorecursiveFieldBuilder().getBuilder();
         }
-
-        /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code> */
-        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder
-            getCorecursiveOrBuilder() {
+        /**
+         * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
+         */
+        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder getCorecursiveOrBuilder() {
           if (corecursiveBuilder_ != null) {
             return corecursiveBuilder_.getMessageOrBuilder();
           } else {
-            return corecursive_ == null
-                ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .getDefaultInstance()
-                : corecursive_;
+            return corecursive_ == null ?
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance() : corecursive_;
           }
         }
-
-        /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code> */
+        /**
+         * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 corecursive = 2;</code>
+         */
         private com.google.protobuf.SingleFieldBuilder<
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder>
+            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder> 
             internalGetCorecursiveFieldBuilder() {
           if (corecursiveBuilder_ == null) {
-            corecursiveBuilder_ =
-                new com.google.protobuf.SingleFieldBuilder<
-                    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3,
-                    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder,
-                    legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder>(
-                    getCorecursive(), getParentForChildren(), isClean());
+            corecursiveBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder>(
+                    getCorecursive(),
+                    getParentForChildren(),
+                    isClean());
             corecursive_ = null;
           }
           return corecursiveBuilder_;
@@ -4777,44 +4342,36 @@ public Builder clearCorecursive() {
       }
 
       // @@protoc_insertion_point(class_scope:legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage)
-      private static final legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          DEFAULT_INSTANCE;
-
+      private static final legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage DEFAULT_INSTANCE;
       static {
-        DEFAULT_INSTANCE =
-            new legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                .NestedMessage();
+        DEFAULT_INSTANCE = new legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage();
       }
 
-      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          getDefaultInstance() {
+      public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getDefaultInstance() {
         return DEFAULT_INSTANCE;
       }
 
-      private static final com.google.protobuf.Parser<NestedMessage> PARSER =
-          new com.google.protobuf.AbstractParser<NestedMessage>() {
-            @java.lang.Override
-            public NestedMessage parsePartialFrom(
-                com.google.protobuf.CodedInputStream input,
-                com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-                throws com.google.protobuf.InvalidProtocolBufferException {
-              Builder builder = newBuilder();
-              try {
-                builder.mergeFrom(input, extensionRegistry);
-              } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-                throw e.setUnfinishedMessage(builder.buildPartial());
-              } catch (com.google.protobuf.UninitializedMessageException e) {
-                throw e.asInvalidProtocolBufferException()
-                    .setUnfinishedMessage(builder.buildPartial());
-              } catch (java.io.IOException e) {
-                throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                    .setUnfinishedMessage(builder.buildPartial());
-              }
-              return builder.buildPartial();
-            }
-          };
+      private static final com.google.protobuf.Parser<NestedMessage>
+          PARSER = new com.google.protobuf.AbstractParser<NestedMessage>() {
+        @java.lang.Override
+        public NestedMessage parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
+        }
+      };
 
       public static com.google.protobuf.Parser<NestedMessage> parser() {
         return PARSER;
@@ -4826,21 +4383,18 @@ public com.google.protobuf.Parser<NestedMessage> getParserForType() {
       }
 
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-          getDefaultInstanceForType() {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
+
     }
 
     private int bitField0_;
     private int oneofFieldCase_ = 0;
-
     @SuppressWarnings("serial")
     private java.lang.Object oneofField_;
-
     public enum OneofFieldCase
-        implements
-            com.google.protobuf.Internal.EnumLite,
+        implements com.google.protobuf.Internal.EnumLite,
             com.google.protobuf.AbstractMessage.InternalOneOfEnum {
       ONEOF_UINT32(111),
       ONEOF_NESTED_MESSAGE(112),
@@ -4853,11 +4407,9 @@ public enum OneofFieldCase
       ONEOF_ENUM(119),
       ONEOFFIELD_NOT_SET(0);
       private final int value;
-
       private OneofFieldCase(int value) {
         this.value = value;
       }
-
       /**
        * @param value The number of the enum to look for.
        * @return The enum associated with the given number.
@@ -4870,46 +4422,34 @@ public static OneofFieldCase valueOf(int value) {
 
       public static OneofFieldCase forNumber(int value) {
         switch (value) {
-          case 111:
-            return ONEOF_UINT32;
-          case 112:
-            return ONEOF_NESTED_MESSAGE;
-          case 113:
-            return ONEOF_STRING;
-          case 114:
-            return ONEOF_BYTES;
-          case 115:
-            return ONEOF_BOOL;
-          case 116:
-            return ONEOF_UINT64;
-          case 117:
-            return ONEOF_FLOAT;
-          case 118:
-            return ONEOF_DOUBLE;
-          case 119:
-            return ONEOF_ENUM;
-          case 0:
-            return ONEOFFIELD_NOT_SET;
-          default:
-            return null;
+          case 111: return ONEOF_UINT32;
+          case 112: return ONEOF_NESTED_MESSAGE;
+          case 113: return ONEOF_STRING;
+          case 114: return ONEOF_BYTES;
+          case 115: return ONEOF_BOOL;
+          case 116: return ONEOF_UINT64;
+          case 117: return ONEOF_FLOAT;
+          case 118: return ONEOF_DOUBLE;
+          case 119: return ONEOF_ENUM;
+          case 0: return ONEOFFIELD_NOT_SET;
+          default: return null;
         }
       }
-
       public int getNumber() {
         return this.value;
       }
     };
 
-    public OneofFieldCase getOneofFieldCase() {
-      return OneofFieldCase.forNumber(oneofFieldCase_);
+    public OneofFieldCase
+    getOneofFieldCase() {
+      return OneofFieldCase.forNumber(
+          oneofFieldCase_);
     }
 
     public static final int OPTIONAL_INT32_FIELD_NUMBER = 1;
     private int optionalInt32_ = 0;
-
     /**
      * <code>int32 optional_int32 = 1;</code>
-     *
      * @return The optionalInt32.
      */
     @java.lang.Override
@@ -4919,10 +4459,8 @@ public int getOptionalInt32() {
 
     public static final int OPTIONAL_INT64_FIELD_NUMBER = 2;
     private long optionalInt64_ = 0L;
-
     /**
      * <code>int64 optional_int64 = 2;</code>
-     *
      * @return The optionalInt64.
      */
     @java.lang.Override
@@ -4932,10 +4470,8 @@ public long getOptionalInt64() {
 
     public static final int OPTIONAL_UINT32_FIELD_NUMBER = 3;
     private int optionalUint32_ = 0;
-
     /**
      * <code>uint32 optional_uint32 = 3;</code>
-     *
      * @return The optionalUint32.
      */
     @java.lang.Override
@@ -4945,10 +4481,8 @@ public int getOptionalUint32() {
 
     public static final int OPTIONAL_UINT64_FIELD_NUMBER = 4;
     private long optionalUint64_ = 0L;
-
     /**
      * <code>uint64 optional_uint64 = 4;</code>
-     *
      * @return The optionalUint64.
      */
     @java.lang.Override
@@ -4958,10 +4492,8 @@ public long getOptionalUint64() {
 
     public static final int OPTIONAL_SINT32_FIELD_NUMBER = 5;
     private int optionalSint32_ = 0;
-
     /**
      * <code>sint32 optional_sint32 = 5;</code>
-     *
      * @return The optionalSint32.
      */
     @java.lang.Override
@@ -4971,10 +4503,8 @@ public int getOptionalSint32() {
 
     public static final int OPTIONAL_SINT64_FIELD_NUMBER = 6;
     private long optionalSint64_ = 0L;
-
     /**
      * <code>sint64 optional_sint64 = 6;</code>
-     *
      * @return The optionalSint64.
      */
     @java.lang.Override
@@ -4984,10 +4514,8 @@ public long getOptionalSint64() {
 
     public static final int OPTIONAL_FIXED32_FIELD_NUMBER = 7;
     private int optionalFixed32_ = 0;
-
     /**
      * <code>fixed32 optional_fixed32 = 7;</code>
-     *
      * @return The optionalFixed32.
      */
     @java.lang.Override
@@ -4997,10 +4525,8 @@ public int getOptionalFixed32() {
 
     public static final int OPTIONAL_FIXED64_FIELD_NUMBER = 8;
     private long optionalFixed64_ = 0L;
-
     /**
      * <code>fixed64 optional_fixed64 = 8;</code>
-     *
      * @return The optionalFixed64.
      */
     @java.lang.Override
@@ -5010,10 +4536,8 @@ public long getOptionalFixed64() {
 
     public static final int OPTIONAL_SFIXED32_FIELD_NUMBER = 9;
     private int optionalSfixed32_ = 0;
-
     /**
      * <code>sfixed32 optional_sfixed32 = 9;</code>
-     *
      * @return The optionalSfixed32.
      */
     @java.lang.Override
@@ -5023,10 +4547,8 @@ public int getOptionalSfixed32() {
 
     public static final int OPTIONAL_SFIXED64_FIELD_NUMBER = 10;
     private long optionalSfixed64_ = 0L;
-
     /**
      * <code>sfixed64 optional_sfixed64 = 10;</code>
-     *
      * @return The optionalSfixed64.
      */
     @java.lang.Override
@@ -5036,10 +4558,8 @@ public long getOptionalSfixed64() {
 
     public static final int OPTIONAL_FLOAT_FIELD_NUMBER = 11;
     private float optionalFloat_ = 0F;
-
     /**
      * <code>float optional_float = 11;</code>
-     *
      * @return The optionalFloat.
      */
     @java.lang.Override
@@ -5049,10 +4569,8 @@ public float getOptionalFloat() {
 
     public static final int OPTIONAL_DOUBLE_FIELD_NUMBER = 12;
     private double optionalDouble_ = 0D;
-
     /**
      * <code>double optional_double = 12;</code>
-     *
      * @return The optionalDouble.
      */
     @java.lang.Override
@@ -5062,10 +4580,8 @@ public double getOptionalDouble() {
 
     public static final int OPTIONAL_BOOL_FIELD_NUMBER = 13;
     private boolean optionalBool_ = false;
-
     /**
      * <code>bool optional_bool = 13;</code>
-     *
      * @return The optionalBool.
      */
     @java.lang.Override
@@ -5074,13 +4590,10 @@ public boolean getOptionalBool() {
     }
 
     public static final int OPTIONAL_STRING_FIELD_NUMBER = 14;
-
     @SuppressWarnings("serial")
     private volatile java.lang.Object optionalString_ = "";
-
     /**
      * <code>string optional_string = 14;</code>
-     *
      * @return The optionalString.
      */
     @java.lang.Override
@@ -5089,24 +4602,25 @@ public java.lang.String getOptionalString() {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         optionalString_ = s;
         return s;
       }
     }
-
     /**
      * <code>string optional_string = 14;</code>
-     *
      * @return The bytes for optionalString.
      */
     @java.lang.Override
-    public com.google.protobuf.ByteString getOptionalStringBytes() {
+    public com.google.protobuf.ByteString
+        getOptionalStringBytes() {
       java.lang.Object ref = optionalString_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
         optionalString_ = b;
         return b;
       } else {
@@ -5116,10 +4630,8 @@ public com.google.protobuf.ByteString getOptionalStringBytes() {
 
     public static final int OPTIONAL_BYTES_FIELD_NUMBER = 15;
     private com.google.protobuf.ByteString optionalBytes_ = com.google.protobuf.ByteString.EMPTY;
-
     /**
      * <code>bytes optional_bytes = 15;</code>
-     *
      * @return The optionalBytes.
      */
     @java.lang.Override
@@ -5128,775 +4640,598 @@ public com.google.protobuf.ByteString getOptionalBytes() {
     }
 
     public static final int OPTIONAL_NESTED_MESSAGE_FIELD_NUMBER = 18;
-    private legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-        optionalNestedMessage_;
-
+    private legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage optionalNestedMessage_;
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
      * @return Whether the optionalNestedMessage field is set.
      */
     @java.lang.Override
     public boolean hasOptionalNestedMessage() {
       return ((bitField0_ & 0x00000001) != 0);
     }
-
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
      * @return The optionalNestedMessage.
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-        getOptionalNestedMessage() {
-      return optionalNestedMessage_ == null
-          ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .getDefaultInstance()
-          : optionalNestedMessage_;
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getOptionalNestedMessage() {
+      return optionalNestedMessage_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance() : optionalNestedMessage_;
     }
-
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-     * </code>
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-            .NestedMessageOrBuilder
-        getOptionalNestedMessageOrBuilder() {
-      return optionalNestedMessage_ == null
-          ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .getDefaultInstance()
-          : optionalNestedMessage_;
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder getOptionalNestedMessageOrBuilder() {
+      return optionalNestedMessage_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance() : optionalNestedMessage_;
     }
 
     public static final int OPTIONAL_FOREIGN_MESSAGE_FIELD_NUMBER = 19;
-    private legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        optionalForeignMessage_;
-
+    private legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage optionalForeignMessage_;
     /**
      * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
-     *
      * @return Whether the optionalForeignMessage field is set.
      */
     @java.lang.Override
     public boolean hasOptionalForeignMessage() {
       return ((bitField0_ & 0x00000002) != 0);
     }
-
     /**
      * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
-     *
      * @return The optionalForeignMessage.
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        getOptionalForeignMessage() {
-      return optionalForeignMessage_ == null
-          ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance()
-          : optionalForeignMessage_;
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getOptionalForeignMessage() {
+      return optionalForeignMessage_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance() : optionalForeignMessage_;
     }
-
-    /** <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code> */
+    /**
+     * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
+     */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder
-        getOptionalForeignMessageOrBuilder() {
-      return optionalForeignMessage_ == null
-          ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance()
-          : optionalForeignMessage_;
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder getOptionalForeignMessageOrBuilder() {
+      return optionalForeignMessage_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance() : optionalForeignMessage_;
     }
 
     public static final int OPTIONAL_NESTED_ENUM_FIELD_NUMBER = 21;
     private int optionalNestedEnum_ = 0;
-
     /**
-     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;</code>
      * @return The enum numeric value on the wire for optionalNestedEnum.
      */
-    @java.lang.Override
-    public int getOptionalNestedEnumValue() {
+    @java.lang.Override public int getOptionalNestedEnumValue() {
       return optionalNestedEnum_;
     }
-
     /**
-     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;</code>
      * @return The optionalNestedEnum.
      */
-    @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getOptionalNestedEnum() {
-      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum result =
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-              .forNumber(optionalNestedEnum_);
-      return result == null
-          ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-              .UNRECOGNIZED
-          : result;
+    @java.lang.Override public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getOptionalNestedEnum() {
+      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.forNumber(optionalNestedEnum_);
+      return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.UNRECOGNIZED : result;
     }
 
     public static final int OPTIONAL_FOREIGN_ENUM_FIELD_NUMBER = 22;
     private int optionalForeignEnum_ = 0;
-
     /**
      * <code>.legacy_gencode_test.proto3.ForeignEnum optional_foreign_enum = 22;</code>
-     *
      * @return The enum numeric value on the wire for optionalForeignEnum.
      */
-    @java.lang.Override
-    public int getOptionalForeignEnumValue() {
+    @java.lang.Override public int getOptionalForeignEnumValue() {
       return optionalForeignEnum_;
     }
-
     /**
      * <code>.legacy_gencode_test.proto3.ForeignEnum optional_foreign_enum = 22;</code>
-     *
      * @return The optionalForeignEnum.
      */
-    @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getOptionalForeignEnum() {
-      legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum result =
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.forNumber(
-              optionalForeignEnum_);
-      return result == null
-          ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.UNRECOGNIZED
-          : result;
+    @java.lang.Override public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getOptionalForeignEnum() {
+      legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.forNumber(optionalForeignEnum_);
+      return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.UNRECOGNIZED : result;
     }
 
     public static final int OPTIONAL_ALIASED_ENUM_FIELD_NUMBER = 23;
     private int optionalAliasedEnum_ = 0;
-
     /**
-     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;</code>
      * @return The enum numeric value on the wire for optionalAliasedEnum.
      */
-    @java.lang.Override
-    public int getOptionalAliasedEnumValue() {
+    @java.lang.Override public int getOptionalAliasedEnumValue() {
       return optionalAliasedEnum_;
     }
-
     /**
-     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;</code>
      * @return The optionalAliasedEnum.
      */
-    @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum
-        getOptionalAliasedEnum() {
-      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum result =
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum
-              .forNumber(optionalAliasedEnum_);
-      return result == null
-          ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum
-              .UNRECOGNIZED
-          : result;
+    @java.lang.Override public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum getOptionalAliasedEnum() {
+      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum.forNumber(optionalAliasedEnum_);
+      return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum.UNRECOGNIZED : result;
     }
 
     public static final int RECURSIVE_MESSAGE_FIELD_NUMBER = 27;
     private legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 recursiveMessage_;
-
     /**
      * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
-     *
      * @return Whether the recursiveMessage field is set.
      */
     @java.lang.Override
     public boolean hasRecursiveMessage() {
       return ((bitField0_ & 0x00000004) != 0);
     }
-
     /**
      * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
-     *
      * @return The recursiveMessage.
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-        getRecursiveMessage() {
-      return recursiveMessage_ == null
-          ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .getDefaultInstance()
-          : recursiveMessage_;
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 getRecursiveMessage() {
+      return recursiveMessage_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance() : recursiveMessage_;
     }
-
-    /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code> */
+    /**
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
+     */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder
-        getRecursiveMessageOrBuilder() {
-      return recursiveMessage_ == null
-          ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .getDefaultInstance()
-          : recursiveMessage_;
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder getRecursiveMessageOrBuilder() {
+      return recursiveMessage_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance() : recursiveMessage_;
     }
 
     public static final int REPEATED_INT32_FIELD_NUMBER = 31;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList repeatedInt32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList repeatedInt32_ =
+        emptyIntList();
     /**
-     *
-     *
      * <pre>
      * Repeated
      * </pre>
      *
      * <code>repeated int32 repeated_int32 = 31;</code>
-     *
      * @return A list containing the repeatedInt32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getRepeatedInt32List() {
+    public java.util.List<java.lang.Integer>
+        getRepeatedInt32List() {
       return repeatedInt32_;
     }
-
     /**
-     *
-     *
      * <pre>
      * Repeated
      * </pre>
      *
      * <code>repeated int32 repeated_int32 = 31;</code>
-     *
      * @return The count of repeatedInt32.
      */
     public int getRepeatedInt32Count() {
       return repeatedInt32_.size();
     }
-
     /**
-     *
-     *
      * <pre>
      * Repeated
      * </pre>
      *
      * <code>repeated int32 repeated_int32 = 31;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedInt32 at the given index.
      */
     public int getRepeatedInt32(int index) {
       return repeatedInt32_.getInt(index);
     }
-
     private int repeatedInt32MemoizedSerializedSize = -1;
 
     public static final int REPEATED_INT64_FIELD_NUMBER = 32;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList repeatedInt64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList repeatedInt64_ =
+        emptyLongList();
     /**
      * <code>repeated int64 repeated_int64 = 32;</code>
-     *
      * @return A list containing the repeatedInt64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getRepeatedInt64List() {
+    public java.util.List<java.lang.Long>
+        getRepeatedInt64List() {
       return repeatedInt64_;
     }
-
     /**
      * <code>repeated int64 repeated_int64 = 32;</code>
-     *
      * @return The count of repeatedInt64.
      */
     public int getRepeatedInt64Count() {
       return repeatedInt64_.size();
     }
-
     /**
      * <code>repeated int64 repeated_int64 = 32;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedInt64 at the given index.
      */
     public long getRepeatedInt64(int index) {
       return repeatedInt64_.getLong(index);
     }
-
     private int repeatedInt64MemoizedSerializedSize = -1;
 
     public static final int REPEATED_UINT32_FIELD_NUMBER = 33;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList repeatedUint32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList repeatedUint32_ =
+        emptyIntList();
     /**
      * <code>repeated uint32 repeated_uint32 = 33;</code>
-     *
      * @return A list containing the repeatedUint32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getRepeatedUint32List() {
+    public java.util.List<java.lang.Integer>
+        getRepeatedUint32List() {
       return repeatedUint32_;
     }
-
     /**
      * <code>repeated uint32 repeated_uint32 = 33;</code>
-     *
      * @return The count of repeatedUint32.
      */
     public int getRepeatedUint32Count() {
       return repeatedUint32_.size();
     }
-
     /**
      * <code>repeated uint32 repeated_uint32 = 33;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedUint32 at the given index.
      */
     public int getRepeatedUint32(int index) {
       return repeatedUint32_.getInt(index);
     }
-
     private int repeatedUint32MemoizedSerializedSize = -1;
 
     public static final int REPEATED_UINT64_FIELD_NUMBER = 34;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList repeatedUint64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList repeatedUint64_ =
+        emptyLongList();
     /**
      * <code>repeated uint64 repeated_uint64 = 34;</code>
-     *
      * @return A list containing the repeatedUint64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getRepeatedUint64List() {
+    public java.util.List<java.lang.Long>
+        getRepeatedUint64List() {
       return repeatedUint64_;
     }
-
     /**
      * <code>repeated uint64 repeated_uint64 = 34;</code>
-     *
      * @return The count of repeatedUint64.
      */
     public int getRepeatedUint64Count() {
       return repeatedUint64_.size();
     }
-
     /**
      * <code>repeated uint64 repeated_uint64 = 34;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedUint64 at the given index.
      */
     public long getRepeatedUint64(int index) {
       return repeatedUint64_.getLong(index);
     }
-
     private int repeatedUint64MemoizedSerializedSize = -1;
 
     public static final int REPEATED_SINT32_FIELD_NUMBER = 35;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList repeatedSint32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList repeatedSint32_ =
+        emptyIntList();
     /**
      * <code>repeated sint32 repeated_sint32 = 35;</code>
-     *
      * @return A list containing the repeatedSint32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getRepeatedSint32List() {
+    public java.util.List<java.lang.Integer>
+        getRepeatedSint32List() {
       return repeatedSint32_;
     }
-
     /**
      * <code>repeated sint32 repeated_sint32 = 35;</code>
-     *
      * @return The count of repeatedSint32.
      */
     public int getRepeatedSint32Count() {
       return repeatedSint32_.size();
     }
-
     /**
      * <code>repeated sint32 repeated_sint32 = 35;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedSint32 at the given index.
      */
     public int getRepeatedSint32(int index) {
       return repeatedSint32_.getInt(index);
     }
-
     private int repeatedSint32MemoizedSerializedSize = -1;
 
     public static final int REPEATED_SINT64_FIELD_NUMBER = 36;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList repeatedSint64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList repeatedSint64_ =
+        emptyLongList();
     /**
      * <code>repeated sint64 repeated_sint64 = 36;</code>
-     *
      * @return A list containing the repeatedSint64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getRepeatedSint64List() {
+    public java.util.List<java.lang.Long>
+        getRepeatedSint64List() {
       return repeatedSint64_;
     }
-
     /**
      * <code>repeated sint64 repeated_sint64 = 36;</code>
-     *
      * @return The count of repeatedSint64.
      */
     public int getRepeatedSint64Count() {
       return repeatedSint64_.size();
     }
-
     /**
      * <code>repeated sint64 repeated_sint64 = 36;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedSint64 at the given index.
      */
     public long getRepeatedSint64(int index) {
       return repeatedSint64_.getLong(index);
     }
-
     private int repeatedSint64MemoizedSerializedSize = -1;
 
     public static final int REPEATED_FIXED32_FIELD_NUMBER = 37;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList repeatedFixed32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList repeatedFixed32_ =
+        emptyIntList();
     /**
      * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-     *
      * @return A list containing the repeatedFixed32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getRepeatedFixed32List() {
+    public java.util.List<java.lang.Integer>
+        getRepeatedFixed32List() {
       return repeatedFixed32_;
     }
-
     /**
      * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-     *
      * @return The count of repeatedFixed32.
      */
     public int getRepeatedFixed32Count() {
       return repeatedFixed32_.size();
     }
-
     /**
      * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedFixed32 at the given index.
      */
     public int getRepeatedFixed32(int index) {
       return repeatedFixed32_.getInt(index);
     }
-
     private int repeatedFixed32MemoizedSerializedSize = -1;
 
     public static final int REPEATED_FIXED64_FIELD_NUMBER = 38;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList repeatedFixed64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList repeatedFixed64_ =
+        emptyLongList();
     /**
      * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-     *
      * @return A list containing the repeatedFixed64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getRepeatedFixed64List() {
+    public java.util.List<java.lang.Long>
+        getRepeatedFixed64List() {
       return repeatedFixed64_;
     }
-
     /**
      * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-     *
      * @return The count of repeatedFixed64.
      */
     public int getRepeatedFixed64Count() {
       return repeatedFixed64_.size();
     }
-
     /**
      * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedFixed64 at the given index.
      */
     public long getRepeatedFixed64(int index) {
       return repeatedFixed64_.getLong(index);
     }
-
     private int repeatedFixed64MemoizedSerializedSize = -1;
 
     public static final int REPEATED_SFIXED32_FIELD_NUMBER = 39;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList repeatedSfixed32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList repeatedSfixed32_ =
+        emptyIntList();
     /**
      * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-     *
      * @return A list containing the repeatedSfixed32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getRepeatedSfixed32List() {
+    public java.util.List<java.lang.Integer>
+        getRepeatedSfixed32List() {
       return repeatedSfixed32_;
     }
-
     /**
      * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-     *
      * @return The count of repeatedSfixed32.
      */
     public int getRepeatedSfixed32Count() {
       return repeatedSfixed32_.size();
     }
-
     /**
      * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedSfixed32 at the given index.
      */
     public int getRepeatedSfixed32(int index) {
       return repeatedSfixed32_.getInt(index);
     }
-
     private int repeatedSfixed32MemoizedSerializedSize = -1;
 
     public static final int REPEATED_SFIXED64_FIELD_NUMBER = 40;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList repeatedSfixed64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList repeatedSfixed64_ =
+        emptyLongList();
     /**
      * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-     *
      * @return A list containing the repeatedSfixed64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getRepeatedSfixed64List() {
+    public java.util.List<java.lang.Long>
+        getRepeatedSfixed64List() {
       return repeatedSfixed64_;
     }
-
     /**
      * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-     *
      * @return The count of repeatedSfixed64.
      */
     public int getRepeatedSfixed64Count() {
       return repeatedSfixed64_.size();
     }
-
     /**
      * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedSfixed64 at the given index.
      */
     public long getRepeatedSfixed64(int index) {
       return repeatedSfixed64_.getLong(index);
     }
-
     private int repeatedSfixed64MemoizedSerializedSize = -1;
 
     public static final int REPEATED_FLOAT_FIELD_NUMBER = 41;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.FloatList repeatedFloat_ = emptyFloatList();
-
+    private com.google.protobuf.Internal.FloatList repeatedFloat_ =
+        emptyFloatList();
     /**
      * <code>repeated float repeated_float = 41;</code>
-     *
      * @return A list containing the repeatedFloat.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Float> getRepeatedFloatList() {
+    public java.util.List<java.lang.Float>
+        getRepeatedFloatList() {
       return repeatedFloat_;
     }
-
     /**
      * <code>repeated float repeated_float = 41;</code>
-     *
      * @return The count of repeatedFloat.
      */
     public int getRepeatedFloatCount() {
       return repeatedFloat_.size();
     }
-
     /**
      * <code>repeated float repeated_float = 41;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedFloat at the given index.
      */
     public float getRepeatedFloat(int index) {
       return repeatedFloat_.getFloat(index);
     }
-
     private int repeatedFloatMemoizedSerializedSize = -1;
 
     public static final int REPEATED_DOUBLE_FIELD_NUMBER = 42;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.DoubleList repeatedDouble_ = emptyDoubleList();
-
+    private com.google.protobuf.Internal.DoubleList repeatedDouble_ =
+        emptyDoubleList();
     /**
      * <code>repeated double repeated_double = 42;</code>
-     *
      * @return A list containing the repeatedDouble.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Double> getRepeatedDoubleList() {
+    public java.util.List<java.lang.Double>
+        getRepeatedDoubleList() {
       return repeatedDouble_;
     }
-
     /**
      * <code>repeated double repeated_double = 42;</code>
-     *
      * @return The count of repeatedDouble.
      */
     public int getRepeatedDoubleCount() {
       return repeatedDouble_.size();
     }
-
     /**
      * <code>repeated double repeated_double = 42;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedDouble at the given index.
      */
     public double getRepeatedDouble(int index) {
       return repeatedDouble_.getDouble(index);
     }
-
     private int repeatedDoubleMemoizedSerializedSize = -1;
 
     public static final int REPEATED_BOOL_FIELD_NUMBER = 43;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.BooleanList repeatedBool_ = emptyBooleanList();
-
+    private com.google.protobuf.Internal.BooleanList repeatedBool_ =
+        emptyBooleanList();
     /**
      * <code>repeated bool repeated_bool = 43;</code>
-     *
      * @return A list containing the repeatedBool.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Boolean> getRepeatedBoolList() {
+    public java.util.List<java.lang.Boolean>
+        getRepeatedBoolList() {
       return repeatedBool_;
     }
-
     /**
      * <code>repeated bool repeated_bool = 43;</code>
-     *
      * @return The count of repeatedBool.
      */
     public int getRepeatedBoolCount() {
       return repeatedBool_.size();
     }
-
     /**
      * <code>repeated bool repeated_bool = 43;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedBool at the given index.
      */
     public boolean getRepeatedBool(int index) {
       return repeatedBool_.getBoolean(index);
     }
-
     private int repeatedBoolMemoizedSerializedSize = -1;
 
     public static final int REPEATED_STRING_FIELD_NUMBER = 44;
-
     @SuppressWarnings("serial")
     private com.google.protobuf.LazyStringArrayList repeatedString_ =
         com.google.protobuf.LazyStringArrayList.emptyList();
-
     /**
      * <code>repeated string repeated_string = 44;</code>
-     *
      * @return A list containing the repeatedString.
      */
-    public com.google.protobuf.ProtocolStringList getRepeatedStringList() {
+    public com.google.protobuf.ProtocolStringList
+        getRepeatedStringList() {
       return repeatedString_;
     }
-
     /**
      * <code>repeated string repeated_string = 44;</code>
-     *
      * @return The count of repeatedString.
      */
     public int getRepeatedStringCount() {
       return repeatedString_.size();
     }
-
     /**
      * <code>repeated string repeated_string = 44;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedString at the given index.
      */
     public java.lang.String getRepeatedString(int index) {
       return repeatedString_.get(index);
     }
-
     /**
      * <code>repeated string repeated_string = 44;</code>
-     *
      * @param index The index of the value to return.
      * @return The bytes of the repeatedString at the given index.
      */
-    public com.google.protobuf.ByteString getRepeatedStringBytes(int index) {
+    public com.google.protobuf.ByteString
+        getRepeatedStringBytes(int index) {
       return repeatedString_.getByteString(index);
     }
 
     public static final int REPEATED_BYTES_FIELD_NUMBER = 45;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.ProtobufList<com.google.protobuf.ByteString>
-        repeatedBytes_ = emptyList(com.google.protobuf.ByteString.class);
-
+    private com.google.protobuf.Internal.ProtobufList<com.google.protobuf.ByteString> repeatedBytes_ =
+        emptyList(com.google.protobuf.ByteString.class);
     /**
      * <code>repeated bytes repeated_bytes = 45;</code>
-     *
      * @return A list containing the repeatedBytes.
      */
     @java.lang.Override
-    public java.util.List<com.google.protobuf.ByteString> getRepeatedBytesList() {
+    public java.util.List<com.google.protobuf.ByteString>
+        getRepeatedBytesList() {
       return repeatedBytes_;
     }
-
     /**
      * <code>repeated bytes repeated_bytes = 45;</code>
-     *
      * @return The count of repeatedBytes.
      */
     public int getRepeatedBytesCount() {
       return repeatedBytes_.size();
     }
-
     /**
      * <code>repeated bytes repeated_bytes = 45;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedBytes at the given index.
      */
@@ -5905,211 +5240,137 @@ public com.google.protobuf.ByteString getRepeatedBytes(int index) {
     }
 
     public static final int REPEATED_NESTED_MESSAGE_FIELD_NUMBER = 48;
-
     @SuppressWarnings("serial")
-    private java.util.List<
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-        repeatedNestedMessage_;
-
+    private java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> repeatedNestedMessage_;
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
      */
     @java.lang.Override
-    public java.util.List<
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-        getRepeatedNestedMessageList() {
+    public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> getRepeatedNestedMessageList() {
       return repeatedNestedMessage_;
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
      */
     @java.lang.Override
-    public java.util.List<
-            ? extends
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .NestedMessageOrBuilder>
+    public java.util.List<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> 
         getRepeatedNestedMessageOrBuilderList() {
       return repeatedNestedMessage_;
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
      */
     @java.lang.Override
     public int getRepeatedNestedMessageCount() {
       return repeatedNestedMessage_.size();
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-        getRepeatedNestedMessage(int index) {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getRepeatedNestedMessage(int index) {
       return repeatedNestedMessage_.get(index);
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-            .NestedMessageOrBuilder
-        getRepeatedNestedMessageOrBuilder(int index) {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder getRepeatedNestedMessageOrBuilder(
+        int index) {
       return repeatedNestedMessage_.get(index);
     }
 
     public static final int REPEATED_FOREIGN_MESSAGE_FIELD_NUMBER = 49;
-
     @SuppressWarnings("serial")
-    private java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-        repeatedForeignMessage_;
-
+    private java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> repeatedForeignMessage_;
     /**
-     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
      */
     @java.lang.Override
-    public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-        getRepeatedForeignMessageList() {
+    public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> getRepeatedForeignMessageList() {
       return repeatedForeignMessage_;
     }
-
     /**
-     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
      */
     @java.lang.Override
-    public java.util.List<
-            ? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>
+    public java.util.List<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder> 
         getRepeatedForeignMessageOrBuilderList() {
       return repeatedForeignMessage_;
     }
-
     /**
-     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
      */
     @java.lang.Override
     public int getRepeatedForeignMessageCount() {
       return repeatedForeignMessage_.size();
     }
-
     /**
-     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        getRepeatedForeignMessage(int index) {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedForeignMessage(int index) {
       return repeatedForeignMessage_.get(index);
     }
-
     /**
-     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-     * </code>
+     * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder
-        getRepeatedForeignMessageOrBuilder(int index) {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder getRepeatedForeignMessageOrBuilder(
+        int index) {
       return repeatedForeignMessage_.get(index);
     }
 
     public static final int REPEATED_NESTED_ENUM_FIELD_NUMBER = 51;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList repeatedNestedEnum_ = emptyIntList();
-
-    private static final com.google.protobuf.Internal.IntListAdapter.IntConverter<
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        repeatedNestedEnum_converter_ =
+    private com.google.protobuf.Internal.IntList repeatedNestedEnum_ =
+        emptyIntList();
+    private static final     com.google.protobuf.Internal.IntListAdapter.IntConverter<
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> repeatedNestedEnum_converter_ =
             new com.google.protobuf.Internal.IntListAdapter.IntConverter<
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .NestedEnum>() {
-              public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedEnum
-                  convert(int from) {
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                    result =
-                        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                            .NestedEnum.forNumber(from);
-                return result == null
-                    ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                        .NestedEnum.UNRECOGNIZED
-                    : result;
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>() {
+              public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum convert(int from) {
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.forNumber(from);
+                return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.UNRECOGNIZED : result;
               }
             };
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
      * @return A list containing the repeatedNestedEnum.
      */
     @java.lang.Override
-    public java.util.List<
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        getRepeatedNestedEnumList() {
+    public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> getRepeatedNestedEnumList() {
       return new com.google.protobuf.Internal.IntListAdapter<
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(
-          repeatedNestedEnum_, repeatedNestedEnum_converter_);
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(repeatedNestedEnum_, repeatedNestedEnum_converter_);
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
      * @return The count of repeatedNestedEnum.
      */
     @java.lang.Override
     public int getRepeatedNestedEnumCount() {
       return repeatedNestedEnum_.size();
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
      * @param index The index of the element to return.
      * @return The repeatedNestedEnum at the given index.
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getRepeatedNestedEnum(int index) {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getRepeatedNestedEnum(int index) {
       return repeatedNestedEnum_converter_.convert(repeatedNestedEnum_.getInt(index));
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
      * @return A list containing the enum numeric values on the wire for repeatedNestedEnum.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getRepeatedNestedEnumValueList() {
+    public java.util.List<java.lang.Integer>
+    getRepeatedNestedEnumValueList() {
       return repeatedNestedEnum_;
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
      * @param index The index of the value to return.
      * @return The enum numeric value on the wire of repeatedNestedEnum at the given index.
      */
@@ -6117,77 +5378,58 @@ public java.util.List<java.lang.Integer> getRepeatedNestedEnumValueList() {
     public int getRepeatedNestedEnumValue(int index) {
       return repeatedNestedEnum_.getInt(index);
     }
-
     private int repeatedNestedEnumMemoizedSerializedSize;
 
     public static final int REPEATED_FOREIGN_ENUM_FIELD_NUMBER = 52;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList repeatedForeignEnum_ = emptyIntList();
-
-    private static final com.google.protobuf.Internal.IntListAdapter.IntConverter<
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-        repeatedForeignEnum_converter_ =
+    private com.google.protobuf.Internal.IntList repeatedForeignEnum_ =
+        emptyIntList();
+    private static final     com.google.protobuf.Internal.IntListAdapter.IntConverter<
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum> repeatedForeignEnum_converter_ =
             new com.google.protobuf.Internal.IntListAdapter.IntConverter<
                 legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>() {
-              public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum convert(
-                  int from) {
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum result =
-                    legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.forNumber(from);
-                return result == null
-                    ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.UNRECOGNIZED
-                    : result;
+              public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum convert(int from) {
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.forNumber(from);
+                return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.UNRECOGNIZED : result;
               }
             };
-
     /**
      * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-     *
      * @return A list containing the repeatedForeignEnum.
      */
     @java.lang.Override
-    public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-        getRepeatedForeignEnumList() {
+    public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum> getRepeatedForeignEnumList() {
       return new com.google.protobuf.Internal.IntListAdapter<
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>(
-          repeatedForeignEnum_, repeatedForeignEnum_converter_);
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>(repeatedForeignEnum_, repeatedForeignEnum_converter_);
     }
-
     /**
      * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-     *
      * @return The count of repeatedForeignEnum.
      */
     @java.lang.Override
     public int getRepeatedForeignEnumCount() {
       return repeatedForeignEnum_.size();
     }
-
     /**
      * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-     *
      * @param index The index of the element to return.
      * @return The repeatedForeignEnum at the given index.
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getRepeatedForeignEnum(
-        int index) {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getRepeatedForeignEnum(int index) {
       return repeatedForeignEnum_converter_.convert(repeatedForeignEnum_.getInt(index));
     }
-
     /**
      * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-     *
      * @return A list containing the enum numeric values on the wire for repeatedForeignEnum.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getRepeatedForeignEnumValueList() {
+    public java.util.List<java.lang.Integer>
+    getRepeatedForeignEnumValueList() {
       return repeatedForeignEnum_;
     }
-
     /**
      * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-     *
      * @param index The index of the value to return.
      * @return The enum numeric value on the wire of repeatedForeignEnum at the given index.
      */
@@ -6195,579 +5437,460 @@ public java.util.List<java.lang.Integer> getRepeatedForeignEnumValueList() {
     public int getRepeatedForeignEnumValue(int index) {
       return repeatedForeignEnum_.getInt(index);
     }
-
     private int repeatedForeignEnumMemoizedSerializedSize;
 
     public static final int PACKED_INT32_FIELD_NUMBER = 75;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList packedInt32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList packedInt32_ =
+        emptyIntList();
     /**
-     *
-     *
      * <pre>
      * Packed
      * </pre>
      *
      * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-     *
      * @return A list containing the packedInt32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getPackedInt32List() {
+    public java.util.List<java.lang.Integer>
+        getPackedInt32List() {
       return packedInt32_;
     }
-
     /**
-     *
-     *
      * <pre>
      * Packed
      * </pre>
      *
      * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-     *
      * @return The count of packedInt32.
      */
     public int getPackedInt32Count() {
       return packedInt32_.size();
     }
-
     /**
-     *
-     *
      * <pre>
      * Packed
      * </pre>
      *
      * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedInt32 at the given index.
      */
     public int getPackedInt32(int index) {
       return packedInt32_.getInt(index);
     }
-
     private int packedInt32MemoizedSerializedSize = -1;
 
     public static final int PACKED_INT64_FIELD_NUMBER = 76;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList packedInt64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList packedInt64_ =
+        emptyLongList();
     /**
      * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-     *
      * @return A list containing the packedInt64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getPackedInt64List() {
+    public java.util.List<java.lang.Long>
+        getPackedInt64List() {
       return packedInt64_;
     }
-
     /**
      * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-     *
      * @return The count of packedInt64.
      */
     public int getPackedInt64Count() {
       return packedInt64_.size();
     }
-
     /**
      * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedInt64 at the given index.
      */
     public long getPackedInt64(int index) {
       return packedInt64_.getLong(index);
     }
-
     private int packedInt64MemoizedSerializedSize = -1;
 
     public static final int PACKED_UINT32_FIELD_NUMBER = 77;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList packedUint32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList packedUint32_ =
+        emptyIntList();
     /**
      * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-     *
      * @return A list containing the packedUint32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getPackedUint32List() {
+    public java.util.List<java.lang.Integer>
+        getPackedUint32List() {
       return packedUint32_;
     }
-
     /**
      * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-     *
      * @return The count of packedUint32.
      */
     public int getPackedUint32Count() {
       return packedUint32_.size();
     }
-
     /**
      * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedUint32 at the given index.
      */
     public int getPackedUint32(int index) {
       return packedUint32_.getInt(index);
     }
-
     private int packedUint32MemoizedSerializedSize = -1;
 
     public static final int PACKED_UINT64_FIELD_NUMBER = 78;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList packedUint64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList packedUint64_ =
+        emptyLongList();
     /**
      * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-     *
      * @return A list containing the packedUint64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getPackedUint64List() {
+    public java.util.List<java.lang.Long>
+        getPackedUint64List() {
       return packedUint64_;
     }
-
     /**
      * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-     *
      * @return The count of packedUint64.
      */
     public int getPackedUint64Count() {
       return packedUint64_.size();
     }
-
     /**
      * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedUint64 at the given index.
      */
     public long getPackedUint64(int index) {
       return packedUint64_.getLong(index);
     }
-
     private int packedUint64MemoizedSerializedSize = -1;
 
     public static final int PACKED_SINT32_FIELD_NUMBER = 79;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList packedSint32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList packedSint32_ =
+        emptyIntList();
     /**
      * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-     *
      * @return A list containing the packedSint32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getPackedSint32List() {
+    public java.util.List<java.lang.Integer>
+        getPackedSint32List() {
       return packedSint32_;
     }
-
     /**
      * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-     *
      * @return The count of packedSint32.
      */
     public int getPackedSint32Count() {
       return packedSint32_.size();
     }
-
     /**
      * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedSint32 at the given index.
      */
     public int getPackedSint32(int index) {
       return packedSint32_.getInt(index);
     }
-
     private int packedSint32MemoizedSerializedSize = -1;
 
     public static final int PACKED_SINT64_FIELD_NUMBER = 80;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList packedSint64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList packedSint64_ =
+        emptyLongList();
     /**
      * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-     *
      * @return A list containing the packedSint64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getPackedSint64List() {
+    public java.util.List<java.lang.Long>
+        getPackedSint64List() {
       return packedSint64_;
     }
-
     /**
      * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-     *
      * @return The count of packedSint64.
      */
     public int getPackedSint64Count() {
       return packedSint64_.size();
     }
-
     /**
      * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedSint64 at the given index.
      */
     public long getPackedSint64(int index) {
       return packedSint64_.getLong(index);
     }
-
     private int packedSint64MemoizedSerializedSize = -1;
 
     public static final int PACKED_FIXED32_FIELD_NUMBER = 81;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList packedFixed32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList packedFixed32_ =
+        emptyIntList();
     /**
      * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-     *
      * @return A list containing the packedFixed32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getPackedFixed32List() {
+    public java.util.List<java.lang.Integer>
+        getPackedFixed32List() {
       return packedFixed32_;
     }
-
     /**
      * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-     *
      * @return The count of packedFixed32.
      */
     public int getPackedFixed32Count() {
       return packedFixed32_.size();
     }
-
     /**
      * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedFixed32 at the given index.
      */
     public int getPackedFixed32(int index) {
       return packedFixed32_.getInt(index);
     }
-
     private int packedFixed32MemoizedSerializedSize = -1;
 
     public static final int PACKED_FIXED64_FIELD_NUMBER = 82;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList packedFixed64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList packedFixed64_ =
+        emptyLongList();
     /**
      * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-     *
      * @return A list containing the packedFixed64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getPackedFixed64List() {
+    public java.util.List<java.lang.Long>
+        getPackedFixed64List() {
       return packedFixed64_;
     }
-
     /**
      * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-     *
      * @return The count of packedFixed64.
      */
     public int getPackedFixed64Count() {
       return packedFixed64_.size();
     }
-
     /**
      * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedFixed64 at the given index.
      */
     public long getPackedFixed64(int index) {
       return packedFixed64_.getLong(index);
     }
-
     private int packedFixed64MemoizedSerializedSize = -1;
 
     public static final int PACKED_SFIXED32_FIELD_NUMBER = 83;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList packedSfixed32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList packedSfixed32_ =
+        emptyIntList();
     /**
      * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-     *
      * @return A list containing the packedSfixed32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getPackedSfixed32List() {
+    public java.util.List<java.lang.Integer>
+        getPackedSfixed32List() {
       return packedSfixed32_;
     }
-
     /**
      * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-     *
      * @return The count of packedSfixed32.
      */
     public int getPackedSfixed32Count() {
       return packedSfixed32_.size();
     }
-
     /**
      * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedSfixed32 at the given index.
      */
     public int getPackedSfixed32(int index) {
       return packedSfixed32_.getInt(index);
     }
-
     private int packedSfixed32MemoizedSerializedSize = -1;
 
     public static final int PACKED_SFIXED64_FIELD_NUMBER = 84;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList packedSfixed64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList packedSfixed64_ =
+        emptyLongList();
     /**
      * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-     *
      * @return A list containing the packedSfixed64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getPackedSfixed64List() {
+    public java.util.List<java.lang.Long>
+        getPackedSfixed64List() {
       return packedSfixed64_;
     }
-
     /**
      * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-     *
      * @return The count of packedSfixed64.
      */
     public int getPackedSfixed64Count() {
       return packedSfixed64_.size();
     }
-
     /**
      * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedSfixed64 at the given index.
      */
     public long getPackedSfixed64(int index) {
       return packedSfixed64_.getLong(index);
     }
-
     private int packedSfixed64MemoizedSerializedSize = -1;
 
     public static final int PACKED_FLOAT_FIELD_NUMBER = 85;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.FloatList packedFloat_ = emptyFloatList();
-
+    private com.google.protobuf.Internal.FloatList packedFloat_ =
+        emptyFloatList();
     /**
      * <code>repeated float packed_float = 85 [packed = true];</code>
-     *
      * @return A list containing the packedFloat.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Float> getPackedFloatList() {
+    public java.util.List<java.lang.Float>
+        getPackedFloatList() {
       return packedFloat_;
     }
-
     /**
      * <code>repeated float packed_float = 85 [packed = true];</code>
-     *
      * @return The count of packedFloat.
      */
     public int getPackedFloatCount() {
       return packedFloat_.size();
     }
-
     /**
      * <code>repeated float packed_float = 85 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedFloat at the given index.
      */
     public float getPackedFloat(int index) {
       return packedFloat_.getFloat(index);
     }
-
     private int packedFloatMemoizedSerializedSize = -1;
 
     public static final int PACKED_DOUBLE_FIELD_NUMBER = 86;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.DoubleList packedDouble_ = emptyDoubleList();
-
+    private com.google.protobuf.Internal.DoubleList packedDouble_ =
+        emptyDoubleList();
     /**
      * <code>repeated double packed_double = 86 [packed = true];</code>
-     *
      * @return A list containing the packedDouble.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Double> getPackedDoubleList() {
+    public java.util.List<java.lang.Double>
+        getPackedDoubleList() {
       return packedDouble_;
     }
-
     /**
      * <code>repeated double packed_double = 86 [packed = true];</code>
-     *
      * @return The count of packedDouble.
      */
     public int getPackedDoubleCount() {
       return packedDouble_.size();
     }
-
     /**
      * <code>repeated double packed_double = 86 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedDouble at the given index.
      */
     public double getPackedDouble(int index) {
       return packedDouble_.getDouble(index);
     }
-
     private int packedDoubleMemoizedSerializedSize = -1;
 
     public static final int PACKED_BOOL_FIELD_NUMBER = 87;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.BooleanList packedBool_ = emptyBooleanList();
-
+    private com.google.protobuf.Internal.BooleanList packedBool_ =
+        emptyBooleanList();
     /**
      * <code>repeated bool packed_bool = 87 [packed = true];</code>
-     *
      * @return A list containing the packedBool.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Boolean> getPackedBoolList() {
+    public java.util.List<java.lang.Boolean>
+        getPackedBoolList() {
       return packedBool_;
     }
-
     /**
      * <code>repeated bool packed_bool = 87 [packed = true];</code>
-     *
      * @return The count of packedBool.
      */
     public int getPackedBoolCount() {
       return packedBool_.size();
     }
-
     /**
      * <code>repeated bool packed_bool = 87 [packed = true];</code>
-     *
      * @param index The index of the element to return.
      * @return The packedBool at the given index.
      */
     public boolean getPackedBool(int index) {
       return packedBool_.getBoolean(index);
     }
-
     private int packedBoolMemoizedSerializedSize = -1;
 
     public static final int PACKED_NESTED_ENUM_FIELD_NUMBER = 88;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList packedNestedEnum_ = emptyIntList();
-
-    private static final com.google.protobuf.Internal.IntListAdapter.IntConverter<
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        packedNestedEnum_converter_ =
+    private com.google.protobuf.Internal.IntList packedNestedEnum_ =
+        emptyIntList();
+    private static final     com.google.protobuf.Internal.IntListAdapter.IntConverter<
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> packedNestedEnum_converter_ =
             new com.google.protobuf.Internal.IntListAdapter.IntConverter<
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .NestedEnum>() {
-              public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedEnum
-                  convert(int from) {
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                    result =
-                        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                            .NestedEnum.forNumber(from);
-                return result == null
-                    ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                        .NestedEnum.UNRECOGNIZED
-                    : result;
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>() {
+              public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum convert(int from) {
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.forNumber(from);
+                return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.UNRECOGNIZED : result;
               }
             };
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
      * @return A list containing the packedNestedEnum.
      */
     @java.lang.Override
-    public java.util.List<
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        getPackedNestedEnumList() {
+    public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> getPackedNestedEnumList() {
       return new com.google.protobuf.Internal.IntListAdapter<
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(
-          packedNestedEnum_, packedNestedEnum_converter_);
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(packedNestedEnum_, packedNestedEnum_converter_);
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
      * @return The count of packedNestedEnum.
      */
     @java.lang.Override
     public int getPackedNestedEnumCount() {
       return packedNestedEnum_.size();
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
      * @param index The index of the element to return.
      * @return The packedNestedEnum at the given index.
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getPackedNestedEnum(int index) {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getPackedNestedEnum(int index) {
       return packedNestedEnum_converter_.convert(packedNestedEnum_.getInt(index));
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
      * @return A list containing the enum numeric values on the wire for packedNestedEnum.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getPackedNestedEnumValueList() {
+    public java.util.List<java.lang.Integer>
+    getPackedNestedEnumValueList() {
       return packedNestedEnum_;
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
      * @param index The index of the value to return.
      * @return The enum numeric value on the wire of packedNestedEnum at the given index.
      */
@@ -6775,54 +5898,42 @@ public java.util.List<java.lang.Integer> getPackedNestedEnumValueList() {
     public int getPackedNestedEnumValue(int index) {
       return packedNestedEnum_.getInt(index);
     }
-
     private int packedNestedEnumMemoizedSerializedSize;
 
     public static final int UNPACKED_INT32_FIELD_NUMBER = 89;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList unpackedInt32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList unpackedInt32_ =
+        emptyIntList();
     /**
-     *
-     *
      * <pre>
      * Unpacked
      * </pre>
      *
      * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-     *
      * @return A list containing the unpackedInt32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getUnpackedInt32List() {
+    public java.util.List<java.lang.Integer>
+        getUnpackedInt32List() {
       return unpackedInt32_;
     }
-
     /**
-     *
-     *
      * <pre>
      * Unpacked
      * </pre>
      *
      * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-     *
      * @return The count of unpackedInt32.
      */
     public int getUnpackedInt32Count() {
       return unpackedInt32_.size();
     }
-
     /**
-     *
-     *
      * <pre>
      * Unpacked
      * </pre>
      *
      * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedInt32 at the given index.
      */
@@ -6831,32 +5942,27 @@ public int getUnpackedInt32(int index) {
     }
 
     public static final int UNPACKED_INT64_FIELD_NUMBER = 90;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList unpackedInt64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList unpackedInt64_ =
+        emptyLongList();
     /**
      * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-     *
      * @return A list containing the unpackedInt64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getUnpackedInt64List() {
+    public java.util.List<java.lang.Long>
+        getUnpackedInt64List() {
       return unpackedInt64_;
     }
-
     /**
      * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-     *
      * @return The count of unpackedInt64.
      */
     public int getUnpackedInt64Count() {
       return unpackedInt64_.size();
     }
-
     /**
      * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedInt64 at the given index.
      */
@@ -6865,32 +5971,27 @@ public long getUnpackedInt64(int index) {
     }
 
     public static final int UNPACKED_UINT32_FIELD_NUMBER = 91;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList unpackedUint32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList unpackedUint32_ =
+        emptyIntList();
     /**
      * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-     *
      * @return A list containing the unpackedUint32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getUnpackedUint32List() {
+    public java.util.List<java.lang.Integer>
+        getUnpackedUint32List() {
       return unpackedUint32_;
     }
-
     /**
      * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-     *
      * @return The count of unpackedUint32.
      */
     public int getUnpackedUint32Count() {
       return unpackedUint32_.size();
     }
-
     /**
      * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedUint32 at the given index.
      */
@@ -6899,32 +6000,27 @@ public int getUnpackedUint32(int index) {
     }
 
     public static final int UNPACKED_UINT64_FIELD_NUMBER = 92;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList unpackedUint64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList unpackedUint64_ =
+        emptyLongList();
     /**
      * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-     *
      * @return A list containing the unpackedUint64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getUnpackedUint64List() {
+    public java.util.List<java.lang.Long>
+        getUnpackedUint64List() {
       return unpackedUint64_;
     }
-
     /**
      * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-     *
      * @return The count of unpackedUint64.
      */
     public int getUnpackedUint64Count() {
       return unpackedUint64_.size();
     }
-
     /**
      * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedUint64 at the given index.
      */
@@ -6933,32 +6029,27 @@ public long getUnpackedUint64(int index) {
     }
 
     public static final int UNPACKED_SINT32_FIELD_NUMBER = 93;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList unpackedSint32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList unpackedSint32_ =
+        emptyIntList();
     /**
      * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-     *
      * @return A list containing the unpackedSint32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getUnpackedSint32List() {
+    public java.util.List<java.lang.Integer>
+        getUnpackedSint32List() {
       return unpackedSint32_;
     }
-
     /**
      * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-     *
      * @return The count of unpackedSint32.
      */
     public int getUnpackedSint32Count() {
       return unpackedSint32_.size();
     }
-
     /**
      * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedSint32 at the given index.
      */
@@ -6967,32 +6058,27 @@ public int getUnpackedSint32(int index) {
     }
 
     public static final int UNPACKED_SINT64_FIELD_NUMBER = 94;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList unpackedSint64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList unpackedSint64_ =
+        emptyLongList();
     /**
      * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-     *
      * @return A list containing the unpackedSint64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getUnpackedSint64List() {
+    public java.util.List<java.lang.Long>
+        getUnpackedSint64List() {
       return unpackedSint64_;
     }
-
     /**
      * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-     *
      * @return The count of unpackedSint64.
      */
     public int getUnpackedSint64Count() {
       return unpackedSint64_.size();
     }
-
     /**
      * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedSint64 at the given index.
      */
@@ -7001,32 +6087,27 @@ public long getUnpackedSint64(int index) {
     }
 
     public static final int UNPACKED_FIXED32_FIELD_NUMBER = 95;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList unpackedFixed32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList unpackedFixed32_ =
+        emptyIntList();
     /**
      * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-     *
      * @return A list containing the unpackedFixed32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getUnpackedFixed32List() {
+    public java.util.List<java.lang.Integer>
+        getUnpackedFixed32List() {
       return unpackedFixed32_;
     }
-
     /**
      * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-     *
      * @return The count of unpackedFixed32.
      */
     public int getUnpackedFixed32Count() {
       return unpackedFixed32_.size();
     }
-
     /**
      * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedFixed32 at the given index.
      */
@@ -7035,32 +6116,27 @@ public int getUnpackedFixed32(int index) {
     }
 
     public static final int UNPACKED_FIXED64_FIELD_NUMBER = 96;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList unpackedFixed64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList unpackedFixed64_ =
+        emptyLongList();
     /**
      * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-     *
      * @return A list containing the unpackedFixed64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getUnpackedFixed64List() {
+    public java.util.List<java.lang.Long>
+        getUnpackedFixed64List() {
       return unpackedFixed64_;
     }
-
     /**
      * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-     *
      * @return The count of unpackedFixed64.
      */
     public int getUnpackedFixed64Count() {
       return unpackedFixed64_.size();
     }
-
     /**
      * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedFixed64 at the given index.
      */
@@ -7069,32 +6145,27 @@ public long getUnpackedFixed64(int index) {
     }
 
     public static final int UNPACKED_SFIXED32_FIELD_NUMBER = 97;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList unpackedSfixed32_ = emptyIntList();
-
+    private com.google.protobuf.Internal.IntList unpackedSfixed32_ =
+        emptyIntList();
     /**
      * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-     *
      * @return A list containing the unpackedSfixed32.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getUnpackedSfixed32List() {
+    public java.util.List<java.lang.Integer>
+        getUnpackedSfixed32List() {
       return unpackedSfixed32_;
     }
-
     /**
      * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-     *
      * @return The count of unpackedSfixed32.
      */
     public int getUnpackedSfixed32Count() {
       return unpackedSfixed32_.size();
     }
-
     /**
      * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedSfixed32 at the given index.
      */
@@ -7103,32 +6174,27 @@ public int getUnpackedSfixed32(int index) {
     }
 
     public static final int UNPACKED_SFIXED64_FIELD_NUMBER = 98;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.LongList unpackedSfixed64_ = emptyLongList();
-
+    private com.google.protobuf.Internal.LongList unpackedSfixed64_ =
+        emptyLongList();
     /**
      * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-     *
      * @return A list containing the unpackedSfixed64.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Long> getUnpackedSfixed64List() {
+    public java.util.List<java.lang.Long>
+        getUnpackedSfixed64List() {
       return unpackedSfixed64_;
     }
-
     /**
      * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-     *
      * @return The count of unpackedSfixed64.
      */
     public int getUnpackedSfixed64Count() {
       return unpackedSfixed64_.size();
     }
-
     /**
      * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedSfixed64 at the given index.
      */
@@ -7137,32 +6203,27 @@ public long getUnpackedSfixed64(int index) {
     }
 
     public static final int UNPACKED_FLOAT_FIELD_NUMBER = 99;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.FloatList unpackedFloat_ = emptyFloatList();
-
+    private com.google.protobuf.Internal.FloatList unpackedFloat_ =
+        emptyFloatList();
     /**
      * <code>repeated float unpacked_float = 99 [packed = false];</code>
-     *
      * @return A list containing the unpackedFloat.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Float> getUnpackedFloatList() {
+    public java.util.List<java.lang.Float>
+        getUnpackedFloatList() {
       return unpackedFloat_;
     }
-
     /**
      * <code>repeated float unpacked_float = 99 [packed = false];</code>
-     *
      * @return The count of unpackedFloat.
      */
     public int getUnpackedFloatCount() {
       return unpackedFloat_.size();
     }
-
     /**
      * <code>repeated float unpacked_float = 99 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedFloat at the given index.
      */
@@ -7171,32 +6232,27 @@ public float getUnpackedFloat(int index) {
     }
 
     public static final int UNPACKED_DOUBLE_FIELD_NUMBER = 100;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.DoubleList unpackedDouble_ = emptyDoubleList();
-
+    private com.google.protobuf.Internal.DoubleList unpackedDouble_ =
+        emptyDoubleList();
     /**
      * <code>repeated double unpacked_double = 100 [packed = false];</code>
-     *
      * @return A list containing the unpackedDouble.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Double> getUnpackedDoubleList() {
+    public java.util.List<java.lang.Double>
+        getUnpackedDoubleList() {
       return unpackedDouble_;
     }
-
     /**
      * <code>repeated double unpacked_double = 100 [packed = false];</code>
-     *
      * @return The count of unpackedDouble.
      */
     public int getUnpackedDoubleCount() {
       return unpackedDouble_.size();
     }
-
     /**
      * <code>repeated double unpacked_double = 100 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedDouble at the given index.
      */
@@ -7205,32 +6261,27 @@ public double getUnpackedDouble(int index) {
     }
 
     public static final int UNPACKED_BOOL_FIELD_NUMBER = 101;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.BooleanList unpackedBool_ = emptyBooleanList();
-
+    private com.google.protobuf.Internal.BooleanList unpackedBool_ =
+        emptyBooleanList();
     /**
      * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-     *
      * @return A list containing the unpackedBool.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Boolean> getUnpackedBoolList() {
+    public java.util.List<java.lang.Boolean>
+        getUnpackedBoolList() {
       return unpackedBool_;
     }
-
     /**
      * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-     *
      * @return The count of unpackedBool.
      */
     public int getUnpackedBoolCount() {
       return unpackedBool_.size();
     }
-
     /**
      * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-     *
      * @param index The index of the element to return.
      * @return The unpackedBool at the given index.
      */
@@ -7239,89 +6290,55 @@ public boolean getUnpackedBool(int index) {
     }
 
     public static final int UNPACKED_NESTED_ENUM_FIELD_NUMBER = 102;
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList unpackedNestedEnum_ = emptyIntList();
-
-    private static final com.google.protobuf.Internal.IntListAdapter.IntConverter<
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        unpackedNestedEnum_converter_ =
+    private com.google.protobuf.Internal.IntList unpackedNestedEnum_ =
+        emptyIntList();
+    private static final     com.google.protobuf.Internal.IntListAdapter.IntConverter<
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> unpackedNestedEnum_converter_ =
             new com.google.protobuf.Internal.IntListAdapter.IntConverter<
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .NestedEnum>() {
-              public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedEnum
-                  convert(int from) {
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                    result =
-                        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                            .NestedEnum.forNumber(from);
-                return result == null
-                    ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                        .NestedEnum.UNRECOGNIZED
-                    : result;
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>() {
+              public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum convert(int from) {
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.forNumber(from);
+                return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.UNRECOGNIZED : result;
               }
             };
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
      * @return A list containing the unpackedNestedEnum.
      */
     @java.lang.Override
-    public java.util.List<
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        getUnpackedNestedEnumList() {
+    public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> getUnpackedNestedEnumList() {
       return new com.google.protobuf.Internal.IntListAdapter<
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(
-          unpackedNestedEnum_, unpackedNestedEnum_converter_);
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(unpackedNestedEnum_, unpackedNestedEnum_converter_);
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
      * @return The count of unpackedNestedEnum.
      */
     @java.lang.Override
     public int getUnpackedNestedEnumCount() {
       return unpackedNestedEnum_.size();
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
      * @param index The index of the element to return.
      * @return The unpackedNestedEnum at the given index.
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getUnpackedNestedEnum(int index) {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getUnpackedNestedEnum(int index) {
       return unpackedNestedEnum_converter_.convert(unpackedNestedEnum_.getInt(index));
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
      * @return A list containing the enum numeric values on the wire for unpackedNestedEnum.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer> getUnpackedNestedEnumValueList() {
+    public java.util.List<java.lang.Integer>
+    getUnpackedNestedEnumValueList() {
       return unpackedNestedEnum_;
     }
-
     /**
-     * <code>
-     * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-     * </code>
-     *
+     * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
      * @param index The index of the value to return.
      * @return The enum numeric value on the wire of unpackedNestedEnum at the given index.
      */
@@ -7331,37 +6348,32 @@ public int getUnpackedNestedEnumValue(int index) {
     }
 
     public static final int MAP_INT32_INT32_FIELD_NUMBER = 56;
-
     private static final class MapInt32Int32DefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Integer, java.lang.Integer>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32Int32Entry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.INT32,
-              0,
-              com.google.protobuf.WireFormat.FieldType.INT32,
-              0);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32Int32Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.INT32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.INT32,
+                  0);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer> mapInt32Int32_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Integer> mapInt32Int32_;
     private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-        internalGetMapInt32Int32() {
+    internalGetMapInt32Int32() {
       if (mapInt32Int32_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapInt32Int32DefaultEntryHolder.defaultEntry);
       }
       return mapInt32Int32_;
     }
-
     public int getMapInt32Int32Count() {
       return internalGetMapInt32Int32().getMap().size();
     }
-
     /**
-     *
-     *
      * <pre>
      * Map
      * </pre>
@@ -7369,21 +6381,20 @@ public int getMapInt32Int32Count() {
      * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
      */
     @java.lang.Override
-    public boolean containsMapInt32Int32(int key) {
+    public boolean containsMapInt32Int32(
+        int key) {
 
       return internalGetMapInt32Int32().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapInt32Int32Map()} instead. */
+    /**
+     * Use {@link #getMapInt32Int32Map()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32() {
       return getMapInt32Int32Map();
     }
-
     /**
-     *
-     *
      * <pre>
      * Map
      * </pre>
@@ -7394,10 +6405,7 @@ public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32() {
     public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32Map() {
       return internalGetMapInt32Int32().getMap();
     }
-
     /**
-     *
-     *
      * <pre>
      * Map
      * </pre>
@@ -7405,15 +6413,15 @@ public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32Map()
      * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
      */
     @java.lang.Override
-    public int getMapInt32Int32OrDefault(int key, int defaultValue) {
+    public int getMapInt32Int32OrDefault(
+        int key,
+        int defaultValue) {
 
-      java.util.Map<java.lang.Integer, java.lang.Integer> map = internalGetMapInt32Int32().getMap();
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapInt32Int32().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
     /**
-     *
-     *
      * <pre>
      * Map
      * </pre>
@@ -7421,9 +6429,11 @@ public int getMapInt32Int32OrDefault(int key, int defaultValue) {
      * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
      */
     @java.lang.Override
-    public int getMapInt32Int32OrThrow(int key) {
+    public int getMapInt32Int32OrThrow(
+        int key) {
 
-      java.util.Map<java.lang.Integer, java.lang.Integer> map = internalGetMapInt32Int32().getMap();
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetMapInt32Int32().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -7431,67 +6441,76 @@ public int getMapInt32Int32OrThrow(int key) {
     }
 
     public static final int MAP_INT64_INT64_FIELD_NUMBER = 57;
-
     private static final class MapInt64Int64DefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Long, java.lang.Long>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt64Int64Entry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.INT64,
-              0L,
-              com.google.protobuf.WireFormat.FieldType.INT64,
-              0L);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Long, java.lang.Long> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Long, java.lang.Long>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt64Int64Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.INT64,
+                  0L,
+                  com.google.protobuf.WireFormat.FieldType.INT64,
+                  0L);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Long, java.lang.Long> mapInt64Int64_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Long, java.lang.Long> mapInt64Int64_;
     private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
-        internalGetMapInt64Int64() {
+    internalGetMapInt64Int64() {
       if (mapInt64Int64_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapInt64Int64DefaultEntryHolder.defaultEntry);
       }
       return mapInt64Int64_;
     }
-
     public int getMapInt64Int64Count() {
       return internalGetMapInt64Int64().getMap().size();
     }
-
-    /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
     @java.lang.Override
-    public boolean containsMapInt64Int64(long key) {
+    public boolean containsMapInt64Int64(
+        long key) {
 
       return internalGetMapInt64Int64().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapInt64Int64Map()} instead. */
+    /**
+     * Use {@link #getMapInt64Int64Map()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Long, java.lang.Long> getMapInt64Int64() {
       return getMapInt64Int64Map();
     }
-
-    /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Long, java.lang.Long> getMapInt64Int64Map() {
       return internalGetMapInt64Int64().getMap();
     }
-
-    /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
     @java.lang.Override
-    public long getMapInt64Int64OrDefault(long key, long defaultValue) {
+    public long getMapInt64Int64OrDefault(
+        long key,
+        long defaultValue) {
 
-      java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapInt64Int64().getMap();
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapInt64Int64().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
+    /**
+     * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+     */
     @java.lang.Override
-    public long getMapInt64Int64OrThrow(long key) {
+    public long getMapInt64Int64OrThrow(
+        long key) {
 
-      java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapInt64Int64().getMap();
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapInt64Int64().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -7499,66 +6518,73 @@ public long getMapInt64Int64OrThrow(long key) {
     }
 
     public static final int MAP_UINT32_UINT32_FIELD_NUMBER = 58;
-
     private static final class MapUint32Uint32DefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Integer, java.lang.Integer>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint32Uint32Entry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.UINT32,
-              0,
-              com.google.protobuf.WireFormat.FieldType.UINT32,
-              0);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint32Uint32Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.UINT32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.UINT32,
+                  0);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer> mapUint32Uint32_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Integer> mapUint32Uint32_;
     private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-        internalGetMapUint32Uint32() {
+    internalGetMapUint32Uint32() {
       if (mapUint32Uint32_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapUint32Uint32DefaultEntryHolder.defaultEntry);
       }
       return mapUint32Uint32_;
     }
-
     public int getMapUint32Uint32Count() {
       return internalGetMapUint32Uint32().getMap().size();
     }
-
-    /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
     @java.lang.Override
-    public boolean containsMapUint32Uint32(int key) {
+    public boolean containsMapUint32Uint32(
+        int key) {
 
       return internalGetMapUint32Uint32().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapUint32Uint32Map()} instead. */
+    /**
+     * Use {@link #getMapUint32Uint32Map()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Integer, java.lang.Integer> getMapUint32Uint32() {
       return getMapUint32Uint32Map();
     }
-
-    /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Integer, java.lang.Integer> getMapUint32Uint32Map() {
       return internalGetMapUint32Uint32().getMap();
     }
-
-    /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
     @java.lang.Override
-    public int getMapUint32Uint32OrDefault(int key, int defaultValue) {
+    public int getMapUint32Uint32OrDefault(
+        int key,
+        int defaultValue) {
 
       java.util.Map<java.lang.Integer, java.lang.Integer> map =
           internalGetMapUint32Uint32().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
+    /**
+     * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+     */
     @java.lang.Override
-    public int getMapUint32Uint32OrThrow(int key) {
+    public int getMapUint32Uint32OrThrow(
+        int key) {
 
       java.util.Map<java.lang.Integer, java.lang.Integer> map =
           internalGetMapUint32Uint32().getMap();
@@ -7569,67 +6595,76 @@ public int getMapUint32Uint32OrThrow(int key) {
     }
 
     public static final int MAP_UINT64_UINT64_FIELD_NUMBER = 59;
-
     private static final class MapUint64Uint64DefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Long, java.lang.Long>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint64Uint64Entry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.UINT64,
-              0L,
-              com.google.protobuf.WireFormat.FieldType.UINT64,
-              0L);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Long, java.lang.Long> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Long, java.lang.Long>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint64Uint64Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.UINT64,
+                  0L,
+                  com.google.protobuf.WireFormat.FieldType.UINT64,
+                  0L);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Long, java.lang.Long> mapUint64Uint64_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Long, java.lang.Long> mapUint64Uint64_;
     private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
-        internalGetMapUint64Uint64() {
+    internalGetMapUint64Uint64() {
       if (mapUint64Uint64_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapUint64Uint64DefaultEntryHolder.defaultEntry);
       }
       return mapUint64Uint64_;
     }
-
     public int getMapUint64Uint64Count() {
       return internalGetMapUint64Uint64().getMap().size();
     }
-
-    /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
     @java.lang.Override
-    public boolean containsMapUint64Uint64(long key) {
+    public boolean containsMapUint64Uint64(
+        long key) {
 
       return internalGetMapUint64Uint64().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapUint64Uint64Map()} instead. */
+    /**
+     * Use {@link #getMapUint64Uint64Map()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Long, java.lang.Long> getMapUint64Uint64() {
       return getMapUint64Uint64Map();
     }
-
-    /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Long, java.lang.Long> getMapUint64Uint64Map() {
       return internalGetMapUint64Uint64().getMap();
     }
-
-    /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
     @java.lang.Override
-    public long getMapUint64Uint64OrDefault(long key, long defaultValue) {
+    public long getMapUint64Uint64OrDefault(
+        long key,
+        long defaultValue) {
 
-      java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapUint64Uint64().getMap();
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapUint64Uint64().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
+    /**
+     * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+     */
     @java.lang.Override
-    public long getMapUint64Uint64OrThrow(long key) {
+    public long getMapUint64Uint64OrThrow(
+        long key) {
 
-      java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapUint64Uint64().getMap();
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapUint64Uint64().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -7637,66 +6672,73 @@ public long getMapUint64Uint64OrThrow(long key) {
     }
 
     public static final int MAP_SINT32_SINT32_FIELD_NUMBER = 60;
-
     private static final class MapSint32Sint32DefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Integer, java.lang.Integer>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint32Sint32Entry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.SINT32,
-              0,
-              com.google.protobuf.WireFormat.FieldType.SINT32,
-              0);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint32Sint32Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.SINT32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.SINT32,
+                  0);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer> mapSint32Sint32_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Integer> mapSint32Sint32_;
     private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-        internalGetMapSint32Sint32() {
+    internalGetMapSint32Sint32() {
       if (mapSint32Sint32_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapSint32Sint32DefaultEntryHolder.defaultEntry);
       }
       return mapSint32Sint32_;
     }
-
     public int getMapSint32Sint32Count() {
       return internalGetMapSint32Sint32().getMap().size();
     }
-
-    /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
     @java.lang.Override
-    public boolean containsMapSint32Sint32(int key) {
+    public boolean containsMapSint32Sint32(
+        int key) {
 
       return internalGetMapSint32Sint32().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapSint32Sint32Map()} instead. */
+    /**
+     * Use {@link #getMapSint32Sint32Map()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSint32Sint32() {
       return getMapSint32Sint32Map();
     }
-
-    /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSint32Sint32Map() {
       return internalGetMapSint32Sint32().getMap();
     }
-
-    /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
     @java.lang.Override
-    public int getMapSint32Sint32OrDefault(int key, int defaultValue) {
+    public int getMapSint32Sint32OrDefault(
+        int key,
+        int defaultValue) {
 
       java.util.Map<java.lang.Integer, java.lang.Integer> map =
           internalGetMapSint32Sint32().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
+    /**
+     * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+     */
     @java.lang.Override
-    public int getMapSint32Sint32OrThrow(int key) {
+    public int getMapSint32Sint32OrThrow(
+        int key) {
 
       java.util.Map<java.lang.Integer, java.lang.Integer> map =
           internalGetMapSint32Sint32().getMap();
@@ -7707,67 +6749,76 @@ public int getMapSint32Sint32OrThrow(int key) {
     }
 
     public static final int MAP_SINT64_SINT64_FIELD_NUMBER = 61;
-
     private static final class MapSint64Sint64DefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Long, java.lang.Long>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint64Sint64Entry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.SINT64,
-              0L,
-              com.google.protobuf.WireFormat.FieldType.SINT64,
-              0L);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Long, java.lang.Long> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Long, java.lang.Long>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint64Sint64Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.SINT64,
+                  0L,
+                  com.google.protobuf.WireFormat.FieldType.SINT64,
+                  0L);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Long, java.lang.Long> mapSint64Sint64_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Long, java.lang.Long> mapSint64Sint64_;
     private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
-        internalGetMapSint64Sint64() {
+    internalGetMapSint64Sint64() {
       if (mapSint64Sint64_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapSint64Sint64DefaultEntryHolder.defaultEntry);
       }
       return mapSint64Sint64_;
     }
-
     public int getMapSint64Sint64Count() {
       return internalGetMapSint64Sint64().getMap().size();
     }
-
-    /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
     @java.lang.Override
-    public boolean containsMapSint64Sint64(long key) {
+    public boolean containsMapSint64Sint64(
+        long key) {
 
       return internalGetMapSint64Sint64().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapSint64Sint64Map()} instead. */
+    /**
+     * Use {@link #getMapSint64Sint64Map()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Long, java.lang.Long> getMapSint64Sint64() {
       return getMapSint64Sint64Map();
     }
-
-    /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Long, java.lang.Long> getMapSint64Sint64Map() {
       return internalGetMapSint64Sint64().getMap();
     }
-
-    /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
     @java.lang.Override
-    public long getMapSint64Sint64OrDefault(long key, long defaultValue) {
+    public long getMapSint64Sint64OrDefault(
+        long key,
+        long defaultValue) {
 
-      java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapSint64Sint64().getMap();
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapSint64Sint64().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
+    /**
+     * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+     */
     @java.lang.Override
-    public long getMapSint64Sint64OrThrow(long key) {
+    public long getMapSint64Sint64OrThrow(
+        long key) {
 
-      java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapSint64Sint64().getMap();
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapSint64Sint64().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -7775,66 +6826,73 @@ public long getMapSint64Sint64OrThrow(long key) {
     }
 
     public static final int MAP_FIXED32_FIXED32_FIELD_NUMBER = 62;
-
     private static final class MapFixed32Fixed32DefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Integer, java.lang.Integer>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed32Fixed32Entry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.FIXED32,
-              0,
-              com.google.protobuf.WireFormat.FieldType.FIXED32,
-              0);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed32Fixed32Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.FIXED32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.FIXED32,
+                  0);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer> mapFixed32Fixed32_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Integer> mapFixed32Fixed32_;
     private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-        internalGetMapFixed32Fixed32() {
+    internalGetMapFixed32Fixed32() {
       if (mapFixed32Fixed32_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapFixed32Fixed32DefaultEntryHolder.defaultEntry);
       }
       return mapFixed32Fixed32_;
     }
-
     public int getMapFixed32Fixed32Count() {
       return internalGetMapFixed32Fixed32().getMap().size();
     }
-
-    /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
     @java.lang.Override
-    public boolean containsMapFixed32Fixed32(int key) {
+    public boolean containsMapFixed32Fixed32(
+        int key) {
 
       return internalGetMapFixed32Fixed32().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapFixed32Fixed32Map()} instead. */
+    /**
+     * Use {@link #getMapFixed32Fixed32Map()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Integer, java.lang.Integer> getMapFixed32Fixed32() {
       return getMapFixed32Fixed32Map();
     }
-
-    /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Integer, java.lang.Integer> getMapFixed32Fixed32Map() {
       return internalGetMapFixed32Fixed32().getMap();
     }
-
-    /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
     @java.lang.Override
-    public int getMapFixed32Fixed32OrDefault(int key, int defaultValue) {
+    public int getMapFixed32Fixed32OrDefault(
+        int key,
+        int defaultValue) {
 
       java.util.Map<java.lang.Integer, java.lang.Integer> map =
           internalGetMapFixed32Fixed32().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
+    /**
+     * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+     */
     @java.lang.Override
-    public int getMapFixed32Fixed32OrThrow(int key) {
+    public int getMapFixed32Fixed32OrThrow(
+        int key) {
 
       java.util.Map<java.lang.Integer, java.lang.Integer> map =
           internalGetMapFixed32Fixed32().getMap();
@@ -7845,67 +6903,76 @@ public int getMapFixed32Fixed32OrThrow(int key) {
     }
 
     public static final int MAP_FIXED64_FIXED64_FIELD_NUMBER = 63;
-
     private static final class MapFixed64Fixed64DefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Long, java.lang.Long>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed64Fixed64Entry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.FIXED64,
-              0L,
-              com.google.protobuf.WireFormat.FieldType.FIXED64,
-              0L);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Long, java.lang.Long> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Long, java.lang.Long>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed64Fixed64Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.FIXED64,
+                  0L,
+                  com.google.protobuf.WireFormat.FieldType.FIXED64,
+                  0L);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Long, java.lang.Long> mapFixed64Fixed64_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Long, java.lang.Long> mapFixed64Fixed64_;
     private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
-        internalGetMapFixed64Fixed64() {
+    internalGetMapFixed64Fixed64() {
       if (mapFixed64Fixed64_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapFixed64Fixed64DefaultEntryHolder.defaultEntry);
       }
       return mapFixed64Fixed64_;
     }
-
     public int getMapFixed64Fixed64Count() {
       return internalGetMapFixed64Fixed64().getMap().size();
     }
-
-    /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
     @java.lang.Override
-    public boolean containsMapFixed64Fixed64(long key) {
+    public boolean containsMapFixed64Fixed64(
+        long key) {
 
       return internalGetMapFixed64Fixed64().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapFixed64Fixed64Map()} instead. */
+    /**
+     * Use {@link #getMapFixed64Fixed64Map()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Long, java.lang.Long> getMapFixed64Fixed64() {
       return getMapFixed64Fixed64Map();
     }
-
-    /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Long, java.lang.Long> getMapFixed64Fixed64Map() {
       return internalGetMapFixed64Fixed64().getMap();
     }
-
-    /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
     @java.lang.Override
-    public long getMapFixed64Fixed64OrDefault(long key, long defaultValue) {
+    public long getMapFixed64Fixed64OrDefault(
+        long key,
+        long defaultValue) {
 
-      java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapFixed64Fixed64().getMap();
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapFixed64Fixed64().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
+    /**
+     * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+     */
     @java.lang.Override
-    public long getMapFixed64Fixed64OrThrow(long key) {
+    public long getMapFixed64Fixed64OrThrow(
+        long key) {
 
-      java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapFixed64Fixed64().getMap();
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapFixed64Fixed64().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -7913,66 +6980,73 @@ public long getMapFixed64Fixed64OrThrow(long key) {
     }
 
     public static final int MAP_SFIXED32_SFIXED32_FIELD_NUMBER = 64;
-
     private static final class MapSfixed32Sfixed32DefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Integer, java.lang.Integer>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed32Sfixed32Entry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.SFIXED32,
-              0,
-              com.google.protobuf.WireFormat.FieldType.SFIXED32,
-              0);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed32Sfixed32Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.SFIXED32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.SFIXED32,
+                  0);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer> mapSfixed32Sfixed32_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Integer> mapSfixed32Sfixed32_;
     private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-        internalGetMapSfixed32Sfixed32() {
+    internalGetMapSfixed32Sfixed32() {
       if (mapSfixed32Sfixed32_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry);
       }
       return mapSfixed32Sfixed32_;
     }
-
     public int getMapSfixed32Sfixed32Count() {
       return internalGetMapSfixed32Sfixed32().getMap().size();
     }
-
-    /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
     @java.lang.Override
-    public boolean containsMapSfixed32Sfixed32(int key) {
+    public boolean containsMapSfixed32Sfixed32(
+        int key) {
 
       return internalGetMapSfixed32Sfixed32().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapSfixed32Sfixed32Map()} instead. */
+    /**
+     * Use {@link #getMapSfixed32Sfixed32Map()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSfixed32Sfixed32() {
       return getMapSfixed32Sfixed32Map();
     }
-
-    /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSfixed32Sfixed32Map() {
       return internalGetMapSfixed32Sfixed32().getMap();
     }
-
-    /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
     @java.lang.Override
-    public int getMapSfixed32Sfixed32OrDefault(int key, int defaultValue) {
+    public int getMapSfixed32Sfixed32OrDefault(
+        int key,
+        int defaultValue) {
 
       java.util.Map<java.lang.Integer, java.lang.Integer> map =
           internalGetMapSfixed32Sfixed32().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
+    /**
+     * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+     */
     @java.lang.Override
-    public int getMapSfixed32Sfixed32OrThrow(int key) {
+    public int getMapSfixed32Sfixed32OrThrow(
+        int key) {
 
       java.util.Map<java.lang.Integer, java.lang.Integer> map =
           internalGetMapSfixed32Sfixed32().getMap();
@@ -7983,67 +7057,76 @@ public int getMapSfixed32Sfixed32OrThrow(int key) {
     }
 
     public static final int MAP_SFIXED64_SFIXED64_FIELD_NUMBER = 65;
-
     private static final class MapSfixed64Sfixed64DefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Long, java.lang.Long>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed64Sfixed64Entry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.SFIXED64,
-              0L,
-              com.google.protobuf.WireFormat.FieldType.SFIXED64,
-              0L);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Long, java.lang.Long> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Long, java.lang.Long>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed64Sfixed64Entry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.SFIXED64,
+                  0L,
+                  com.google.protobuf.WireFormat.FieldType.SFIXED64,
+                  0L);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Long, java.lang.Long> mapSfixed64Sfixed64_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Long, java.lang.Long> mapSfixed64Sfixed64_;
     private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
-        internalGetMapSfixed64Sfixed64() {
+    internalGetMapSfixed64Sfixed64() {
       if (mapSfixed64Sfixed64_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry);
       }
       return mapSfixed64Sfixed64_;
     }
-
     public int getMapSfixed64Sfixed64Count() {
       return internalGetMapSfixed64Sfixed64().getMap().size();
     }
-
-    /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
     @java.lang.Override
-    public boolean containsMapSfixed64Sfixed64(long key) {
+    public boolean containsMapSfixed64Sfixed64(
+        long key) {
 
       return internalGetMapSfixed64Sfixed64().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapSfixed64Sfixed64Map()} instead. */
+    /**
+     * Use {@link #getMapSfixed64Sfixed64Map()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Long, java.lang.Long> getMapSfixed64Sfixed64() {
       return getMapSfixed64Sfixed64Map();
     }
-
-    /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Long, java.lang.Long> getMapSfixed64Sfixed64Map() {
       return internalGetMapSfixed64Sfixed64().getMap();
     }
-
-    /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
     @java.lang.Override
-    public long getMapSfixed64Sfixed64OrDefault(long key, long defaultValue) {
+    public long getMapSfixed64Sfixed64OrDefault(
+        long key,
+        long defaultValue) {
 
-      java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapSfixed64Sfixed64().getMap();
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapSfixed64Sfixed64().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
+    /**
+     * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+     */
     @java.lang.Override
-    public long getMapSfixed64Sfixed64OrThrow(long key) {
+    public long getMapSfixed64Sfixed64OrThrow(
+        long key) {
 
-      java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapSfixed64Sfixed64().getMap();
+      java.util.Map<java.lang.Long, java.lang.Long> map =
+          internalGetMapSfixed64Sfixed64().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -8051,67 +7134,76 @@ public long getMapSfixed64Sfixed64OrThrow(long key) {
     }
 
     public static final int MAP_INT32_FLOAT_FIELD_NUMBER = 66;
-
     private static final class MapInt32FloatDefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Integer, java.lang.Float>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32FloatEntry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.INT32,
-              0,
-              com.google.protobuf.WireFormat.FieldType.FLOAT,
-              0F);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Float> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Float>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32FloatEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.INT32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.FLOAT,
+                  0F);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float> mapInt32Float_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Float> mapInt32Float_;
     private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float>
-        internalGetMapInt32Float() {
+    internalGetMapInt32Float() {
       if (mapInt32Float_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapInt32FloatDefaultEntryHolder.defaultEntry);
       }
       return mapInt32Float_;
     }
-
     public int getMapInt32FloatCount() {
       return internalGetMapInt32Float().getMap().size();
     }
-
-    /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
     @java.lang.Override
-    public boolean containsMapInt32Float(int key) {
+    public boolean containsMapInt32Float(
+        int key) {
 
       return internalGetMapInt32Float().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapInt32FloatMap()} instead. */
+    /**
+     * Use {@link #getMapInt32FloatMap()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Integer, java.lang.Float> getMapInt32Float() {
       return getMapInt32FloatMap();
     }
-
-    /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Integer, java.lang.Float> getMapInt32FloatMap() {
       return internalGetMapInt32Float().getMap();
     }
-
-    /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
     @java.lang.Override
-    public float getMapInt32FloatOrDefault(int key, float defaultValue) {
+    public float getMapInt32FloatOrDefault(
+        int key,
+        float defaultValue) {
 
-      java.util.Map<java.lang.Integer, java.lang.Float> map = internalGetMapInt32Float().getMap();
+      java.util.Map<java.lang.Integer, java.lang.Float> map =
+          internalGetMapInt32Float().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
+    /**
+     * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+     */
     @java.lang.Override
-    public float getMapInt32FloatOrThrow(int key) {
+    public float getMapInt32FloatOrThrow(
+        int key) {
 
-      java.util.Map<java.lang.Integer, java.lang.Float> map = internalGetMapInt32Float().getMap();
+      java.util.Map<java.lang.Integer, java.lang.Float> map =
+          internalGetMapInt32Float().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -8119,67 +7211,76 @@ public float getMapInt32FloatOrThrow(int key) {
     }
 
     public static final int MAP_INT32_DOUBLE_FIELD_NUMBER = 67;
-
     private static final class MapInt32DoubleDefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Double> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Integer, java.lang.Double>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32DoubleEntry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.INT32,
-              0,
-              com.google.protobuf.WireFormat.FieldType.DOUBLE,
-              0D);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Double> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Double>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32DoubleEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.INT32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.DOUBLE,
+                  0D);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Double> mapInt32Double_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Double> mapInt32Double_;
     private com.google.protobuf.MapField<java.lang.Integer, java.lang.Double>
-        internalGetMapInt32Double() {
+    internalGetMapInt32Double() {
       if (mapInt32Double_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapInt32DoubleDefaultEntryHolder.defaultEntry);
       }
       return mapInt32Double_;
     }
-
     public int getMapInt32DoubleCount() {
       return internalGetMapInt32Double().getMap().size();
     }
-
-    /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
     @java.lang.Override
-    public boolean containsMapInt32Double(int key) {
+    public boolean containsMapInt32Double(
+        int key) {
 
       return internalGetMapInt32Double().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapInt32DoubleMap()} instead. */
+    /**
+     * Use {@link #getMapInt32DoubleMap()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Integer, java.lang.Double> getMapInt32Double() {
       return getMapInt32DoubleMap();
     }
-
-    /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Integer, java.lang.Double> getMapInt32DoubleMap() {
       return internalGetMapInt32Double().getMap();
     }
-
-    /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
     @java.lang.Override
-    public double getMapInt32DoubleOrDefault(int key, double defaultValue) {
+    public double getMapInt32DoubleOrDefault(
+        int key,
+        double defaultValue) {
 
-      java.util.Map<java.lang.Integer, java.lang.Double> map = internalGetMapInt32Double().getMap();
+      java.util.Map<java.lang.Integer, java.lang.Double> map =
+          internalGetMapInt32Double().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
+    /**
+     * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+     */
     @java.lang.Override
-    public double getMapInt32DoubleOrThrow(int key) {
+    public double getMapInt32DoubleOrThrow(
+        int key) {
 
-      java.util.Map<java.lang.Integer, java.lang.Double> map = internalGetMapInt32Double().getMap();
+      java.util.Map<java.lang.Integer, java.lang.Double> map =
+          internalGetMapInt32Double().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -8187,67 +7288,76 @@ public double getMapInt32DoubleOrThrow(int key) {
     }
 
     public static final int MAP_BOOL_BOOL_FIELD_NUMBER = 68;
-
     private static final class MapBoolBoolDefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.Boolean, java.lang.Boolean> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.Boolean, java.lang.Boolean>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapBoolBoolEntry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.BOOL,
-              false,
-              com.google.protobuf.WireFormat.FieldType.BOOL,
-              false);
+      static final com.google.protobuf.MapEntry<
+          java.lang.Boolean, java.lang.Boolean> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Boolean, java.lang.Boolean>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapBoolBoolEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.BOOL,
+                  false,
+                  com.google.protobuf.WireFormat.FieldType.BOOL,
+                  false);
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.Boolean, java.lang.Boolean> mapBoolBool_;
-
+    private com.google.protobuf.MapField<
+        java.lang.Boolean, java.lang.Boolean> mapBoolBool_;
     private com.google.protobuf.MapField<java.lang.Boolean, java.lang.Boolean>
-        internalGetMapBoolBool() {
+    internalGetMapBoolBool() {
       if (mapBoolBool_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapBoolBoolDefaultEntryHolder.defaultEntry);
       }
       return mapBoolBool_;
     }
-
     public int getMapBoolBoolCount() {
       return internalGetMapBoolBool().getMap().size();
     }
-
-    /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
     @java.lang.Override
-    public boolean containsMapBoolBool(boolean key) {
+    public boolean containsMapBoolBool(
+        boolean key) {
 
       return internalGetMapBoolBool().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapBoolBoolMap()} instead. */
+    /**
+     * Use {@link #getMapBoolBoolMap()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.Boolean, java.lang.Boolean> getMapBoolBool() {
       return getMapBoolBoolMap();
     }
-
-    /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.Boolean, java.lang.Boolean> getMapBoolBoolMap() {
       return internalGetMapBoolBool().getMap();
     }
-
-    /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
     @java.lang.Override
-    public boolean getMapBoolBoolOrDefault(boolean key, boolean defaultValue) {
+    public boolean getMapBoolBoolOrDefault(
+        boolean key,
+        boolean defaultValue) {
 
-      java.util.Map<java.lang.Boolean, java.lang.Boolean> map = internalGetMapBoolBool().getMap();
+      java.util.Map<java.lang.Boolean, java.lang.Boolean> map =
+          internalGetMapBoolBool().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
+    /**
+     * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+     */
     @java.lang.Override
-    public boolean getMapBoolBoolOrThrow(boolean key) {
+    public boolean getMapBoolBoolOrThrow(
+        boolean key) {
 
-      java.util.Map<java.lang.Boolean, java.lang.Boolean> map = internalGetMapBoolBool().getMap();
+      java.util.Map<java.lang.Boolean, java.lang.Boolean> map =
+          internalGetMapBoolBool().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -8255,76 +7365,78 @@ public boolean getMapBoolBoolOrThrow(boolean key) {
     }
 
     public static final int MAP_STRING_STRING_FIELD_NUMBER = 69;
-
     private static final class MapStringStringDefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.String, java.lang.String> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.String, java.lang.String>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringStringEntry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.STRING,
-              "",
-              com.google.protobuf.WireFormat.FieldType.STRING,
-              "");
+      static final com.google.protobuf.MapEntry<
+          java.lang.String, java.lang.String> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.String, java.lang.String>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringStringEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "");
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.String, java.lang.String> mapStringString_;
-
+    private com.google.protobuf.MapField<
+        java.lang.String, java.lang.String> mapStringString_;
     private com.google.protobuf.MapField<java.lang.String, java.lang.String>
-        internalGetMapStringString() {
+    internalGetMapStringString() {
       if (mapStringString_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapStringStringDefaultEntryHolder.defaultEntry);
       }
       return mapStringString_;
     }
-
     public int getMapStringStringCount() {
       return internalGetMapStringString().getMap().size();
     }
-
-    /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
     @java.lang.Override
-    public boolean containsMapStringString(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public boolean containsMapStringString(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
       return internalGetMapStringString().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapStringStringMap()} instead. */
+    /**
+     * Use {@link #getMapStringStringMap()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, java.lang.String> getMapStringString() {
       return getMapStringStringMap();
     }
-
-    /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.String, java.lang.String> getMapStringStringMap() {
       return internalGetMapStringString().getMap();
     }
-
-    /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
     @java.lang.Override
-    public /* nullable */ java.lang.String getMapStringStringOrDefault(
+    public /* nullable */
+java.lang.String getMapStringStringOrDefault(
         java.lang.String key,
         /* nullable */
-        java.lang.String defaultValue) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
-      java.util.Map<java.lang.String, java.lang.String> map = internalGetMapStringString().getMap();
+java.lang.String defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, java.lang.String> map =
+          internalGetMapStringString().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
+    /**
+     * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+     */
     @java.lang.Override
-    public java.lang.String getMapStringStringOrThrow(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
-      java.util.Map<java.lang.String, java.lang.String> map = internalGetMapStringString().getMap();
+    public java.lang.String getMapStringStringOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, java.lang.String> map =
+          internalGetMapStringString().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -8332,79 +7444,76 @@ public java.lang.String getMapStringStringOrThrow(java.lang.String key) {
     }
 
     public static final int MAP_STRING_BYTES_FIELD_NUMBER = 70;
-
     private static final class MapStringBytesDefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.String, com.google.protobuf.ByteString>
-          defaultEntry =
+      static final com.google.protobuf.MapEntry<
+          java.lang.String, com.google.protobuf.ByteString> defaultEntry =
               com.google.protobuf.MapEntry
-                  .<java.lang.String, com.google.protobuf.ByteString>newDefaultInstance(
-                      legacy_gencode_test.proto3.Proto3GencodeTestProto
-                          .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringBytesEntry_descriptor,
-                      com.google.protobuf.WireFormat.FieldType.STRING,
-                      "",
-                      com.google.protobuf.WireFormat.FieldType.BYTES,
-                      com.google.protobuf.ByteString.EMPTY);
+              .<java.lang.String, com.google.protobuf.ByteString>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringBytesEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.BYTES,
+                  com.google.protobuf.ByteString.EMPTY);
     }
-
     @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<
+        java.lang.String, com.google.protobuf.ByteString> mapStringBytes_;
     private com.google.protobuf.MapField<java.lang.String, com.google.protobuf.ByteString>
-        mapStringBytes_;
-
-    private com.google.protobuf.MapField<java.lang.String, com.google.protobuf.ByteString>
-        internalGetMapStringBytes() {
+    internalGetMapStringBytes() {
       if (mapStringBytes_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapStringBytesDefaultEntryHolder.defaultEntry);
       }
       return mapStringBytes_;
     }
-
     public int getMapStringBytesCount() {
       return internalGetMapStringBytes().getMap().size();
     }
-
-    /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
     @java.lang.Override
-    public boolean containsMapStringBytes(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public boolean containsMapStringBytes(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
       return internalGetMapStringBytes().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapStringBytesMap()} instead. */
+    /**
+     * Use {@link #getMapStringBytesMap()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, com.google.protobuf.ByteString> getMapStringBytes() {
       return getMapStringBytesMap();
     }
-
-    /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
     @java.lang.Override
     public java.util.Map<java.lang.String, com.google.protobuf.ByteString> getMapStringBytesMap() {
       return internalGetMapStringBytes().getMap();
     }
-
-    /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
     @java.lang.Override
-    public /* nullable */ com.google.protobuf.ByteString getMapStringBytesOrDefault(
+    public /* nullable */
+com.google.protobuf.ByteString getMapStringBytesOrDefault(
         java.lang.String key,
         /* nullable */
-        com.google.protobuf.ByteString defaultValue) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+com.google.protobuf.ByteString defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
       java.util.Map<java.lang.String, com.google.protobuf.ByteString> map =
           internalGetMapStringBytes().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
-    /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
+    /**
+     * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+     */
     @java.lang.Override
-    public com.google.protobuf.ByteString getMapStringBytesOrThrow(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public com.google.protobuf.ByteString getMapStringBytesOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
       java.util.Map<java.lang.String, com.google.protobuf.ByteString> map =
           internalGetMapStringBytes().getMap();
       if (!map.containsKey(key)) {
@@ -8414,121 +7523,78 @@ public com.google.protobuf.ByteString getMapStringBytesOrThrow(java.lang.String
     }
 
     public static final int MAP_STRING_NESTED_MESSAGE_FIELD_NUMBER = 71;
-
     private static final class MapStringNestedMessageDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-          defaultEntry =
+          java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> defaultEntry =
               com.google.protobuf.MapEntry
-                  .<java.lang.String,
-                      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                          .NestedMessage>
-                      newDefaultInstance(
-                          legacy_gencode_test.proto3.Proto3GencodeTestProto
-                              .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedMessageEntry_descriptor,
-                          com.google.protobuf.WireFormat.FieldType.STRING,
-                          "",
-                          com.google.protobuf.WireFormat.FieldType.MESSAGE,
-                          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                              .NestedMessage.getDefaultInstance());
+              .<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedMessageEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.MESSAGE,
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance());
     }
-
     @SuppressWarnings("serial")
     private com.google.protobuf.MapField<
-            java.lang.String,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-        mapStringNestedMessage_;
-
-    private com.google.protobuf.MapField<
-            java.lang.String,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-        internalGetMapStringNestedMessage() {
+        java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> mapStringNestedMessage_;
+    private com.google.protobuf.MapField<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
+    internalGetMapStringNestedMessage() {
       if (mapStringNestedMessage_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapStringNestedMessageDefaultEntryHolder.defaultEntry);
       }
       return mapStringNestedMessage_;
     }
-
     public int getMapStringNestedMessageCount() {
       return internalGetMapStringNestedMessage().getMap().size();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
      */
     @java.lang.Override
-    public boolean containsMapStringNestedMessage(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public boolean containsMapStringNestedMessage(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
       return internalGetMapStringNestedMessage().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapStringNestedMessageMap()} instead. */
+    /**
+     * Use {@link #getMapStringNestedMessageMap()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
-    public java.util.Map<
-            java.lang.String,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-        getMapStringNestedMessage() {
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> getMapStringNestedMessage() {
       return getMapStringNestedMessageMap();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
      */
     @java.lang.Override
-    public java.util.Map<
-            java.lang.String,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-        getMapStringNestedMessageMap() {
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> getMapStringNestedMessageMap() {
       return internalGetMapStringNestedMessage().getMap();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
      */
     @java.lang.Override
-    public /* nullable */ legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-            .NestedMessage
-        getMapStringNestedMessageOrDefault(
-            java.lang.String key,
-            /* nullable */
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                defaultValue) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
-      java.util.Map<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-          map = internalGetMapStringNestedMessage().getMap();
+    public /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getMapStringNestedMessageOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> map =
+          internalGetMapStringNestedMessage().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-        getMapStringNestedMessageOrThrow(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
-      java.util.Map<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-          map = internalGetMapStringNestedMessage().getMap();
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getMapStringNestedMessageOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> map =
+          internalGetMapStringNestedMessage().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -8536,111 +7602,78 @@ public boolean containsMapStringNestedMessage(java.lang.String key) {
     }
 
     public static final int MAP_STRING_FOREIGN_MESSAGE_FIELD_NUMBER = 72;
-
     private static final class MapStringForeignMessageDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
-              java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-          defaultEntry =
+          java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> defaultEntry =
               com.google.protobuf.MapEntry
-                  .<java.lang.String,
-                      legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-                      newDefaultInstance(
-                          legacy_gencode_test.proto3.Proto3GencodeTestProto
-                              .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignMessageEntry_descriptor,
-                          com.google.protobuf.WireFormat.FieldType.STRING,
-                          "",
-                          com.google.protobuf.WireFormat.FieldType.MESSAGE,
-                          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-                              .getDefaultInstance());
+              .<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignMessageEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.MESSAGE,
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance());
     }
-
     @SuppressWarnings("serial")
     private com.google.protobuf.MapField<
-            java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-        mapStringForeignMessage_;
-
-    private com.google.protobuf.MapField<
-            java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-        internalGetMapStringForeignMessage() {
+        java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> mapStringForeignMessage_;
+    private com.google.protobuf.MapField<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
+    internalGetMapStringForeignMessage() {
       if (mapStringForeignMessage_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapStringForeignMessageDefaultEntryHolder.defaultEntry);
       }
       return mapStringForeignMessage_;
     }
-
     public int getMapStringForeignMessageCount() {
       return internalGetMapStringForeignMessage().getMap().size();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
      */
     @java.lang.Override
-    public boolean containsMapStringForeignMessage(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public boolean containsMapStringForeignMessage(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
       return internalGetMapStringForeignMessage().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapStringForeignMessageMap()} instead. */
+    /**
+     * Use {@link #getMapStringForeignMessageMap()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
-    public java.util.Map<
-            java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-        getMapStringForeignMessage() {
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> getMapStringForeignMessage() {
       return getMapStringForeignMessageMap();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
      */
     @java.lang.Override
-    public java.util.Map<
-            java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-        getMapStringForeignMessageMap() {
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> getMapStringForeignMessageMap() {
       return internalGetMapStringForeignMessage().getMap();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
      */
     @java.lang.Override
-    public /* nullable */ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        getMapStringForeignMessageOrDefault(
-            java.lang.String key,
-            /* nullable */
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage defaultValue) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
-      java.util.Map<
-              java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-          map = internalGetMapStringForeignMessage().getMap();
+    public /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getMapStringForeignMessageOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> map =
+          internalGetMapStringForeignMessage().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        getMapStringForeignMessageOrThrow(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
-      java.util.Map<
-              java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-          map = internalGetMapStringForeignMessage().getMap();
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getMapStringForeignMessageOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> map =
+          internalGetMapStringForeignMessage().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -8648,126 +7681,93 @@ public boolean containsMapStringForeignMessage(java.lang.String key) {
     }
 
     public static final int MAP_STRING_NESTED_ENUM_FIELD_NUMBER = 73;
-
     private static final class MapStringNestedEnumDefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.String, java.lang.Integer>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedEnumEntry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.STRING,
-              "",
-              com.google.protobuf.WireFormat.FieldType.ENUM,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.FOO
-                  .getNumber());
+      static final com.google.protobuf.MapEntry<
+          java.lang.String, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.String, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedEnumEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.ENUM,
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.FOO.getNumber());
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.String, java.lang.Integer> mapStringNestedEnum_;
-
+    private com.google.protobuf.MapField<
+        java.lang.String, java.lang.Integer> mapStringNestedEnum_;
     private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
-        internalGetMapStringNestedEnum() {
+    internalGetMapStringNestedEnum() {
       if (mapStringNestedEnum_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapStringNestedEnumDefaultEntryHolder.defaultEntry);
       }
       return mapStringNestedEnum_;
     }
-
-    private static final com.google.protobuf.Internal.MapAdapter.Converter<
-            java.lang.Integer,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        mapStringNestedEnumValueConverter =
+    private static final
+    com.google.protobuf.Internal.MapAdapter.Converter<
+        java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> mapStringNestedEnumValueConverter =
             com.google.protobuf.Internal.MapAdapter.newEnumConverter(
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                    .internalGetValueMap(),
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                    .UNRECOGNIZED);
-
-    private static final java.util.Map<
-            java.lang.String,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        internalGetAdaptedMapStringNestedEnumMap(
-            java.util.Map<java.lang.String, java.lang.Integer> map) {
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.internalGetValueMap(),
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.UNRECOGNIZED);
+    private static final java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
+    internalGetAdaptedMapStringNestedEnumMap(
+        java.util.Map<java.lang.String, java.lang.Integer> map) {
       return new com.google.protobuf.Internal.MapAdapter<
-          java.lang.String,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum,
-          java.lang.Integer>(map, mapStringNestedEnumValueConverter);
+          java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum, java.lang.Integer>(
+              map, mapStringNestedEnumValueConverter);
     }
-
     public int getMapStringNestedEnumCount() {
       return internalGetMapStringNestedEnum().getMap().size();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
      */
     @java.lang.Override
-    public boolean containsMapStringNestedEnum(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public boolean containsMapStringNestedEnum(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
       return internalGetMapStringNestedEnum().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapStringNestedEnumMap()} instead. */
+    /**
+     * Use {@link #getMapStringNestedEnumMap()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
-    public java.util.Map<
-            java.lang.String,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        getMapStringNestedEnum() {
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
+    getMapStringNestedEnum() {
       return getMapStringNestedEnumMap();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
      */
     @java.lang.Override
-    public java.util.Map<
-            java.lang.String,
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-        getMapStringNestedEnumMap() {
-      return internalGetAdaptedMapStringNestedEnumMap(internalGetMapStringNestedEnum().getMap());
-    }
-
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
+    getMapStringNestedEnumMap() {
+      return internalGetAdaptedMapStringNestedEnumMap(
+          internalGetMapStringNestedEnum().getMap());}
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
      */
     @java.lang.Override
-    public /* nullable */ legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-            .NestedEnum
-        getMapStringNestedEnumOrDefault(
-            java.lang.String key,
-            /* nullable */
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                defaultValue) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getMapStringNestedEnumOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
       java.util.Map<java.lang.String, java.lang.Integer> map =
           internalGetMapStringNestedEnum().getMap();
       return map.containsKey(key)
-          ? mapStringNestedEnumValueConverter.doForward(map.get(key))
-          : defaultValue;
+             ? mapStringNestedEnumValueConverter.doForward(map.get(key))
+             : defaultValue;
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getMapStringNestedEnumOrThrow(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getMapStringNestedEnumOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
       java.util.Map<java.lang.String, java.lang.Integer> map =
           internalGetMapStringNestedEnum().getMap();
       if (!map.containsKey(key)) {
@@ -8775,49 +7775,42 @@ public boolean containsMapStringNestedEnum(java.lang.String key) {
       }
       return mapStringNestedEnumValueConverter.doForward(map.get(key));
     }
-
-    /** Use {@link #getMapStringNestedEnumValueMap()} instead. */
+    /**
+     * Use {@link #getMapStringNestedEnumValueMap()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
-    public java.util.Map<java.lang.String, java.lang.Integer> getMapStringNestedEnumValue() {
+    public java.util.Map<java.lang.String, java.lang.Integer>
+    getMapStringNestedEnumValue() {
       return getMapStringNestedEnumValueMap();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
      */
     @java.lang.Override
-    public java.util.Map<java.lang.String, java.lang.Integer> getMapStringNestedEnumValueMap() {
+    public java.util.Map<java.lang.String, java.lang.Integer>
+    getMapStringNestedEnumValueMap() {
       return internalGetMapStringNestedEnum().getMap();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
      */
     @java.lang.Override
-    public int getMapStringNestedEnumValueOrDefault(java.lang.String key, int defaultValue) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public int getMapStringNestedEnumValueOrDefault(
+        java.lang.String key,
+        int defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
       java.util.Map<java.lang.String, java.lang.Integer> map =
           internalGetMapStringNestedEnum().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
      */
     @java.lang.Override
-    public int getMapStringNestedEnumValueOrThrow(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public int getMapStringNestedEnumValueOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
       java.util.Map<java.lang.String, java.lang.Integer> map =
           internalGetMapStringNestedEnum().getMap();
       if (!map.containsKey(key)) {
@@ -8827,118 +7820,93 @@ public int getMapStringNestedEnumValueOrThrow(java.lang.String key) {
     }
 
     public static final int MAP_STRING_FOREIGN_ENUM_FIELD_NUMBER = 74;
-
     private static final class MapStringForeignEnumDefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer> defaultEntry =
-          com.google.protobuf.MapEntry.<java.lang.String, java.lang.Integer>newDefaultInstance(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto
-                  .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignEnumEntry_descriptor,
-              com.google.protobuf.WireFormat.FieldType.STRING,
-              "",
-              com.google.protobuf.WireFormat.FieldType.ENUM,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.FOREIGN_FOO
-                  .getNumber());
+      static final com.google.protobuf.MapEntry<
+          java.lang.String, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.String, java.lang.Integer>newDefaultInstance(
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignEnumEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.ENUM,
+                  legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.FOREIGN_FOO.getNumber());
     }
-
     @SuppressWarnings("serial")
-    private com.google.protobuf.MapField<java.lang.String, java.lang.Integer> mapStringForeignEnum_;
-
+    private com.google.protobuf.MapField<
+        java.lang.String, java.lang.Integer> mapStringForeignEnum_;
     private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
-        internalGetMapStringForeignEnum() {
+    internalGetMapStringForeignEnum() {
       if (mapStringForeignEnum_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             MapStringForeignEnumDefaultEntryHolder.defaultEntry);
       }
       return mapStringForeignEnum_;
     }
-
-    private static final com.google.protobuf.Internal.MapAdapter.Converter<
-            java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-        mapStringForeignEnumValueConverter =
+    private static final
+    com.google.protobuf.Internal.MapAdapter.Converter<
+        java.lang.Integer, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum> mapStringForeignEnumValueConverter =
             com.google.protobuf.Internal.MapAdapter.newEnumConverter(
                 legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.internalGetValueMap(),
                 legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.UNRECOGNIZED);
-
-    private static final java.util.Map<
-            java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-        internalGetAdaptedMapStringForeignEnumMap(
-            java.util.Map<java.lang.String, java.lang.Integer> map) {
+    private static final java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
+    internalGetAdaptedMapStringForeignEnumMap(
+        java.util.Map<java.lang.String, java.lang.Integer> map) {
       return new com.google.protobuf.Internal.MapAdapter<
-          java.lang.String,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum,
-          java.lang.Integer>(map, mapStringForeignEnumValueConverter);
+          java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum, java.lang.Integer>(
+              map, mapStringForeignEnumValueConverter);
     }
-
     public int getMapStringForeignEnumCount() {
       return internalGetMapStringForeignEnum().getMap().size();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
      */
     @java.lang.Override
-    public boolean containsMapStringForeignEnum(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public boolean containsMapStringForeignEnum(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
       return internalGetMapStringForeignEnum().getMap().containsKey(key);
     }
-
-    /** Use {@link #getMapStringForeignEnumMap()} instead. */
+    /**
+     * Use {@link #getMapStringForeignEnumMap()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
-    public java.util.Map<
-            java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-        getMapStringForeignEnum() {
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
+    getMapStringForeignEnum() {
       return getMapStringForeignEnumMap();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
      */
     @java.lang.Override
-    public java.util.Map<
-            java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-        getMapStringForeignEnumMap() {
-      return internalGetAdaptedMapStringForeignEnumMap(internalGetMapStringForeignEnum().getMap());
-    }
-
+    public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
+    getMapStringForeignEnumMap() {
+      return internalGetAdaptedMapStringForeignEnumMap(
+          internalGetMapStringForeignEnum().getMap());}
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
      */
     @java.lang.Override
-    public /* nullable */ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum
-        getMapStringForeignEnumOrDefault(
-            java.lang.String key,
-            /* nullable */
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum defaultValue) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getMapStringForeignEnumOrDefault(
+        java.lang.String key,
+        /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
       java.util.Map<java.lang.String, java.lang.Integer> map =
           internalGetMapStringForeignEnum().getMap();
       return map.containsKey(key)
-          ? mapStringForeignEnumValueConverter.doForward(map.get(key))
-          : defaultValue;
+             ? mapStringForeignEnumValueConverter.doForward(map.get(key))
+             : defaultValue;
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum
-        getMapStringForeignEnumOrThrow(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getMapStringForeignEnumOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
       java.util.Map<java.lang.String, java.lang.Integer> map =
           internalGetMapStringForeignEnum().getMap();
       if (!map.containsKey(key)) {
@@ -8946,49 +7914,42 @@ public boolean containsMapStringForeignEnum(java.lang.String key) {
       }
       return mapStringForeignEnumValueConverter.doForward(map.get(key));
     }
-
-    /** Use {@link #getMapStringForeignEnumValueMap()} instead. */
+    /**
+     * Use {@link #getMapStringForeignEnumValueMap()} instead.
+     */
     @java.lang.Override
     @java.lang.Deprecated
-    public java.util.Map<java.lang.String, java.lang.Integer> getMapStringForeignEnumValue() {
+    public java.util.Map<java.lang.String, java.lang.Integer>
+    getMapStringForeignEnumValue() {
       return getMapStringForeignEnumValueMap();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
      */
     @java.lang.Override
-    public java.util.Map<java.lang.String, java.lang.Integer> getMapStringForeignEnumValueMap() {
+    public java.util.Map<java.lang.String, java.lang.Integer>
+    getMapStringForeignEnumValueMap() {
       return internalGetMapStringForeignEnum().getMap();
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
      */
     @java.lang.Override
-    public int getMapStringForeignEnumValueOrDefault(java.lang.String key, int defaultValue) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public int getMapStringForeignEnumValueOrDefault(
+        java.lang.String key,
+        int defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
       java.util.Map<java.lang.String, java.lang.Integer> map =
           internalGetMapStringForeignEnum().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
-
     /**
-     * <code>
-     * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-     * </code>
+     * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
      */
     @java.lang.Override
-    public int getMapStringForeignEnumValueOrThrow(java.lang.String key) {
-      if (key == null) {
-        throw new NullPointerException("map key");
-      }
+    public int getMapStringForeignEnumValueOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
       java.util.Map<java.lang.String, java.lang.Integer> map =
           internalGetMapStringForeignEnum().getMap();
       if (!map.containsKey(key)) {
@@ -8998,20 +7959,16 @@ public int getMapStringForeignEnumValueOrThrow(java.lang.String key) {
     }
 
     public static final int ONEOF_UINT32_FIELD_NUMBER = 111;
-
     /**
      * <code>uint32 oneof_uint32 = 111;</code>
-     *
      * @return Whether the oneofUint32 field is set.
      */
     @java.lang.Override
     public boolean hasOneofUint32() {
       return oneofFieldCase_ == 111;
     }
-
     /**
      * <code>uint32 oneof_uint32 = 111;</code>
-     *
      * @return The oneofUint32.
      */
     @java.lang.Override
@@ -9023,68 +7980,46 @@ public int getOneofUint32() {
     }
 
     public static final int ONEOF_NESTED_MESSAGE_FIELD_NUMBER = 112;
-
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
      * @return Whether the oneofNestedMessage field is set.
      */
     @java.lang.Override
     public boolean hasOneofNestedMessage() {
       return oneofFieldCase_ == 112;
     }
-
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-     * </code>
-     *
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
      * @return The oneofNestedMessage.
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-        getOneofNestedMessage() {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getOneofNestedMessage() {
       if (oneofFieldCase_ == 112) {
-        return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage)
-            oneofField_;
+         return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) oneofField_;
       }
-      return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-          .getDefaultInstance();
+      return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance();
     }
-
     /**
-     * <code>
-     * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-     * </code>
+     * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
      */
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-            .NestedMessageOrBuilder
-        getOneofNestedMessageOrBuilder() {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder getOneofNestedMessageOrBuilder() {
       if (oneofFieldCase_ == 112) {
-        return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage)
-            oneofField_;
+         return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) oneofField_;
       }
-      return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-          .getDefaultInstance();
+      return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance();
     }
 
     public static final int ONEOF_STRING_FIELD_NUMBER = 113;
-
     /**
      * <code>string oneof_string = 113;</code>
-     *
      * @return Whether the oneofString field is set.
      */
     public boolean hasOneofString() {
       return oneofFieldCase_ == 113;
     }
-
     /**
      * <code>string oneof_string = 113;</code>
-     *
      * @return The oneofString.
      */
     public java.lang.String getOneofString() {
@@ -9095,7 +8030,8 @@ public java.lang.String getOneofString() {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (oneofFieldCase_ == 113) {
           oneofField_ = s;
@@ -9103,20 +8039,20 @@ public java.lang.String getOneofString() {
         return s;
       }
     }
-
     /**
      * <code>string oneof_string = 113;</code>
-     *
      * @return The bytes for oneofString.
      */
-    public com.google.protobuf.ByteString getOneofStringBytes() {
+    public com.google.protobuf.ByteString
+        getOneofStringBytes() {
       java.lang.Object ref = "";
       if (oneofFieldCase_ == 113) {
         ref = oneofField_;
       }
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
         if (oneofFieldCase_ == 113) {
           oneofField_ = b;
         }
@@ -9127,20 +8063,16 @@ public com.google.protobuf.ByteString getOneofStringBytes() {
     }
 
     public static final int ONEOF_BYTES_FIELD_NUMBER = 114;
-
     /**
      * <code>bytes oneof_bytes = 114;</code>
-     *
      * @return Whether the oneofBytes field is set.
      */
     @java.lang.Override
     public boolean hasOneofBytes() {
       return oneofFieldCase_ == 114;
     }
-
     /**
      * <code>bytes oneof_bytes = 114;</code>
-     *
      * @return The oneofBytes.
      */
     @java.lang.Override
@@ -9152,20 +8084,16 @@ public com.google.protobuf.ByteString getOneofBytes() {
     }
 
     public static final int ONEOF_BOOL_FIELD_NUMBER = 115;
-
     /**
      * <code>bool oneof_bool = 115;</code>
-     *
      * @return Whether the oneofBool field is set.
      */
     @java.lang.Override
     public boolean hasOneofBool() {
       return oneofFieldCase_ == 115;
     }
-
     /**
      * <code>bool oneof_bool = 115;</code>
-     *
      * @return The oneofBool.
      */
     @java.lang.Override
@@ -9177,20 +8105,16 @@ public boolean getOneofBool() {
     }
 
     public static final int ONEOF_UINT64_FIELD_NUMBER = 116;
-
     /**
      * <code>uint64 oneof_uint64 = 116;</code>
-     *
      * @return Whether the oneofUint64 field is set.
      */
     @java.lang.Override
     public boolean hasOneofUint64() {
       return oneofFieldCase_ == 116;
     }
-
     /**
      * <code>uint64 oneof_uint64 = 116;</code>
-     *
      * @return The oneofUint64.
      */
     @java.lang.Override
@@ -9202,20 +8126,16 @@ public long getOneofUint64() {
     }
 
     public static final int ONEOF_FLOAT_FIELD_NUMBER = 117;
-
     /**
      * <code>float oneof_float = 117;</code>
-     *
      * @return Whether the oneofFloat field is set.
      */
     @java.lang.Override
     public boolean hasOneofFloat() {
       return oneofFieldCase_ == 117;
     }
-
     /**
      * <code>float oneof_float = 117;</code>
-     *
      * @return The oneofFloat.
      */
     @java.lang.Override
@@ -9227,20 +8147,16 @@ public float getOneofFloat() {
     }
 
     public static final int ONEOF_DOUBLE_FIELD_NUMBER = 118;
-
     /**
      * <code>double oneof_double = 118;</code>
-     *
      * @return Whether the oneofDouble field is set.
      */
     @java.lang.Override
     public boolean hasOneofDouble() {
       return oneofFieldCase_ == 118;
     }
-
     /**
      * <code>double oneof_double = 118;</code>
-     *
      * @return The oneofDouble.
      */
     @java.lang.Override
@@ -9252,19 +8168,15 @@ public double getOneofDouble() {
     }
 
     public static final int ONEOF_ENUM_FIELD_NUMBER = 119;
-
     /**
      * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-     *
      * @return Whether the oneofEnum field is set.
      */
     public boolean hasOneofEnum() {
       return oneofFieldCase_ == 119;
     }
-
     /**
      * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-     *
      * @return The enum numeric value on the wire for oneofEnum.
      */
     public int getOneofEnumValue() {
@@ -9273,28 +8185,20 @@ public int getOneofEnumValue() {
       }
       return 0;
     }
-
     /**
      * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-     *
      * @return The oneofEnum.
      */
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-        getOneofEnum() {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getOneofEnum() {
       if (oneofFieldCase_ == 119) {
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum result =
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                .forNumber((java.lang.Integer) oneofField_);
-        return result == null
-            ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                .UNRECOGNIZED
-            : result;
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.forNumber(
+            (java.lang.Integer) oneofField_);
+        return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.UNRECOGNIZED : result;
       }
       return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.FOO;
     }
 
     private byte memoizedIsInitialized = -1;
-
     @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
@@ -9306,7 +8210,8 @@ public final boolean isInitialized() {
     }
 
     @java.lang.Override
-    public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
       getSerializedSize();
       if (optionalInt32_ != 0) {
         output.writeInt32(1, optionalInt32_);
@@ -9359,20 +8264,13 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(19, getOptionalForeignMessage());
       }
-      if (optionalNestedEnum_
-          != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.FOO
-              .getNumber()) {
+      if (optionalNestedEnum_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.FOO.getNumber()) {
         output.writeEnum(21, optionalNestedEnum_);
       }
-      if (optionalForeignEnum_
-          != legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.FOREIGN_FOO
-              .getNumber()) {
+      if (optionalForeignEnum_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.FOREIGN_FOO.getNumber()) {
         output.writeEnum(22, optionalForeignEnum_);
       }
-      if (optionalAliasedEnum_
-          != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum
-              .ALIAS_FOO
-              .getNumber()) {
+      if (optionalAliasedEnum_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum.ALIAS_FOO.getNumber()) {
         output.writeEnum(23, optionalAliasedEnum_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
@@ -9495,64 +8393,116 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       for (int i = 0; i < repeatedForeignEnum_.size(); i++) {
         output.writeEnumNoTag(repeatedForeignEnum_.getInt(i));
       }
-      com.google.protobuf.GeneratedMessage.serializeIntegerMapTo(
-          output, internalGetMapInt32Int32(), MapInt32Int32DefaultEntryHolder.defaultEntry, 56);
-      com.google.protobuf.GeneratedMessage.serializeLongMapTo(
-          output, internalGetMapInt64Int64(), MapInt64Int64DefaultEntryHolder.defaultEntry, 57);
-      com.google.protobuf.GeneratedMessage.serializeIntegerMapTo(
-          output, internalGetMapUint32Uint32(), MapUint32Uint32DefaultEntryHolder.defaultEntry, 58);
-      com.google.protobuf.GeneratedMessage.serializeLongMapTo(
-          output, internalGetMapUint64Uint64(), MapUint64Uint64DefaultEntryHolder.defaultEntry, 59);
-      com.google.protobuf.GeneratedMessage.serializeIntegerMapTo(
-          output, internalGetMapSint32Sint32(), MapSint32Sint32DefaultEntryHolder.defaultEntry, 60);
-      com.google.protobuf.GeneratedMessage.serializeLongMapTo(
-          output, internalGetMapSint64Sint64(), MapSint64Sint64DefaultEntryHolder.defaultEntry, 61);
-      com.google.protobuf.GeneratedMessage.serializeIntegerMapTo(
+      com.google.protobuf.GeneratedMessage
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapInt32Int32(),
+          MapInt32Int32DefaultEntryHolder.defaultEntry,
+          56);
+      com.google.protobuf.GeneratedMessage
+        .serializeLongMapTo(
+          output,
+          internalGetMapInt64Int64(),
+          MapInt64Int64DefaultEntryHolder.defaultEntry,
+          57);
+      com.google.protobuf.GeneratedMessage
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapUint32Uint32(),
+          MapUint32Uint32DefaultEntryHolder.defaultEntry,
+          58);
+      com.google.protobuf.GeneratedMessage
+        .serializeLongMapTo(
+          output,
+          internalGetMapUint64Uint64(),
+          MapUint64Uint64DefaultEntryHolder.defaultEntry,
+          59);
+      com.google.protobuf.GeneratedMessage
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapSint32Sint32(),
+          MapSint32Sint32DefaultEntryHolder.defaultEntry,
+          60);
+      com.google.protobuf.GeneratedMessage
+        .serializeLongMapTo(
+          output,
+          internalGetMapSint64Sint64(),
+          MapSint64Sint64DefaultEntryHolder.defaultEntry,
+          61);
+      com.google.protobuf.GeneratedMessage
+        .serializeIntegerMapTo(
           output,
           internalGetMapFixed32Fixed32(),
           MapFixed32Fixed32DefaultEntryHolder.defaultEntry,
           62);
-      com.google.protobuf.GeneratedMessage.serializeLongMapTo(
+      com.google.protobuf.GeneratedMessage
+        .serializeLongMapTo(
           output,
           internalGetMapFixed64Fixed64(),
           MapFixed64Fixed64DefaultEntryHolder.defaultEntry,
           63);
-      com.google.protobuf.GeneratedMessage.serializeIntegerMapTo(
+      com.google.protobuf.GeneratedMessage
+        .serializeIntegerMapTo(
           output,
           internalGetMapSfixed32Sfixed32(),
           MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry,
           64);
-      com.google.protobuf.GeneratedMessage.serializeLongMapTo(
+      com.google.protobuf.GeneratedMessage
+        .serializeLongMapTo(
           output,
           internalGetMapSfixed64Sfixed64(),
           MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry,
           65);
-      com.google.protobuf.GeneratedMessage.serializeIntegerMapTo(
-          output, internalGetMapInt32Float(), MapInt32FloatDefaultEntryHolder.defaultEntry, 66);
-      com.google.protobuf.GeneratedMessage.serializeIntegerMapTo(
-          output, internalGetMapInt32Double(), MapInt32DoubleDefaultEntryHolder.defaultEntry, 67);
-      com.google.protobuf.GeneratedMessage.serializeBooleanMapTo(
-          output, internalGetMapBoolBool(), MapBoolBoolDefaultEntryHolder.defaultEntry, 68);
-      com.google.protobuf.GeneratedMessage.serializeStringMapTo(
-          output, internalGetMapStringString(), MapStringStringDefaultEntryHolder.defaultEntry, 69);
-      com.google.protobuf.GeneratedMessage.serializeStringMapTo(
-          output, internalGetMapStringBytes(), MapStringBytesDefaultEntryHolder.defaultEntry, 70);
-      com.google.protobuf.GeneratedMessage.serializeStringMapTo(
+      com.google.protobuf.GeneratedMessage
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapInt32Float(),
+          MapInt32FloatDefaultEntryHolder.defaultEntry,
+          66);
+      com.google.protobuf.GeneratedMessage
+        .serializeIntegerMapTo(
+          output,
+          internalGetMapInt32Double(),
+          MapInt32DoubleDefaultEntryHolder.defaultEntry,
+          67);
+      com.google.protobuf.GeneratedMessage
+        .serializeBooleanMapTo(
+          output,
+          internalGetMapBoolBool(),
+          MapBoolBoolDefaultEntryHolder.defaultEntry,
+          68);
+      com.google.protobuf.GeneratedMessage
+        .serializeStringMapTo(
+          output,
+          internalGetMapStringString(),
+          MapStringStringDefaultEntryHolder.defaultEntry,
+          69);
+      com.google.protobuf.GeneratedMessage
+        .serializeStringMapTo(
+          output,
+          internalGetMapStringBytes(),
+          MapStringBytesDefaultEntryHolder.defaultEntry,
+          70);
+      com.google.protobuf.GeneratedMessage
+        .serializeStringMapTo(
           output,
           internalGetMapStringNestedMessage(),
           MapStringNestedMessageDefaultEntryHolder.defaultEntry,
           71);
-      com.google.protobuf.GeneratedMessage.serializeStringMapTo(
+      com.google.protobuf.GeneratedMessage
+        .serializeStringMapTo(
           output,
           internalGetMapStringForeignMessage(),
           MapStringForeignMessageDefaultEntryHolder.defaultEntry,
           72);
-      com.google.protobuf.GeneratedMessage.serializeStringMapTo(
+      com.google.protobuf.GeneratedMessage
+        .serializeStringMapTo(
           output,
           internalGetMapStringNestedEnum(),
           MapStringNestedEnumDefaultEntryHolder.defaultEntry,
           73);
-      com.google.protobuf.GeneratedMessage.serializeStringMapTo(
+      com.google.protobuf.GeneratedMessage
+        .serializeStringMapTo(
           output,
           internalGetMapStringForeignEnum(),
           MapStringForeignEnumDefaultEntryHolder.defaultEntry,
@@ -9698,31 +8648,34 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
         output.writeEnum(102, unpackedNestedEnum_.getInt(i));
       }
       if (oneofFieldCase_ == 111) {
-        output.writeUInt32(111, (int) ((java.lang.Integer) oneofField_));
+        output.writeUInt32(
+            111, (int)((java.lang.Integer) oneofField_));
       }
       if (oneofFieldCase_ == 112) {
-        output.writeMessage(
-            112,
-            (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage)
-                oneofField_);
+        output.writeMessage(112, (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) oneofField_);
       }
       if (oneofFieldCase_ == 113) {
         com.google.protobuf.GeneratedMessage.writeString(output, 113, oneofField_);
       }
       if (oneofFieldCase_ == 114) {
-        output.writeBytes(114, (com.google.protobuf.ByteString) oneofField_);
+        output.writeBytes(
+            114, (com.google.protobuf.ByteString) oneofField_);
       }
       if (oneofFieldCase_ == 115) {
-        output.writeBool(115, (boolean) ((java.lang.Boolean) oneofField_));
+        output.writeBool(
+            115, (boolean)((java.lang.Boolean) oneofField_));
       }
       if (oneofFieldCase_ == 116) {
-        output.writeUInt64(116, (long) ((java.lang.Long) oneofField_));
+        output.writeUInt64(
+            116, (long)((java.lang.Long) oneofField_));
       }
       if (oneofFieldCase_ == 117) {
-        output.writeFloat(117, (float) ((java.lang.Float) oneofField_));
+        output.writeFloat(
+            117, (float)((java.lang.Float) oneofField_));
       }
       if (oneofFieldCase_ == 118) {
-        output.writeDouble(118, (double) ((java.lang.Double) oneofField_));
+        output.writeDouble(
+            118, (double)((java.lang.Double) oneofField_));
       }
       if (oneofFieldCase_ == 119) {
         output.writeEnum(119, ((java.lang.Integer) oneofField_));
@@ -9737,159 +8690,169 @@ public int getSerializedSize() {
 
       size = 0;
       if (optionalInt32_ != 0) {
-        size += com.google.protobuf.CodedOutputStream.computeInt32Size(1, optionalInt32_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(1, optionalInt32_);
       }
       if (optionalInt64_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream.computeInt64Size(2, optionalInt64_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt64Size(2, optionalInt64_);
       }
       if (optionalUint32_ != 0) {
-        size += com.google.protobuf.CodedOutputStream.computeUInt32Size(3, optionalUint32_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(3, optionalUint32_);
       }
       if (optionalUint64_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream.computeUInt64Size(4, optionalUint64_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(4, optionalUint64_);
       }
       if (optionalSint32_ != 0) {
-        size += com.google.protobuf.CodedOutputStream.computeSInt32Size(5, optionalSint32_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeSInt32Size(5, optionalSint32_);
       }
       if (optionalSint64_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream.computeSInt64Size(6, optionalSint64_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeSInt64Size(6, optionalSint64_);
       }
       if (optionalFixed32_ != 0) {
-        size += com.google.protobuf.CodedOutputStream.computeFixed32Size(7, optionalFixed32_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeFixed32Size(7, optionalFixed32_);
       }
       if (optionalFixed64_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream.computeFixed64Size(8, optionalFixed64_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeFixed64Size(8, optionalFixed64_);
       }
       if (optionalSfixed32_ != 0) {
-        size += com.google.protobuf.CodedOutputStream.computeSFixed32Size(9, optionalSfixed32_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeSFixed32Size(9, optionalSfixed32_);
       }
       if (optionalSfixed64_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream.computeSFixed64Size(10, optionalSfixed64_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeSFixed64Size(10, optionalSfixed64_);
       }
       if (java.lang.Float.floatToRawIntBits(optionalFloat_) != 0) {
-        size += com.google.protobuf.CodedOutputStream.computeFloatSize(11, optionalFloat_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeFloatSize(11, optionalFloat_);
       }
       if (java.lang.Double.doubleToRawLongBits(optionalDouble_) != 0) {
-        size += com.google.protobuf.CodedOutputStream.computeDoubleSize(12, optionalDouble_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeDoubleSize(12, optionalDouble_);
       }
       if (optionalBool_ != false) {
-        size += com.google.protobuf.CodedOutputStream.computeBoolSize(13, optionalBool_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(13, optionalBool_);
       }
       if (!com.google.protobuf.GeneratedMessage.isStringEmpty(optionalString_)) {
         size += com.google.protobuf.GeneratedMessage.computeStringSize(14, optionalString_);
       }
       if (!optionalBytes_.isEmpty()) {
-        size += com.google.protobuf.CodedOutputStream.computeBytesSize(15, optionalBytes_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(15, optionalBytes_);
       }
       if (((bitField0_ & 0x00000001) != 0)) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeMessageSize(
-                18, getOptionalNestedMessage());
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(18, getOptionalNestedMessage());
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeMessageSize(
-                19, getOptionalForeignMessage());
-      }
-      if (optionalNestedEnum_
-          != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.FOO
-              .getNumber()) {
-        size += com.google.protobuf.CodedOutputStream.computeEnumSize(21, optionalNestedEnum_);
-      }
-      if (optionalForeignEnum_
-          != legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.FOREIGN_FOO
-              .getNumber()) {
-        size += com.google.protobuf.CodedOutputStream.computeEnumSize(22, optionalForeignEnum_);
-      }
-      if (optionalAliasedEnum_
-          != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum
-              .ALIAS_FOO
-              .getNumber()) {
-        size += com.google.protobuf.CodedOutputStream.computeEnumSize(23, optionalAliasedEnum_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(19, getOptionalForeignMessage());
+      }
+      if (optionalNestedEnum_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.FOO.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(21, optionalNestedEnum_);
+      }
+      if (optionalForeignEnum_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.FOREIGN_FOO.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(22, optionalForeignEnum_);
+      }
+      if (optionalAliasedEnum_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum.ALIAS_FOO.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(23, optionalAliasedEnum_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(27, getRecursiveMessage());
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(27, getRecursiveMessage());
       }
       {
         int dataSize = 0;
         for (int i = 0; i < repeatedInt32_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(repeatedInt32_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt32SizeNoTag(repeatedInt32_.getInt(i));
         }
         size += dataSize;
         if (!getRepeatedInt32List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedInt32MemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < repeatedInt64_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeInt64SizeNoTag(
-                  repeatedInt64_.getLong(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt64SizeNoTag(repeatedInt64_.getLong(i));
         }
         size += dataSize;
         if (!getRepeatedInt64List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedInt64MemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < repeatedUint32_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeUInt32SizeNoTag(
-                  repeatedUint32_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(repeatedUint32_.getInt(i));
         }
         size += dataSize;
         if (!getRepeatedUint32List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedUint32MemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < repeatedUint64_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeUInt64SizeNoTag(
-                  repeatedUint64_.getLong(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt64SizeNoTag(repeatedUint64_.getLong(i));
         }
         size += dataSize;
         if (!getRepeatedUint64List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedUint64MemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < repeatedSint32_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeSInt32SizeNoTag(
-                  repeatedSint32_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt32SizeNoTag(repeatedSint32_.getInt(i));
         }
         size += dataSize;
         if (!getRepeatedSint32List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedSint32MemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < repeatedSint64_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeSInt64SizeNoTag(
-                  repeatedSint64_.getLong(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt64SizeNoTag(repeatedSint64_.getLong(i));
         }
         size += dataSize;
         if (!getRepeatedSint64List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedSint64MemoizedSerializedSize = dataSize;
       }
@@ -9899,7 +8862,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getRepeatedFixed32List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedFixed32MemoizedSerializedSize = dataSize;
       }
@@ -9909,7 +8873,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getRepeatedFixed64List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedFixed64MemoizedSerializedSize = dataSize;
       }
@@ -9919,7 +8884,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getRepeatedSfixed32List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedSfixed32MemoizedSerializedSize = dataSize;
       }
@@ -9929,7 +8895,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getRepeatedSfixed64List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedSfixed64MemoizedSerializedSize = dataSize;
       }
@@ -9939,7 +8906,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getRepeatedFloatList().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedFloatMemoizedSerializedSize = dataSize;
       }
@@ -9949,7 +8917,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getRepeatedDoubleList().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedDoubleMemoizedSerializedSize = dataSize;
       }
@@ -9959,7 +8928,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getRepeatedBoolList().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         repeatedBoolMemoizedSerializedSize = dataSize;
       }
@@ -9974,329 +8944,315 @@ public int getSerializedSize() {
       {
         int dataSize = 0;
         for (int i = 0; i < repeatedBytes_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeBytesSizeNoTag(repeatedBytes_.get(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeBytesSizeNoTag(repeatedBytes_.get(i));
         }
         size += dataSize;
         size += 2 * getRepeatedBytesList().size();
       }
       for (int i = 0; i < repeatedNestedMessage_.size(); i++) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeMessageSize(
-                48, repeatedNestedMessage_.get(i));
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(48, repeatedNestedMessage_.get(i));
       }
       for (int i = 0; i < repeatedForeignMessage_.size(); i++) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeMessageSize(
-                49, repeatedForeignMessage_.get(i));
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(49, repeatedForeignMessage_.get(i));
       }
       {
         int dataSize = 0;
         for (int i = 0; i < repeatedNestedEnum_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeEnumSizeNoTag(
-                  repeatedNestedEnum_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeEnumSizeNoTag(repeatedNestedEnum_.getInt(i));
         }
         size += dataSize;
-        if (!getRepeatedNestedEnumList().isEmpty()) {
-          size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeUInt32SizeNoTag(dataSize);
-        }
-        repeatedNestedEnumMemoizedSerializedSize = dataSize;
+        if (!getRepeatedNestedEnumList().isEmpty()) {  size += 2;
+          size += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(dataSize);
+        }repeatedNestedEnumMemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < repeatedForeignEnum_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeEnumSizeNoTag(
-                  repeatedForeignEnum_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeEnumSizeNoTag(repeatedForeignEnum_.getInt(i));
         }
         size += dataSize;
-        if (!getRepeatedForeignEnumList().isEmpty()) {
-          size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeUInt32SizeNoTag(dataSize);
-        }
-        repeatedForeignEnumMemoizedSerializedSize = dataSize;
-      }
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry :
-          internalGetMapInt32Int32().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer> mapInt32Int32__ =
-            MapInt32Int32DefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(56, mapInt32Int32__);
-      }
-      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry :
-          internalGetMapInt64Int64().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> mapInt64Int64__ =
-            MapInt64Int64DefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(57, mapInt64Int64__);
-      }
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry :
-          internalGetMapUint32Uint32().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer> mapUint32Uint32__ =
-            MapUint32Uint32DefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(58, mapUint32Uint32__);
-      }
-      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry :
-          internalGetMapUint64Uint64().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> mapUint64Uint64__ =
-            MapUint64Uint64DefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(59, mapUint64Uint64__);
-      }
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry :
-          internalGetMapSint32Sint32().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer> mapSint32Sint32__ =
-            MapSint32Sint32DefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(60, mapSint32Sint32__);
-      }
-      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry :
-          internalGetMapSint64Sint64().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> mapSint64Sint64__ =
-            MapSint64Sint64DefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(61, mapSint64Sint64__);
-      }
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry :
-          internalGetMapFixed32Fixed32().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer> mapFixed32Fixed32__ =
-            MapFixed32Fixed32DefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(62, mapFixed32Fixed32__);
-      }
-      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry :
-          internalGetMapFixed64Fixed64().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> mapFixed64Fixed64__ =
-            MapFixed64Fixed64DefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(63, mapFixed64Fixed64__);
-      }
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry :
-          internalGetMapSfixed32Sfixed32().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer> mapSfixed32Sfixed32__ =
-            MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(64, mapSfixed32Sfixed32__);
-      }
-      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry :
-          internalGetMapSfixed64Sfixed64().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> mapSfixed64Sfixed64__ =
-            MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(65, mapSfixed64Sfixed64__);
-      }
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Float> entry :
-          internalGetMapInt32Float().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float> mapInt32Float__ =
-            MapInt32FloatDefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(66, mapInt32Float__);
-      }
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Double> entry :
-          internalGetMapInt32Double().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Double> mapInt32Double__ =
-            MapInt32DoubleDefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(67, mapInt32Double__);
-      }
-      for (java.util.Map.Entry<java.lang.Boolean, java.lang.Boolean> entry :
-          internalGetMapBoolBool().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Boolean, java.lang.Boolean> mapBoolBool__ =
-            MapBoolBoolDefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(68, mapBoolBool__);
-      }
-      for (java.util.Map.Entry<java.lang.String, java.lang.String> entry :
-          internalGetMapStringString().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.String, java.lang.String> mapStringString__ =
-            MapStringStringDefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(69, mapStringString__);
-      }
-      for (java.util.Map.Entry<java.lang.String, com.google.protobuf.ByteString> entry :
-          internalGetMapStringBytes().getMap().entrySet()) {
+        if (!getRepeatedForeignEnumList().isEmpty()) {  size += 2;
+          size += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(dataSize);
+        }repeatedForeignEnumMemoizedSerializedSize = dataSize;
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetMapInt32Int32().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        mapInt32Int32__ = MapInt32Int32DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(56, mapInt32Int32__);
+      }
+      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry
+           : internalGetMapInt64Int64().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+        mapInt64Int64__ = MapInt64Int64DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(57, mapInt64Int64__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetMapUint32Uint32().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        mapUint32Uint32__ = MapUint32Uint32DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(58, mapUint32Uint32__);
+      }
+      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry
+           : internalGetMapUint64Uint64().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+        mapUint64Uint64__ = MapUint64Uint64DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(59, mapUint64Uint64__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetMapSint32Sint32().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        mapSint32Sint32__ = MapSint32Sint32DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(60, mapSint32Sint32__);
+      }
+      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry
+           : internalGetMapSint64Sint64().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+        mapSint64Sint64__ = MapSint64Sint64DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(61, mapSint64Sint64__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetMapFixed32Fixed32().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        mapFixed32Fixed32__ = MapFixed32Fixed32DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(62, mapFixed32Fixed32__);
+      }
+      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry
+           : internalGetMapFixed64Fixed64().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+        mapFixed64Fixed64__ = MapFixed64Fixed64DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(63, mapFixed64Fixed64__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetMapSfixed32Sfixed32().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        mapSfixed32Sfixed32__ = MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(64, mapSfixed32Sfixed32__);
+      }
+      for (java.util.Map.Entry<java.lang.Long, java.lang.Long> entry
+           : internalGetMapSfixed64Sfixed64().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+        mapSfixed64Sfixed64__ = MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(65, mapSfixed64Sfixed64__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Float> entry
+           : internalGetMapInt32Float().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float>
+        mapInt32Float__ = MapInt32FloatDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(66, mapInt32Float__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Double> entry
+           : internalGetMapInt32Double().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Double>
+        mapInt32Double__ = MapInt32DoubleDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(67, mapInt32Double__);
+      }
+      for (java.util.Map.Entry<java.lang.Boolean, java.lang.Boolean> entry
+           : internalGetMapBoolBool().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Boolean, java.lang.Boolean>
+        mapBoolBool__ = MapBoolBoolDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(68, mapBoolBool__);
+      }
+      for (java.util.Map.Entry<java.lang.String, java.lang.String> entry
+           : internalGetMapStringString().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, java.lang.String>
+        mapStringString__ = MapStringStringDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(69, mapStringString__);
+      }
+      for (java.util.Map.Entry<java.lang.String, com.google.protobuf.ByteString> entry
+           : internalGetMapStringBytes().getMap().entrySet()) {
         com.google.protobuf.MapEntry<java.lang.String, com.google.protobuf.ByteString>
-            mapStringBytes__ =
-                MapStringBytesDefaultEntryHolder.defaultEntry
-                    .newBuilderForType()
-                    .setKey(entry.getKey())
-                    .setValue(entry.getValue())
-                    .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(70, mapStringBytes__);
-      }
-      for (java.util.Map.Entry<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-          entry : internalGetMapStringNestedMessage().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<
-                java.lang.String,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-            mapStringNestedMessage__ =
-                MapStringNestedMessageDefaultEntryHolder.defaultEntry
-                    .newBuilderForType()
-                    .setKey(entry.getKey())
-                    .setValue(entry.getValue())
-                    .build();
-        size +=
-            com.google.protobuf.CodedOutputStream.computeMessageSize(71, mapStringNestedMessage__);
-      }
-      for (java.util.Map.Entry<
-              java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-          entry : internalGetMapStringForeignMessage().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<
-                java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-            mapStringForeignMessage__ =
-                MapStringForeignMessageDefaultEntryHolder.defaultEntry
-                    .newBuilderForType()
-                    .setKey(entry.getKey())
-                    .setValue(entry.getValue())
-                    .build();
-        size +=
-            com.google.protobuf.CodedOutputStream.computeMessageSize(72, mapStringForeignMessage__);
-      }
-      for (java.util.Map.Entry<java.lang.String, java.lang.Integer> entry :
-          internalGetMapStringNestedEnum().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer> mapStringNestedEnum__ =
-            MapStringNestedEnumDefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size += com.google.protobuf.CodedOutputStream.computeMessageSize(73, mapStringNestedEnum__);
-      }
-      for (java.util.Map.Entry<java.lang.String, java.lang.Integer> entry :
-          internalGetMapStringForeignEnum().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer> mapStringForeignEnum__ =
-            MapStringForeignEnumDefaultEntryHolder.defaultEntry
-                .newBuilderForType()
-                .setKey(entry.getKey())
-                .setValue(entry.getValue())
-                .build();
-        size +=
-            com.google.protobuf.CodedOutputStream.computeMessageSize(74, mapStringForeignEnum__);
+        mapStringBytes__ = MapStringBytesDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(70, mapStringBytes__);
+      }
+      for (java.util.Map.Entry<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> entry
+           : internalGetMapStringNestedMessage().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
+        mapStringNestedMessage__ = MapStringNestedMessageDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(71, mapStringNestedMessage__);
+      }
+      for (java.util.Map.Entry<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> entry
+           : internalGetMapStringForeignMessage().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
+        mapStringForeignMessage__ = MapStringForeignMessageDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(72, mapStringForeignMessage__);
+      }
+      for (java.util.Map.Entry<java.lang.String, java.lang.Integer> entry
+           : internalGetMapStringNestedEnum().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer>
+        mapStringNestedEnum__ = MapStringNestedEnumDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(73, mapStringNestedEnum__);
+      }
+      for (java.util.Map.Entry<java.lang.String, java.lang.Integer> entry
+           : internalGetMapStringForeignEnum().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer>
+        mapStringForeignEnum__ = MapStringForeignEnumDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(74, mapStringForeignEnum__);
       }
       {
         int dataSize = 0;
         for (int i = 0; i < packedInt32_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(packedInt32_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt32SizeNoTag(packedInt32_.getInt(i));
         }
         size += dataSize;
         if (!getPackedInt32List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedInt32MemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < packedInt64_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeInt64SizeNoTag(packedInt64_.getLong(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt64SizeNoTag(packedInt64_.getLong(i));
         }
         size += dataSize;
         if (!getPackedInt64List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedInt64MemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < packedUint32_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeUInt32SizeNoTag(packedUint32_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(packedUint32_.getInt(i));
         }
         size += dataSize;
         if (!getPackedUint32List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedUint32MemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < packedUint64_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeUInt64SizeNoTag(
-                  packedUint64_.getLong(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt64SizeNoTag(packedUint64_.getLong(i));
         }
         size += dataSize;
         if (!getPackedUint64List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedUint64MemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < packedSint32_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeSInt32SizeNoTag(packedSint32_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt32SizeNoTag(packedSint32_.getInt(i));
         }
         size += dataSize;
         if (!getPackedSint32List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedSint32MemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < packedSint64_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeSInt64SizeNoTag(
-                  packedSint64_.getLong(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt64SizeNoTag(packedSint64_.getLong(i));
         }
         size += dataSize;
         if (!getPackedSint64List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedSint64MemoizedSerializedSize = dataSize;
       }
@@ -10306,7 +9262,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getPackedFixed32List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedFixed32MemoizedSerializedSize = dataSize;
       }
@@ -10316,7 +9273,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getPackedFixed64List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedFixed64MemoizedSerializedSize = dataSize;
       }
@@ -10326,7 +9284,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getPackedSfixed32List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedSfixed32MemoizedSerializedSize = dataSize;
       }
@@ -10336,7 +9295,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getPackedSfixed64List().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedSfixed64MemoizedSerializedSize = dataSize;
       }
@@ -10346,7 +9306,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getPackedFloatList().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedFloatMemoizedSerializedSize = dataSize;
       }
@@ -10356,7 +9317,8 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getPackedDoubleList().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedDoubleMemoizedSerializedSize = dataSize;
       }
@@ -10366,29 +9328,28 @@ public int getSerializedSize() {
         size += dataSize;
         if (!getPackedBoolList().isEmpty()) {
           size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
         }
         packedBoolMemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < packedNestedEnum_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeEnumSizeNoTag(
-                  packedNestedEnum_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeEnumSizeNoTag(packedNestedEnum_.getInt(i));
         }
         size += dataSize;
-        if (!getPackedNestedEnumList().isEmpty()) {
-          size += 2;
-          size += com.google.protobuf.CodedOutputStream.computeUInt32SizeNoTag(dataSize);
-        }
-        packedNestedEnumMemoizedSerializedSize = dataSize;
+        if (!getPackedNestedEnumList().isEmpty()) {  size += 2;
+          size += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(dataSize);
+        }packedNestedEnumMemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
         for (int i = 0; i < unpackedInt32_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(unpackedInt32_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt32SizeNoTag(unpackedInt32_.getInt(i));
         }
         size += dataSize;
         size += 2 * getUnpackedInt32List().size();
@@ -10396,9 +9357,8 @@ public int getSerializedSize() {
       {
         int dataSize = 0;
         for (int i = 0; i < unpackedInt64_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeInt64SizeNoTag(
-                  unpackedInt64_.getLong(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt64SizeNoTag(unpackedInt64_.getLong(i));
         }
         size += dataSize;
         size += 2 * getUnpackedInt64List().size();
@@ -10406,9 +9366,8 @@ public int getSerializedSize() {
       {
         int dataSize = 0;
         for (int i = 0; i < unpackedUint32_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeUInt32SizeNoTag(
-                  unpackedUint32_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(unpackedUint32_.getInt(i));
         }
         size += dataSize;
         size += 2 * getUnpackedUint32List().size();
@@ -10416,9 +9375,8 @@ public int getSerializedSize() {
       {
         int dataSize = 0;
         for (int i = 0; i < unpackedUint64_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeUInt64SizeNoTag(
-                  unpackedUint64_.getLong(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt64SizeNoTag(unpackedUint64_.getLong(i));
         }
         size += dataSize;
         size += 2 * getUnpackedUint64List().size();
@@ -10426,9 +9384,8 @@ public int getSerializedSize() {
       {
         int dataSize = 0;
         for (int i = 0; i < unpackedSint32_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeSInt32SizeNoTag(
-                  unpackedSint32_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt32SizeNoTag(unpackedSint32_.getInt(i));
         }
         size += dataSize;
         size += 2 * getUnpackedSint32List().size();
@@ -10436,9 +9393,8 @@ public int getSerializedSize() {
       {
         int dataSize = 0;
         for (int i = 0; i < unpackedSint64_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeSInt64SizeNoTag(
-                  unpackedSint64_.getLong(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeSInt64SizeNoTag(unpackedSint64_.getLong(i));
         }
         size += dataSize;
         size += 2 * getUnpackedSint64List().size();
@@ -10488,58 +9444,52 @@ public int getSerializedSize() {
       {
         int dataSize = 0;
         for (int i = 0; i < unpackedNestedEnum_.size(); i++) {
-          dataSize +=
-              com.google.protobuf.CodedOutputStream.computeEnumSizeNoTag(
-                  unpackedNestedEnum_.getInt(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeEnumSizeNoTag(unpackedNestedEnum_.getInt(i));
         }
         size += dataSize;
         size += 2 * unpackedNestedEnum_.size();
       }
       if (oneofFieldCase_ == 111) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeUInt32Size(
-                111, (int) ((java.lang.Integer) oneofField_));
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(
+              111, (int)((java.lang.Integer) oneofField_));
       }
       if (oneofFieldCase_ == 112) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeMessageSize(
-                112,
-                (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                        .NestedMessage)
-                    oneofField_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(112, (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) oneofField_);
       }
       if (oneofFieldCase_ == 113) {
         size += com.google.protobuf.GeneratedMessage.computeStringSize(113, oneofField_);
       }
       if (oneofFieldCase_ == 114) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeBytesSize(
-                114, (com.google.protobuf.ByteString) oneofField_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(
+              114, (com.google.protobuf.ByteString) oneofField_);
       }
       if (oneofFieldCase_ == 115) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeBoolSize(
-                115, (boolean) ((java.lang.Boolean) oneofField_));
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(
+              115, (boolean)((java.lang.Boolean) oneofField_));
       }
       if (oneofFieldCase_ == 116) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeUInt64Size(
-                116, (long) ((java.lang.Long) oneofField_));
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(
+              116, (long)((java.lang.Long) oneofField_));
       }
       if (oneofFieldCase_ == 117) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeFloatSize(
-                117, (float) ((java.lang.Float) oneofField_));
+        size += com.google.protobuf.CodedOutputStream
+          .computeFloatSize(
+              117, (float)((java.lang.Float) oneofField_));
       }
       if (oneofFieldCase_ == 118) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeDoubleSize(
-                118, (double) ((java.lang.Double) oneofField_));
+        size += com.google.protobuf.CodedOutputStream
+          .computeDoubleSize(
+              118, (double)((java.lang.Double) oneofField_));
       }
       if (oneofFieldCase_ == 119) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeEnumSize(
-                119, ((java.lang.Integer) oneofField_));
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(119, ((java.lang.Integer) oneofField_));
       }
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
@@ -10549,152 +9499,230 @@ public int getSerializedSize() {
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
-        return true;
+       return true;
       }
       if (!(obj instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3)) {
         return super.equals(obj);
       }
-      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 other =
-          (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3) obj;
-
-      if (getOptionalInt32() != other.getOptionalInt32()) return false;
-      if (getOptionalInt64() != other.getOptionalInt64()) return false;
-      if (getOptionalUint32() != other.getOptionalUint32()) return false;
-      if (getOptionalUint64() != other.getOptionalUint64()) return false;
-      if (getOptionalSint32() != other.getOptionalSint32()) return false;
-      if (getOptionalSint64() != other.getOptionalSint64()) return false;
-      if (getOptionalFixed32() != other.getOptionalFixed32()) return false;
-      if (getOptionalFixed64() != other.getOptionalFixed64()) return false;
-      if (getOptionalSfixed32() != other.getOptionalSfixed32()) return false;
-      if (getOptionalSfixed64() != other.getOptionalSfixed64()) return false;
+      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 other = (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3) obj;
+
+      if (getOptionalInt32()
+          != other.getOptionalInt32()) return false;
+      if (getOptionalInt64()
+          != other.getOptionalInt64()) return false;
+      if (getOptionalUint32()
+          != other.getOptionalUint32()) return false;
+      if (getOptionalUint64()
+          != other.getOptionalUint64()) return false;
+      if (getOptionalSint32()
+          != other.getOptionalSint32()) return false;
+      if (getOptionalSint64()
+          != other.getOptionalSint64()) return false;
+      if (getOptionalFixed32()
+          != other.getOptionalFixed32()) return false;
+      if (getOptionalFixed64()
+          != other.getOptionalFixed64()) return false;
+      if (getOptionalSfixed32()
+          != other.getOptionalSfixed32()) return false;
+      if (getOptionalSfixed64()
+          != other.getOptionalSfixed64()) return false;
       if (java.lang.Float.floatToIntBits(getOptionalFloat())
-          != java.lang.Float.floatToIntBits(other.getOptionalFloat())) return false;
+          != java.lang.Float.floatToIntBits(
+              other.getOptionalFloat())) return false;
       if (java.lang.Double.doubleToLongBits(getOptionalDouble())
-          != java.lang.Double.doubleToLongBits(other.getOptionalDouble())) return false;
-      if (getOptionalBool() != other.getOptionalBool()) return false;
-      if (!getOptionalString().equals(other.getOptionalString())) return false;
-      if (!getOptionalBytes().equals(other.getOptionalBytes())) return false;
+          != java.lang.Double.doubleToLongBits(
+              other.getOptionalDouble())) return false;
+      if (getOptionalBool()
+          != other.getOptionalBool()) return false;
+      if (!getOptionalString()
+          .equals(other.getOptionalString())) return false;
+      if (!getOptionalBytes()
+          .equals(other.getOptionalBytes())) return false;
       if (hasOptionalNestedMessage() != other.hasOptionalNestedMessage()) return false;
       if (hasOptionalNestedMessage()) {
-        if (!getOptionalNestedMessage().equals(other.getOptionalNestedMessage())) return false;
+        if (!getOptionalNestedMessage()
+            .equals(other.getOptionalNestedMessage())) return false;
       }
       if (hasOptionalForeignMessage() != other.hasOptionalForeignMessage()) return false;
       if (hasOptionalForeignMessage()) {
-        if (!getOptionalForeignMessage().equals(other.getOptionalForeignMessage())) return false;
+        if (!getOptionalForeignMessage()
+            .equals(other.getOptionalForeignMessage())) return false;
       }
       if (optionalNestedEnum_ != other.optionalNestedEnum_) return false;
       if (optionalForeignEnum_ != other.optionalForeignEnum_) return false;
       if (optionalAliasedEnum_ != other.optionalAliasedEnum_) return false;
       if (hasRecursiveMessage() != other.hasRecursiveMessage()) return false;
       if (hasRecursiveMessage()) {
-        if (!getRecursiveMessage().equals(other.getRecursiveMessage())) return false;
-      }
-      if (!getRepeatedInt32List().equals(other.getRepeatedInt32List())) return false;
-      if (!getRepeatedInt64List().equals(other.getRepeatedInt64List())) return false;
-      if (!getRepeatedUint32List().equals(other.getRepeatedUint32List())) return false;
-      if (!getRepeatedUint64List().equals(other.getRepeatedUint64List())) return false;
-      if (!getRepeatedSint32List().equals(other.getRepeatedSint32List())) return false;
-      if (!getRepeatedSint64List().equals(other.getRepeatedSint64List())) return false;
-      if (!getRepeatedFixed32List().equals(other.getRepeatedFixed32List())) return false;
-      if (!getRepeatedFixed64List().equals(other.getRepeatedFixed64List())) return false;
-      if (!getRepeatedSfixed32List().equals(other.getRepeatedSfixed32List())) return false;
-      if (!getRepeatedSfixed64List().equals(other.getRepeatedSfixed64List())) return false;
-      if (!getRepeatedFloatList().equals(other.getRepeatedFloatList())) return false;
-      if (!getRepeatedDoubleList().equals(other.getRepeatedDoubleList())) return false;
-      if (!getRepeatedBoolList().equals(other.getRepeatedBoolList())) return false;
-      if (!getRepeatedStringList().equals(other.getRepeatedStringList())) return false;
-      if (!getRepeatedBytesList().equals(other.getRepeatedBytesList())) return false;
-      if (!getRepeatedNestedMessageList().equals(other.getRepeatedNestedMessageList()))
-        return false;
-      if (!getRepeatedForeignMessageList().equals(other.getRepeatedForeignMessageList()))
-        return false;
+        if (!getRecursiveMessage()
+            .equals(other.getRecursiveMessage())) return false;
+      }
+      if (!getRepeatedInt32List()
+          .equals(other.getRepeatedInt32List())) return false;
+      if (!getRepeatedInt64List()
+          .equals(other.getRepeatedInt64List())) return false;
+      if (!getRepeatedUint32List()
+          .equals(other.getRepeatedUint32List())) return false;
+      if (!getRepeatedUint64List()
+          .equals(other.getRepeatedUint64List())) return false;
+      if (!getRepeatedSint32List()
+          .equals(other.getRepeatedSint32List())) return false;
+      if (!getRepeatedSint64List()
+          .equals(other.getRepeatedSint64List())) return false;
+      if (!getRepeatedFixed32List()
+          .equals(other.getRepeatedFixed32List())) return false;
+      if (!getRepeatedFixed64List()
+          .equals(other.getRepeatedFixed64List())) return false;
+      if (!getRepeatedSfixed32List()
+          .equals(other.getRepeatedSfixed32List())) return false;
+      if (!getRepeatedSfixed64List()
+          .equals(other.getRepeatedSfixed64List())) return false;
+      if (!getRepeatedFloatList()
+          .equals(other.getRepeatedFloatList())) return false;
+      if (!getRepeatedDoubleList()
+          .equals(other.getRepeatedDoubleList())) return false;
+      if (!getRepeatedBoolList()
+          .equals(other.getRepeatedBoolList())) return false;
+      if (!getRepeatedStringList()
+          .equals(other.getRepeatedStringList())) return false;
+      if (!getRepeatedBytesList()
+          .equals(other.getRepeatedBytesList())) return false;
+      if (!getRepeatedNestedMessageList()
+          .equals(other.getRepeatedNestedMessageList())) return false;
+      if (!getRepeatedForeignMessageList()
+          .equals(other.getRepeatedForeignMessageList())) return false;
       if (!repeatedNestedEnum_.equals(other.repeatedNestedEnum_)) return false;
       if (!repeatedForeignEnum_.equals(other.repeatedForeignEnum_)) return false;
-      if (!getPackedInt32List().equals(other.getPackedInt32List())) return false;
-      if (!getPackedInt64List().equals(other.getPackedInt64List())) return false;
-      if (!getPackedUint32List().equals(other.getPackedUint32List())) return false;
-      if (!getPackedUint64List().equals(other.getPackedUint64List())) return false;
-      if (!getPackedSint32List().equals(other.getPackedSint32List())) return false;
-      if (!getPackedSint64List().equals(other.getPackedSint64List())) return false;
-      if (!getPackedFixed32List().equals(other.getPackedFixed32List())) return false;
-      if (!getPackedFixed64List().equals(other.getPackedFixed64List())) return false;
-      if (!getPackedSfixed32List().equals(other.getPackedSfixed32List())) return false;
-      if (!getPackedSfixed64List().equals(other.getPackedSfixed64List())) return false;
-      if (!getPackedFloatList().equals(other.getPackedFloatList())) return false;
-      if (!getPackedDoubleList().equals(other.getPackedDoubleList())) return false;
-      if (!getPackedBoolList().equals(other.getPackedBoolList())) return false;
+      if (!getPackedInt32List()
+          .equals(other.getPackedInt32List())) return false;
+      if (!getPackedInt64List()
+          .equals(other.getPackedInt64List())) return false;
+      if (!getPackedUint32List()
+          .equals(other.getPackedUint32List())) return false;
+      if (!getPackedUint64List()
+          .equals(other.getPackedUint64List())) return false;
+      if (!getPackedSint32List()
+          .equals(other.getPackedSint32List())) return false;
+      if (!getPackedSint64List()
+          .equals(other.getPackedSint64List())) return false;
+      if (!getPackedFixed32List()
+          .equals(other.getPackedFixed32List())) return false;
+      if (!getPackedFixed64List()
+          .equals(other.getPackedFixed64List())) return false;
+      if (!getPackedSfixed32List()
+          .equals(other.getPackedSfixed32List())) return false;
+      if (!getPackedSfixed64List()
+          .equals(other.getPackedSfixed64List())) return false;
+      if (!getPackedFloatList()
+          .equals(other.getPackedFloatList())) return false;
+      if (!getPackedDoubleList()
+          .equals(other.getPackedDoubleList())) return false;
+      if (!getPackedBoolList()
+          .equals(other.getPackedBoolList())) return false;
       if (!packedNestedEnum_.equals(other.packedNestedEnum_)) return false;
-      if (!getUnpackedInt32List().equals(other.getUnpackedInt32List())) return false;
-      if (!getUnpackedInt64List().equals(other.getUnpackedInt64List())) return false;
-      if (!getUnpackedUint32List().equals(other.getUnpackedUint32List())) return false;
-      if (!getUnpackedUint64List().equals(other.getUnpackedUint64List())) return false;
-      if (!getUnpackedSint32List().equals(other.getUnpackedSint32List())) return false;
-      if (!getUnpackedSint64List().equals(other.getUnpackedSint64List())) return false;
-      if (!getUnpackedFixed32List().equals(other.getUnpackedFixed32List())) return false;
-      if (!getUnpackedFixed64List().equals(other.getUnpackedFixed64List())) return false;
-      if (!getUnpackedSfixed32List().equals(other.getUnpackedSfixed32List())) return false;
-      if (!getUnpackedSfixed64List().equals(other.getUnpackedSfixed64List())) return false;
-      if (!getUnpackedFloatList().equals(other.getUnpackedFloatList())) return false;
-      if (!getUnpackedDoubleList().equals(other.getUnpackedDoubleList())) return false;
-      if (!getUnpackedBoolList().equals(other.getUnpackedBoolList())) return false;
+      if (!getUnpackedInt32List()
+          .equals(other.getUnpackedInt32List())) return false;
+      if (!getUnpackedInt64List()
+          .equals(other.getUnpackedInt64List())) return false;
+      if (!getUnpackedUint32List()
+          .equals(other.getUnpackedUint32List())) return false;
+      if (!getUnpackedUint64List()
+          .equals(other.getUnpackedUint64List())) return false;
+      if (!getUnpackedSint32List()
+          .equals(other.getUnpackedSint32List())) return false;
+      if (!getUnpackedSint64List()
+          .equals(other.getUnpackedSint64List())) return false;
+      if (!getUnpackedFixed32List()
+          .equals(other.getUnpackedFixed32List())) return false;
+      if (!getUnpackedFixed64List()
+          .equals(other.getUnpackedFixed64List())) return false;
+      if (!getUnpackedSfixed32List()
+          .equals(other.getUnpackedSfixed32List())) return false;
+      if (!getUnpackedSfixed64List()
+          .equals(other.getUnpackedSfixed64List())) return false;
+      if (!getUnpackedFloatList()
+          .equals(other.getUnpackedFloatList())) return false;
+      if (!getUnpackedDoubleList()
+          .equals(other.getUnpackedDoubleList())) return false;
+      if (!getUnpackedBoolList()
+          .equals(other.getUnpackedBoolList())) return false;
       if (!unpackedNestedEnum_.equals(other.unpackedNestedEnum_)) return false;
-      if (!internalGetMapInt32Int32().equals(other.internalGetMapInt32Int32())) return false;
-      if (!internalGetMapInt64Int64().equals(other.internalGetMapInt64Int64())) return false;
-      if (!internalGetMapUint32Uint32().equals(other.internalGetMapUint32Uint32())) return false;
-      if (!internalGetMapUint64Uint64().equals(other.internalGetMapUint64Uint64())) return false;
-      if (!internalGetMapSint32Sint32().equals(other.internalGetMapSint32Sint32())) return false;
-      if (!internalGetMapSint64Sint64().equals(other.internalGetMapSint64Sint64())) return false;
-      if (!internalGetMapFixed32Fixed32().equals(other.internalGetMapFixed32Fixed32()))
-        return false;
-      if (!internalGetMapFixed64Fixed64().equals(other.internalGetMapFixed64Fixed64()))
-        return false;
-      if (!internalGetMapSfixed32Sfixed32().equals(other.internalGetMapSfixed32Sfixed32()))
-        return false;
-      if (!internalGetMapSfixed64Sfixed64().equals(other.internalGetMapSfixed64Sfixed64()))
-        return false;
-      if (!internalGetMapInt32Float().equals(other.internalGetMapInt32Float())) return false;
-      if (!internalGetMapInt32Double().equals(other.internalGetMapInt32Double())) return false;
-      if (!internalGetMapBoolBool().equals(other.internalGetMapBoolBool())) return false;
-      if (!internalGetMapStringString().equals(other.internalGetMapStringString())) return false;
-      if (!internalGetMapStringBytes().equals(other.internalGetMapStringBytes())) return false;
-      if (!internalGetMapStringNestedMessage().equals(other.internalGetMapStringNestedMessage()))
-        return false;
-      if (!internalGetMapStringForeignMessage().equals(other.internalGetMapStringForeignMessage()))
-        return false;
-      if (!internalGetMapStringNestedEnum().equals(other.internalGetMapStringNestedEnum()))
-        return false;
-      if (!internalGetMapStringForeignEnum().equals(other.internalGetMapStringForeignEnum()))
-        return false;
+      if (!internalGetMapInt32Int32().equals(
+          other.internalGetMapInt32Int32())) return false;
+      if (!internalGetMapInt64Int64().equals(
+          other.internalGetMapInt64Int64())) return false;
+      if (!internalGetMapUint32Uint32().equals(
+          other.internalGetMapUint32Uint32())) return false;
+      if (!internalGetMapUint64Uint64().equals(
+          other.internalGetMapUint64Uint64())) return false;
+      if (!internalGetMapSint32Sint32().equals(
+          other.internalGetMapSint32Sint32())) return false;
+      if (!internalGetMapSint64Sint64().equals(
+          other.internalGetMapSint64Sint64())) return false;
+      if (!internalGetMapFixed32Fixed32().equals(
+          other.internalGetMapFixed32Fixed32())) return false;
+      if (!internalGetMapFixed64Fixed64().equals(
+          other.internalGetMapFixed64Fixed64())) return false;
+      if (!internalGetMapSfixed32Sfixed32().equals(
+          other.internalGetMapSfixed32Sfixed32())) return false;
+      if (!internalGetMapSfixed64Sfixed64().equals(
+          other.internalGetMapSfixed64Sfixed64())) return false;
+      if (!internalGetMapInt32Float().equals(
+          other.internalGetMapInt32Float())) return false;
+      if (!internalGetMapInt32Double().equals(
+          other.internalGetMapInt32Double())) return false;
+      if (!internalGetMapBoolBool().equals(
+          other.internalGetMapBoolBool())) return false;
+      if (!internalGetMapStringString().equals(
+          other.internalGetMapStringString())) return false;
+      if (!internalGetMapStringBytes().equals(
+          other.internalGetMapStringBytes())) return false;
+      if (!internalGetMapStringNestedMessage().equals(
+          other.internalGetMapStringNestedMessage())) return false;
+      if (!internalGetMapStringForeignMessage().equals(
+          other.internalGetMapStringForeignMessage())) return false;
+      if (!internalGetMapStringNestedEnum().equals(
+          other.internalGetMapStringNestedEnum())) return false;
+      if (!internalGetMapStringForeignEnum().equals(
+          other.internalGetMapStringForeignEnum())) return false;
       if (!getOneofFieldCase().equals(other.getOneofFieldCase())) return false;
       switch (oneofFieldCase_) {
         case 111:
-          if (getOneofUint32() != other.getOneofUint32()) return false;
+          if (getOneofUint32()
+              != other.getOneofUint32()) return false;
           break;
         case 112:
-          if (!getOneofNestedMessage().equals(other.getOneofNestedMessage())) return false;
+          if (!getOneofNestedMessage()
+              .equals(other.getOneofNestedMessage())) return false;
           break;
         case 113:
-          if (!getOneofString().equals(other.getOneofString())) return false;
+          if (!getOneofString()
+              .equals(other.getOneofString())) return false;
           break;
         case 114:
-          if (!getOneofBytes().equals(other.getOneofBytes())) return false;
+          if (!getOneofBytes()
+              .equals(other.getOneofBytes())) return false;
           break;
         case 115:
-          if (getOneofBool() != other.getOneofBool()) return false;
+          if (getOneofBool()
+              != other.getOneofBool()) return false;
           break;
         case 116:
-          if (getOneofUint64() != other.getOneofUint64()) return false;
+          if (getOneofUint64()
+              != other.getOneofUint64()) return false;
           break;
         case 117:
           if (java.lang.Float.floatToIntBits(getOneofFloat())
-              != java.lang.Float.floatToIntBits(other.getOneofFloat())) return false;
+              != java.lang.Float.floatToIntBits(
+                  other.getOneofFloat())) return false;
           break;
         case 118:
           if (java.lang.Double.doubleToLongBits(getOneofDouble())
-              != java.lang.Double.doubleToLongBits(other.getOneofDouble())) return false;
+              != java.lang.Double.doubleToLongBits(
+                  other.getOneofDouble())) return false;
           break;
         case 119:
-          if (getOneofEnumValue() != other.getOneofEnumValue()) return false;
+          if (getOneofEnumValue()
+              != other.getOneofEnumValue()) return false;
           break;
         case 0:
         default:
@@ -10713,32 +9741,37 @@ public int hashCode() {
       hash = (37 * hash) + OPTIONAL_INT32_FIELD_NUMBER;
       hash = (53 * hash) + getOptionalInt32();
       hash = (37 * hash) + OPTIONAL_INT64_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getOptionalInt64());
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getOptionalInt64());
       hash = (37 * hash) + OPTIONAL_UINT32_FIELD_NUMBER;
       hash = (53 * hash) + getOptionalUint32();
       hash = (37 * hash) + OPTIONAL_UINT64_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getOptionalUint64());
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getOptionalUint64());
       hash = (37 * hash) + OPTIONAL_SINT32_FIELD_NUMBER;
       hash = (53 * hash) + getOptionalSint32();
       hash = (37 * hash) + OPTIONAL_SINT64_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getOptionalSint64());
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getOptionalSint64());
       hash = (37 * hash) + OPTIONAL_FIXED32_FIELD_NUMBER;
       hash = (53 * hash) + getOptionalFixed32();
       hash = (37 * hash) + OPTIONAL_FIXED64_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getOptionalFixed64());
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getOptionalFixed64());
       hash = (37 * hash) + OPTIONAL_SFIXED32_FIELD_NUMBER;
       hash = (53 * hash) + getOptionalSfixed32();
       hash = (37 * hash) + OPTIONAL_SFIXED64_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getOptionalSfixed64());
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getOptionalSfixed64());
       hash = (37 * hash) + OPTIONAL_FLOAT_FIELD_NUMBER;
-      hash = (53 * hash) + java.lang.Float.floatToIntBits(getOptionalFloat());
+      hash = (53 * hash) + java.lang.Float.floatToIntBits(
+          getOptionalFloat());
       hash = (37 * hash) + OPTIONAL_DOUBLE_FIELD_NUMBER;
-      hash =
-          (53 * hash)
-              + com.google.protobuf.Internal.hashLong(
-                  java.lang.Double.doubleToLongBits(getOptionalDouble()));
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          java.lang.Double.doubleToLongBits(getOptionalDouble()));
       hash = (37 * hash) + OPTIONAL_BOOL_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getOptionalBool());
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getOptionalBool());
       hash = (37 * hash) + OPTIONAL_STRING_FIELD_NUMBER;
       hash = (53 * hash) + getOptionalString().hashCode();
       hash = (37 * hash) + OPTIONAL_BYTES_FIELD_NUMBER;
@@ -11044,22 +10077,23 @@ public int hashCode() {
           break;
         case 115:
           hash = (37 * hash) + ONEOF_BOOL_FIELD_NUMBER;
-          hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getOneofBool());
+          hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+              getOneofBool());
           break;
         case 116:
           hash = (37 * hash) + ONEOF_UINT64_FIELD_NUMBER;
-          hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getOneofUint64());
+          hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+              getOneofUint64());
           break;
         case 117:
           hash = (37 * hash) + ONEOF_FLOAT_FIELD_NUMBER;
-          hash = (53 * hash) + java.lang.Float.floatToIntBits(getOneofFloat());
+          hash = (53 * hash) + java.lang.Float.floatToIntBits(
+              getOneofFloat());
           break;
         case 118:
           hash = (37 * hash) + ONEOF_DOUBLE_FIELD_NUMBER;
-          hash =
-              (53 * hash)
-                  + com.google.protobuf.Internal.hashLong(
-                      java.lang.Double.doubleToLongBits(getOneofDouble()));
+          hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+              java.lang.Double.doubleToLongBits(getOneofDouble()));
           break;
         case 119:
           hash = (37 * hash) + ONEOF_ENUM_FIELD_NUMBER;
@@ -11074,106 +10108,98 @@ public int hashCode() {
     }
 
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(
-        java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(
-        java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(
-        byte[] data) throws com.google.protobuf.InvalidProtocolBufferException {
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(
-        byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(
-        java.io.InputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input);
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(
-        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseDelimitedWithIOException(PARSER, input);
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-        parseDelimitedFrom(
-            java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseDelimitedWithIOException(
-          PARSER, input, extensionRegistry);
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(
-        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input);
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
     @java.lang.Override
-    public Builder newBuilderForType() {
-      return newBuilder();
-    }
-
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-
-    public static Builder newBuilder(
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 prototype) {
+    public static Builder newBuilder(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-
     @java.lang.Override
     public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
 
     @java.lang.Override
-    protected Builder newBuilderForType(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
-
     /**
-     *
-     *
      * <pre>
      * This is a slightly trimmed-down version of TestAllTypesProto3 from
      * google/protobuf/test_messages_proto3.proto but without imports/ctypes.
@@ -11181,13 +10207,13 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessage.Builder
      *
      * Protobuf type {@code legacy_gencode_test.proto3.TestMostTypesProto3}
      */
-    public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder<Builder>
-        implements
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:legacy_gencode_test.proto3.TestMostTypesProto3)
         legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor;
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor;
       }
 
       @SuppressWarnings({"rawtypes"})
@@ -11233,10 +10259,10 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
           case 74:
             return internalGetMapStringForeignEnum();
           default:
-            throw new RuntimeException("Invalid map field number: " + number);
+            throw new RuntimeException(
+                "Invalid map field number: " + number);
         }
       }
-
       @SuppressWarnings({"rawtypes"})
       protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
           int number) {
@@ -11280,34 +10306,31 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFi
           case 74:
             return internalGetMutableMapStringForeignEnum();
           default:
-            throw new RuntimeException("Invalid map field number: " + number);
+            throw new RuntimeException(
+                "Invalid map field number: " + number);
         }
       }
-
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_fieldAccessorTable
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.class,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder
-                    .class);
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.class, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder.class);
       }
 
-      // Construct using
-      // legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.newBuilder()
+      // Construct using legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
-
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessage
+                .alwaysUseFieldBuilders) {
           internalGetOptionalNestedMessageFieldBuilder();
           internalGetOptionalForeignMessageFieldBuilder();
           internalGetRecursiveMessageFieldBuilder();
@@ -11315,7 +10338,6 @@ private void maybeForceBuilderInitialization() {
           internalGetRepeatedForeignMessageFieldBuilder();
         }
       }
-
       @java.lang.Override
       public Builder clear() {
         super.clear();
@@ -11368,7 +10390,8 @@ public Builder clear() {
         repeatedFloat_ = emptyFloatList();
         repeatedDouble_ = emptyDoubleList();
         repeatedBool_ = emptyBooleanList();
-        repeatedString_ = com.google.protobuf.LazyStringArrayList.emptyList();
+        repeatedString_ =
+            com.google.protobuf.LazyStringArrayList.emptyList();
         repeatedBytes_ = emptyList(com.google.protobuf.ByteString.class);
         if (repeatedNestedMessageBuilder_ == null) {
           repeatedNestedMessage_ = java.util.Collections.emptyList();
@@ -11442,22 +10465,19 @@ public Builder clear() {
       }
 
       @java.lang.Override
-      public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor;
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor;
       }
 
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-          getDefaultInstanceForType() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-            .getDefaultInstance();
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 getDefaultInstanceForType() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance();
       }
 
       @java.lang.Override
       public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 build() {
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result =
-            buildPartial();
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -11466,25 +10486,17 @@ public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 bui
 
       @java.lang.Override
       public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 buildPartial() {
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result =
-            new legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3(this);
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result = new legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3(this);
         buildPartialRepeatedFields(result);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
-        if (bitField1_ != 0) {
-          buildPartial1(result);
-        }
-        if (bitField2_ != 0) {
-          buildPartial2(result);
-        }
+        if (bitField0_ != 0) { buildPartial0(result); }
+        if (bitField1_ != 0) { buildPartial1(result); }
+        if (bitField2_ != 0) { buildPartial2(result); }
         buildPartialOneofs(result);
         onBuilt();
         return result;
       }
 
-      private void buildPartialRepeatedFields(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result) {
+      private void buildPartialRepeatedFields(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result) {
         if (repeatedNestedMessageBuilder_ == null) {
           if (((bitField1_ & 0x00000010) != 0)) {
             repeatedNestedMessage_ = java.util.Collections.unmodifiableList(repeatedNestedMessage_);
@@ -11496,8 +10508,7 @@ private void buildPartialRepeatedFields(
         }
         if (repeatedForeignMessageBuilder_ == null) {
           if (((bitField1_ & 0x00000020) != 0)) {
-            repeatedForeignMessage_ =
-                java.util.Collections.unmodifiableList(repeatedForeignMessage_);
+            repeatedForeignMessage_ = java.util.Collections.unmodifiableList(repeatedForeignMessage_);
             bitField1_ = (bitField1_ & ~0x00000020);
           }
           result.repeatedForeignMessage_ = repeatedForeignMessage_;
@@ -11506,8 +10517,7 @@ private void buildPartialRepeatedFields(
         }
       }
 
-      private void buildPartial0(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result) {
+      private void buildPartial0(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.optionalInt32_ = optionalInt32_;
@@ -11556,17 +10566,15 @@ private void buildPartial0(
         }
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00008000) != 0)) {
-          result.optionalNestedMessage_ =
-              optionalNestedMessageBuilder_ == null
-                  ? optionalNestedMessage_
-                  : optionalNestedMessageBuilder_.build();
+          result.optionalNestedMessage_ = optionalNestedMessageBuilder_ == null
+              ? optionalNestedMessage_
+              : optionalNestedMessageBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00010000) != 0)) {
-          result.optionalForeignMessage_ =
-              optionalForeignMessageBuilder_ == null
-                  ? optionalForeignMessage_
-                  : optionalForeignMessageBuilder_.build();
+          result.optionalForeignMessage_ = optionalForeignMessageBuilder_ == null
+              ? optionalForeignMessage_
+              : optionalForeignMessageBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
         if (((from_bitField0_ & 0x00020000) != 0)) {
@@ -11579,10 +10587,9 @@ private void buildPartial0(
           result.optionalAliasedEnum_ = optionalAliasedEnum_;
         }
         if (((from_bitField0_ & 0x00100000) != 0)) {
-          result.recursiveMessage_ =
-              recursiveMessageBuilder_ == null
-                  ? recursiveMessage_
-                  : recursiveMessageBuilder_.build();
+          result.recursiveMessage_ = recursiveMessageBuilder_ == null
+              ? recursiveMessage_
+              : recursiveMessageBuilder_.build();
           to_bitField0_ |= 0x00000004;
         }
         if (((from_bitField0_ & 0x00200000) != 0)) {
@@ -11632,8 +10639,7 @@ private void buildPartial0(
         result.bitField0_ |= to_bitField0_;
       }
 
-      private void buildPartial1(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result) {
+      private void buildPartial1(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result) {
         int from_bitField1_ = bitField1_;
         if (((from_bitField1_ & 0x00000001) != 0)) {
           repeatedDouble_.makeImmutable();
@@ -11757,8 +10763,7 @@ private void buildPartial1(
         }
       }
 
-      private void buildPartial2(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result) {
+      private void buildPartial2(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result) {
         int from_bitField2_ = bitField2_;
         if (((from_bitField2_ & 0x00000001) != 0)) {
           unpackedFloat_.makeImmutable();
@@ -11837,14 +10842,10 @@ private void buildPartial2(
           result.mapStringBytes_.makeImmutable();
         }
         if (((from_bitField2_ & 0x00080000) != 0)) {
-          result.mapStringNestedMessage_ =
-              internalGetMapStringNestedMessage()
-                  .build(MapStringNestedMessageDefaultEntryHolder.defaultEntry);
+          result.mapStringNestedMessage_ = internalGetMapStringNestedMessage().build(MapStringNestedMessageDefaultEntryHolder.defaultEntry);
         }
         if (((from_bitField2_ & 0x00100000) != 0)) {
-          result.mapStringForeignMessage_ =
-              internalGetMapStringForeignMessage()
-                  .build(MapStringForeignMessageDefaultEntryHolder.defaultEntry);
+          result.mapStringForeignMessage_ = internalGetMapStringForeignMessage().build(MapStringForeignMessageDefaultEntryHolder.defaultEntry);
         }
         if (((from_bitField2_ & 0x00200000) != 0)) {
           result.mapStringNestedEnum_ = internalGetMapStringNestedEnum();
@@ -11856,32 +10857,27 @@ private void buildPartial2(
         }
       }
 
-      private void buildPartialOneofs(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result) {
+      private void buildPartialOneofs(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 result) {
         result.oneofFieldCase_ = oneofFieldCase_;
         result.oneofField_ = this.oneofField_;
-        if (oneofFieldCase_ == 112 && oneofNestedMessageBuilder_ != null) {
+        if (oneofFieldCase_ == 112 &&
+            oneofNestedMessageBuilder_ != null) {
           result.oneofField_ = oneofNestedMessageBuilder_.build();
         }
       }
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other
-            instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3) {
-          return mergeFrom(
-              (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3) other);
+        if (other instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3) {
+          return mergeFrom((legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 other) {
-        if (other
-            == legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                .getDefaultInstance()) return this;
+      public Builder mergeFrom(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 other) {
+        if (other == legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance()) return this;
         if (other.getOptionalInt32() != 0) {
           setOptionalInt32(other.getOptionalInt32());
         }
@@ -12129,10 +11125,9 @@ public Builder mergeFrom(
               repeatedNestedMessageBuilder_ = null;
               repeatedNestedMessage_ = other.repeatedNestedMessage_;
               bitField1_ = (bitField1_ & ~0x00000010);
-              repeatedNestedMessageBuilder_ =
-                  com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders
-                      ? internalGetRepeatedNestedMessageFieldBuilder()
-                      : null;
+              repeatedNestedMessageBuilder_ = 
+                com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                   internalGetRepeatedNestedMessageFieldBuilder() : null;
             } else {
               repeatedNestedMessageBuilder_.addAllMessages(other.repeatedNestedMessage_);
             }
@@ -12156,10 +11151,9 @@ public Builder mergeFrom(
               repeatedForeignMessageBuilder_ = null;
               repeatedForeignMessage_ = other.repeatedForeignMessage_;
               bitField1_ = (bitField1_ & ~0x00000020);
-              repeatedForeignMessageBuilder_ =
-                  com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders
-                      ? internalGetRepeatedForeignMessageFieldBuilder()
-                      : null;
+              repeatedForeignMessageBuilder_ = 
+                com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                   internalGetRepeatedForeignMessageFieldBuilder() : null;
             } else {
               repeatedForeignMessageBuilder_.addAllMessages(other.repeatedForeignMessage_);
             }
@@ -12495,98 +11489,105 @@ public Builder mergeFrom(
           }
           onChanged();
         }
-        internalGetMutableMapInt32Int32().mergeFrom(other.internalGetMapInt32Int32());
+        internalGetMutableMapInt32Int32().mergeFrom(
+            other.internalGetMapInt32Int32());
         bitField2_ |= 0x00000010;
-        internalGetMutableMapInt64Int64().mergeFrom(other.internalGetMapInt64Int64());
+        internalGetMutableMapInt64Int64().mergeFrom(
+            other.internalGetMapInt64Int64());
         bitField2_ |= 0x00000020;
-        internalGetMutableMapUint32Uint32().mergeFrom(other.internalGetMapUint32Uint32());
+        internalGetMutableMapUint32Uint32().mergeFrom(
+            other.internalGetMapUint32Uint32());
         bitField2_ |= 0x00000040;
-        internalGetMutableMapUint64Uint64().mergeFrom(other.internalGetMapUint64Uint64());
+        internalGetMutableMapUint64Uint64().mergeFrom(
+            other.internalGetMapUint64Uint64());
         bitField2_ |= 0x00000080;
-        internalGetMutableMapSint32Sint32().mergeFrom(other.internalGetMapSint32Sint32());
+        internalGetMutableMapSint32Sint32().mergeFrom(
+            other.internalGetMapSint32Sint32());
         bitField2_ |= 0x00000100;
-        internalGetMutableMapSint64Sint64().mergeFrom(other.internalGetMapSint64Sint64());
+        internalGetMutableMapSint64Sint64().mergeFrom(
+            other.internalGetMapSint64Sint64());
         bitField2_ |= 0x00000200;
-        internalGetMutableMapFixed32Fixed32().mergeFrom(other.internalGetMapFixed32Fixed32());
+        internalGetMutableMapFixed32Fixed32().mergeFrom(
+            other.internalGetMapFixed32Fixed32());
         bitField2_ |= 0x00000400;
-        internalGetMutableMapFixed64Fixed64().mergeFrom(other.internalGetMapFixed64Fixed64());
+        internalGetMutableMapFixed64Fixed64().mergeFrom(
+            other.internalGetMapFixed64Fixed64());
         bitField2_ |= 0x00000800;
-        internalGetMutableMapSfixed32Sfixed32().mergeFrom(other.internalGetMapSfixed32Sfixed32());
+        internalGetMutableMapSfixed32Sfixed32().mergeFrom(
+            other.internalGetMapSfixed32Sfixed32());
         bitField2_ |= 0x00001000;
-        internalGetMutableMapSfixed64Sfixed64().mergeFrom(other.internalGetMapSfixed64Sfixed64());
+        internalGetMutableMapSfixed64Sfixed64().mergeFrom(
+            other.internalGetMapSfixed64Sfixed64());
         bitField2_ |= 0x00002000;
-        internalGetMutableMapInt32Float().mergeFrom(other.internalGetMapInt32Float());
+        internalGetMutableMapInt32Float().mergeFrom(
+            other.internalGetMapInt32Float());
         bitField2_ |= 0x00004000;
-        internalGetMutableMapInt32Double().mergeFrom(other.internalGetMapInt32Double());
+        internalGetMutableMapInt32Double().mergeFrom(
+            other.internalGetMapInt32Double());
         bitField2_ |= 0x00008000;
-        internalGetMutableMapBoolBool().mergeFrom(other.internalGetMapBoolBool());
+        internalGetMutableMapBoolBool().mergeFrom(
+            other.internalGetMapBoolBool());
         bitField2_ |= 0x00010000;
-        internalGetMutableMapStringString().mergeFrom(other.internalGetMapStringString());
+        internalGetMutableMapStringString().mergeFrom(
+            other.internalGetMapStringString());
         bitField2_ |= 0x00020000;
-        internalGetMutableMapStringBytes().mergeFrom(other.internalGetMapStringBytes());
+        internalGetMutableMapStringBytes().mergeFrom(
+            other.internalGetMapStringBytes());
         bitField2_ |= 0x00040000;
-        internalGetMutableMapStringNestedMessage()
-            .mergeFrom(other.internalGetMapStringNestedMessage());
+        internalGetMutableMapStringNestedMessage().mergeFrom(
+            other.internalGetMapStringNestedMessage());
         bitField2_ |= 0x00080000;
-        internalGetMutableMapStringForeignMessage()
-            .mergeFrom(other.internalGetMapStringForeignMessage());
+        internalGetMutableMapStringForeignMessage().mergeFrom(
+            other.internalGetMapStringForeignMessage());
         bitField2_ |= 0x00100000;
-        internalGetMutableMapStringNestedEnum().mergeFrom(other.internalGetMapStringNestedEnum());
+        internalGetMutableMapStringNestedEnum().mergeFrom(
+            other.internalGetMapStringNestedEnum());
         bitField2_ |= 0x00200000;
-        internalGetMutableMapStringForeignEnum().mergeFrom(other.internalGetMapStringForeignEnum());
+        internalGetMutableMapStringForeignEnum().mergeFrom(
+            other.internalGetMapStringForeignEnum());
         bitField2_ |= 0x00400000;
         switch (other.getOneofFieldCase()) {
-          case ONEOF_UINT32:
-            {
-              setOneofUint32(other.getOneofUint32());
-              break;
-            }
-          case ONEOF_NESTED_MESSAGE:
-            {
-              mergeOneofNestedMessage(other.getOneofNestedMessage());
-              break;
-            }
-          case ONEOF_STRING:
-            {
-              oneofFieldCase_ = 113;
-              oneofField_ = other.oneofField_;
-              onChanged();
-              break;
-            }
-          case ONEOF_BYTES:
-            {
-              setOneofBytes(other.getOneofBytes());
-              break;
-            }
-          case ONEOF_BOOL:
-            {
-              setOneofBool(other.getOneofBool());
-              break;
-            }
-          case ONEOF_UINT64:
-            {
-              setOneofUint64(other.getOneofUint64());
-              break;
-            }
-          case ONEOF_FLOAT:
-            {
-              setOneofFloat(other.getOneofFloat());
-              break;
-            }
-          case ONEOF_DOUBLE:
-            {
-              setOneofDouble(other.getOneofDouble());
-              break;
-            }
-          case ONEOF_ENUM:
-            {
-              setOneofEnumValue(other.getOneofEnumValue());
-              break;
-            }
-          case ONEOFFIELD_NOT_SET:
-            {
-              break;
-            }
+          case ONEOF_UINT32: {
+            setOneofUint32(other.getOneofUint32());
+            break;
+          }
+          case ONEOF_NESTED_MESSAGE: {
+            mergeOneofNestedMessage(other.getOneofNestedMessage());
+            break;
+          }
+          case ONEOF_STRING: {
+            oneofFieldCase_ = 113;
+            oneofField_ = other.oneofField_;
+            onChanged();
+            break;
+          }
+          case ONEOF_BYTES: {
+            setOneofBytes(other.getOneofBytes());
+            break;
+          }
+          case ONEOF_BOOL: {
+            setOneofBool(other.getOneofBool());
+            break;
+          }
+          case ONEOF_UINT64: {
+            setOneofUint64(other.getOneofUint64());
+            break;
+          }
+          case ONEOF_FLOAT: {
+            setOneofFloat(other.getOneofFloat());
+            break;
+          }
+          case ONEOF_DOUBLE: {
+            setOneofDouble(other.getOneofDouble());
+            break;
+          }
+          case ONEOF_ENUM: {
+            setOneofEnumValue(other.getOneofEnumValue());
+            break;
+          }
+          case ONEOFFIELD_NOT_SET: {
+            break;
+          }
         }
         this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
@@ -12614,1291 +11615,1090 @@ public Builder mergeFrom(
               case 0:
                 done = true;
                 break;
-              case 8:
-                {
-                  optionalInt32_ = input.readInt32();
-                  bitField0_ |= 0x00000001;
-                  break;
-                } // case 8
-              case 16:
-                {
-                  optionalInt64_ = input.readInt64();
-                  bitField0_ |= 0x00000002;
-                  break;
-                } // case 16
-              case 24:
-                {
-                  optionalUint32_ = input.readUInt32();
-                  bitField0_ |= 0x00000004;
-                  break;
-                } // case 24
-              case 32:
-                {
-                  optionalUint64_ = input.readUInt64();
-                  bitField0_ |= 0x00000008;
-                  break;
-                } // case 32
-              case 40:
-                {
-                  optionalSint32_ = input.readSInt32();
-                  bitField0_ |= 0x00000010;
-                  break;
-                } // case 40
-              case 48:
-                {
-                  optionalSint64_ = input.readSInt64();
-                  bitField0_ |= 0x00000020;
-                  break;
-                } // case 48
-              case 61:
-                {
-                  optionalFixed32_ = input.readFixed32();
-                  bitField0_ |= 0x00000040;
-                  break;
-                } // case 61
-              case 65:
-                {
-                  optionalFixed64_ = input.readFixed64();
-                  bitField0_ |= 0x00000080;
-                  break;
-                } // case 65
-              case 77:
-                {
-                  optionalSfixed32_ = input.readSFixed32();
-                  bitField0_ |= 0x00000100;
-                  break;
-                } // case 77
-              case 81:
-                {
-                  optionalSfixed64_ = input.readSFixed64();
-                  bitField0_ |= 0x00000200;
-                  break;
-                } // case 81
-              case 93:
-                {
-                  optionalFloat_ = input.readFloat();
-                  bitField0_ |= 0x00000400;
-                  break;
-                } // case 93
-              case 97:
-                {
-                  optionalDouble_ = input.readDouble();
-                  bitField0_ |= 0x00000800;
-                  break;
-                } // case 97
-              case 104:
-                {
-                  optionalBool_ = input.readBool();
-                  bitField0_ |= 0x00001000;
-                  break;
-                } // case 104
-              case 114:
-                {
-                  optionalString_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00002000;
-                  break;
-                } // case 114
-              case 122:
-                {
-                  optionalBytes_ = input.readBytes();
-                  bitField0_ |= 0x00004000;
-                  break;
-                } // case 122
-              case 146:
-                {
-                  input.readMessage(
-                      internalGetOptionalNestedMessageFieldBuilder().getBuilder(),
-                      extensionRegistry);
-                  bitField0_ |= 0x00008000;
-                  break;
-                } // case 146
-              case 154:
-                {
-                  input.readMessage(
-                      internalGetOptionalForeignMessageFieldBuilder().getBuilder(),
-                      extensionRegistry);
-                  bitField0_ |= 0x00010000;
-                  break;
-                } // case 154
-              case 168:
-                {
-                  optionalNestedEnum_ = input.readEnum();
-                  bitField0_ |= 0x00020000;
-                  break;
-                } // case 168
-              case 176:
-                {
-                  optionalForeignEnum_ = input.readEnum();
-                  bitField0_ |= 0x00040000;
-                  break;
-                } // case 176
-              case 184:
-                {
-                  optionalAliasedEnum_ = input.readEnum();
-                  bitField0_ |= 0x00080000;
-                  break;
-                } // case 184
-              case 218:
-                {
-                  input.readMessage(
-                      internalGetRecursiveMessageFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00100000;
-                  break;
-                } // case 218
-              case 248:
-                {
-                  int v = input.readInt32();
-                  ensureRepeatedInt32IsMutable();
-                  repeatedInt32_.addInt(v);
-                  break;
-                } // case 248
-              case 250:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureRepeatedInt32IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedInt32_.addInt(input.readInt32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 250
-              case 256:
-                {
-                  long v = input.readInt64();
-                  ensureRepeatedInt64IsMutable();
-                  repeatedInt64_.addLong(v);
-                  break;
-                } // case 256
-              case 258:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureRepeatedInt64IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedInt64_.addLong(input.readInt64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 258
-              case 264:
-                {
-                  int v = input.readUInt32();
-                  ensureRepeatedUint32IsMutable();
-                  repeatedUint32_.addInt(v);
-                  break;
-                } // case 264
-              case 266:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureRepeatedUint32IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedUint32_.addInt(input.readUInt32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 266
-              case 272:
-                {
-                  long v = input.readUInt64();
-                  ensureRepeatedUint64IsMutable();
-                  repeatedUint64_.addLong(v);
-                  break;
-                } // case 272
-              case 274:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureRepeatedUint64IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedUint64_.addLong(input.readUInt64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 274
-              case 280:
-                {
-                  int v = input.readSInt32();
-                  ensureRepeatedSint32IsMutable();
-                  repeatedSint32_.addInt(v);
-                  break;
-                } // case 280
-              case 282:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureRepeatedSint32IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedSint32_.addInt(input.readSInt32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 282
-              case 288:
-                {
-                  long v = input.readSInt64();
-                  ensureRepeatedSint64IsMutable();
-                  repeatedSint64_.addLong(v);
-                  break;
-                } // case 288
-              case 290:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureRepeatedSint64IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedSint64_.addLong(input.readSInt64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 290
-              case 301:
-                {
-                  int v = input.readFixed32();
-                  ensureRepeatedFixed32IsMutable();
-                  repeatedFixed32_.addInt(v);
-                  break;
-                } // case 301
-              case 298:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureRepeatedFixed32IsMutable(alloc / 4);
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedFixed32_.addInt(input.readFixed32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 298
-              case 305:
-                {
-                  long v = input.readFixed64();
-                  ensureRepeatedFixed64IsMutable();
-                  repeatedFixed64_.addLong(v);
-                  break;
-                } // case 305
-              case 306:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureRepeatedFixed64IsMutable(alloc / 8);
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedFixed64_.addLong(input.readFixed64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 306
-              case 317:
-                {
-                  int v = input.readSFixed32();
-                  ensureRepeatedSfixed32IsMutable();
-                  repeatedSfixed32_.addInt(v);
-                  break;
-                } // case 317
-              case 314:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureRepeatedSfixed32IsMutable(alloc / 4);
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedSfixed32_.addInt(input.readSFixed32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 314
-              case 321:
-                {
-                  long v = input.readSFixed64();
-                  ensureRepeatedSfixed64IsMutable();
-                  repeatedSfixed64_.addLong(v);
-                  break;
-                } // case 321
-              case 322:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureRepeatedSfixed64IsMutable(alloc / 8);
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedSfixed64_.addLong(input.readSFixed64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 322
-              case 333:
-                {
-                  float v = input.readFloat();
-                  ensureRepeatedFloatIsMutable();
-                  repeatedFloat_.addFloat(v);
-                  break;
-                } // case 333
-              case 330:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureRepeatedFloatIsMutable(alloc / 4);
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedFloat_.addFloat(input.readFloat());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 330
-              case 337:
-                {
-                  double v = input.readDouble();
-                  ensureRepeatedDoubleIsMutable();
-                  repeatedDouble_.addDouble(v);
-                  break;
-                } // case 337
-              case 338:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureRepeatedDoubleIsMutable(alloc / 8);
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedDouble_.addDouble(input.readDouble());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 338
-              case 344:
-                {
-                  boolean v = input.readBool();
-                  ensureRepeatedBoolIsMutable();
-                  repeatedBool_.addBoolean(v);
-                  break;
-                } // case 344
-              case 346:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureRepeatedBoolIsMutable(alloc / 1);
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedBool_.addBoolean(input.readBool());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 346
-              case 354:
-                {
-                  java.lang.String s = input.readStringRequireUtf8();
-                  ensureRepeatedStringIsMutable();
-                  repeatedString_.add(s);
-                  break;
-                } // case 354
-              case 362:
-                {
-                  com.google.protobuf.ByteString v = input.readBytes();
-                  ensureRepeatedBytesIsMutable();
-                  repeatedBytes_.add(v);
-                  break;
-                } // case 362
-              case 386:
-                {
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                          .NestedMessage
-                      m =
-                          input.readMessage(
-                              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                                  .NestedMessage.parser(),
-                              extensionRegistry);
-                  if (repeatedNestedMessageBuilder_ == null) {
-                    ensureRepeatedNestedMessageIsMutable();
-                    repeatedNestedMessage_.add(m);
-                  } else {
-                    repeatedNestedMessageBuilder_.addMessage(m);
-                  }
-                  break;
-                } // case 386
-              case 394:
-                {
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage m =
-                      input.readMessage(
-                          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.parser(),
-                          extensionRegistry);
-                  if (repeatedForeignMessageBuilder_ == null) {
-                    ensureRepeatedForeignMessageIsMutable();
-                    repeatedForeignMessage_.add(m);
-                  } else {
-                    repeatedForeignMessageBuilder_.addMessage(m);
-                  }
-                  break;
-                } // case 394
-              case 408:
-                {
-                  int tmpRaw = input.readEnum();
-                  ensureRepeatedNestedEnumIsMutable();
-                  repeatedNestedEnum_.addInt(tmpRaw);
-                  break;
-                } // case 408
-              case 410:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureRepeatedNestedEnumIsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedNestedEnum_.addInt(input.readEnum());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 410
-              case 416:
-                {
-                  int tmpRaw = input.readEnum();
-                  ensureRepeatedForeignEnumIsMutable();
-                  repeatedForeignEnum_.addInt(tmpRaw);
-                  break;
-                } // case 416
-              case 418:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureRepeatedForeignEnumIsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    repeatedForeignEnum_.addInt(input.readEnum());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 418
-              case 450:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-                      mapInt32Int32__ =
-                          input.readMessage(
-                              MapInt32Int32DefaultEntryHolder.defaultEntry.getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapInt32Int32()
-                      .getMutableMap()
-                      .put(mapInt32Int32__.getKey(), mapInt32Int32__.getValue());
-                  bitField2_ |= 0x00000010;
-                  break;
-                } // case 450
-              case 458:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> mapInt64Int64__ =
-                      input.readMessage(
-                          MapInt64Int64DefaultEntryHolder.defaultEntry.getParserForType(),
-                          extensionRegistry);
-                  internalGetMutableMapInt64Int64()
-                      .getMutableMap()
-                      .put(mapInt64Int64__.getKey(), mapInt64Int64__.getValue());
-                  bitField2_ |= 0x00000020;
-                  break;
-                } // case 458
-              case 466:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-                      mapUint32Uint32__ =
-                          input.readMessage(
-                              MapUint32Uint32DefaultEntryHolder.defaultEntry.getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapUint32Uint32()
-                      .getMutableMap()
-                      .put(mapUint32Uint32__.getKey(), mapUint32Uint32__.getValue());
-                  bitField2_ |= 0x00000040;
-                  break;
-                } // case 466
-              case 474:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> mapUint64Uint64__ =
-                      input.readMessage(
-                          MapUint64Uint64DefaultEntryHolder.defaultEntry.getParserForType(),
-                          extensionRegistry);
-                  internalGetMutableMapUint64Uint64()
-                      .getMutableMap()
-                      .put(mapUint64Uint64__.getKey(), mapUint64Uint64__.getValue());
-                  bitField2_ |= 0x00000080;
-                  break;
-                } // case 474
-              case 482:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-                      mapSint32Sint32__ =
-                          input.readMessage(
-                              MapSint32Sint32DefaultEntryHolder.defaultEntry.getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapSint32Sint32()
-                      .getMutableMap()
-                      .put(mapSint32Sint32__.getKey(), mapSint32Sint32__.getValue());
-                  bitField2_ |= 0x00000100;
-                  break;
-                } // case 482
-              case 490:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> mapSint64Sint64__ =
-                      input.readMessage(
-                          MapSint64Sint64DefaultEntryHolder.defaultEntry.getParserForType(),
-                          extensionRegistry);
-                  internalGetMutableMapSint64Sint64()
-                      .getMutableMap()
-                      .put(mapSint64Sint64__.getKey(), mapSint64Sint64__.getValue());
-                  bitField2_ |= 0x00000200;
-                  break;
-                } // case 490
-              case 498:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-                      mapFixed32Fixed32__ =
-                          input.readMessage(
-                              MapFixed32Fixed32DefaultEntryHolder.defaultEntry.getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapFixed32Fixed32()
-                      .getMutableMap()
-                      .put(mapFixed32Fixed32__.getKey(), mapFixed32Fixed32__.getValue());
-                  bitField2_ |= 0x00000400;
-                  break;
-                } // case 498
-              case 506:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long> mapFixed64Fixed64__ =
-                      input.readMessage(
-                          MapFixed64Fixed64DefaultEntryHolder.defaultEntry.getParserForType(),
-                          extensionRegistry);
-                  internalGetMutableMapFixed64Fixed64()
-                      .getMutableMap()
-                      .put(mapFixed64Fixed64__.getKey(), mapFixed64Fixed64__.getValue());
-                  bitField2_ |= 0x00000800;
-                  break;
-                } // case 506
-              case 514:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-                      mapSfixed32Sfixed32__ =
-                          input.readMessage(
-                              MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry.getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapSfixed32Sfixed32()
-                      .getMutableMap()
-                      .put(mapSfixed32Sfixed32__.getKey(), mapSfixed32Sfixed32__.getValue());
-                  bitField2_ |= 0x00001000;
-                  break;
-                } // case 514
-              case 522:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
-                      mapSfixed64Sfixed64__ =
-                          input.readMessage(
-                              MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry.getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapSfixed64Sfixed64()
-                      .getMutableMap()
-                      .put(mapSfixed64Sfixed64__.getKey(), mapSfixed64Sfixed64__.getValue());
-                  bitField2_ |= 0x00002000;
-                  break;
-                } // case 522
-              case 530:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float> mapInt32Float__ =
-                      input.readMessage(
-                          MapInt32FloatDefaultEntryHolder.defaultEntry.getParserForType(),
-                          extensionRegistry);
-                  internalGetMutableMapInt32Float()
-                      .getMutableMap()
-                      .put(mapInt32Float__.getKey(), mapInt32Float__.getValue());
-                  bitField2_ |= 0x00004000;
-                  break;
-                } // case 530
-              case 538:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Double>
-                      mapInt32Double__ =
-                          input.readMessage(
-                              MapInt32DoubleDefaultEntryHolder.defaultEntry.getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapInt32Double()
-                      .getMutableMap()
-                      .put(mapInt32Double__.getKey(), mapInt32Double__.getValue());
-                  bitField2_ |= 0x00008000;
-                  break;
-                } // case 538
-              case 546:
-                {
-                  com.google.protobuf.MapEntry<java.lang.Boolean, java.lang.Boolean> mapBoolBool__ =
-                      input.readMessage(
-                          MapBoolBoolDefaultEntryHolder.defaultEntry.getParserForType(),
-                          extensionRegistry);
-                  internalGetMutableMapBoolBool()
-                      .getMutableMap()
-                      .put(mapBoolBool__.getKey(), mapBoolBool__.getValue());
-                  bitField2_ |= 0x00010000;
-                  break;
-                } // case 546
-              case 554:
-                {
-                  com.google.protobuf.MapEntry<java.lang.String, java.lang.String>
-                      mapStringString__ =
-                          input.readMessage(
-                              MapStringStringDefaultEntryHolder.defaultEntry.getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapStringString()
-                      .getMutableMap()
-                      .put(mapStringString__.getKey(), mapStringString__.getValue());
-                  bitField2_ |= 0x00020000;
-                  break;
-                } // case 554
-              case 562:
-                {
-                  com.google.protobuf.MapEntry<java.lang.String, com.google.protobuf.ByteString>
-                      mapStringBytes__ =
-                          input.readMessage(
-                              MapStringBytesDefaultEntryHolder.defaultEntry.getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapStringBytes()
-                      .getMutableMap()
-                      .put(mapStringBytes__.getKey(), mapStringBytes__.getValue());
-                  bitField2_ |= 0x00040000;
-                  break;
-                } // case 562
-              case 570:
-                {
-                  com.google.protobuf.MapEntry<
-                          java.lang.String,
-                          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                              .NestedMessage>
-                      mapStringNestedMessage__ =
-                          input.readMessage(
-                              MapStringNestedMessageDefaultEntryHolder.defaultEntry
-                                  .getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapStringNestedMessage()
-                      .ensureBuilderMap()
-                      .put(mapStringNestedMessage__.getKey(), mapStringNestedMessage__.getValue());
-                  bitField2_ |= 0x00080000;
-                  break;
-                } // case 570
-              case 578:
-                {
-                  com.google.protobuf.MapEntry<
-                          java.lang.String,
-                          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-                      mapStringForeignMessage__ =
-                          input.readMessage(
-                              MapStringForeignMessageDefaultEntryHolder.defaultEntry
-                                  .getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapStringForeignMessage()
-                      .ensureBuilderMap()
-                      .put(
-                          mapStringForeignMessage__.getKey(), mapStringForeignMessage__.getValue());
-                  bitField2_ |= 0x00100000;
-                  break;
-                } // case 578
-              case 586:
-                {
-                  com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer>
-                      mapStringNestedEnum__ =
-                          input.readMessage(
-                              MapStringNestedEnumDefaultEntryHolder.defaultEntry.getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapStringNestedEnum()
-                      .getMutableMap()
-                      .put(mapStringNestedEnum__.getKey(), mapStringNestedEnum__.getValue());
-                  bitField2_ |= 0x00200000;
-                  break;
-                } // case 586
-              case 594:
-                {
-                  com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer>
-                      mapStringForeignEnum__ =
-                          input.readMessage(
-                              MapStringForeignEnumDefaultEntryHolder.defaultEntry
-                                  .getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableMapStringForeignEnum()
-                      .getMutableMap()
-                      .put(mapStringForeignEnum__.getKey(), mapStringForeignEnum__.getValue());
-                  bitField2_ |= 0x00400000;
-                  break;
-                } // case 594
-              case 600:
-                {
-                  int v = input.readInt32();
-                  ensurePackedInt32IsMutable();
-                  packedInt32_.addInt(v);
-                  break;
-                } // case 600
-              case 602:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensurePackedInt32IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedInt32_.addInt(input.readInt32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 602
-              case 608:
-                {
-                  long v = input.readInt64();
-                  ensurePackedInt64IsMutable();
-                  packedInt64_.addLong(v);
-                  break;
-                } // case 608
-              case 610:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensurePackedInt64IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedInt64_.addLong(input.readInt64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 610
-              case 616:
-                {
-                  int v = input.readUInt32();
-                  ensurePackedUint32IsMutable();
-                  packedUint32_.addInt(v);
-                  break;
-                } // case 616
-              case 618:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensurePackedUint32IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedUint32_.addInt(input.readUInt32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 618
-              case 624:
-                {
-                  long v = input.readUInt64();
-                  ensurePackedUint64IsMutable();
-                  packedUint64_.addLong(v);
-                  break;
-                } // case 624
-              case 626:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensurePackedUint64IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedUint64_.addLong(input.readUInt64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 626
-              case 632:
-                {
-                  int v = input.readSInt32();
-                  ensurePackedSint32IsMutable();
-                  packedSint32_.addInt(v);
-                  break;
-                } // case 632
-              case 634:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensurePackedSint32IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedSint32_.addInt(input.readSInt32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 634
-              case 640:
-                {
-                  long v = input.readSInt64();
-                  ensurePackedSint64IsMutable();
-                  packedSint64_.addLong(v);
-                  break;
-                } // case 640
-              case 642:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensurePackedSint64IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedSint64_.addLong(input.readSInt64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 642
-              case 653:
-                {
-                  int v = input.readFixed32();
-                  ensurePackedFixed32IsMutable();
-                  packedFixed32_.addInt(v);
-                  break;
-                } // case 653
-              case 650:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensurePackedFixed32IsMutable(alloc / 4);
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedFixed32_.addInt(input.readFixed32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 650
-              case 657:
-                {
-                  long v = input.readFixed64();
-                  ensurePackedFixed64IsMutable();
-                  packedFixed64_.addLong(v);
-                  break;
-                } // case 657
-              case 658:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensurePackedFixed64IsMutable(alloc / 8);
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedFixed64_.addLong(input.readFixed64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 658
-              case 669:
-                {
-                  int v = input.readSFixed32();
-                  ensurePackedSfixed32IsMutable();
-                  packedSfixed32_.addInt(v);
-                  break;
-                } // case 669
-              case 666:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensurePackedSfixed32IsMutable(alloc / 4);
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedSfixed32_.addInt(input.readSFixed32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 666
-              case 673:
-                {
-                  long v = input.readSFixed64();
-                  ensurePackedSfixed64IsMutable();
-                  packedSfixed64_.addLong(v);
-                  break;
-                } // case 673
-              case 674:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensurePackedSfixed64IsMutable(alloc / 8);
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedSfixed64_.addLong(input.readSFixed64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 674
-              case 685:
-                {
-                  float v = input.readFloat();
-                  ensurePackedFloatIsMutable();
-                  packedFloat_.addFloat(v);
-                  break;
-                } // case 685
-              case 682:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensurePackedFloatIsMutable(alloc / 4);
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedFloat_.addFloat(input.readFloat());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 682
-              case 689:
-                {
-                  double v = input.readDouble();
-                  ensurePackedDoubleIsMutable();
-                  packedDouble_.addDouble(v);
-                  break;
-                } // case 689
-              case 690:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensurePackedDoubleIsMutable(alloc / 8);
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedDouble_.addDouble(input.readDouble());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 690
-              case 696:
-                {
-                  boolean v = input.readBool();
-                  ensurePackedBoolIsMutable();
-                  packedBool_.addBoolean(v);
-                  break;
-                } // case 696
-              case 698:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensurePackedBoolIsMutable(alloc / 1);
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedBool_.addBoolean(input.readBool());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 698
-              case 704:
-                {
-                  int tmpRaw = input.readEnum();
-                  ensurePackedNestedEnumIsMutable();
-                  packedNestedEnum_.addInt(tmpRaw);
-                  break;
-                } // case 704
-              case 706:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensurePackedNestedEnumIsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    packedNestedEnum_.addInt(input.readEnum());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 706
-              case 712:
-                {
-                  int v = input.readInt32();
-                  ensureUnpackedInt32IsMutable();
-                  unpackedInt32_.addInt(v);
-                  break;
-                } // case 712
-              case 714:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureUnpackedInt32IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedInt32_.addInt(input.readInt32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 714
-              case 720:
-                {
-                  long v = input.readInt64();
-                  ensureUnpackedInt64IsMutable();
-                  unpackedInt64_.addLong(v);
-                  break;
-                } // case 720
-              case 722:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureUnpackedInt64IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedInt64_.addLong(input.readInt64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 722
-              case 728:
-                {
-                  int v = input.readUInt32();
-                  ensureUnpackedUint32IsMutable();
-                  unpackedUint32_.addInt(v);
-                  break;
-                } // case 728
-              case 730:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureUnpackedUint32IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedUint32_.addInt(input.readUInt32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 730
-              case 736:
-                {
-                  long v = input.readUInt64();
-                  ensureUnpackedUint64IsMutable();
-                  unpackedUint64_.addLong(v);
-                  break;
-                } // case 736
-              case 738:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureUnpackedUint64IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedUint64_.addLong(input.readUInt64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 738
-              case 744:
-                {
-                  int v = input.readSInt32();
-                  ensureUnpackedSint32IsMutable();
-                  unpackedSint32_.addInt(v);
-                  break;
-                } // case 744
-              case 746:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureUnpackedSint32IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedSint32_.addInt(input.readSInt32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 746
-              case 752:
-                {
-                  long v = input.readSInt64();
-                  ensureUnpackedSint64IsMutable();
-                  unpackedSint64_.addLong(v);
-                  break;
-                } // case 752
-              case 754:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureUnpackedSint64IsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedSint64_.addLong(input.readSInt64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 754
-              case 765:
-                {
-                  int v = input.readFixed32();
-                  ensureUnpackedFixed32IsMutable();
-                  unpackedFixed32_.addInt(v);
-                  break;
-                } // case 765
-              case 762:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureUnpackedFixed32IsMutable(alloc / 4);
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedFixed32_.addInt(input.readFixed32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 762
-              case 769:
-                {
-                  long v = input.readFixed64();
-                  ensureUnpackedFixed64IsMutable();
-                  unpackedFixed64_.addLong(v);
-                  break;
-                } // case 769
-              case 770:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureUnpackedFixed64IsMutable(alloc / 8);
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedFixed64_.addLong(input.readFixed64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 770
-              case 781:
-                {
-                  int v = input.readSFixed32();
-                  ensureUnpackedSfixed32IsMutable();
-                  unpackedSfixed32_.addInt(v);
-                  break;
-                } // case 781
-              case 778:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureUnpackedSfixed32IsMutable(alloc / 4);
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedSfixed32_.addInt(input.readSFixed32());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 778
-              case 785:
-                {
-                  long v = input.readSFixed64();
-                  ensureUnpackedSfixed64IsMutable();
-                  unpackedSfixed64_.addLong(v);
-                  break;
-                } // case 785
-              case 786:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureUnpackedSfixed64IsMutable(alloc / 8);
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedSfixed64_.addLong(input.readSFixed64());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 786
-              case 797:
-                {
-                  float v = input.readFloat();
-                  ensureUnpackedFloatIsMutable();
-                  unpackedFloat_.addFloat(v);
-                  break;
-                } // case 797
-              case 794:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureUnpackedFloatIsMutable(alloc / 4);
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedFloat_.addFloat(input.readFloat());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 794
-              case 801:
-                {
-                  double v = input.readDouble();
-                  ensureUnpackedDoubleIsMutable();
-                  unpackedDouble_.addDouble(v);
-                  break;
-                } // case 801
-              case 802:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureUnpackedDoubleIsMutable(alloc / 8);
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedDouble_.addDouble(input.readDouble());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 802
-              case 808:
-                {
-                  boolean v = input.readBool();
-                  ensureUnpackedBoolIsMutable();
-                  unpackedBool_.addBoolean(v);
-                  break;
-                } // case 808
-              case 810:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  int alloc = length > 4096 ? 4096 : length;
-                  ensureUnpackedBoolIsMutable(alloc / 1);
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedBool_.addBoolean(input.readBool());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 810
-              case 816:
-                {
-                  int tmpRaw = input.readEnum();
-                  ensureUnpackedNestedEnumIsMutable();
-                  unpackedNestedEnum_.addInt(tmpRaw);
-                  break;
-                } // case 816
-              case 818:
-                {
-                  int length = input.readRawVarint32();
-                  int limit = input.pushLimit(length);
-                  ensureUnpackedNestedEnumIsMutable();
-                  while (input.getBytesUntilLimit() > 0) {
-                    unpackedNestedEnum_.addInt(input.readEnum());
-                  }
-                  input.popLimit(limit);
-                  break;
-                } // case 818
-              case 888:
-                {
-                  oneofField_ = input.readUInt32();
-                  oneofFieldCase_ = 111;
-                  break;
-                } // case 888
-              case 898:
-                {
-                  input.readMessage(
-                      internalGetOneofNestedMessageFieldBuilder().getBuilder(), extensionRegistry);
-                  oneofFieldCase_ = 112;
-                  break;
-                } // case 898
-              case 906:
-                {
-                  java.lang.String s = input.readStringRequireUtf8();
-                  oneofFieldCase_ = 113;
-                  oneofField_ = s;
-                  break;
-                } // case 906
-              case 914:
-                {
-                  oneofField_ = input.readBytes();
-                  oneofFieldCase_ = 114;
-                  break;
-                } // case 914
-              case 920:
-                {
-                  oneofField_ = input.readBool();
-                  oneofFieldCase_ = 115;
-                  break;
-                } // case 920
-              case 928:
-                {
-                  oneofField_ = input.readUInt64();
-                  oneofFieldCase_ = 116;
-                  break;
-                } // case 928
-              case 941:
-                {
-                  oneofField_ = input.readFloat();
-                  oneofFieldCase_ = 117;
-                  break;
-                } // case 941
-              case 945:
-                {
-                  oneofField_ = input.readDouble();
-                  oneofFieldCase_ = 118;
-                  break;
-                } // case 945
-              case 952:
-                {
-                  int rawValue = input.readEnum();
-                  oneofFieldCase_ = 119;
-                  oneofField_ = rawValue;
-                  break;
-                } // case 952
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
+              case 8: {
+                optionalInt32_ = input.readInt32();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 16: {
+                optionalInt64_ = input.readInt64();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 24: {
+                optionalUint32_ = input.readUInt32();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              case 32: {
+                optionalUint64_ = input.readUInt64();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 32
+              case 40: {
+                optionalSint32_ = input.readSInt32();
+                bitField0_ |= 0x00000010;
+                break;
+              } // case 40
+              case 48: {
+                optionalSint64_ = input.readSInt64();
+                bitField0_ |= 0x00000020;
+                break;
+              } // case 48
+              case 61: {
+                optionalFixed32_ = input.readFixed32();
+                bitField0_ |= 0x00000040;
+                break;
+              } // case 61
+              case 65: {
+                optionalFixed64_ = input.readFixed64();
+                bitField0_ |= 0x00000080;
+                break;
+              } // case 65
+              case 77: {
+                optionalSfixed32_ = input.readSFixed32();
+                bitField0_ |= 0x00000100;
+                break;
+              } // case 77
+              case 81: {
+                optionalSfixed64_ = input.readSFixed64();
+                bitField0_ |= 0x00000200;
+                break;
+              } // case 81
+              case 93: {
+                optionalFloat_ = input.readFloat();
+                bitField0_ |= 0x00000400;
+                break;
+              } // case 93
+              case 97: {
+                optionalDouble_ = input.readDouble();
+                bitField0_ |= 0x00000800;
+                break;
+              } // case 97
+              case 104: {
+                optionalBool_ = input.readBool();
+                bitField0_ |= 0x00001000;
+                break;
+              } // case 104
+              case 114: {
+                optionalString_ = input.readStringRequireUtf8();
+                bitField0_ |= 0x00002000;
+                break;
+              } // case 114
+              case 122: {
+                optionalBytes_ = input.readBytes();
+                bitField0_ |= 0x00004000;
+                break;
+              } // case 122
+              case 146: {
+                input.readMessage(
+                    internalGetOptionalNestedMessageFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00008000;
+                break;
+              } // case 146
+              case 154: {
+                input.readMessage(
+                    internalGetOptionalForeignMessageFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00010000;
+                break;
+              } // case 154
+              case 168: {
+                optionalNestedEnum_ = input.readEnum();
+                bitField0_ |= 0x00020000;
+                break;
+              } // case 168
+              case 176: {
+                optionalForeignEnum_ = input.readEnum();
+                bitField0_ |= 0x00040000;
+                break;
+              } // case 176
+              case 184: {
+                optionalAliasedEnum_ = input.readEnum();
+                bitField0_ |= 0x00080000;
+                break;
+              } // case 184
+              case 218: {
+                input.readMessage(
+                    internalGetRecursiveMessageFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00100000;
+                break;
+              } // case 218
+              case 248: {
+                int v = input.readInt32();
+                ensureRepeatedInt32IsMutable();
+                repeatedInt32_.addInt(v);
+                break;
+              } // case 248
+              case 250: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedInt32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedInt32_.addInt(input.readInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 250
+              case 256: {
+                long v = input.readInt64();
+                ensureRepeatedInt64IsMutable();
+                repeatedInt64_.addLong(v);
+                break;
+              } // case 256
+              case 258: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedInt64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedInt64_.addLong(input.readInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 258
+              case 264: {
+                int v = input.readUInt32();
+                ensureRepeatedUint32IsMutable();
+                repeatedUint32_.addInt(v);
+                break;
+              } // case 264
+              case 266: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedUint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedUint32_.addInt(input.readUInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 266
+              case 272: {
+                long v = input.readUInt64();
+                ensureRepeatedUint64IsMutable();
+                repeatedUint64_.addLong(v);
+                break;
+              } // case 272
+              case 274: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedUint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedUint64_.addLong(input.readUInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 274
+              case 280: {
+                int v = input.readSInt32();
+                ensureRepeatedSint32IsMutable();
+                repeatedSint32_.addInt(v);
+                break;
+              } // case 280
+              case 282: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedSint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedSint32_.addInt(input.readSInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 282
+              case 288: {
+                long v = input.readSInt64();
+                ensureRepeatedSint64IsMutable();
+                repeatedSint64_.addLong(v);
+                break;
+              } // case 288
+              case 290: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedSint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedSint64_.addLong(input.readSInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 290
+              case 301: {
+                int v = input.readFixed32();
+                ensureRepeatedFixed32IsMutable();
+                repeatedFixed32_.addInt(v);
+                break;
+              } // case 301
+              case 298: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedFixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedFixed32_.addInt(input.readFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 298
+              case 305: {
+                long v = input.readFixed64();
+                ensureRepeatedFixed64IsMutable();
+                repeatedFixed64_.addLong(v);
+                break;
+              } // case 305
+              case 306: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedFixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedFixed64_.addLong(input.readFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 306
+              case 317: {
+                int v = input.readSFixed32();
+                ensureRepeatedSfixed32IsMutable();
+                repeatedSfixed32_.addInt(v);
+                break;
+              } // case 317
+              case 314: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedSfixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedSfixed32_.addInt(input.readSFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 314
+              case 321: {
+                long v = input.readSFixed64();
+                ensureRepeatedSfixed64IsMutable();
+                repeatedSfixed64_.addLong(v);
+                break;
+              } // case 321
+              case 322: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedSfixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedSfixed64_.addLong(input.readSFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 322
+              case 333: {
+                float v = input.readFloat();
+                ensureRepeatedFloatIsMutable();
+                repeatedFloat_.addFloat(v);
+                break;
+              } // case 333
+              case 330: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedFloatIsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedFloat_.addFloat(input.readFloat());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 330
+              case 337: {
+                double v = input.readDouble();
+                ensureRepeatedDoubleIsMutable();
+                repeatedDouble_.addDouble(v);
+                break;
+              } // case 337
+              case 338: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedDoubleIsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedDouble_.addDouble(input.readDouble());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 338
+              case 344: {
+                boolean v = input.readBool();
+                ensureRepeatedBoolIsMutable();
+                repeatedBool_.addBoolean(v);
+                break;
+              } // case 344
+              case 346: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureRepeatedBoolIsMutable(alloc / 1);
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedBool_.addBoolean(input.readBool());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 346
+              case 354: {
+                java.lang.String s = input.readStringRequireUtf8();
+                ensureRepeatedStringIsMutable();
+                repeatedString_.add(s);
+                break;
+              } // case 354
+              case 362: {
+                com.google.protobuf.ByteString v = input.readBytes();
+                ensureRepeatedBytesIsMutable();
+                repeatedBytes_.add(v);
+                break;
+              } // case 362
+              case 386: {
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage m =
+                    input.readMessage(
+                        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.parser(),
+                        extensionRegistry);
+                if (repeatedNestedMessageBuilder_ == null) {
+                  ensureRepeatedNestedMessageIsMutable();
+                  repeatedNestedMessage_.add(m);
+                } else {
+                  repeatedNestedMessageBuilder_.addMessage(m);
+                }
+                break;
+              } // case 386
+              case 394: {
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage m =
+                    input.readMessage(
+                        legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.parser(),
+                        extensionRegistry);
+                if (repeatedForeignMessageBuilder_ == null) {
+                  ensureRepeatedForeignMessageIsMutable();
+                  repeatedForeignMessage_.add(m);
+                } else {
+                  repeatedForeignMessageBuilder_.addMessage(m);
+                }
+                break;
+              } // case 394
+              case 408: {
+                int tmpRaw = input.readEnum();
+                ensureRepeatedNestedEnumIsMutable();
+                repeatedNestedEnum_.addInt(tmpRaw);
+                break;
+              } // case 408
+              case 410: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedNestedEnumIsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedNestedEnum_.addInt(input.readEnum());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 410
+              case 416: {
+                int tmpRaw = input.readEnum();
+                ensureRepeatedForeignEnumIsMutable();
+                repeatedForeignEnum_.addInt(tmpRaw);
+                break;
+              } // case 416
+              case 418: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRepeatedForeignEnumIsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  repeatedForeignEnum_.addInt(input.readEnum());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 418
+              case 450: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+                mapInt32Int32__ = input.readMessage(
+                    MapInt32Int32DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapInt32Int32().getMutableMap().put(
+                    mapInt32Int32__.getKey(), mapInt32Int32__.getValue());
+                bitField2_ |= 0x00000010;
+                break;
+              } // case 450
+              case 458: {
+                com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+                mapInt64Int64__ = input.readMessage(
+                    MapInt64Int64DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapInt64Int64().getMutableMap().put(
+                    mapInt64Int64__.getKey(), mapInt64Int64__.getValue());
+                bitField2_ |= 0x00000020;
+                break;
+              } // case 458
+              case 466: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+                mapUint32Uint32__ = input.readMessage(
+                    MapUint32Uint32DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapUint32Uint32().getMutableMap().put(
+                    mapUint32Uint32__.getKey(), mapUint32Uint32__.getValue());
+                bitField2_ |= 0x00000040;
+                break;
+              } // case 466
+              case 474: {
+                com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+                mapUint64Uint64__ = input.readMessage(
+                    MapUint64Uint64DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapUint64Uint64().getMutableMap().put(
+                    mapUint64Uint64__.getKey(), mapUint64Uint64__.getValue());
+                bitField2_ |= 0x00000080;
+                break;
+              } // case 474
+              case 482: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+                mapSint32Sint32__ = input.readMessage(
+                    MapSint32Sint32DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapSint32Sint32().getMutableMap().put(
+                    mapSint32Sint32__.getKey(), mapSint32Sint32__.getValue());
+                bitField2_ |= 0x00000100;
+                break;
+              } // case 482
+              case 490: {
+                com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+                mapSint64Sint64__ = input.readMessage(
+                    MapSint64Sint64DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapSint64Sint64().getMutableMap().put(
+                    mapSint64Sint64__.getKey(), mapSint64Sint64__.getValue());
+                bitField2_ |= 0x00000200;
+                break;
+              } // case 490
+              case 498: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+                mapFixed32Fixed32__ = input.readMessage(
+                    MapFixed32Fixed32DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapFixed32Fixed32().getMutableMap().put(
+                    mapFixed32Fixed32__.getKey(), mapFixed32Fixed32__.getValue());
+                bitField2_ |= 0x00000400;
+                break;
+              } // case 498
+              case 506: {
+                com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+                mapFixed64Fixed64__ = input.readMessage(
+                    MapFixed64Fixed64DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapFixed64Fixed64().getMutableMap().put(
+                    mapFixed64Fixed64__.getKey(), mapFixed64Fixed64__.getValue());
+                bitField2_ |= 0x00000800;
+                break;
+              } // case 506
+              case 514: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+                mapSfixed32Sfixed32__ = input.readMessage(
+                    MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapSfixed32Sfixed32().getMutableMap().put(
+                    mapSfixed32Sfixed32__.getKey(), mapSfixed32Sfixed32__.getValue());
+                bitField2_ |= 0x00001000;
+                break;
+              } // case 514
+              case 522: {
+                com.google.protobuf.MapEntry<java.lang.Long, java.lang.Long>
+                mapSfixed64Sfixed64__ = input.readMessage(
+                    MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapSfixed64Sfixed64().getMutableMap().put(
+                    mapSfixed64Sfixed64__.getKey(), mapSfixed64Sfixed64__.getValue());
+                bitField2_ |= 0x00002000;
+                break;
+              } // case 522
+              case 530: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float>
+                mapInt32Float__ = input.readMessage(
+                    MapInt32FloatDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapInt32Float().getMutableMap().put(
+                    mapInt32Float__.getKey(), mapInt32Float__.getValue());
+                bitField2_ |= 0x00004000;
+                break;
+              } // case 530
+              case 538: {
+                com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Double>
+                mapInt32Double__ = input.readMessage(
+                    MapInt32DoubleDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapInt32Double().getMutableMap().put(
+                    mapInt32Double__.getKey(), mapInt32Double__.getValue());
+                bitField2_ |= 0x00008000;
+                break;
+              } // case 538
+              case 546: {
+                com.google.protobuf.MapEntry<java.lang.Boolean, java.lang.Boolean>
+                mapBoolBool__ = input.readMessage(
+                    MapBoolBoolDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapBoolBool().getMutableMap().put(
+                    mapBoolBool__.getKey(), mapBoolBool__.getValue());
+                bitField2_ |= 0x00010000;
+                break;
+              } // case 546
+              case 554: {
+                com.google.protobuf.MapEntry<java.lang.String, java.lang.String>
+                mapStringString__ = input.readMessage(
+                    MapStringStringDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapStringString().getMutableMap().put(
+                    mapStringString__.getKey(), mapStringString__.getValue());
+                bitField2_ |= 0x00020000;
+                break;
+              } // case 554
+              case 562: {
+                com.google.protobuf.MapEntry<java.lang.String, com.google.protobuf.ByteString>
+                mapStringBytes__ = input.readMessage(
+                    MapStringBytesDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapStringBytes().getMutableMap().put(
+                    mapStringBytes__.getKey(), mapStringBytes__.getValue());
+                bitField2_ |= 0x00040000;
+                break;
+              } // case 562
+              case 570: {
+                com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
+                mapStringNestedMessage__ = input.readMessage(
+                    MapStringNestedMessageDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapStringNestedMessage().ensureBuilderMap().put(
+                    mapStringNestedMessage__.getKey(), mapStringNestedMessage__.getValue());
+                bitField2_ |= 0x00080000;
+                break;
+              } // case 570
+              case 578: {
+                com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
+                mapStringForeignMessage__ = input.readMessage(
+                    MapStringForeignMessageDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapStringForeignMessage().ensureBuilderMap().put(
+                    mapStringForeignMessage__.getKey(), mapStringForeignMessage__.getValue());
+                bitField2_ |= 0x00100000;
+                break;
+              } // case 578
+              case 586: {
+                com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer>
+                mapStringNestedEnum__ = input.readMessage(
+                    MapStringNestedEnumDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapStringNestedEnum().getMutableMap().put(
+                    mapStringNestedEnum__.getKey(), mapStringNestedEnum__.getValue());
+                bitField2_ |= 0x00200000;
+                break;
+              } // case 586
+              case 594: {
+                com.google.protobuf.MapEntry<java.lang.String, java.lang.Integer>
+                mapStringForeignEnum__ = input.readMessage(
+                    MapStringForeignEnumDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+                internalGetMutableMapStringForeignEnum().getMutableMap().put(
+                    mapStringForeignEnum__.getKey(), mapStringForeignEnum__.getValue());
+                bitField2_ |= 0x00400000;
+                break;
+              } // case 594
+              case 600: {
+                int v = input.readInt32();
+                ensurePackedInt32IsMutable();
+                packedInt32_.addInt(v);
+                break;
+              } // case 600
+              case 602: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedInt32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedInt32_.addInt(input.readInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 602
+              case 608: {
+                long v = input.readInt64();
+                ensurePackedInt64IsMutable();
+                packedInt64_.addLong(v);
+                break;
+              } // case 608
+              case 610: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedInt64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedInt64_.addLong(input.readInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 610
+              case 616: {
+                int v = input.readUInt32();
+                ensurePackedUint32IsMutable();
+                packedUint32_.addInt(v);
+                break;
+              } // case 616
+              case 618: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedUint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedUint32_.addInt(input.readUInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 618
+              case 624: {
+                long v = input.readUInt64();
+                ensurePackedUint64IsMutable();
+                packedUint64_.addLong(v);
+                break;
+              } // case 624
+              case 626: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedUint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedUint64_.addLong(input.readUInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 626
+              case 632: {
+                int v = input.readSInt32();
+                ensurePackedSint32IsMutable();
+                packedSint32_.addInt(v);
+                break;
+              } // case 632
+              case 634: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedSint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedSint32_.addInt(input.readSInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 634
+              case 640: {
+                long v = input.readSInt64();
+                ensurePackedSint64IsMutable();
+                packedSint64_.addLong(v);
+                break;
+              } // case 640
+              case 642: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedSint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedSint64_.addLong(input.readSInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 642
+              case 653: {
+                int v = input.readFixed32();
+                ensurePackedFixed32IsMutable();
+                packedFixed32_.addInt(v);
+                break;
+              } // case 653
+              case 650: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedFixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedFixed32_.addInt(input.readFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 650
+              case 657: {
+                long v = input.readFixed64();
+                ensurePackedFixed64IsMutable();
+                packedFixed64_.addLong(v);
+                break;
+              } // case 657
+              case 658: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedFixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedFixed64_.addLong(input.readFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 658
+              case 669: {
+                int v = input.readSFixed32();
+                ensurePackedSfixed32IsMutable();
+                packedSfixed32_.addInt(v);
+                break;
+              } // case 669
+              case 666: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedSfixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedSfixed32_.addInt(input.readSFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 666
+              case 673: {
+                long v = input.readSFixed64();
+                ensurePackedSfixed64IsMutable();
+                packedSfixed64_.addLong(v);
+                break;
+              } // case 673
+              case 674: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedSfixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedSfixed64_.addLong(input.readSFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 674
+              case 685: {
+                float v = input.readFloat();
+                ensurePackedFloatIsMutable();
+                packedFloat_.addFloat(v);
+                break;
+              } // case 685
+              case 682: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedFloatIsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedFloat_.addFloat(input.readFloat());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 682
+              case 689: {
+                double v = input.readDouble();
+                ensurePackedDoubleIsMutable();
+                packedDouble_.addDouble(v);
+                break;
+              } // case 689
+              case 690: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedDoubleIsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedDouble_.addDouble(input.readDouble());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 690
+              case 696: {
+                boolean v = input.readBool();
+                ensurePackedBoolIsMutable();
+                packedBool_.addBoolean(v);
+                break;
+              } // case 696
+              case 698: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensurePackedBoolIsMutable(alloc / 1);
+                while (input.getBytesUntilLimit() > 0) {
+                  packedBool_.addBoolean(input.readBool());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 698
+              case 704: {
+                int tmpRaw = input.readEnum();
+                ensurePackedNestedEnumIsMutable();
+                packedNestedEnum_.addInt(tmpRaw);
+                break;
+              } // case 704
+              case 706: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensurePackedNestedEnumIsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  packedNestedEnum_.addInt(input.readEnum());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 706
+              case 712: {
+                int v = input.readInt32();
+                ensureUnpackedInt32IsMutable();
+                unpackedInt32_.addInt(v);
+                break;
+              } // case 712
+              case 714: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedInt32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedInt32_.addInt(input.readInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 714
+              case 720: {
+                long v = input.readInt64();
+                ensureUnpackedInt64IsMutable();
+                unpackedInt64_.addLong(v);
+                break;
+              } // case 720
+              case 722: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedInt64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedInt64_.addLong(input.readInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 722
+              case 728: {
+                int v = input.readUInt32();
+                ensureUnpackedUint32IsMutable();
+                unpackedUint32_.addInt(v);
+                break;
+              } // case 728
+              case 730: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedUint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedUint32_.addInt(input.readUInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 730
+              case 736: {
+                long v = input.readUInt64();
+                ensureUnpackedUint64IsMutable();
+                unpackedUint64_.addLong(v);
+                break;
+              } // case 736
+              case 738: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedUint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedUint64_.addLong(input.readUInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 738
+              case 744: {
+                int v = input.readSInt32();
+                ensureUnpackedSint32IsMutable();
+                unpackedSint32_.addInt(v);
+                break;
+              } // case 744
+              case 746: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedSint32IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedSint32_.addInt(input.readSInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 746
+              case 752: {
+                long v = input.readSInt64();
+                ensureUnpackedSint64IsMutable();
+                unpackedSint64_.addLong(v);
+                break;
+              } // case 752
+              case 754: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedSint64IsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedSint64_.addLong(input.readSInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 754
+              case 765: {
+                int v = input.readFixed32();
+                ensureUnpackedFixed32IsMutable();
+                unpackedFixed32_.addInt(v);
+                break;
+              } // case 765
+              case 762: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedFixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedFixed32_.addInt(input.readFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 762
+              case 769: {
+                long v = input.readFixed64();
+                ensureUnpackedFixed64IsMutable();
+                unpackedFixed64_.addLong(v);
+                break;
+              } // case 769
+              case 770: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedFixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedFixed64_.addLong(input.readFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 770
+              case 781: {
+                int v = input.readSFixed32();
+                ensureUnpackedSfixed32IsMutable();
+                unpackedSfixed32_.addInt(v);
+                break;
+              } // case 781
+              case 778: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedSfixed32IsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedSfixed32_.addInt(input.readSFixed32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 778
+              case 785: {
+                long v = input.readSFixed64();
+                ensureUnpackedSfixed64IsMutable();
+                unpackedSfixed64_.addLong(v);
+                break;
+              } // case 785
+              case 786: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedSfixed64IsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedSfixed64_.addLong(input.readSFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 786
+              case 797: {
+                float v = input.readFloat();
+                ensureUnpackedFloatIsMutable();
+                unpackedFloat_.addFloat(v);
+                break;
+              } // case 797
+              case 794: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedFloatIsMutable(alloc / 4);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedFloat_.addFloat(input.readFloat());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 794
+              case 801: {
+                double v = input.readDouble();
+                ensureUnpackedDoubleIsMutable();
+                unpackedDouble_.addDouble(v);
+                break;
+              } // case 801
+              case 802: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedDoubleIsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedDouble_.addDouble(input.readDouble());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 802
+              case 808: {
+                boolean v = input.readBool();
+                ensureUnpackedBoolIsMutable();
+                unpackedBool_.addBoolean(v);
+                break;
+              } // case 808
+              case 810: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureUnpackedBoolIsMutable(alloc / 1);
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedBool_.addBoolean(input.readBool());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 810
+              case 816: {
+                int tmpRaw = input.readEnum();
+                ensureUnpackedNestedEnumIsMutable();
+                unpackedNestedEnum_.addInt(tmpRaw);
+                break;
+              } // case 816
+              case 818: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureUnpackedNestedEnumIsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  unpackedNestedEnum_.addInt(input.readEnum());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 818
+              case 888: {
+                oneofField_ = input.readUInt32();
+                oneofFieldCase_ = 111;
+                break;
+              } // case 888
+              case 898: {
+                input.readMessage(
+                    internalGetOneofNestedMessageFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                oneofFieldCase_ = 112;
+                break;
+              } // case 898
+              case 906: {
+                java.lang.String s = input.readStringRequireUtf8();
+                oneofFieldCase_ = 113;
+                oneofField_ = s;
+                break;
+              } // case 906
+              case 914: {
+                oneofField_ = input.readBytes();
+                oneofFieldCase_ = 114;
+                break;
+              } // case 914
+              case 920: {
+                oneofField_ = input.readBool();
+                oneofFieldCase_ = 115;
+                break;
+              } // case 920
+              case 928: {
+                oneofField_ = input.readUInt64();
+                oneofFieldCase_ = 116;
+                break;
+              } // case 928
+              case 941: {
+                oneofField_ = input.readFloat();
+                oneofFieldCase_ = 117;
+                break;
+              } // case 941
+              case 945: {
+                oneofField_ = input.readDouble();
+                oneofFieldCase_ = 118;
+                break;
+              } // case 945
+              case 952: {
+                int rawValue = input.readEnum();
+                oneofFieldCase_ = 119;
+                oneofField_ = rawValue;
+                break;
+              } // case 952
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
             } // switch (tag)
           } // while (!done)
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -13908,12 +12708,12 @@ public Builder mergeFrom(
         } // finally
         return this;
       }
-
       private int oneofFieldCase_ = 0;
       private java.lang.Object oneofField_;
-
-      public OneofFieldCase getOneofFieldCase() {
-        return OneofFieldCase.forNumber(oneofFieldCase_);
+      public OneofFieldCase
+          getOneofFieldCase() {
+        return OneofFieldCase.forNumber(
+            oneofFieldCase_);
       }
 
       public Builder clearOneofField() {
@@ -13927,21 +12727,17 @@ public Builder clearOneofField() {
       private int bitField1_;
       private int bitField2_;
 
-      private int optionalInt32_;
-
+      private int optionalInt32_ ;
       /**
        * <code>int32 optional_int32 = 1;</code>
-       *
        * @return The optionalInt32.
        */
       @java.lang.Override
       public int getOptionalInt32() {
         return optionalInt32_;
       }
-
       /**
        * <code>int32 optional_int32 = 1;</code>
-       *
        * @param value The optionalInt32 to set.
        * @return This builder for chaining.
        */
@@ -13952,10 +12748,8 @@ public Builder setOptionalInt32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>int32 optional_int32 = 1;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalInt32() {
@@ -13965,21 +12759,17 @@ public Builder clearOptionalInt32() {
         return this;
       }
 
-      private long optionalInt64_;
-
+      private long optionalInt64_ ;
       /**
        * <code>int64 optional_int64 = 2;</code>
-       *
        * @return The optionalInt64.
        */
       @java.lang.Override
       public long getOptionalInt64() {
         return optionalInt64_;
       }
-
       /**
        * <code>int64 optional_int64 = 2;</code>
-       *
        * @param value The optionalInt64 to set.
        * @return This builder for chaining.
        */
@@ -13990,10 +12780,8 @@ public Builder setOptionalInt64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>int64 optional_int64 = 2;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalInt64() {
@@ -14003,21 +12791,17 @@ public Builder clearOptionalInt64() {
         return this;
       }
 
-      private int optionalUint32_;
-
+      private int optionalUint32_ ;
       /**
        * <code>uint32 optional_uint32 = 3;</code>
-       *
        * @return The optionalUint32.
        */
       @java.lang.Override
       public int getOptionalUint32() {
         return optionalUint32_;
       }
-
       /**
        * <code>uint32 optional_uint32 = 3;</code>
-       *
        * @param value The optionalUint32 to set.
        * @return This builder for chaining.
        */
@@ -14028,10 +12812,8 @@ public Builder setOptionalUint32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>uint32 optional_uint32 = 3;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalUint32() {
@@ -14041,21 +12823,17 @@ public Builder clearOptionalUint32() {
         return this;
       }
 
-      private long optionalUint64_;
-
+      private long optionalUint64_ ;
       /**
        * <code>uint64 optional_uint64 = 4;</code>
-       *
        * @return The optionalUint64.
        */
       @java.lang.Override
       public long getOptionalUint64() {
         return optionalUint64_;
       }
-
       /**
        * <code>uint64 optional_uint64 = 4;</code>
-       *
        * @param value The optionalUint64 to set.
        * @return This builder for chaining.
        */
@@ -14066,10 +12844,8 @@ public Builder setOptionalUint64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>uint64 optional_uint64 = 4;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalUint64() {
@@ -14079,21 +12855,17 @@ public Builder clearOptionalUint64() {
         return this;
       }
 
-      private int optionalSint32_;
-
+      private int optionalSint32_ ;
       /**
        * <code>sint32 optional_sint32 = 5;</code>
-       *
        * @return The optionalSint32.
        */
       @java.lang.Override
       public int getOptionalSint32() {
         return optionalSint32_;
       }
-
       /**
        * <code>sint32 optional_sint32 = 5;</code>
-       *
        * @param value The optionalSint32 to set.
        * @return This builder for chaining.
        */
@@ -14104,10 +12876,8 @@ public Builder setOptionalSint32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>sint32 optional_sint32 = 5;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalSint32() {
@@ -14117,21 +12887,17 @@ public Builder clearOptionalSint32() {
         return this;
       }
 
-      private long optionalSint64_;
-
+      private long optionalSint64_ ;
       /**
        * <code>sint64 optional_sint64 = 6;</code>
-       *
        * @return The optionalSint64.
        */
       @java.lang.Override
       public long getOptionalSint64() {
         return optionalSint64_;
       }
-
       /**
        * <code>sint64 optional_sint64 = 6;</code>
-       *
        * @param value The optionalSint64 to set.
        * @return This builder for chaining.
        */
@@ -14142,10 +12908,8 @@ public Builder setOptionalSint64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>sint64 optional_sint64 = 6;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalSint64() {
@@ -14155,21 +12919,17 @@ public Builder clearOptionalSint64() {
         return this;
       }
 
-      private int optionalFixed32_;
-
+      private int optionalFixed32_ ;
       /**
        * <code>fixed32 optional_fixed32 = 7;</code>
-       *
        * @return The optionalFixed32.
        */
       @java.lang.Override
       public int getOptionalFixed32() {
         return optionalFixed32_;
       }
-
       /**
        * <code>fixed32 optional_fixed32 = 7;</code>
-       *
        * @param value The optionalFixed32 to set.
        * @return This builder for chaining.
        */
@@ -14180,10 +12940,8 @@ public Builder setOptionalFixed32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>fixed32 optional_fixed32 = 7;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalFixed32() {
@@ -14193,21 +12951,17 @@ public Builder clearOptionalFixed32() {
         return this;
       }
 
-      private long optionalFixed64_;
-
+      private long optionalFixed64_ ;
       /**
        * <code>fixed64 optional_fixed64 = 8;</code>
-       *
        * @return The optionalFixed64.
        */
       @java.lang.Override
       public long getOptionalFixed64() {
         return optionalFixed64_;
       }
-
       /**
        * <code>fixed64 optional_fixed64 = 8;</code>
-       *
        * @param value The optionalFixed64 to set.
        * @return This builder for chaining.
        */
@@ -14218,10 +12972,8 @@ public Builder setOptionalFixed64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>fixed64 optional_fixed64 = 8;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalFixed64() {
@@ -14231,21 +12983,17 @@ public Builder clearOptionalFixed64() {
         return this;
       }
 
-      private int optionalSfixed32_;
-
+      private int optionalSfixed32_ ;
       /**
        * <code>sfixed32 optional_sfixed32 = 9;</code>
-       *
        * @return The optionalSfixed32.
        */
       @java.lang.Override
       public int getOptionalSfixed32() {
         return optionalSfixed32_;
       }
-
       /**
        * <code>sfixed32 optional_sfixed32 = 9;</code>
-       *
        * @param value The optionalSfixed32 to set.
        * @return This builder for chaining.
        */
@@ -14256,10 +13004,8 @@ public Builder setOptionalSfixed32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>sfixed32 optional_sfixed32 = 9;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalSfixed32() {
@@ -14269,21 +13015,17 @@ public Builder clearOptionalSfixed32() {
         return this;
       }
 
-      private long optionalSfixed64_;
-
+      private long optionalSfixed64_ ;
       /**
        * <code>sfixed64 optional_sfixed64 = 10;</code>
-       *
        * @return The optionalSfixed64.
        */
       @java.lang.Override
       public long getOptionalSfixed64() {
         return optionalSfixed64_;
       }
-
       /**
        * <code>sfixed64 optional_sfixed64 = 10;</code>
-       *
        * @param value The optionalSfixed64 to set.
        * @return This builder for chaining.
        */
@@ -14294,10 +13036,8 @@ public Builder setOptionalSfixed64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>sfixed64 optional_sfixed64 = 10;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalSfixed64() {
@@ -14307,21 +13047,17 @@ public Builder clearOptionalSfixed64() {
         return this;
       }
 
-      private float optionalFloat_;
-
+      private float optionalFloat_ ;
       /**
        * <code>float optional_float = 11;</code>
-       *
        * @return The optionalFloat.
        */
       @java.lang.Override
       public float getOptionalFloat() {
         return optionalFloat_;
       }
-
       /**
        * <code>float optional_float = 11;</code>
-       *
        * @param value The optionalFloat to set.
        * @return This builder for chaining.
        */
@@ -14332,10 +13068,8 @@ public Builder setOptionalFloat(float value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>float optional_float = 11;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalFloat() {
@@ -14345,21 +13079,17 @@ public Builder clearOptionalFloat() {
         return this;
       }
 
-      private double optionalDouble_;
-
+      private double optionalDouble_ ;
       /**
        * <code>double optional_double = 12;</code>
-       *
        * @return The optionalDouble.
        */
       @java.lang.Override
       public double getOptionalDouble() {
         return optionalDouble_;
       }
-
       /**
        * <code>double optional_double = 12;</code>
-       *
        * @param value The optionalDouble to set.
        * @return This builder for chaining.
        */
@@ -14370,10 +13100,8 @@ public Builder setOptionalDouble(double value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>double optional_double = 12;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalDouble() {
@@ -14383,21 +13111,17 @@ public Builder clearOptionalDouble() {
         return this;
       }
 
-      private boolean optionalBool_;
-
+      private boolean optionalBool_ ;
       /**
        * <code>bool optional_bool = 13;</code>
-       *
        * @return The optionalBool.
        */
       @java.lang.Override
       public boolean getOptionalBool() {
         return optionalBool_;
       }
-
       /**
        * <code>bool optional_bool = 13;</code>
-       *
        * @param value The optionalBool to set.
        * @return This builder for chaining.
        */
@@ -14408,10 +13132,8 @@ public Builder setOptionalBool(boolean value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>bool optional_bool = 13;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalBool() {
@@ -14422,16 +13144,15 @@ public Builder clearOptionalBool() {
       }
 
       private java.lang.Object optionalString_ = "";
-
       /**
        * <code>string optional_string = 14;</code>
-       *
        * @return The optionalString.
        */
       public java.lang.String getOptionalString() {
         java.lang.Object ref = optionalString_;
         if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           optionalString_ = s;
           return s;
@@ -14439,43 +13160,38 @@ public java.lang.String getOptionalString() {
           return (java.lang.String) ref;
         }
       }
-
       /**
        * <code>string optional_string = 14;</code>
-       *
        * @return The bytes for optionalString.
        */
-      public com.google.protobuf.ByteString getOptionalStringBytes() {
+      public com.google.protobuf.ByteString
+          getOptionalStringBytes() {
         java.lang.Object ref = optionalString_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
-              com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
           optionalString_ = b;
           return b;
         } else {
           return (com.google.protobuf.ByteString) ref;
         }
       }
-
       /**
        * <code>string optional_string = 14;</code>
-       *
        * @param value The optionalString to set.
        * @return This builder for chaining.
        */
-      public Builder setOptionalString(java.lang.String value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setOptionalString(
+          java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
         optionalString_ = value;
         bitField0_ |= 0x00002000;
         onChanged();
         return this;
       }
-
       /**
        * <code>string optional_string = 14;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalString() {
@@ -14484,17 +13200,14 @@ public Builder clearOptionalString() {
         onChanged();
         return this;
       }
-
       /**
        * <code>string optional_string = 14;</code>
-       *
        * @param value The bytes for optionalString to set.
        * @return This builder for chaining.
        */
-      public Builder setOptionalStringBytes(com.google.protobuf.ByteString value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setOptionalStringBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
         checkByteStringIsUtf8(value);
         optionalString_ = value;
         bitField0_ |= 0x00002000;
@@ -14503,36 +13216,28 @@ public Builder setOptionalStringBytes(com.google.protobuf.ByteString value) {
       }
 
       private com.google.protobuf.ByteString optionalBytes_ = com.google.protobuf.ByteString.EMPTY;
-
       /**
        * <code>bytes optional_bytes = 15;</code>
-       *
        * @return The optionalBytes.
        */
       @java.lang.Override
       public com.google.protobuf.ByteString getOptionalBytes() {
         return optionalBytes_;
       }
-
       /**
        * <code>bytes optional_bytes = 15;</code>
-       *
        * @param value The optionalBytes to set.
        * @return This builder for chaining.
        */
       public Builder setOptionalBytes(com.google.protobuf.ByteString value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         optionalBytes_ = value;
         bitField0_ |= 0x00004000;
         onChanged();
         return this;
       }
-
       /**
        * <code>bytes optional_bytes = 15;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalBytes() {
@@ -14542,54 +13247,31 @@ public Builder clearOptionalBytes() {
         return this;
       }
 
-      private legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-          optionalNestedMessage_;
+      private legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage optionalNestedMessage_;
       private com.google.protobuf.SingleFieldBuilder<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .NestedMessageOrBuilder>
-          optionalNestedMessageBuilder_;
-
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> optionalNestedMessageBuilder_;
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
        * @return Whether the optionalNestedMessage field is set.
        */
       public boolean hasOptionalNestedMessage() {
         return ((bitField0_ & 0x00008000) != 0);
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
        * @return The optionalNestedMessage.
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-          getOptionalNestedMessage() {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getOptionalNestedMessage() {
         if (optionalNestedMessageBuilder_ == null) {
-          return optionalNestedMessage_ == null
-              ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .getDefaultInstance()
-              : optionalNestedMessage_;
+          return optionalNestedMessage_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance() : optionalNestedMessage_;
         } else {
           return optionalNestedMessageBuilder_.getMessage();
         }
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
        */
-      public Builder setOptionalNestedMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              value) {
+      public Builder setOptionalNestedMessage(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage value) {
         if (optionalNestedMessageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -14602,16 +13284,11 @@ public Builder setOptionalNestedMessage(
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
        */
       public Builder setOptionalNestedMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder
-              builderForValue) {
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder builderForValue) {
         if (optionalNestedMessageBuilder_ == null) {
           optionalNestedMessage_ = builderForValue.build();
         } else {
@@ -14621,21 +13298,14 @@ public Builder setOptionalNestedMessage(
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
        */
-      public Builder mergeOptionalNestedMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              value) {
+      public Builder mergeOptionalNestedMessage(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage value) {
         if (optionalNestedMessageBuilder_ == null) {
-          if (((bitField0_ & 0x00008000) != 0)
-              && optionalNestedMessage_ != null
-              && optionalNestedMessage_
-                  != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage.getDefaultInstance()) {
+          if (((bitField0_ & 0x00008000) != 0) &&
+            optionalNestedMessage_ != null &&
+            optionalNestedMessage_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance()) {
             getOptionalNestedMessageBuilder().mergeFrom(value);
           } else {
             optionalNestedMessage_ = value;
@@ -14649,11 +13319,8 @@ public Builder mergeOptionalNestedMessage(
         }
         return this;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
        */
       public Builder clearOptionalNestedMessage() {
         bitField0_ = (bitField0_ & ~0x00008000);
@@ -14665,102 +13332,67 @@ public Builder clearOptionalNestedMessage() {
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .Builder
-          getOptionalNestedMessageBuilder() {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder getOptionalNestedMessageBuilder() {
         bitField0_ |= 0x00008000;
         onChanged();
         return internalGetOptionalNestedMessageFieldBuilder().getBuilder();
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessageOrBuilder
-          getOptionalNestedMessageOrBuilder() {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder getOptionalNestedMessageOrBuilder() {
         if (optionalNestedMessageBuilder_ != null) {
           return optionalNestedMessageBuilder_.getMessageOrBuilder();
         } else {
-          return optionalNestedMessage_ == null
-              ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .getDefaultInstance()
-              : optionalNestedMessage_;
+          return optionalNestedMessage_ == null ?
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance() : optionalNestedMessage_;
         }
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage optional_nested_message = 18;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .NestedMessageOrBuilder>
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> 
           internalGetOptionalNestedMessageFieldBuilder() {
         if (optionalNestedMessageBuilder_ == null) {
-          optionalNestedMessageBuilder_ =
-              new com.google.protobuf.SingleFieldBuilder<
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage.Builder,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessageOrBuilder>(
-                  getOptionalNestedMessage(), getParentForChildren(), isClean());
+          optionalNestedMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder>(
+                  getOptionalNestedMessage(),
+                  getParentForChildren(),
+                  isClean());
           optionalNestedMessage_ = null;
         }
         return optionalNestedMessageBuilder_;
       }
 
-      private legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-          optionalForeignMessage_;
+      private legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage optionalForeignMessage_;
       private com.google.protobuf.SingleFieldBuilder<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>
-          optionalForeignMessageBuilder_;
-
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder> optionalForeignMessageBuilder_;
       /**
        * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
-       *
        * @return Whether the optionalForeignMessage field is set.
        */
       public boolean hasOptionalForeignMessage() {
         return ((bitField0_ & 0x00010000) != 0);
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
-       *
        * @return The optionalForeignMessage.
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-          getOptionalForeignMessage() {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getOptionalForeignMessage() {
         if (optionalForeignMessageBuilder_ == null) {
-          return optionalForeignMessage_ == null
-              ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-                  .getDefaultInstance()
-              : optionalForeignMessage_;
+          return optionalForeignMessage_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance() : optionalForeignMessage_;
         } else {
           return optionalForeignMessageBuilder_.getMessage();
         }
       }
-
-      /** <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code> */
-      public Builder setOptionalForeignMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage value) {
+      /**
+       * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
+       */
+      public Builder setOptionalForeignMessage(legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage value) {
         if (optionalForeignMessageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -14773,11 +13405,11 @@ public Builder setOptionalForeignMessage(
         onChanged();
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code> */
+      /**
+       * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
+       */
       public Builder setOptionalForeignMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder
-              builderForValue) {
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder builderForValue) {
         if (optionalForeignMessageBuilder_ == null) {
           optionalForeignMessage_ = builderForValue.build();
         } else {
@@ -14787,16 +13419,14 @@ public Builder setOptionalForeignMessage(
         onChanged();
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code> */
-      public Builder mergeOptionalForeignMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage value) {
+      /**
+       * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
+       */
+      public Builder mergeOptionalForeignMessage(legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage value) {
         if (optionalForeignMessageBuilder_ == null) {
-          if (((bitField0_ & 0x00010000) != 0)
-              && optionalForeignMessage_ != null
-              && optionalForeignMessage_
-                  != legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-                      .getDefaultInstance()) {
+          if (((bitField0_ & 0x00010000) != 0) &&
+            optionalForeignMessage_ != null &&
+            optionalForeignMessage_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance()) {
             getOptionalForeignMessageBuilder().mergeFrom(value);
           } else {
             optionalForeignMessage_ = value;
@@ -14810,8 +13440,9 @@ public Builder mergeOptionalForeignMessage(
         }
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code> */
+      /**
+       * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
+       */
       public Builder clearOptionalForeignMessage() {
         bitField0_ = (bitField0_ & ~0x00010000);
         optionalForeignMessage_ = null;
@@ -14822,63 +13453,52 @@ public Builder clearOptionalForeignMessage() {
         onChanged();
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code> */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder
-          getOptionalForeignMessageBuilder() {
+      /**
+       * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
+       */
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder getOptionalForeignMessageBuilder() {
         bitField0_ |= 0x00010000;
         onChanged();
         return internalGetOptionalForeignMessageFieldBuilder().getBuilder();
       }
-
-      /** <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code> */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder
-          getOptionalForeignMessageOrBuilder() {
+      /**
+       * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
+       */
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder getOptionalForeignMessageOrBuilder() {
         if (optionalForeignMessageBuilder_ != null) {
           return optionalForeignMessageBuilder_.getMessageOrBuilder();
         } else {
-          return optionalForeignMessage_ == null
-              ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-                  .getDefaultInstance()
-              : optionalForeignMessage_;
+          return optionalForeignMessage_ == null ?
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance() : optionalForeignMessage_;
         }
       }
-
-      /** <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code> */
+      /**
+       * <code>.legacy_gencode_test.proto3.ForeignMessage optional_foreign_message = 19;</code>
+       */
       private com.google.protobuf.SingleFieldBuilder<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder> 
           internalGetOptionalForeignMessageFieldBuilder() {
         if (optionalForeignMessageBuilder_ == null) {
-          optionalForeignMessageBuilder_ =
-              new com.google.protobuf.SingleFieldBuilder<
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>(
-                  getOptionalForeignMessage(), getParentForChildren(), isClean());
+          optionalForeignMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>(
+                  getOptionalForeignMessage(),
+                  getParentForChildren(),
+                  isClean());
           optionalForeignMessage_ = null;
         }
         return optionalForeignMessageBuilder_;
       }
 
       private int optionalNestedEnum_ = 0;
-
       /**
-       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;</code>
        * @return The enum numeric value on the wire for optionalNestedEnum.
        */
-      @java.lang.Override
-      public int getOptionalNestedEnumValue() {
+      @java.lang.Override public int getOptionalNestedEnumValue() {
         return optionalNestedEnum_;
       }
-
       /**
-       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;</code>
        * @param value The enum numeric value on the wire for optionalNestedEnum to set.
        * @return This builder for chaining.
        */
@@ -14888,47 +13508,29 @@ public Builder setOptionalNestedEnumValue(int value) {
         onChanged();
         return this;
       }
-
       /**
-       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;</code>
        * @return The optionalNestedEnum.
        */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-          getOptionalNestedEnum() {
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum result =
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                .forNumber(optionalNestedEnum_);
-        return result == null
-            ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                .UNRECOGNIZED
-            : result;
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getOptionalNestedEnum() {
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.forNumber(optionalNestedEnum_);
+        return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.UNRECOGNIZED : result;
       }
-
       /**
-       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;</code>
        * @param value The optionalNestedEnum to set.
        * @return This builder for chaining.
        */
-      public Builder setOptionalNestedEnum(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setOptionalNestedEnum(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00020000;
         optionalNestedEnum_ = value.getNumber();
         onChanged();
         return this;
       }
-
       /**
-       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum optional_nested_enum = 21;</code>
        * @return This builder for chaining.
        */
       public Builder clearOptionalNestedEnum() {
@@ -14939,20 +13541,15 @@ public Builder clearOptionalNestedEnum() {
       }
 
       private int optionalForeignEnum_ = 0;
-
       /**
        * <code>.legacy_gencode_test.proto3.ForeignEnum optional_foreign_enum = 22;</code>
-       *
        * @return The enum numeric value on the wire for optionalForeignEnum.
        */
-      @java.lang.Override
-      public int getOptionalForeignEnumValue() {
+      @java.lang.Override public int getOptionalForeignEnumValue() {
         return optionalForeignEnum_;
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.ForeignEnum optional_foreign_enum = 22;</code>
-       *
        * @param value The enum numeric value on the wire for optionalForeignEnum to set.
        * @return This builder for chaining.
        */
@@ -14962,43 +13559,29 @@ public Builder setOptionalForeignEnumValue(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.ForeignEnum optional_foreign_enum = 22;</code>
-       *
        * @return The optionalForeignEnum.
        */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum
-          getOptionalForeignEnum() {
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum result =
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.forNumber(
-                optionalForeignEnum_);
-        return result == null
-            ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.UNRECOGNIZED
-            : result;
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getOptionalForeignEnum() {
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.forNumber(optionalForeignEnum_);
+        return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum.UNRECOGNIZED : result;
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.ForeignEnum optional_foreign_enum = 22;</code>
-       *
        * @param value The optionalForeignEnum to set.
        * @return This builder for chaining.
        */
-      public Builder setOptionalForeignEnum(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setOptionalForeignEnum(legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum value) {
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00040000;
         optionalForeignEnum_ = value.getNumber();
         onChanged();
         return this;
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.ForeignEnum optional_foreign_enum = 22;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOptionalForeignEnum() {
@@ -15009,24 +13592,15 @@ public Builder clearOptionalForeignEnum() {
       }
 
       private int optionalAliasedEnum_ = 0;
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;</code>
        * @return The enum numeric value on the wire for optionalAliasedEnum.
        */
-      @java.lang.Override
-      public int getOptionalAliasedEnumValue() {
+      @java.lang.Override public int getOptionalAliasedEnumValue() {
         return optionalAliasedEnum_;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;</code>
        * @param value The enum numeric value on the wire for optionalAliasedEnum to set.
        * @return This builder for chaining.
        */
@@ -15036,50 +13610,29 @@ public Builder setOptionalAliasedEnumValue(int value) {
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;</code>
        * @return The optionalAliasedEnum.
        */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum
-          getOptionalAliasedEnum() {
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum result =
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum
-                .forNumber(optionalAliasedEnum_);
-        return result == null
-            ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum
-                .UNRECOGNIZED
-            : result;
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum getOptionalAliasedEnum() {
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum.forNumber(optionalAliasedEnum_);
+        return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum.UNRECOGNIZED : result;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;</code>
        * @param value The optionalAliasedEnum to set.
        * @return This builder for chaining.
        */
-      public Builder setOptionalAliasedEnum(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setOptionalAliasedEnum(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.AliasedEnum value) {
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00080000;
         optionalAliasedEnum_ = value.getNumber();
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.AliasedEnum optional_aliased_enum = 23;</code>
        * @return This builder for chaining.
        */
       public Builder clearOptionalAliasedEnum() {
@@ -15089,43 +13642,31 @@ public Builder clearOptionalAliasedEnum() {
         return this;
       }
 
-      private legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-          recursiveMessage_;
+      private legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 recursiveMessage_;
       private com.google.protobuf.SingleFieldBuilder<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder>
-          recursiveMessageBuilder_;
-
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder> recursiveMessageBuilder_;
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
-       *
        * @return Whether the recursiveMessage field is set.
        */
       public boolean hasRecursiveMessage() {
         return ((bitField0_ & 0x00100000) != 0);
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
-       *
        * @return The recursiveMessage.
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-          getRecursiveMessage() {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 getRecursiveMessage() {
         if (recursiveMessageBuilder_ == null) {
-          return recursiveMessage_ == null
-              ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .getDefaultInstance()
-              : recursiveMessage_;
+          return recursiveMessage_ == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance() : recursiveMessage_;
         } else {
           return recursiveMessageBuilder_.getMessage();
         }
       }
-
-      /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code> */
-      public Builder setRecursiveMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 value) {
+      /**
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
+       */
+      public Builder setRecursiveMessage(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 value) {
         if (recursiveMessageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -15138,11 +13679,11 @@ public Builder setRecursiveMessage(
         onChanged();
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code> */
+      /**
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
+       */
       public Builder setRecursiveMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder
-              builderForValue) {
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder builderForValue) {
         if (recursiveMessageBuilder_ == null) {
           recursiveMessage_ = builderForValue.build();
         } else {
@@ -15152,16 +13693,14 @@ public Builder setRecursiveMessage(
         onChanged();
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code> */
-      public Builder mergeRecursiveMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 value) {
+      /**
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
+       */
+      public Builder mergeRecursiveMessage(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 value) {
         if (recursiveMessageBuilder_ == null) {
-          if (((bitField0_ & 0x00100000) != 0)
-              && recursiveMessage_ != null
-              && recursiveMessage_
-                  != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .getDefaultInstance()) {
+          if (((bitField0_ & 0x00100000) != 0) &&
+            recursiveMessage_ != null &&
+            recursiveMessage_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance()) {
             getRecursiveMessageBuilder().mergeFrom(value);
           } else {
             recursiveMessage_ = value;
@@ -15175,8 +13714,9 @@ public Builder mergeRecursiveMessage(
         }
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code> */
+      /**
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
+       */
       public Builder clearRecursiveMessage() {
         bitField0_ = (bitField0_ & ~0x00100000);
         recursiveMessage_ = null;
@@ -15187,116 +13727,97 @@ public Builder clearRecursiveMessage() {
         onChanged();
         return this;
       }
-
-      /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code> */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder
-          getRecursiveMessageBuilder() {
+      /**
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
+       */
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder getRecursiveMessageBuilder() {
         bitField0_ |= 0x00100000;
         onChanged();
         return internalGetRecursiveMessageFieldBuilder().getBuilder();
       }
-
-      /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code> */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder
-          getRecursiveMessageOrBuilder() {
+      /**
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
+       */
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder getRecursiveMessageOrBuilder() {
         if (recursiveMessageBuilder_ != null) {
           return recursiveMessageBuilder_.getMessageOrBuilder();
         } else {
-          return recursiveMessage_ == null
-              ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .getDefaultInstance()
-              : recursiveMessage_;
+          return recursiveMessage_ == null ?
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.getDefaultInstance() : recursiveMessage_;
         }
       }
-
-      /** <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code> */
+      /**
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3 recursive_message = 27;</code>
+       */
       private com.google.protobuf.SingleFieldBuilder<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder>
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder> 
           internalGetRecursiveMessageFieldBuilder() {
         if (recursiveMessageBuilder_ == null) {
-          recursiveMessageBuilder_ =
-              new com.google.protobuf.SingleFieldBuilder<
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder>(
-                  getRecursiveMessage(), getParentForChildren(), isClean());
+          recursiveMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3OrBuilder>(
+                  getRecursiveMessage(),
+                  getParentForChildren(),
+                  isClean());
           recursiveMessage_ = null;
         }
         return recursiveMessageBuilder_;
       }
 
       private com.google.protobuf.Internal.IntList repeatedInt32_ = emptyIntList();
-
       private void ensureRepeatedInt32IsMutable() {
         if (!repeatedInt32_.isModifiable()) {
           repeatedInt32_ = makeMutableCopy(repeatedInt32_);
         }
         bitField0_ |= 0x00200000;
       }
-
       /**
-       *
-       *
        * <pre>
        * Repeated
        * </pre>
        *
        * <code>repeated int32 repeated_int32 = 31;</code>
-       *
        * @return A list containing the repeatedInt32.
        */
-      public java.util.List<java.lang.Integer> getRepeatedInt32List() {
+      public java.util.List<java.lang.Integer>
+          getRepeatedInt32List() {
         repeatedInt32_.makeImmutable();
         return repeatedInt32_;
       }
-
       /**
-       *
-       *
        * <pre>
        * Repeated
        * </pre>
        *
        * <code>repeated int32 repeated_int32 = 31;</code>
-       *
        * @return The count of repeatedInt32.
        */
       public int getRepeatedInt32Count() {
         return repeatedInt32_.size();
       }
-
       /**
-       *
-       *
        * <pre>
        * Repeated
        * </pre>
        *
        * <code>repeated int32 repeated_int32 = 31;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedInt32 at the given index.
        */
       public int getRepeatedInt32(int index) {
         return repeatedInt32_.getInt(index);
       }
-
       /**
-       *
-       *
        * <pre>
        * Repeated
        * </pre>
        *
        * <code>repeated int32 repeated_int32 = 31;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedInt32 to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedInt32(int index, int value) {
+      public Builder setRepeatedInt32(
+          int index, int value) {
 
         ensureRepeatedInt32IsMutable();
         repeatedInt32_.setInt(index, value);
@@ -15304,16 +13825,12 @@ public Builder setRepeatedInt32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
-       *
-       *
        * <pre>
        * Repeated
        * </pre>
        *
        * <code>repeated int32 repeated_int32 = 31;</code>
-       *
        * @param value The repeatedInt32 to add.
        * @return This builder for chaining.
        */
@@ -15325,36 +13842,30 @@ public Builder addRepeatedInt32(int value) {
         onChanged();
         return this;
       }
-
       /**
-       *
-       *
        * <pre>
        * Repeated
        * </pre>
        *
        * <code>repeated int32 repeated_int32 = 31;</code>
-       *
        * @param values The repeatedInt32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedInt32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllRepeatedInt32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureRepeatedInt32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedInt32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedInt32_);
         bitField0_ |= 0x00200000;
         onChanged();
         return this;
       }
-
       /**
-       *
-       *
        * <pre>
        * Repeated
        * </pre>
        *
        * <code>repeated int32 repeated_int32 = 31;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedInt32() {
@@ -15365,51 +13876,44 @@ public Builder clearRepeatedInt32() {
       }
 
       private com.google.protobuf.Internal.LongList repeatedInt64_ = emptyLongList();
-
       private void ensureRepeatedInt64IsMutable() {
         if (!repeatedInt64_.isModifiable()) {
           repeatedInt64_ = makeMutableCopy(repeatedInt64_);
         }
         bitField0_ |= 0x00400000;
       }
-
       /**
        * <code>repeated int64 repeated_int64 = 32;</code>
-       *
        * @return A list containing the repeatedInt64.
        */
-      public java.util.List<java.lang.Long> getRepeatedInt64List() {
+      public java.util.List<java.lang.Long>
+          getRepeatedInt64List() {
         repeatedInt64_.makeImmutable();
         return repeatedInt64_;
       }
-
       /**
        * <code>repeated int64 repeated_int64 = 32;</code>
-       *
        * @return The count of repeatedInt64.
        */
       public int getRepeatedInt64Count() {
         return repeatedInt64_.size();
       }
-
       /**
        * <code>repeated int64 repeated_int64 = 32;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedInt64 at the given index.
        */
       public long getRepeatedInt64(int index) {
         return repeatedInt64_.getLong(index);
       }
-
       /**
        * <code>repeated int64 repeated_int64 = 32;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedInt64 to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedInt64(int index, long value) {
+      public Builder setRepeatedInt64(
+          int index, long value) {
 
         ensureRepeatedInt64IsMutable();
         repeatedInt64_.setLong(index, value);
@@ -15417,10 +13921,8 @@ public Builder setRepeatedInt64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated int64 repeated_int64 = 32;</code>
-       *
        * @param value The repeatedInt64 to add.
        * @return This builder for chaining.
        */
@@ -15432,24 +13934,22 @@ public Builder addRepeatedInt64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated int64 repeated_int64 = 32;</code>
-       *
        * @param values The repeatedInt64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedInt64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllRepeatedInt64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensureRepeatedInt64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedInt64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedInt64_);
         bitField0_ |= 0x00400000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated int64 repeated_int64 = 32;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedInt64() {
@@ -15460,51 +13960,44 @@ public Builder clearRepeatedInt64() {
       }
 
       private com.google.protobuf.Internal.IntList repeatedUint32_ = emptyIntList();
-
       private void ensureRepeatedUint32IsMutable() {
         if (!repeatedUint32_.isModifiable()) {
           repeatedUint32_ = makeMutableCopy(repeatedUint32_);
         }
         bitField0_ |= 0x00800000;
       }
-
       /**
        * <code>repeated uint32 repeated_uint32 = 33;</code>
-       *
        * @return A list containing the repeatedUint32.
        */
-      public java.util.List<java.lang.Integer> getRepeatedUint32List() {
+      public java.util.List<java.lang.Integer>
+          getRepeatedUint32List() {
         repeatedUint32_.makeImmutable();
         return repeatedUint32_;
       }
-
       /**
        * <code>repeated uint32 repeated_uint32 = 33;</code>
-       *
        * @return The count of repeatedUint32.
        */
       public int getRepeatedUint32Count() {
         return repeatedUint32_.size();
       }
-
       /**
        * <code>repeated uint32 repeated_uint32 = 33;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedUint32 at the given index.
        */
       public int getRepeatedUint32(int index) {
         return repeatedUint32_.getInt(index);
       }
-
       /**
        * <code>repeated uint32 repeated_uint32 = 33;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedUint32 to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedUint32(int index, int value) {
+      public Builder setRepeatedUint32(
+          int index, int value) {
 
         ensureRepeatedUint32IsMutable();
         repeatedUint32_.setInt(index, value);
@@ -15512,10 +14005,8 @@ public Builder setRepeatedUint32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint32 repeated_uint32 = 33;</code>
-       *
        * @param value The repeatedUint32 to add.
        * @return This builder for chaining.
        */
@@ -15527,24 +14018,22 @@ public Builder addRepeatedUint32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint32 repeated_uint32 = 33;</code>
-       *
        * @param values The repeatedUint32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedUint32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllRepeatedUint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureRepeatedUint32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedUint32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedUint32_);
         bitField0_ |= 0x00800000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint32 repeated_uint32 = 33;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedUint32() {
@@ -15555,51 +14044,44 @@ public Builder clearRepeatedUint32() {
       }
 
       private com.google.protobuf.Internal.LongList repeatedUint64_ = emptyLongList();
-
       private void ensureRepeatedUint64IsMutable() {
         if (!repeatedUint64_.isModifiable()) {
           repeatedUint64_ = makeMutableCopy(repeatedUint64_);
         }
         bitField0_ |= 0x01000000;
       }
-
       /**
        * <code>repeated uint64 repeated_uint64 = 34;</code>
-       *
        * @return A list containing the repeatedUint64.
        */
-      public java.util.List<java.lang.Long> getRepeatedUint64List() {
+      public java.util.List<java.lang.Long>
+          getRepeatedUint64List() {
         repeatedUint64_.makeImmutable();
         return repeatedUint64_;
       }
-
       /**
        * <code>repeated uint64 repeated_uint64 = 34;</code>
-       *
        * @return The count of repeatedUint64.
        */
       public int getRepeatedUint64Count() {
         return repeatedUint64_.size();
       }
-
       /**
        * <code>repeated uint64 repeated_uint64 = 34;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedUint64 at the given index.
        */
       public long getRepeatedUint64(int index) {
         return repeatedUint64_.getLong(index);
       }
-
       /**
        * <code>repeated uint64 repeated_uint64 = 34;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedUint64 to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedUint64(int index, long value) {
+      public Builder setRepeatedUint64(
+          int index, long value) {
 
         ensureRepeatedUint64IsMutable();
         repeatedUint64_.setLong(index, value);
@@ -15607,10 +14089,8 @@ public Builder setRepeatedUint64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint64 repeated_uint64 = 34;</code>
-       *
        * @param value The repeatedUint64 to add.
        * @return This builder for chaining.
        */
@@ -15622,24 +14102,22 @@ public Builder addRepeatedUint64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint64 repeated_uint64 = 34;</code>
-       *
        * @param values The repeatedUint64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedUint64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllRepeatedUint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensureRepeatedUint64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedUint64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedUint64_);
         bitField0_ |= 0x01000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint64 repeated_uint64 = 34;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedUint64() {
@@ -15650,51 +14128,44 @@ public Builder clearRepeatedUint64() {
       }
 
       private com.google.protobuf.Internal.IntList repeatedSint32_ = emptyIntList();
-
       private void ensureRepeatedSint32IsMutable() {
         if (!repeatedSint32_.isModifiable()) {
           repeatedSint32_ = makeMutableCopy(repeatedSint32_);
         }
         bitField0_ |= 0x02000000;
       }
-
       /**
        * <code>repeated sint32 repeated_sint32 = 35;</code>
-       *
        * @return A list containing the repeatedSint32.
        */
-      public java.util.List<java.lang.Integer> getRepeatedSint32List() {
+      public java.util.List<java.lang.Integer>
+          getRepeatedSint32List() {
         repeatedSint32_.makeImmutable();
         return repeatedSint32_;
       }
-
       /**
        * <code>repeated sint32 repeated_sint32 = 35;</code>
-       *
        * @return The count of repeatedSint32.
        */
       public int getRepeatedSint32Count() {
         return repeatedSint32_.size();
       }
-
       /**
        * <code>repeated sint32 repeated_sint32 = 35;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedSint32 at the given index.
        */
       public int getRepeatedSint32(int index) {
         return repeatedSint32_.getInt(index);
       }
-
       /**
        * <code>repeated sint32 repeated_sint32 = 35;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedSint32 to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedSint32(int index, int value) {
+      public Builder setRepeatedSint32(
+          int index, int value) {
 
         ensureRepeatedSint32IsMutable();
         repeatedSint32_.setInt(index, value);
@@ -15702,10 +14173,8 @@ public Builder setRepeatedSint32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint32 repeated_sint32 = 35;</code>
-       *
        * @param value The repeatedSint32 to add.
        * @return This builder for chaining.
        */
@@ -15717,24 +14186,22 @@ public Builder addRepeatedSint32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint32 repeated_sint32 = 35;</code>
-       *
        * @param values The repeatedSint32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedSint32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllRepeatedSint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureRepeatedSint32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedSint32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedSint32_);
         bitField0_ |= 0x02000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint32 repeated_sint32 = 35;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedSint32() {
@@ -15745,51 +14212,44 @@ public Builder clearRepeatedSint32() {
       }
 
       private com.google.protobuf.Internal.LongList repeatedSint64_ = emptyLongList();
-
       private void ensureRepeatedSint64IsMutable() {
         if (!repeatedSint64_.isModifiable()) {
           repeatedSint64_ = makeMutableCopy(repeatedSint64_);
         }
         bitField0_ |= 0x04000000;
       }
-
       /**
        * <code>repeated sint64 repeated_sint64 = 36;</code>
-       *
        * @return A list containing the repeatedSint64.
        */
-      public java.util.List<java.lang.Long> getRepeatedSint64List() {
+      public java.util.List<java.lang.Long>
+          getRepeatedSint64List() {
         repeatedSint64_.makeImmutable();
         return repeatedSint64_;
       }
-
       /**
        * <code>repeated sint64 repeated_sint64 = 36;</code>
-       *
        * @return The count of repeatedSint64.
        */
       public int getRepeatedSint64Count() {
         return repeatedSint64_.size();
       }
-
       /**
        * <code>repeated sint64 repeated_sint64 = 36;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedSint64 at the given index.
        */
       public long getRepeatedSint64(int index) {
         return repeatedSint64_.getLong(index);
       }
-
       /**
        * <code>repeated sint64 repeated_sint64 = 36;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedSint64 to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedSint64(int index, long value) {
+      public Builder setRepeatedSint64(
+          int index, long value) {
 
         ensureRepeatedSint64IsMutable();
         repeatedSint64_.setLong(index, value);
@@ -15797,10 +14257,8 @@ public Builder setRepeatedSint64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint64 repeated_sint64 = 36;</code>
-       *
        * @param value The repeatedSint64 to add.
        * @return This builder for chaining.
        */
@@ -15812,24 +14270,22 @@ public Builder addRepeatedSint64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint64 repeated_sint64 = 36;</code>
-       *
        * @param values The repeatedSint64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedSint64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllRepeatedSint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensureRepeatedSint64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedSint64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedSint64_);
         bitField0_ |= 0x04000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint64 repeated_sint64 = 36;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedSint64() {
@@ -15840,58 +14296,50 @@ public Builder clearRepeatedSint64() {
       }
 
       private com.google.protobuf.Internal.IntList repeatedFixed32_ = emptyIntList();
-
       private void ensureRepeatedFixed32IsMutable() {
         if (!repeatedFixed32_.isModifiable()) {
           repeatedFixed32_ = makeMutableCopy(repeatedFixed32_);
         }
         bitField0_ |= 0x08000000;
       }
-
       private void ensureRepeatedFixed32IsMutable(int capacity) {
         if (!repeatedFixed32_.isModifiable()) {
           repeatedFixed32_ = makeMutableCopy(repeatedFixed32_, capacity);
         }
         bitField0_ |= 0x08000000;
       }
-
       /**
        * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-       *
        * @return A list containing the repeatedFixed32.
        */
-      public java.util.List<java.lang.Integer> getRepeatedFixed32List() {
+      public java.util.List<java.lang.Integer>
+          getRepeatedFixed32List() {
         repeatedFixed32_.makeImmutable();
         return repeatedFixed32_;
       }
-
       /**
        * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-       *
        * @return The count of repeatedFixed32.
        */
       public int getRepeatedFixed32Count() {
         return repeatedFixed32_.size();
       }
-
       /**
        * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedFixed32 at the given index.
        */
       public int getRepeatedFixed32(int index) {
         return repeatedFixed32_.getInt(index);
       }
-
       /**
        * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedFixed32 to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedFixed32(int index, int value) {
+      public Builder setRepeatedFixed32(
+          int index, int value) {
 
         ensureRepeatedFixed32IsMutable();
         repeatedFixed32_.setInt(index, value);
@@ -15899,10 +14347,8 @@ public Builder setRepeatedFixed32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-       *
        * @param value The repeatedFixed32 to add.
        * @return This builder for chaining.
        */
@@ -15914,24 +14360,22 @@ public Builder addRepeatedFixed32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-       *
        * @param values The repeatedFixed32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedFixed32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllRepeatedFixed32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureRepeatedFixed32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedFixed32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedFixed32_);
         bitField0_ |= 0x08000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed32 repeated_fixed32 = 37;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedFixed32() {
@@ -15942,58 +14386,50 @@ public Builder clearRepeatedFixed32() {
       }
 
       private com.google.protobuf.Internal.LongList repeatedFixed64_ = emptyLongList();
-
       private void ensureRepeatedFixed64IsMutable() {
         if (!repeatedFixed64_.isModifiable()) {
           repeatedFixed64_ = makeMutableCopy(repeatedFixed64_);
         }
         bitField0_ |= 0x10000000;
       }
-
       private void ensureRepeatedFixed64IsMutable(int capacity) {
         if (!repeatedFixed64_.isModifiable()) {
           repeatedFixed64_ = makeMutableCopy(repeatedFixed64_, capacity);
         }
         bitField0_ |= 0x10000000;
       }
-
       /**
        * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-       *
        * @return A list containing the repeatedFixed64.
        */
-      public java.util.List<java.lang.Long> getRepeatedFixed64List() {
+      public java.util.List<java.lang.Long>
+          getRepeatedFixed64List() {
         repeatedFixed64_.makeImmutable();
         return repeatedFixed64_;
       }
-
       /**
        * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-       *
        * @return The count of repeatedFixed64.
        */
       public int getRepeatedFixed64Count() {
         return repeatedFixed64_.size();
       }
-
       /**
        * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedFixed64 at the given index.
        */
       public long getRepeatedFixed64(int index) {
         return repeatedFixed64_.getLong(index);
       }
-
       /**
        * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedFixed64 to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedFixed64(int index, long value) {
+      public Builder setRepeatedFixed64(
+          int index, long value) {
 
         ensureRepeatedFixed64IsMutable();
         repeatedFixed64_.setLong(index, value);
@@ -16001,10 +14437,8 @@ public Builder setRepeatedFixed64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-       *
        * @param value The repeatedFixed64 to add.
        * @return This builder for chaining.
        */
@@ -16016,24 +14450,22 @@ public Builder addRepeatedFixed64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-       *
        * @param values The repeatedFixed64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedFixed64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllRepeatedFixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensureRepeatedFixed64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedFixed64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedFixed64_);
         bitField0_ |= 0x10000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed64 repeated_fixed64 = 38;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedFixed64() {
@@ -16044,58 +14476,50 @@ public Builder clearRepeatedFixed64() {
       }
 
       private com.google.protobuf.Internal.IntList repeatedSfixed32_ = emptyIntList();
-
       private void ensureRepeatedSfixed32IsMutable() {
         if (!repeatedSfixed32_.isModifiable()) {
           repeatedSfixed32_ = makeMutableCopy(repeatedSfixed32_);
         }
         bitField0_ |= 0x20000000;
       }
-
       private void ensureRepeatedSfixed32IsMutable(int capacity) {
         if (!repeatedSfixed32_.isModifiable()) {
           repeatedSfixed32_ = makeMutableCopy(repeatedSfixed32_, capacity);
         }
         bitField0_ |= 0x20000000;
       }
-
       /**
        * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-       *
        * @return A list containing the repeatedSfixed32.
        */
-      public java.util.List<java.lang.Integer> getRepeatedSfixed32List() {
+      public java.util.List<java.lang.Integer>
+          getRepeatedSfixed32List() {
         repeatedSfixed32_.makeImmutable();
         return repeatedSfixed32_;
       }
-
       /**
        * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-       *
        * @return The count of repeatedSfixed32.
        */
       public int getRepeatedSfixed32Count() {
         return repeatedSfixed32_.size();
       }
-
       /**
        * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedSfixed32 at the given index.
        */
       public int getRepeatedSfixed32(int index) {
         return repeatedSfixed32_.getInt(index);
       }
-
       /**
        * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedSfixed32 to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedSfixed32(int index, int value) {
+      public Builder setRepeatedSfixed32(
+          int index, int value) {
 
         ensureRepeatedSfixed32IsMutable();
         repeatedSfixed32_.setInt(index, value);
@@ -16103,10 +14527,8 @@ public Builder setRepeatedSfixed32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-       *
        * @param value The repeatedSfixed32 to add.
        * @return This builder for chaining.
        */
@@ -16118,25 +14540,22 @@ public Builder addRepeatedSfixed32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-       *
        * @param values The repeatedSfixed32 to add.
        * @return This builder for chaining.
        */
       public Builder addAllRepeatedSfixed32(
           java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureRepeatedSfixed32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedSfixed32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedSfixed32_);
         bitField0_ |= 0x20000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed32 repeated_sfixed32 = 39;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedSfixed32() {
@@ -16147,58 +14566,50 @@ public Builder clearRepeatedSfixed32() {
       }
 
       private com.google.protobuf.Internal.LongList repeatedSfixed64_ = emptyLongList();
-
       private void ensureRepeatedSfixed64IsMutable() {
         if (!repeatedSfixed64_.isModifiable()) {
           repeatedSfixed64_ = makeMutableCopy(repeatedSfixed64_);
         }
         bitField0_ |= 0x40000000;
       }
-
       private void ensureRepeatedSfixed64IsMutable(int capacity) {
         if (!repeatedSfixed64_.isModifiable()) {
           repeatedSfixed64_ = makeMutableCopy(repeatedSfixed64_, capacity);
         }
         bitField0_ |= 0x40000000;
       }
-
       /**
        * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-       *
        * @return A list containing the repeatedSfixed64.
        */
-      public java.util.List<java.lang.Long> getRepeatedSfixed64List() {
+      public java.util.List<java.lang.Long>
+          getRepeatedSfixed64List() {
         repeatedSfixed64_.makeImmutable();
         return repeatedSfixed64_;
       }
-
       /**
        * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-       *
        * @return The count of repeatedSfixed64.
        */
       public int getRepeatedSfixed64Count() {
         return repeatedSfixed64_.size();
       }
-
       /**
        * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedSfixed64 at the given index.
        */
       public long getRepeatedSfixed64(int index) {
         return repeatedSfixed64_.getLong(index);
       }
-
       /**
        * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedSfixed64 to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedSfixed64(int index, long value) {
+      public Builder setRepeatedSfixed64(
+          int index, long value) {
 
         ensureRepeatedSfixed64IsMutable();
         repeatedSfixed64_.setLong(index, value);
@@ -16206,10 +14617,8 @@ public Builder setRepeatedSfixed64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-       *
        * @param value The repeatedSfixed64 to add.
        * @return This builder for chaining.
        */
@@ -16221,24 +14630,22 @@ public Builder addRepeatedSfixed64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-       *
        * @param values The repeatedSfixed64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedSfixed64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllRepeatedSfixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensureRepeatedSfixed64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedSfixed64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedSfixed64_);
         bitField0_ |= 0x40000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed64 repeated_sfixed64 = 40;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedSfixed64() {
@@ -16249,58 +14656,50 @@ public Builder clearRepeatedSfixed64() {
       }
 
       private com.google.protobuf.Internal.FloatList repeatedFloat_ = emptyFloatList();
-
       private void ensureRepeatedFloatIsMutable() {
         if (!repeatedFloat_.isModifiable()) {
           repeatedFloat_ = makeMutableCopy(repeatedFloat_);
         }
         bitField0_ |= 0x80000000;
       }
-
       private void ensureRepeatedFloatIsMutable(int capacity) {
         if (!repeatedFloat_.isModifiable()) {
           repeatedFloat_ = makeMutableCopy(repeatedFloat_, capacity);
         }
         bitField0_ |= 0x80000000;
       }
-
       /**
        * <code>repeated float repeated_float = 41;</code>
-       *
        * @return A list containing the repeatedFloat.
        */
-      public java.util.List<java.lang.Float> getRepeatedFloatList() {
+      public java.util.List<java.lang.Float>
+          getRepeatedFloatList() {
         repeatedFloat_.makeImmutable();
         return repeatedFloat_;
       }
-
       /**
        * <code>repeated float repeated_float = 41;</code>
-       *
        * @return The count of repeatedFloat.
        */
       public int getRepeatedFloatCount() {
         return repeatedFloat_.size();
       }
-
       /**
        * <code>repeated float repeated_float = 41;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedFloat at the given index.
        */
       public float getRepeatedFloat(int index) {
         return repeatedFloat_.getFloat(index);
       }
-
       /**
        * <code>repeated float repeated_float = 41;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedFloat to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedFloat(int index, float value) {
+      public Builder setRepeatedFloat(
+          int index, float value) {
 
         ensureRepeatedFloatIsMutable();
         repeatedFloat_.setFloat(index, value);
@@ -16308,10 +14707,8 @@ public Builder setRepeatedFloat(int index, float value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated float repeated_float = 41;</code>
-       *
        * @param value The repeatedFloat to add.
        * @return This builder for chaining.
        */
@@ -16323,24 +14720,22 @@ public Builder addRepeatedFloat(float value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated float repeated_float = 41;</code>
-       *
        * @param values The repeatedFloat to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedFloat(java.lang.Iterable<? extends java.lang.Float> values) {
+      public Builder addAllRepeatedFloat(
+          java.lang.Iterable<? extends java.lang.Float> values) {
         ensureRepeatedFloatIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedFloat_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedFloat_);
         bitField0_ |= 0x80000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated float repeated_float = 41;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedFloat() {
@@ -16351,58 +14746,50 @@ public Builder clearRepeatedFloat() {
       }
 
       private com.google.protobuf.Internal.DoubleList repeatedDouble_ = emptyDoubleList();
-
       private void ensureRepeatedDoubleIsMutable() {
         if (!repeatedDouble_.isModifiable()) {
           repeatedDouble_ = makeMutableCopy(repeatedDouble_);
         }
         bitField1_ |= 0x00000001;
       }
-
       private void ensureRepeatedDoubleIsMutable(int capacity) {
         if (!repeatedDouble_.isModifiable()) {
           repeatedDouble_ = makeMutableCopy(repeatedDouble_, capacity);
         }
         bitField1_ |= 0x00000001;
       }
-
       /**
        * <code>repeated double repeated_double = 42;</code>
-       *
        * @return A list containing the repeatedDouble.
        */
-      public java.util.List<java.lang.Double> getRepeatedDoubleList() {
+      public java.util.List<java.lang.Double>
+          getRepeatedDoubleList() {
         repeatedDouble_.makeImmutable();
         return repeatedDouble_;
       }
-
       /**
        * <code>repeated double repeated_double = 42;</code>
-       *
        * @return The count of repeatedDouble.
        */
       public int getRepeatedDoubleCount() {
         return repeatedDouble_.size();
       }
-
       /**
        * <code>repeated double repeated_double = 42;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedDouble at the given index.
        */
       public double getRepeatedDouble(int index) {
         return repeatedDouble_.getDouble(index);
       }
-
       /**
        * <code>repeated double repeated_double = 42;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedDouble to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedDouble(int index, double value) {
+      public Builder setRepeatedDouble(
+          int index, double value) {
 
         ensureRepeatedDoubleIsMutable();
         repeatedDouble_.setDouble(index, value);
@@ -16410,10 +14797,8 @@ public Builder setRepeatedDouble(int index, double value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated double repeated_double = 42;</code>
-       *
        * @param value The repeatedDouble to add.
        * @return This builder for chaining.
        */
@@ -16425,24 +14810,22 @@ public Builder addRepeatedDouble(double value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated double repeated_double = 42;</code>
-       *
        * @param values The repeatedDouble to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedDouble(java.lang.Iterable<? extends java.lang.Double> values) {
+      public Builder addAllRepeatedDouble(
+          java.lang.Iterable<? extends java.lang.Double> values) {
         ensureRepeatedDoubleIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedDouble_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedDouble_);
         bitField1_ |= 0x00000001;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated double repeated_double = 42;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedDouble() {
@@ -16453,58 +14836,50 @@ public Builder clearRepeatedDouble() {
       }
 
       private com.google.protobuf.Internal.BooleanList repeatedBool_ = emptyBooleanList();
-
       private void ensureRepeatedBoolIsMutable() {
         if (!repeatedBool_.isModifiable()) {
           repeatedBool_ = makeMutableCopy(repeatedBool_);
         }
         bitField1_ |= 0x00000002;
       }
-
       private void ensureRepeatedBoolIsMutable(int capacity) {
         if (!repeatedBool_.isModifiable()) {
           repeatedBool_ = makeMutableCopy(repeatedBool_, capacity);
         }
         bitField1_ |= 0x00000002;
       }
-
       /**
        * <code>repeated bool repeated_bool = 43;</code>
-       *
        * @return A list containing the repeatedBool.
        */
-      public java.util.List<java.lang.Boolean> getRepeatedBoolList() {
+      public java.util.List<java.lang.Boolean>
+          getRepeatedBoolList() {
         repeatedBool_.makeImmutable();
         return repeatedBool_;
       }
-
       /**
        * <code>repeated bool repeated_bool = 43;</code>
-       *
        * @return The count of repeatedBool.
        */
       public int getRepeatedBoolCount() {
         return repeatedBool_.size();
       }
-
       /**
        * <code>repeated bool repeated_bool = 43;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedBool at the given index.
        */
       public boolean getRepeatedBool(int index) {
         return repeatedBool_.getBoolean(index);
       }
-
       /**
        * <code>repeated bool repeated_bool = 43;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedBool to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedBool(int index, boolean value) {
+      public Builder setRepeatedBool(
+          int index, boolean value) {
 
         ensureRepeatedBoolIsMutable();
         repeatedBool_.setBoolean(index, value);
@@ -16512,10 +14887,8 @@ public Builder setRepeatedBool(int index, boolean value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bool repeated_bool = 43;</code>
-       *
        * @param value The repeatedBool to add.
        * @return This builder for chaining.
        */
@@ -16527,24 +14900,22 @@ public Builder addRepeatedBool(boolean value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bool repeated_bool = 43;</code>
-       *
        * @param values The repeatedBool to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedBool(java.lang.Iterable<? extends java.lang.Boolean> values) {
+      public Builder addAllRepeatedBool(
+          java.lang.Iterable<? extends java.lang.Boolean> values) {
         ensureRepeatedBoolIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedBool_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedBool_);
         bitField1_ |= 0x00000002;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bool repeated_bool = 43;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedBool() {
@@ -16556,125 +14927,107 @@ public Builder clearRepeatedBool() {
 
       private com.google.protobuf.LazyStringArrayList repeatedString_ =
           com.google.protobuf.LazyStringArrayList.emptyList();
-
       private void ensureRepeatedStringIsMutable() {
         if (!repeatedString_.isModifiable()) {
           repeatedString_ = new com.google.protobuf.LazyStringArrayList(repeatedString_);
         }
         bitField1_ |= 0x00000004;
       }
-
       /**
        * <code>repeated string repeated_string = 44;</code>
-       *
        * @return A list containing the repeatedString.
        */
-      public com.google.protobuf.ProtocolStringList getRepeatedStringList() {
+      public com.google.protobuf.ProtocolStringList
+          getRepeatedStringList() {
         repeatedString_.makeImmutable();
         return repeatedString_;
       }
-
       /**
        * <code>repeated string repeated_string = 44;</code>
-       *
        * @return The count of repeatedString.
        */
       public int getRepeatedStringCount() {
         return repeatedString_.size();
       }
-
       /**
        * <code>repeated string repeated_string = 44;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedString at the given index.
        */
       public java.lang.String getRepeatedString(int index) {
         return repeatedString_.get(index);
       }
-
       /**
        * <code>repeated string repeated_string = 44;</code>
-       *
        * @param index The index of the value to return.
        * @return The bytes of the repeatedString at the given index.
        */
-      public com.google.protobuf.ByteString getRepeatedStringBytes(int index) {
+      public com.google.protobuf.ByteString
+          getRepeatedStringBytes(int index) {
         return repeatedString_.getByteString(index);
       }
-
       /**
        * <code>repeated string repeated_string = 44;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedString to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedString(int index, java.lang.String value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setRepeatedString(
+          int index, java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
         ensureRepeatedStringIsMutable();
         repeatedString_.set(index, value);
         bitField1_ |= 0x00000004;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated string repeated_string = 44;</code>
-       *
        * @param value The repeatedString to add.
        * @return This builder for chaining.
        */
-      public Builder addRepeatedString(java.lang.String value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder addRepeatedString(
+          java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
         ensureRepeatedStringIsMutable();
         repeatedString_.add(value);
         bitField1_ |= 0x00000004;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated string repeated_string = 44;</code>
-       *
        * @param values The repeatedString to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedString(java.lang.Iterable<java.lang.String> values) {
+      public Builder addAllRepeatedString(
+          java.lang.Iterable<java.lang.String> values) {
         ensureRepeatedStringIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedString_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedString_);
         bitField1_ |= 0x00000004;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated string repeated_string = 44;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedString() {
-        repeatedString_ = com.google.protobuf.LazyStringArrayList.emptyList();
-        bitField1_ = (bitField1_ & ~0x00000004);
-        ;
+        repeatedString_ =
+          com.google.protobuf.LazyStringArrayList.emptyList();
+        bitField1_ = (bitField1_ & ~0x00000004);;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated string repeated_string = 44;</code>
-       *
        * @param value The bytes of the repeatedString to add.
        * @return This builder for chaining.
        */
-      public Builder addRepeatedStringBytes(com.google.protobuf.ByteString value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder addRepeatedStringBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
         checkByteStringIsUtf8(value);
         ensureRepeatedStringIsMutable();
         repeatedString_.add(value);
@@ -16683,98 +15036,81 @@ public Builder addRepeatedStringBytes(com.google.protobuf.ByteString value) {
         return this;
       }
 
-      private com.google.protobuf.Internal.ProtobufList<com.google.protobuf.ByteString>
-          repeatedBytes_ = emptyList(com.google.protobuf.ByteString.class);
-
+      private com.google.protobuf.Internal.ProtobufList<com.google.protobuf.ByteString> repeatedBytes_ = emptyList(com.google.protobuf.ByteString.class);
       private void ensureRepeatedBytesIsMutable() {
         if (!repeatedBytes_.isModifiable()) {
           repeatedBytes_ = makeMutableCopy(repeatedBytes_);
         }
         bitField1_ |= 0x00000008;
       }
-
       /**
        * <code>repeated bytes repeated_bytes = 45;</code>
-       *
        * @return A list containing the repeatedBytes.
        */
-      public java.util.List<com.google.protobuf.ByteString> getRepeatedBytesList() {
+      public java.util.List<com.google.protobuf.ByteString>
+          getRepeatedBytesList() {
         repeatedBytes_.makeImmutable();
         return repeatedBytes_;
       }
-
       /**
        * <code>repeated bytes repeated_bytes = 45;</code>
-       *
        * @return The count of repeatedBytes.
        */
       public int getRepeatedBytesCount() {
         return repeatedBytes_.size();
       }
-
       /**
        * <code>repeated bytes repeated_bytes = 45;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedBytes at the given index.
        */
       public com.google.protobuf.ByteString getRepeatedBytes(int index) {
         return repeatedBytes_.get(index);
       }
-
       /**
        * <code>repeated bytes repeated_bytes = 45;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedBytes to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedBytes(int index, com.google.protobuf.ByteString value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setRepeatedBytes(
+          int index, com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
         ensureRepeatedBytesIsMutable();
         repeatedBytes_.set(index, value);
         bitField1_ |= 0x00000008;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bytes repeated_bytes = 45;</code>
-       *
        * @param value The repeatedBytes to add.
        * @return This builder for chaining.
        */
       public Builder addRepeatedBytes(com.google.protobuf.ByteString value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         ensureRepeatedBytesIsMutable();
         repeatedBytes_.add(value);
         bitField1_ |= 0x00000008;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bytes repeated_bytes = 45;</code>
-       *
        * @param values The repeatedBytes to add.
        * @return This builder for chaining.
        */
       public Builder addAllRepeatedBytes(
           java.lang.Iterable<? extends com.google.protobuf.ByteString> values) {
         ensureRepeatedBytesIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedBytes_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, repeatedBytes_);
         bitField1_ |= 0x00000008;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bytes repeated_bytes = 45;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedBytes() {
@@ -16784,47 +15120,30 @@ public Builder clearRepeatedBytes() {
         return this;
       }
 
-      private java.util.List<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-          repeatedNestedMessage_ = java.util.Collections.emptyList();
-
+      private java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> repeatedNestedMessage_ =
+        java.util.Collections.emptyList();
       private void ensureRepeatedNestedMessageIsMutable() {
         if (!((bitField1_ & 0x00000010) != 0)) {
-          repeatedNestedMessage_ =
-              new java.util.ArrayList<
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage>(repeatedNestedMessage_);
+          repeatedNestedMessage_ = new java.util.ArrayList<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>(repeatedNestedMessage_);
           bitField1_ |= 0x00000010;
-        }
+         }
       }
 
       private com.google.protobuf.RepeatedFieldBuilder<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .NestedMessageOrBuilder>
-          repeatedNestedMessageBuilder_;
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> repeatedNestedMessageBuilder_;
 
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
-      public java.util.List<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-          getRepeatedNestedMessageList() {
+      public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> getRepeatedNestedMessageList() {
         if (repeatedNestedMessageBuilder_ == null) {
           return java.util.Collections.unmodifiableList(repeatedNestedMessage_);
         } else {
           return repeatedNestedMessageBuilder_.getMessageList();
         }
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
       public int getRepeatedNestedMessageCount() {
         if (repeatedNestedMessageBuilder_ == null) {
@@ -16833,30 +15152,21 @@ public int getRepeatedNestedMessageCount() {
           return repeatedNestedMessageBuilder_.getCount();
         }
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-          getRepeatedNestedMessage(int index) {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getRepeatedNestedMessage(int index) {
         if (repeatedNestedMessageBuilder_ == null) {
           return repeatedNestedMessage_.get(index);
         } else {
           return repeatedNestedMessageBuilder_.getMessage(index);
         }
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
       public Builder setRepeatedNestedMessage(
-          int index,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              value) {
+          int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage value) {
         if (repeatedNestedMessageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -16869,17 +15179,11 @@ public Builder setRepeatedNestedMessage(
         }
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
       public Builder setRepeatedNestedMessage(
-          int index,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder
-              builderForValue) {
+          int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder builderForValue) {
         if (repeatedNestedMessageBuilder_ == null) {
           ensureRepeatedNestedMessageIsMutable();
           repeatedNestedMessage_.set(index, builderForValue.build());
@@ -16889,15 +15193,10 @@ public Builder setRepeatedNestedMessage(
         }
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
-      public Builder addRepeatedNestedMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              value) {
+      public Builder addRepeatedNestedMessage(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage value) {
         if (repeatedNestedMessageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -16910,16 +15209,11 @@ public Builder addRepeatedNestedMessage(
         }
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
       public Builder addRepeatedNestedMessage(
-          int index,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              value) {
+          int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage value) {
         if (repeatedNestedMessageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -16932,16 +15226,11 @@ public Builder addRepeatedNestedMessage(
         }
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
       public Builder addRepeatedNestedMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder
-              builderForValue) {
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder builderForValue) {
         if (repeatedNestedMessageBuilder_ == null) {
           ensureRepeatedNestedMessageIsMutable();
           repeatedNestedMessage_.add(builderForValue.build());
@@ -16951,17 +15240,11 @@ public Builder addRepeatedNestedMessage(
         }
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
       public Builder addRepeatedNestedMessage(
-          int index,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder
-              builderForValue) {
+          int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder builderForValue) {
         if (repeatedNestedMessageBuilder_ == null) {
           ensureRepeatedNestedMessageIsMutable();
           repeatedNestedMessage_.add(index, builderForValue.build());
@@ -16971,32 +15254,23 @@ public Builder addRepeatedNestedMessage(
         }
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
       public Builder addAllRepeatedNestedMessage(
-          java.lang.Iterable<
-                  ? extends
-                      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                          .NestedMessage>
-              values) {
+          java.lang.Iterable<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> values) {
         if (repeatedNestedMessageBuilder_ == null) {
           ensureRepeatedNestedMessageIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedNestedMessage_);
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, repeatedNestedMessage_);
           onChanged();
         } else {
           repeatedNestedMessageBuilder_.addAllMessages(values);
         }
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
       public Builder clearRepeatedNestedMessage() {
         if (repeatedNestedMessageBuilder_ == null) {
@@ -17008,11 +15282,8 @@ public Builder clearRepeatedNestedMessage() {
         }
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
       public Builder removeRepeatedNestedMessage(int index) {
         if (repeatedNestedMessageBuilder_ == null) {
@@ -17024,107 +15295,62 @@ public Builder removeRepeatedNestedMessage(int index) {
         }
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .Builder
-          getRepeatedNestedMessageBuilder(int index) {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder getRepeatedNestedMessageBuilder(
+          int index) {
         return internalGetRepeatedNestedMessageFieldBuilder().getBuilder(index);
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessageOrBuilder
-          getRepeatedNestedMessageOrBuilder(int index) {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder getRepeatedNestedMessageOrBuilder(
+          int index) {
         if (repeatedNestedMessageBuilder_ == null) {
-          return repeatedNestedMessage_.get(index);
-        } else {
+          return repeatedNestedMessage_.get(index);  } else {
           return repeatedNestedMessageBuilder_.getMessageOrBuilder(index);
         }
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
-      public java.util.List<
-              ? extends
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessageOrBuilder>
-          getRepeatedNestedMessageOrBuilderList() {
+      public java.util.List<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> 
+           getRepeatedNestedMessageOrBuilderList() {
         if (repeatedNestedMessageBuilder_ != null) {
           return repeatedNestedMessageBuilder_.getMessageOrBuilderList();
         } else {
           return java.util.Collections.unmodifiableList(repeatedNestedMessage_);
         }
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .Builder
-          addRepeatedNestedMessageBuilder() {
-        return internalGetRepeatedNestedMessageFieldBuilder()
-            .addBuilder(
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                    .getDefaultInstance());
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder addRepeatedNestedMessageBuilder() {
+        return internalGetRepeatedNestedMessageFieldBuilder().addBuilder(
+            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance());
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .Builder
-          addRepeatedNestedMessageBuilder(int index) {
-        return internalGetRepeatedNestedMessageFieldBuilder()
-            .addBuilder(
-                index,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                    .getDefaultInstance());
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder addRepeatedNestedMessageBuilder(
+          int index) {
+        return internalGetRepeatedNestedMessageFieldBuilder().addBuilder(
+            index, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance());
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage repeated_nested_message = 48;</code>
        */
-      public java.util.List<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder>
-          getRepeatedNestedMessageBuilderList() {
+      public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder> 
+           getRepeatedNestedMessageBuilderList() {
         return internalGetRepeatedNestedMessageFieldBuilder().getBuilderList();
       }
-
       private com.google.protobuf.RepeatedFieldBuilder<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .NestedMessageOrBuilder>
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> 
           internalGetRepeatedNestedMessageFieldBuilder() {
         if (repeatedNestedMessageBuilder_ == null) {
-          repeatedNestedMessageBuilder_ =
-              new com.google.protobuf.RepeatedFieldBuilder<
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage.Builder,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessageOrBuilder>(
+          repeatedNestedMessageBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder>(
                   repeatedNestedMessage_,
                   ((bitField1_ & 0x00000010) != 0),
                   getParentForChildren(),
@@ -17134,41 +15360,30 @@ public Builder removeRepeatedNestedMessage(int index) {
         return repeatedNestedMessageBuilder_;
       }
 
-      private java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-          repeatedForeignMessage_ = java.util.Collections.emptyList();
-
+      private java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> repeatedForeignMessage_ =
+        java.util.Collections.emptyList();
       private void ensureRepeatedForeignMessageIsMutable() {
         if (!((bitField1_ & 0x00000020) != 0)) {
-          repeatedForeignMessage_ =
-              new java.util.ArrayList<
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>(
-                  repeatedForeignMessage_);
+          repeatedForeignMessage_ = new java.util.ArrayList<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>(repeatedForeignMessage_);
           bitField1_ |= 0x00000020;
-        }
+         }
       }
 
       private com.google.protobuf.RepeatedFieldBuilder<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>
-          repeatedForeignMessageBuilder_;
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder> repeatedForeignMessageBuilder_;
 
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
-      public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-          getRepeatedForeignMessageList() {
+      public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> getRepeatedForeignMessageList() {
         if (repeatedForeignMessageBuilder_ == null) {
           return java.util.Collections.unmodifiableList(repeatedForeignMessage_);
         } else {
           return repeatedForeignMessageBuilder_.getMessageList();
         }
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
       public int getRepeatedForeignMessageCount() {
         if (repeatedForeignMessageBuilder_ == null) {
@@ -17177,23 +15392,18 @@ public int getRepeatedForeignMessageCount() {
           return repeatedForeignMessageBuilder_.getCount();
         }
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-          getRepeatedForeignMessage(int index) {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getRepeatedForeignMessage(int index) {
         if (repeatedForeignMessageBuilder_ == null) {
           return repeatedForeignMessage_.get(index);
         } else {
           return repeatedForeignMessageBuilder_.getMessage(index);
         }
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
       public Builder setRepeatedForeignMessage(
           int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage value) {
@@ -17209,15 +15419,11 @@ public Builder setRepeatedForeignMessage(
         }
         return this;
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
       public Builder setRepeatedForeignMessage(
-          int index,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder
-              builderForValue) {
+          int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder builderForValue) {
         if (repeatedForeignMessageBuilder_ == null) {
           ensureRepeatedForeignMessageIsMutable();
           repeatedForeignMessage_.set(index, builderForValue.build());
@@ -17227,13 +15433,10 @@ public Builder setRepeatedForeignMessage(
         }
         return this;
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
-      public Builder addRepeatedForeignMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage value) {
+      public Builder addRepeatedForeignMessage(legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage value) {
         if (repeatedForeignMessageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -17246,10 +15449,8 @@ public Builder addRepeatedForeignMessage(
         }
         return this;
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
       public Builder addRepeatedForeignMessage(
           int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage value) {
@@ -17265,14 +15466,11 @@ public Builder addRepeatedForeignMessage(
         }
         return this;
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
       public Builder addRepeatedForeignMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder
-              builderForValue) {
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder builderForValue) {
         if (repeatedForeignMessageBuilder_ == null) {
           ensureRepeatedForeignMessageIsMutable();
           repeatedForeignMessage_.add(builderForValue.build());
@@ -17282,15 +15480,11 @@ public Builder addRepeatedForeignMessage(
         }
         return this;
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
       public Builder addRepeatedForeignMessage(
-          int index,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder
-              builderForValue) {
+          int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder builderForValue) {
         if (repeatedForeignMessageBuilder_ == null) {
           ensureRepeatedForeignMessageIsMutable();
           repeatedForeignMessage_.add(index, builderForValue.build());
@@ -17300,28 +15494,23 @@ public Builder addRepeatedForeignMessage(
         }
         return this;
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
       public Builder addAllRepeatedForeignMessage(
-          java.lang.Iterable<
-                  ? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-              values) {
+          java.lang.Iterable<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> values) {
         if (repeatedForeignMessageBuilder_ == null) {
           ensureRepeatedForeignMessageIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(values, repeatedForeignMessage_);
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, repeatedForeignMessage_);
           onChanged();
         } else {
           repeatedForeignMessageBuilder_.addAllMessages(values);
         }
         return this;
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
       public Builder clearRepeatedForeignMessage() {
         if (repeatedForeignMessageBuilder_ == null) {
@@ -17333,10 +15522,8 @@ public Builder clearRepeatedForeignMessage() {
         }
         return this;
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
       public Builder removeRepeatedForeignMessage(int index) {
         if (repeatedForeignMessageBuilder_ == null) {
@@ -17348,89 +15535,62 @@ public Builder removeRepeatedForeignMessage(int index) {
         }
         return this;
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder
-          getRepeatedForeignMessageBuilder(int index) {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder getRepeatedForeignMessageBuilder(
+          int index) {
         return internalGetRepeatedForeignMessageFieldBuilder().getBuilder(index);
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder
-          getRepeatedForeignMessageOrBuilder(int index) {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder getRepeatedForeignMessageOrBuilder(
+          int index) {
         if (repeatedForeignMessageBuilder_ == null) {
-          return repeatedForeignMessage_.get(index);
-        } else {
+          return repeatedForeignMessage_.get(index);  } else {
           return repeatedForeignMessageBuilder_.getMessageOrBuilder(index);
         }
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
-      public java.util.List<
-              ? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>
-          getRepeatedForeignMessageOrBuilderList() {
+      public java.util.List<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder> 
+           getRepeatedForeignMessageOrBuilderList() {
         if (repeatedForeignMessageBuilder_ != null) {
           return repeatedForeignMessageBuilder_.getMessageOrBuilderList();
         } else {
           return java.util.Collections.unmodifiableList(repeatedForeignMessage_);
         }
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder
-          addRepeatedForeignMessageBuilder() {
-        return internalGetRepeatedForeignMessageFieldBuilder()
-            .addBuilder(
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-                    .getDefaultInstance());
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder addRepeatedForeignMessageBuilder() {
+        return internalGetRepeatedForeignMessageFieldBuilder().addBuilder(
+            legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance());
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder
-          addRepeatedForeignMessageBuilder(int index) {
-        return internalGetRepeatedForeignMessageFieldBuilder()
-            .addBuilder(
-                index,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-                    .getDefaultInstance());
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder addRepeatedForeignMessageBuilder(
+          int index) {
+        return internalGetRepeatedForeignMessageFieldBuilder().addBuilder(
+            index, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance());
       }
-
       /**
-       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;
-       * </code>
+       * <code>repeated .legacy_gencode_test.proto3.ForeignMessage repeated_foreign_message = 49;</code>
        */
-      public java.util.List<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder>
-          getRepeatedForeignMessageBuilderList() {
+      public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder> 
+           getRepeatedForeignMessageBuilderList() {
         return internalGetRepeatedForeignMessageFieldBuilder().getBuilderList();
       }
-
       private com.google.protobuf.RepeatedFieldBuilder<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder> 
           internalGetRepeatedForeignMessageFieldBuilder() {
         if (repeatedForeignMessageBuilder_ == null) {
-          repeatedForeignMessageBuilder_ =
-              new com.google.protobuf.RepeatedFieldBuilder<
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>(
+          repeatedForeignMessageBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>(
                   repeatedForeignMessage_,
                   ((bitField1_ & 0x00000020) != 0),
                   getParentForChildren(),
@@ -17441,121 +15601,77 @@ public Builder removeRepeatedForeignMessage(int index) {
       }
 
       private com.google.protobuf.Internal.IntList repeatedNestedEnum_ = emptyIntList();
-
       private void ensureRepeatedNestedEnumIsMutable() {
         if (!repeatedNestedEnum_.isModifiable()) {
           repeatedNestedEnum_ = makeMutableCopy(repeatedNestedEnum_);
         }
         bitField1_ |= 0x00000040;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @return A list containing the repeatedNestedEnum.
        */
-      public java.util.List<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-          getRepeatedNestedEnumList() {
+      public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> getRepeatedNestedEnumList() {
         return new com.google.protobuf.Internal.IntListAdapter<
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(
-            repeatedNestedEnum_, repeatedNestedEnum_converter_);
+            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(repeatedNestedEnum_, repeatedNestedEnum_converter_);
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @return The count of repeatedNestedEnum.
        */
       public int getRepeatedNestedEnumCount() {
         return repeatedNestedEnum_.size();
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @param index The index of the element to return.
        * @return The repeatedNestedEnum at the given index.
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-          getRepeatedNestedEnum(int index) {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getRepeatedNestedEnum(int index) {
         return repeatedNestedEnum_converter_.convert(repeatedNestedEnum_.getInt(index));
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @param index The index to set the value at.
        * @param value The repeatedNestedEnum to set.
        * @return This builder for chaining.
        */
       public Builder setRepeatedNestedEnum(
-          int index,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+          int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
+        if (value == null) { throw new NullPointerException(); }
         ensureRepeatedNestedEnumIsMutable();
         repeatedNestedEnum_.setInt(index, value.getNumber());
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @param value The repeatedNestedEnum to add.
        * @return This builder for chaining.
        */
-      public Builder addRepeatedNestedEnum(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder addRepeatedNestedEnum(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
+        if (value == null) { throw new NullPointerException(); }
         ensureRepeatedNestedEnumIsMutable();
         repeatedNestedEnum_.addInt(value.getNumber());
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @param values The repeatedNestedEnum to add.
        * @return This builder for chaining.
        */
       public Builder addAllRepeatedNestedEnum(
-          java.lang.Iterable<
-                  ? extends
-                      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                          .NestedEnum>
-              values) {
+          java.lang.Iterable<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> values) {
         ensureRepeatedNestedEnumIsMutable();
-        for (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-            value : values) {
+        for (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value : values) {
           repeatedNestedEnum_.addInt(value.getNumber());
         }
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @return This builder for chaining.
        */
       public Builder clearRepeatedNestedEnum() {
@@ -17564,52 +15680,38 @@ public Builder clearRepeatedNestedEnum() {
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @return A list containing the enum numeric values on the wire for repeatedNestedEnum.
        */
-      public java.util.List<java.lang.Integer> getRepeatedNestedEnumValueList() {
+      public java.util.List<java.lang.Integer>
+      getRepeatedNestedEnumValueList() {
         repeatedNestedEnum_.makeImmutable();
         return repeatedNestedEnum_;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @param index The index of the value to return.
        * @return The enum numeric value on the wire of repeatedNestedEnum at the given index.
        */
       public int getRepeatedNestedEnumValue(int index) {
         return repeatedNestedEnum_.getInt(index);
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @param index The index to set the value at.
        * @param value The enum numeric value on the wire for repeatedNestedEnum to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedNestedEnumValue(int index, int value) {
+      public Builder setRepeatedNestedEnumValue(
+          int index, int value) {
         ensureRepeatedNestedEnumIsMutable();
         repeatedNestedEnum_.setInt(index, value);
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @param value The enum numeric value on the wire for repeatedNestedEnum to add.
        * @return This builder for chaining.
        */
@@ -17619,16 +15721,13 @@ public Builder addRepeatedNestedEnumValue(int value) {
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum repeated_nested_enum = 51;</code>
        * @param values The enum numeric values on the wire for repeatedNestedEnum to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedNestedEnumValue(java.lang.Iterable<java.lang.Integer> values) {
+      public Builder addAllRepeatedNestedEnumValue(
+          java.lang.Iterable<java.lang.Integer> values) {
         ensureRepeatedNestedEnumIsMutable();
         for (int value : values) {
           repeatedNestedEnum_.addInt(value);
@@ -17638,91 +15737,68 @@ public Builder addAllRepeatedNestedEnumValue(java.lang.Iterable<java.lang.Intege
       }
 
       private com.google.protobuf.Internal.IntList repeatedForeignEnum_ = emptyIntList();
-
       private void ensureRepeatedForeignEnumIsMutable() {
         if (!repeatedForeignEnum_.isModifiable()) {
           repeatedForeignEnum_ = makeMutableCopy(repeatedForeignEnum_);
         }
         bitField1_ |= 0x00000080;
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @return A list containing the repeatedForeignEnum.
        */
-      public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-          getRepeatedForeignEnumList() {
+      public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum> getRepeatedForeignEnumList() {
         return new com.google.protobuf.Internal.IntListAdapter<
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>(
-            repeatedForeignEnum_, repeatedForeignEnum_converter_);
+            legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>(repeatedForeignEnum_, repeatedForeignEnum_converter_);
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @return The count of repeatedForeignEnum.
        */
       public int getRepeatedForeignEnumCount() {
         return repeatedForeignEnum_.size();
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @param index The index of the element to return.
        * @return The repeatedForeignEnum at the given index.
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getRepeatedForeignEnum(
-          int index) {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getRepeatedForeignEnum(int index) {
         return repeatedForeignEnum_converter_.convert(repeatedForeignEnum_.getInt(index));
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @param index The index to set the value at.
        * @param value The repeatedForeignEnum to set.
        * @return This builder for chaining.
        */
       public Builder setRepeatedForeignEnum(
           int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         ensureRepeatedForeignEnumIsMutable();
         repeatedForeignEnum_.setInt(index, value.getNumber());
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @param value The repeatedForeignEnum to add.
        * @return This builder for chaining.
        */
-      public Builder addRepeatedForeignEnum(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder addRepeatedForeignEnum(legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum value) {
+        if (value == null) { throw new NullPointerException(); }
         ensureRepeatedForeignEnumIsMutable();
         repeatedForeignEnum_.addInt(value.getNumber());
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @param values The repeatedForeignEnum to add.
        * @return This builder for chaining.
        */
       public Builder addAllRepeatedForeignEnum(
-          java.lang.Iterable<
-                  ? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-              values) {
+          java.lang.Iterable<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum> values) {
         ensureRepeatedForeignEnumIsMutable();
         for (legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum value : values) {
           repeatedForeignEnum_.addInt(value.getNumber());
@@ -17730,10 +15806,8 @@ public Builder addAllRepeatedForeignEnum(
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearRepeatedForeignEnum() {
@@ -17742,44 +15816,38 @@ public Builder clearRepeatedForeignEnum() {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @return A list containing the enum numeric values on the wire for repeatedForeignEnum.
        */
-      public java.util.List<java.lang.Integer> getRepeatedForeignEnumValueList() {
+      public java.util.List<java.lang.Integer>
+      getRepeatedForeignEnumValueList() {
         repeatedForeignEnum_.makeImmutable();
         return repeatedForeignEnum_;
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @param index The index of the value to return.
        * @return The enum numeric value on the wire of repeatedForeignEnum at the given index.
        */
       public int getRepeatedForeignEnumValue(int index) {
         return repeatedForeignEnum_.getInt(index);
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @param index The index to set the value at.
        * @param value The enum numeric value on the wire for repeatedForeignEnum to set.
        * @return This builder for chaining.
        */
-      public Builder setRepeatedForeignEnumValue(int index, int value) {
+      public Builder setRepeatedForeignEnumValue(
+          int index, int value) {
         ensureRepeatedForeignEnumIsMutable();
         repeatedForeignEnum_.setInt(index, value);
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @param value The enum numeric value on the wire for repeatedForeignEnum to add.
        * @return This builder for chaining.
        */
@@ -17789,14 +15857,13 @@ public Builder addRepeatedForeignEnumValue(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated .legacy_gencode_test.proto3.ForeignEnum repeated_foreign_enum = 52;</code>
-       *
        * @param values The enum numeric values on the wire for repeatedForeignEnum to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRepeatedForeignEnumValue(java.lang.Iterable<java.lang.Integer> values) {
+      public Builder addAllRepeatedForeignEnumValue(
+          java.lang.Iterable<java.lang.Integer> values) {
         ensureRepeatedForeignEnumIsMutable();
         for (int value : values) {
           repeatedForeignEnum_.addInt(value);
@@ -17806,75 +15873,60 @@ public Builder addAllRepeatedForeignEnumValue(java.lang.Iterable<java.lang.Integ
       }
 
       private com.google.protobuf.Internal.IntList packedInt32_ = emptyIntList();
-
       private void ensurePackedInt32IsMutable() {
         if (!packedInt32_.isModifiable()) {
           packedInt32_ = makeMutableCopy(packedInt32_);
         }
         bitField1_ |= 0x00000100;
       }
-
       /**
-       *
-       *
        * <pre>
        * Packed
        * </pre>
        *
        * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-       *
        * @return A list containing the packedInt32.
        */
-      public java.util.List<java.lang.Integer> getPackedInt32List() {
+      public java.util.List<java.lang.Integer>
+          getPackedInt32List() {
         packedInt32_.makeImmutable();
         return packedInt32_;
       }
-
       /**
-       *
-       *
        * <pre>
        * Packed
        * </pre>
        *
        * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-       *
        * @return The count of packedInt32.
        */
       public int getPackedInt32Count() {
         return packedInt32_.size();
       }
-
       /**
-       *
-       *
        * <pre>
        * Packed
        * </pre>
        *
        * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedInt32 at the given index.
        */
       public int getPackedInt32(int index) {
         return packedInt32_.getInt(index);
       }
-
       /**
-       *
-       *
        * <pre>
        * Packed
        * </pre>
        *
        * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedInt32 to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedInt32(int index, int value) {
+      public Builder setPackedInt32(
+          int index, int value) {
 
         ensurePackedInt32IsMutable();
         packedInt32_.setInt(index, value);
@@ -17882,16 +15934,12 @@ public Builder setPackedInt32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
-       *
-       *
        * <pre>
        * Packed
        * </pre>
        *
        * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-       *
        * @param value The packedInt32 to add.
        * @return This builder for chaining.
        */
@@ -17903,36 +15951,30 @@ public Builder addPackedInt32(int value) {
         onChanged();
         return this;
       }
-
       /**
-       *
-       *
        * <pre>
        * Packed
        * </pre>
        *
        * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-       *
        * @param values The packedInt32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedInt32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllPackedInt32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensurePackedInt32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedInt32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedInt32_);
         bitField1_ |= 0x00000100;
         onChanged();
         return this;
       }
-
       /**
-       *
-       *
        * <pre>
        * Packed
        * </pre>
        *
        * <code>repeated int32 packed_int32 = 75 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedInt32() {
@@ -17943,51 +15985,44 @@ public Builder clearPackedInt32() {
       }
 
       private com.google.protobuf.Internal.LongList packedInt64_ = emptyLongList();
-
       private void ensurePackedInt64IsMutable() {
         if (!packedInt64_.isModifiable()) {
           packedInt64_ = makeMutableCopy(packedInt64_);
         }
         bitField1_ |= 0x00000200;
       }
-
       /**
        * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-       *
        * @return A list containing the packedInt64.
        */
-      public java.util.List<java.lang.Long> getPackedInt64List() {
+      public java.util.List<java.lang.Long>
+          getPackedInt64List() {
         packedInt64_.makeImmutable();
         return packedInt64_;
       }
-
       /**
        * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-       *
        * @return The count of packedInt64.
        */
       public int getPackedInt64Count() {
         return packedInt64_.size();
       }
-
       /**
        * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedInt64 at the given index.
        */
       public long getPackedInt64(int index) {
         return packedInt64_.getLong(index);
       }
-
       /**
        * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedInt64 to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedInt64(int index, long value) {
+      public Builder setPackedInt64(
+          int index, long value) {
 
         ensurePackedInt64IsMutable();
         packedInt64_.setLong(index, value);
@@ -17995,10 +16030,8 @@ public Builder setPackedInt64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-       *
        * @param value The packedInt64 to add.
        * @return This builder for chaining.
        */
@@ -18010,24 +16043,22 @@ public Builder addPackedInt64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-       *
        * @param values The packedInt64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedInt64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllPackedInt64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensurePackedInt64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedInt64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedInt64_);
         bitField1_ |= 0x00000200;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated int64 packed_int64 = 76 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedInt64() {
@@ -18038,51 +16069,44 @@ public Builder clearPackedInt64() {
       }
 
       private com.google.protobuf.Internal.IntList packedUint32_ = emptyIntList();
-
       private void ensurePackedUint32IsMutable() {
         if (!packedUint32_.isModifiable()) {
           packedUint32_ = makeMutableCopy(packedUint32_);
         }
         bitField1_ |= 0x00000400;
       }
-
       /**
        * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-       *
        * @return A list containing the packedUint32.
        */
-      public java.util.List<java.lang.Integer> getPackedUint32List() {
+      public java.util.List<java.lang.Integer>
+          getPackedUint32List() {
         packedUint32_.makeImmutable();
         return packedUint32_;
       }
-
       /**
        * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-       *
        * @return The count of packedUint32.
        */
       public int getPackedUint32Count() {
         return packedUint32_.size();
       }
-
       /**
        * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedUint32 at the given index.
        */
       public int getPackedUint32(int index) {
         return packedUint32_.getInt(index);
       }
-
       /**
        * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedUint32 to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedUint32(int index, int value) {
+      public Builder setPackedUint32(
+          int index, int value) {
 
         ensurePackedUint32IsMutable();
         packedUint32_.setInt(index, value);
@@ -18090,10 +16114,8 @@ public Builder setPackedUint32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-       *
        * @param value The packedUint32 to add.
        * @return This builder for chaining.
        */
@@ -18105,24 +16127,22 @@ public Builder addPackedUint32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-       *
        * @param values The packedUint32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedUint32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllPackedUint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensurePackedUint32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedUint32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedUint32_);
         bitField1_ |= 0x00000400;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint32 packed_uint32 = 77 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedUint32() {
@@ -18133,51 +16153,44 @@ public Builder clearPackedUint32() {
       }
 
       private com.google.protobuf.Internal.LongList packedUint64_ = emptyLongList();
-
       private void ensurePackedUint64IsMutable() {
         if (!packedUint64_.isModifiable()) {
           packedUint64_ = makeMutableCopy(packedUint64_);
         }
         bitField1_ |= 0x00000800;
       }
-
       /**
        * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-       *
        * @return A list containing the packedUint64.
        */
-      public java.util.List<java.lang.Long> getPackedUint64List() {
+      public java.util.List<java.lang.Long>
+          getPackedUint64List() {
         packedUint64_.makeImmutable();
         return packedUint64_;
       }
-
       /**
        * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-       *
        * @return The count of packedUint64.
        */
       public int getPackedUint64Count() {
         return packedUint64_.size();
       }
-
       /**
        * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedUint64 at the given index.
        */
       public long getPackedUint64(int index) {
         return packedUint64_.getLong(index);
       }
-
       /**
        * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedUint64 to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedUint64(int index, long value) {
+      public Builder setPackedUint64(
+          int index, long value) {
 
         ensurePackedUint64IsMutable();
         packedUint64_.setLong(index, value);
@@ -18185,10 +16198,8 @@ public Builder setPackedUint64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-       *
        * @param value The packedUint64 to add.
        * @return This builder for chaining.
        */
@@ -18200,24 +16211,22 @@ public Builder addPackedUint64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-       *
        * @param values The packedUint64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedUint64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllPackedUint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensurePackedUint64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedUint64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedUint64_);
         bitField1_ |= 0x00000800;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint64 packed_uint64 = 78 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedUint64() {
@@ -18228,51 +16237,44 @@ public Builder clearPackedUint64() {
       }
 
       private com.google.protobuf.Internal.IntList packedSint32_ = emptyIntList();
-
       private void ensurePackedSint32IsMutable() {
         if (!packedSint32_.isModifiable()) {
           packedSint32_ = makeMutableCopy(packedSint32_);
         }
         bitField1_ |= 0x00001000;
       }
-
       /**
        * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-       *
        * @return A list containing the packedSint32.
        */
-      public java.util.List<java.lang.Integer> getPackedSint32List() {
+      public java.util.List<java.lang.Integer>
+          getPackedSint32List() {
         packedSint32_.makeImmutable();
         return packedSint32_;
       }
-
       /**
        * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-       *
        * @return The count of packedSint32.
        */
       public int getPackedSint32Count() {
         return packedSint32_.size();
       }
-
       /**
        * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedSint32 at the given index.
        */
       public int getPackedSint32(int index) {
         return packedSint32_.getInt(index);
       }
-
       /**
        * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedSint32 to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedSint32(int index, int value) {
+      public Builder setPackedSint32(
+          int index, int value) {
 
         ensurePackedSint32IsMutable();
         packedSint32_.setInt(index, value);
@@ -18280,10 +16282,8 @@ public Builder setPackedSint32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-       *
        * @param value The packedSint32 to add.
        * @return This builder for chaining.
        */
@@ -18295,24 +16295,22 @@ public Builder addPackedSint32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-       *
        * @param values The packedSint32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedSint32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllPackedSint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensurePackedSint32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedSint32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedSint32_);
         bitField1_ |= 0x00001000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint32 packed_sint32 = 79 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedSint32() {
@@ -18323,51 +16321,44 @@ public Builder clearPackedSint32() {
       }
 
       private com.google.protobuf.Internal.LongList packedSint64_ = emptyLongList();
-
       private void ensurePackedSint64IsMutable() {
         if (!packedSint64_.isModifiable()) {
           packedSint64_ = makeMutableCopy(packedSint64_);
         }
         bitField1_ |= 0x00002000;
       }
-
       /**
        * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-       *
        * @return A list containing the packedSint64.
        */
-      public java.util.List<java.lang.Long> getPackedSint64List() {
+      public java.util.List<java.lang.Long>
+          getPackedSint64List() {
         packedSint64_.makeImmutable();
         return packedSint64_;
       }
-
       /**
        * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-       *
        * @return The count of packedSint64.
        */
       public int getPackedSint64Count() {
         return packedSint64_.size();
       }
-
       /**
        * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedSint64 at the given index.
        */
       public long getPackedSint64(int index) {
         return packedSint64_.getLong(index);
       }
-
       /**
        * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedSint64 to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedSint64(int index, long value) {
+      public Builder setPackedSint64(
+          int index, long value) {
 
         ensurePackedSint64IsMutable();
         packedSint64_.setLong(index, value);
@@ -18375,10 +16366,8 @@ public Builder setPackedSint64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-       *
        * @param value The packedSint64 to add.
        * @return This builder for chaining.
        */
@@ -18390,24 +16379,22 @@ public Builder addPackedSint64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-       *
        * @param values The packedSint64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedSint64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllPackedSint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensurePackedSint64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedSint64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedSint64_);
         bitField1_ |= 0x00002000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint64 packed_sint64 = 80 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedSint64() {
@@ -18418,58 +16405,50 @@ public Builder clearPackedSint64() {
       }
 
       private com.google.protobuf.Internal.IntList packedFixed32_ = emptyIntList();
-
       private void ensurePackedFixed32IsMutable() {
         if (!packedFixed32_.isModifiable()) {
           packedFixed32_ = makeMutableCopy(packedFixed32_);
         }
         bitField1_ |= 0x00004000;
       }
-
       private void ensurePackedFixed32IsMutable(int capacity) {
         if (!packedFixed32_.isModifiable()) {
           packedFixed32_ = makeMutableCopy(packedFixed32_, capacity);
         }
         bitField1_ |= 0x00004000;
       }
-
       /**
        * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-       *
        * @return A list containing the packedFixed32.
        */
-      public java.util.List<java.lang.Integer> getPackedFixed32List() {
+      public java.util.List<java.lang.Integer>
+          getPackedFixed32List() {
         packedFixed32_.makeImmutable();
         return packedFixed32_;
       }
-
       /**
        * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-       *
        * @return The count of packedFixed32.
        */
       public int getPackedFixed32Count() {
         return packedFixed32_.size();
       }
-
       /**
        * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedFixed32 at the given index.
        */
       public int getPackedFixed32(int index) {
         return packedFixed32_.getInt(index);
       }
-
       /**
        * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedFixed32 to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedFixed32(int index, int value) {
+      public Builder setPackedFixed32(
+          int index, int value) {
 
         ensurePackedFixed32IsMutable();
         packedFixed32_.setInt(index, value);
@@ -18477,10 +16456,8 @@ public Builder setPackedFixed32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-       *
        * @param value The packedFixed32 to add.
        * @return This builder for chaining.
        */
@@ -18492,24 +16469,22 @@ public Builder addPackedFixed32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-       *
        * @param values The packedFixed32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedFixed32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllPackedFixed32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensurePackedFixed32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedFixed32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedFixed32_);
         bitField1_ |= 0x00004000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed32 packed_fixed32 = 81 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedFixed32() {
@@ -18520,58 +16495,50 @@ public Builder clearPackedFixed32() {
       }
 
       private com.google.protobuf.Internal.LongList packedFixed64_ = emptyLongList();
-
       private void ensurePackedFixed64IsMutable() {
         if (!packedFixed64_.isModifiable()) {
           packedFixed64_ = makeMutableCopy(packedFixed64_);
         }
         bitField1_ |= 0x00008000;
       }
-
       private void ensurePackedFixed64IsMutable(int capacity) {
         if (!packedFixed64_.isModifiable()) {
           packedFixed64_ = makeMutableCopy(packedFixed64_, capacity);
         }
         bitField1_ |= 0x00008000;
       }
-
       /**
        * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-       *
        * @return A list containing the packedFixed64.
        */
-      public java.util.List<java.lang.Long> getPackedFixed64List() {
+      public java.util.List<java.lang.Long>
+          getPackedFixed64List() {
         packedFixed64_.makeImmutable();
         return packedFixed64_;
       }
-
       /**
        * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-       *
        * @return The count of packedFixed64.
        */
       public int getPackedFixed64Count() {
         return packedFixed64_.size();
       }
-
       /**
        * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedFixed64 at the given index.
        */
       public long getPackedFixed64(int index) {
         return packedFixed64_.getLong(index);
       }
-
       /**
        * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedFixed64 to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedFixed64(int index, long value) {
+      public Builder setPackedFixed64(
+          int index, long value) {
 
         ensurePackedFixed64IsMutable();
         packedFixed64_.setLong(index, value);
@@ -18579,10 +16546,8 @@ public Builder setPackedFixed64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-       *
        * @param value The packedFixed64 to add.
        * @return This builder for chaining.
        */
@@ -18594,24 +16559,22 @@ public Builder addPackedFixed64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-       *
        * @param values The packedFixed64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedFixed64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllPackedFixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensurePackedFixed64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedFixed64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedFixed64_);
         bitField1_ |= 0x00008000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed64 packed_fixed64 = 82 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedFixed64() {
@@ -18622,58 +16585,50 @@ public Builder clearPackedFixed64() {
       }
 
       private com.google.protobuf.Internal.IntList packedSfixed32_ = emptyIntList();
-
       private void ensurePackedSfixed32IsMutable() {
         if (!packedSfixed32_.isModifiable()) {
           packedSfixed32_ = makeMutableCopy(packedSfixed32_);
         }
         bitField1_ |= 0x00010000;
       }
-
       private void ensurePackedSfixed32IsMutable(int capacity) {
         if (!packedSfixed32_.isModifiable()) {
           packedSfixed32_ = makeMutableCopy(packedSfixed32_, capacity);
         }
         bitField1_ |= 0x00010000;
       }
-
       /**
        * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-       *
        * @return A list containing the packedSfixed32.
        */
-      public java.util.List<java.lang.Integer> getPackedSfixed32List() {
+      public java.util.List<java.lang.Integer>
+          getPackedSfixed32List() {
         packedSfixed32_.makeImmutable();
         return packedSfixed32_;
       }
-
       /**
        * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-       *
        * @return The count of packedSfixed32.
        */
       public int getPackedSfixed32Count() {
         return packedSfixed32_.size();
       }
-
       /**
        * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedSfixed32 at the given index.
        */
       public int getPackedSfixed32(int index) {
         return packedSfixed32_.getInt(index);
       }
-
       /**
        * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedSfixed32 to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedSfixed32(int index, int value) {
+      public Builder setPackedSfixed32(
+          int index, int value) {
 
         ensurePackedSfixed32IsMutable();
         packedSfixed32_.setInt(index, value);
@@ -18681,10 +16636,8 @@ public Builder setPackedSfixed32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-       *
        * @param value The packedSfixed32 to add.
        * @return This builder for chaining.
        */
@@ -18696,24 +16649,22 @@ public Builder addPackedSfixed32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-       *
        * @param values The packedSfixed32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedSfixed32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllPackedSfixed32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensurePackedSfixed32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedSfixed32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedSfixed32_);
         bitField1_ |= 0x00010000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed32 packed_sfixed32 = 83 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedSfixed32() {
@@ -18724,58 +16675,50 @@ public Builder clearPackedSfixed32() {
       }
 
       private com.google.protobuf.Internal.LongList packedSfixed64_ = emptyLongList();
-
       private void ensurePackedSfixed64IsMutable() {
         if (!packedSfixed64_.isModifiable()) {
           packedSfixed64_ = makeMutableCopy(packedSfixed64_);
         }
         bitField1_ |= 0x00020000;
       }
-
       private void ensurePackedSfixed64IsMutable(int capacity) {
         if (!packedSfixed64_.isModifiable()) {
           packedSfixed64_ = makeMutableCopy(packedSfixed64_, capacity);
         }
         bitField1_ |= 0x00020000;
       }
-
       /**
        * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-       *
        * @return A list containing the packedSfixed64.
        */
-      public java.util.List<java.lang.Long> getPackedSfixed64List() {
+      public java.util.List<java.lang.Long>
+          getPackedSfixed64List() {
         packedSfixed64_.makeImmutable();
         return packedSfixed64_;
       }
-
       /**
        * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-       *
        * @return The count of packedSfixed64.
        */
       public int getPackedSfixed64Count() {
         return packedSfixed64_.size();
       }
-
       /**
        * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedSfixed64 at the given index.
        */
       public long getPackedSfixed64(int index) {
         return packedSfixed64_.getLong(index);
       }
-
       /**
        * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedSfixed64 to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedSfixed64(int index, long value) {
+      public Builder setPackedSfixed64(
+          int index, long value) {
 
         ensurePackedSfixed64IsMutable();
         packedSfixed64_.setLong(index, value);
@@ -18783,10 +16726,8 @@ public Builder setPackedSfixed64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-       *
        * @param value The packedSfixed64 to add.
        * @return This builder for chaining.
        */
@@ -18798,24 +16739,22 @@ public Builder addPackedSfixed64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-       *
        * @param values The packedSfixed64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedSfixed64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllPackedSfixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensurePackedSfixed64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedSfixed64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedSfixed64_);
         bitField1_ |= 0x00020000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed64 packed_sfixed64 = 84 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedSfixed64() {
@@ -18826,58 +16765,50 @@ public Builder clearPackedSfixed64() {
       }
 
       private com.google.protobuf.Internal.FloatList packedFloat_ = emptyFloatList();
-
       private void ensurePackedFloatIsMutable() {
         if (!packedFloat_.isModifiable()) {
           packedFloat_ = makeMutableCopy(packedFloat_);
         }
         bitField1_ |= 0x00040000;
       }
-
       private void ensurePackedFloatIsMutable(int capacity) {
         if (!packedFloat_.isModifiable()) {
           packedFloat_ = makeMutableCopy(packedFloat_, capacity);
         }
         bitField1_ |= 0x00040000;
       }
-
       /**
        * <code>repeated float packed_float = 85 [packed = true];</code>
-       *
        * @return A list containing the packedFloat.
        */
-      public java.util.List<java.lang.Float> getPackedFloatList() {
+      public java.util.List<java.lang.Float>
+          getPackedFloatList() {
         packedFloat_.makeImmutable();
         return packedFloat_;
       }
-
       /**
        * <code>repeated float packed_float = 85 [packed = true];</code>
-       *
        * @return The count of packedFloat.
        */
       public int getPackedFloatCount() {
         return packedFloat_.size();
       }
-
       /**
        * <code>repeated float packed_float = 85 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedFloat at the given index.
        */
       public float getPackedFloat(int index) {
         return packedFloat_.getFloat(index);
       }
-
       /**
        * <code>repeated float packed_float = 85 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedFloat to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedFloat(int index, float value) {
+      public Builder setPackedFloat(
+          int index, float value) {
 
         ensurePackedFloatIsMutable();
         packedFloat_.setFloat(index, value);
@@ -18885,10 +16816,8 @@ public Builder setPackedFloat(int index, float value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated float packed_float = 85 [packed = true];</code>
-       *
        * @param value The packedFloat to add.
        * @return This builder for chaining.
        */
@@ -18900,24 +16829,22 @@ public Builder addPackedFloat(float value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated float packed_float = 85 [packed = true];</code>
-       *
        * @param values The packedFloat to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedFloat(java.lang.Iterable<? extends java.lang.Float> values) {
+      public Builder addAllPackedFloat(
+          java.lang.Iterable<? extends java.lang.Float> values) {
         ensurePackedFloatIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedFloat_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedFloat_);
         bitField1_ |= 0x00040000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated float packed_float = 85 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedFloat() {
@@ -18928,58 +16855,50 @@ public Builder clearPackedFloat() {
       }
 
       private com.google.protobuf.Internal.DoubleList packedDouble_ = emptyDoubleList();
-
       private void ensurePackedDoubleIsMutable() {
         if (!packedDouble_.isModifiable()) {
           packedDouble_ = makeMutableCopy(packedDouble_);
         }
         bitField1_ |= 0x00080000;
       }
-
       private void ensurePackedDoubleIsMutable(int capacity) {
         if (!packedDouble_.isModifiable()) {
           packedDouble_ = makeMutableCopy(packedDouble_, capacity);
         }
         bitField1_ |= 0x00080000;
       }
-
       /**
        * <code>repeated double packed_double = 86 [packed = true];</code>
-       *
        * @return A list containing the packedDouble.
        */
-      public java.util.List<java.lang.Double> getPackedDoubleList() {
+      public java.util.List<java.lang.Double>
+          getPackedDoubleList() {
         packedDouble_.makeImmutable();
         return packedDouble_;
       }
-
       /**
        * <code>repeated double packed_double = 86 [packed = true];</code>
-       *
        * @return The count of packedDouble.
        */
       public int getPackedDoubleCount() {
         return packedDouble_.size();
       }
-
       /**
        * <code>repeated double packed_double = 86 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedDouble at the given index.
        */
       public double getPackedDouble(int index) {
         return packedDouble_.getDouble(index);
       }
-
       /**
        * <code>repeated double packed_double = 86 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedDouble to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedDouble(int index, double value) {
+      public Builder setPackedDouble(
+          int index, double value) {
 
         ensurePackedDoubleIsMutable();
         packedDouble_.setDouble(index, value);
@@ -18987,10 +16906,8 @@ public Builder setPackedDouble(int index, double value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated double packed_double = 86 [packed = true];</code>
-       *
        * @param value The packedDouble to add.
        * @return This builder for chaining.
        */
@@ -19002,24 +16919,22 @@ public Builder addPackedDouble(double value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated double packed_double = 86 [packed = true];</code>
-       *
        * @param values The packedDouble to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedDouble(java.lang.Iterable<? extends java.lang.Double> values) {
+      public Builder addAllPackedDouble(
+          java.lang.Iterable<? extends java.lang.Double> values) {
         ensurePackedDoubleIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedDouble_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedDouble_);
         bitField1_ |= 0x00080000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated double packed_double = 86 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedDouble() {
@@ -19030,58 +16945,50 @@ public Builder clearPackedDouble() {
       }
 
       private com.google.protobuf.Internal.BooleanList packedBool_ = emptyBooleanList();
-
       private void ensurePackedBoolIsMutable() {
         if (!packedBool_.isModifiable()) {
           packedBool_ = makeMutableCopy(packedBool_);
         }
         bitField1_ |= 0x00100000;
       }
-
       private void ensurePackedBoolIsMutable(int capacity) {
         if (!packedBool_.isModifiable()) {
           packedBool_ = makeMutableCopy(packedBool_, capacity);
         }
         bitField1_ |= 0x00100000;
       }
-
       /**
        * <code>repeated bool packed_bool = 87 [packed = true];</code>
-       *
        * @return A list containing the packedBool.
        */
-      public java.util.List<java.lang.Boolean> getPackedBoolList() {
+      public java.util.List<java.lang.Boolean>
+          getPackedBoolList() {
         packedBool_.makeImmutable();
         return packedBool_;
       }
-
       /**
        * <code>repeated bool packed_bool = 87 [packed = true];</code>
-       *
        * @return The count of packedBool.
        */
       public int getPackedBoolCount() {
         return packedBool_.size();
       }
-
       /**
        * <code>repeated bool packed_bool = 87 [packed = true];</code>
-       *
        * @param index The index of the element to return.
        * @return The packedBool at the given index.
        */
       public boolean getPackedBool(int index) {
         return packedBool_.getBoolean(index);
       }
-
       /**
        * <code>repeated bool packed_bool = 87 [packed = true];</code>
-       *
        * @param index The index to set the value at.
        * @param value The packedBool to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedBool(int index, boolean value) {
+      public Builder setPackedBool(
+          int index, boolean value) {
 
         ensurePackedBoolIsMutable();
         packedBool_.setBoolean(index, value);
@@ -19089,10 +16996,8 @@ public Builder setPackedBool(int index, boolean value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bool packed_bool = 87 [packed = true];</code>
-       *
        * @param value The packedBool to add.
        * @return This builder for chaining.
        */
@@ -19104,24 +17009,22 @@ public Builder addPackedBool(boolean value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bool packed_bool = 87 [packed = true];</code>
-       *
        * @param values The packedBool to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedBool(java.lang.Iterable<? extends java.lang.Boolean> values) {
+      public Builder addAllPackedBool(
+          java.lang.Iterable<? extends java.lang.Boolean> values) {
         ensurePackedBoolIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, packedBool_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packedBool_);
         bitField1_ |= 0x00100000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bool packed_bool = 87 [packed = true];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearPackedBool() {
@@ -19132,121 +17035,77 @@ public Builder clearPackedBool() {
       }
 
       private com.google.protobuf.Internal.IntList packedNestedEnum_ = emptyIntList();
-
       private void ensurePackedNestedEnumIsMutable() {
         if (!packedNestedEnum_.isModifiable()) {
           packedNestedEnum_ = makeMutableCopy(packedNestedEnum_);
         }
         bitField1_ |= 0x00200000;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @return A list containing the packedNestedEnum.
        */
-      public java.util.List<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-          getPackedNestedEnumList() {
+      public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> getPackedNestedEnumList() {
         return new com.google.protobuf.Internal.IntListAdapter<
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(
-            packedNestedEnum_, packedNestedEnum_converter_);
+            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(packedNestedEnum_, packedNestedEnum_converter_);
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @return The count of packedNestedEnum.
        */
       public int getPackedNestedEnumCount() {
         return packedNestedEnum_.size();
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @param index The index of the element to return.
        * @return The packedNestedEnum at the given index.
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-          getPackedNestedEnum(int index) {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getPackedNestedEnum(int index) {
         return packedNestedEnum_converter_.convert(packedNestedEnum_.getInt(index));
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @param index The index to set the value at.
        * @param value The packedNestedEnum to set.
        * @return This builder for chaining.
        */
       public Builder setPackedNestedEnum(
-          int index,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+          int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
+        if (value == null) { throw new NullPointerException(); }
         ensurePackedNestedEnumIsMutable();
         packedNestedEnum_.setInt(index, value.getNumber());
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @param value The packedNestedEnum to add.
        * @return This builder for chaining.
        */
-      public Builder addPackedNestedEnum(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder addPackedNestedEnum(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
+        if (value == null) { throw new NullPointerException(); }
         ensurePackedNestedEnumIsMutable();
         packedNestedEnum_.addInt(value.getNumber());
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @param values The packedNestedEnum to add.
        * @return This builder for chaining.
        */
       public Builder addAllPackedNestedEnum(
-          java.lang.Iterable<
-                  ? extends
-                      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                          .NestedEnum>
-              values) {
+          java.lang.Iterable<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> values) {
         ensurePackedNestedEnumIsMutable();
-        for (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-            value : values) {
+        for (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value : values) {
           packedNestedEnum_.addInt(value.getNumber());
         }
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @return This builder for chaining.
        */
       public Builder clearPackedNestedEnum() {
@@ -19255,52 +17114,38 @@ public Builder clearPackedNestedEnum() {
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @return A list containing the enum numeric values on the wire for packedNestedEnum.
        */
-      public java.util.List<java.lang.Integer> getPackedNestedEnumValueList() {
+      public java.util.List<java.lang.Integer>
+      getPackedNestedEnumValueList() {
         packedNestedEnum_.makeImmutable();
         return packedNestedEnum_;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @param index The index of the value to return.
        * @return The enum numeric value on the wire of packedNestedEnum at the given index.
        */
       public int getPackedNestedEnumValue(int index) {
         return packedNestedEnum_.getInt(index);
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @param index The index to set the value at.
        * @param value The enum numeric value on the wire for packedNestedEnum to set.
        * @return This builder for chaining.
        */
-      public Builder setPackedNestedEnumValue(int index, int value) {
+      public Builder setPackedNestedEnumValue(
+          int index, int value) {
         ensurePackedNestedEnumIsMutable();
         packedNestedEnum_.setInt(index, value);
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @param value The enum numeric value on the wire for packedNestedEnum to add.
        * @return This builder for chaining.
        */
@@ -19310,16 +17155,13 @@ public Builder addPackedNestedEnumValue(int value) {
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum packed_nested_enum = 88 [packed = true];</code>
        * @param values The enum numeric values on the wire for packedNestedEnum to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPackedNestedEnumValue(java.lang.Iterable<java.lang.Integer> values) {
+      public Builder addAllPackedNestedEnumValue(
+          java.lang.Iterable<java.lang.Integer> values) {
         ensurePackedNestedEnumIsMutable();
         for (int value : values) {
           packedNestedEnum_.addInt(value);
@@ -19329,75 +17171,60 @@ public Builder addAllPackedNestedEnumValue(java.lang.Iterable<java.lang.Integer>
       }
 
       private com.google.protobuf.Internal.IntList unpackedInt32_ = emptyIntList();
-
       private void ensureUnpackedInt32IsMutable() {
         if (!unpackedInt32_.isModifiable()) {
           unpackedInt32_ = makeMutableCopy(unpackedInt32_);
         }
         bitField1_ |= 0x00400000;
       }
-
       /**
-       *
-       *
        * <pre>
        * Unpacked
        * </pre>
        *
        * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-       *
        * @return A list containing the unpackedInt32.
        */
-      public java.util.List<java.lang.Integer> getUnpackedInt32List() {
+      public java.util.List<java.lang.Integer>
+          getUnpackedInt32List() {
         unpackedInt32_.makeImmutable();
         return unpackedInt32_;
       }
-
       /**
-       *
-       *
        * <pre>
        * Unpacked
        * </pre>
        *
        * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-       *
        * @return The count of unpackedInt32.
        */
       public int getUnpackedInt32Count() {
         return unpackedInt32_.size();
       }
-
       /**
-       *
-       *
        * <pre>
        * Unpacked
        * </pre>
        *
        * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedInt32 at the given index.
        */
       public int getUnpackedInt32(int index) {
         return unpackedInt32_.getInt(index);
       }
-
       /**
-       *
-       *
        * <pre>
        * Unpacked
        * </pre>
        *
        * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedInt32 to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedInt32(int index, int value) {
+      public Builder setUnpackedInt32(
+          int index, int value) {
 
         ensureUnpackedInt32IsMutable();
         unpackedInt32_.setInt(index, value);
@@ -19405,16 +17232,12 @@ public Builder setUnpackedInt32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
-       *
-       *
        * <pre>
        * Unpacked
        * </pre>
        *
        * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-       *
        * @param value The unpackedInt32 to add.
        * @return This builder for chaining.
        */
@@ -19426,36 +17249,30 @@ public Builder addUnpackedInt32(int value) {
         onChanged();
         return this;
       }
-
       /**
-       *
-       *
        * <pre>
        * Unpacked
        * </pre>
        *
        * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-       *
        * @param values The unpackedInt32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedInt32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllUnpackedInt32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureUnpackedInt32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedInt32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedInt32_);
         bitField1_ |= 0x00400000;
         onChanged();
         return this;
       }
-
       /**
-       *
-       *
        * <pre>
        * Unpacked
        * </pre>
        *
        * <code>repeated int32 unpacked_int32 = 89 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedInt32() {
@@ -19466,51 +17283,44 @@ public Builder clearUnpackedInt32() {
       }
 
       private com.google.protobuf.Internal.LongList unpackedInt64_ = emptyLongList();
-
       private void ensureUnpackedInt64IsMutable() {
         if (!unpackedInt64_.isModifiable()) {
           unpackedInt64_ = makeMutableCopy(unpackedInt64_);
         }
         bitField1_ |= 0x00800000;
       }
-
       /**
        * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-       *
        * @return A list containing the unpackedInt64.
        */
-      public java.util.List<java.lang.Long> getUnpackedInt64List() {
+      public java.util.List<java.lang.Long>
+          getUnpackedInt64List() {
         unpackedInt64_.makeImmutable();
         return unpackedInt64_;
       }
-
       /**
        * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-       *
        * @return The count of unpackedInt64.
        */
       public int getUnpackedInt64Count() {
         return unpackedInt64_.size();
       }
-
       /**
        * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedInt64 at the given index.
        */
       public long getUnpackedInt64(int index) {
         return unpackedInt64_.getLong(index);
       }
-
       /**
        * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedInt64 to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedInt64(int index, long value) {
+      public Builder setUnpackedInt64(
+          int index, long value) {
 
         ensureUnpackedInt64IsMutable();
         unpackedInt64_.setLong(index, value);
@@ -19518,10 +17328,8 @@ public Builder setUnpackedInt64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-       *
        * @param value The unpackedInt64 to add.
        * @return This builder for chaining.
        */
@@ -19533,24 +17341,22 @@ public Builder addUnpackedInt64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-       *
        * @param values The unpackedInt64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedInt64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllUnpackedInt64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensureUnpackedInt64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedInt64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedInt64_);
         bitField1_ |= 0x00800000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated int64 unpacked_int64 = 90 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedInt64() {
@@ -19561,51 +17367,44 @@ public Builder clearUnpackedInt64() {
       }
 
       private com.google.protobuf.Internal.IntList unpackedUint32_ = emptyIntList();
-
       private void ensureUnpackedUint32IsMutable() {
         if (!unpackedUint32_.isModifiable()) {
           unpackedUint32_ = makeMutableCopy(unpackedUint32_);
         }
         bitField1_ |= 0x01000000;
       }
-
       /**
        * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-       *
        * @return A list containing the unpackedUint32.
        */
-      public java.util.List<java.lang.Integer> getUnpackedUint32List() {
+      public java.util.List<java.lang.Integer>
+          getUnpackedUint32List() {
         unpackedUint32_.makeImmutable();
         return unpackedUint32_;
       }
-
       /**
        * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-       *
        * @return The count of unpackedUint32.
        */
       public int getUnpackedUint32Count() {
         return unpackedUint32_.size();
       }
-
       /**
        * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedUint32 at the given index.
        */
       public int getUnpackedUint32(int index) {
         return unpackedUint32_.getInt(index);
       }
-
       /**
        * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedUint32 to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedUint32(int index, int value) {
+      public Builder setUnpackedUint32(
+          int index, int value) {
 
         ensureUnpackedUint32IsMutable();
         unpackedUint32_.setInt(index, value);
@@ -19613,10 +17412,8 @@ public Builder setUnpackedUint32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-       *
        * @param value The unpackedUint32 to add.
        * @return This builder for chaining.
        */
@@ -19628,24 +17425,22 @@ public Builder addUnpackedUint32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-       *
        * @param values The unpackedUint32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedUint32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllUnpackedUint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureUnpackedUint32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedUint32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedUint32_);
         bitField1_ |= 0x01000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint32 unpacked_uint32 = 91 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedUint32() {
@@ -19656,51 +17451,44 @@ public Builder clearUnpackedUint32() {
       }
 
       private com.google.protobuf.Internal.LongList unpackedUint64_ = emptyLongList();
-
       private void ensureUnpackedUint64IsMutable() {
         if (!unpackedUint64_.isModifiable()) {
           unpackedUint64_ = makeMutableCopy(unpackedUint64_);
         }
         bitField1_ |= 0x02000000;
       }
-
       /**
        * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-       *
        * @return A list containing the unpackedUint64.
        */
-      public java.util.List<java.lang.Long> getUnpackedUint64List() {
+      public java.util.List<java.lang.Long>
+          getUnpackedUint64List() {
         unpackedUint64_.makeImmutable();
         return unpackedUint64_;
       }
-
       /**
        * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-       *
        * @return The count of unpackedUint64.
        */
       public int getUnpackedUint64Count() {
         return unpackedUint64_.size();
       }
-
       /**
        * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedUint64 at the given index.
        */
       public long getUnpackedUint64(int index) {
         return unpackedUint64_.getLong(index);
       }
-
       /**
        * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedUint64 to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedUint64(int index, long value) {
+      public Builder setUnpackedUint64(
+          int index, long value) {
 
         ensureUnpackedUint64IsMutable();
         unpackedUint64_.setLong(index, value);
@@ -19708,10 +17496,8 @@ public Builder setUnpackedUint64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-       *
        * @param value The unpackedUint64 to add.
        * @return This builder for chaining.
        */
@@ -19723,24 +17509,22 @@ public Builder addUnpackedUint64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-       *
        * @param values The unpackedUint64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedUint64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllUnpackedUint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensureUnpackedUint64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedUint64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedUint64_);
         bitField1_ |= 0x02000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated uint64 unpacked_uint64 = 92 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedUint64() {
@@ -19751,51 +17535,44 @@ public Builder clearUnpackedUint64() {
       }
 
       private com.google.protobuf.Internal.IntList unpackedSint32_ = emptyIntList();
-
       private void ensureUnpackedSint32IsMutable() {
         if (!unpackedSint32_.isModifiable()) {
           unpackedSint32_ = makeMutableCopy(unpackedSint32_);
         }
         bitField1_ |= 0x04000000;
       }
-
       /**
        * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-       *
        * @return A list containing the unpackedSint32.
        */
-      public java.util.List<java.lang.Integer> getUnpackedSint32List() {
+      public java.util.List<java.lang.Integer>
+          getUnpackedSint32List() {
         unpackedSint32_.makeImmutable();
         return unpackedSint32_;
       }
-
       /**
        * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-       *
        * @return The count of unpackedSint32.
        */
       public int getUnpackedSint32Count() {
         return unpackedSint32_.size();
       }
-
       /**
        * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedSint32 at the given index.
        */
       public int getUnpackedSint32(int index) {
         return unpackedSint32_.getInt(index);
       }
-
       /**
        * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedSint32 to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedSint32(int index, int value) {
+      public Builder setUnpackedSint32(
+          int index, int value) {
 
         ensureUnpackedSint32IsMutable();
         unpackedSint32_.setInt(index, value);
@@ -19803,10 +17580,8 @@ public Builder setUnpackedSint32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-       *
        * @param value The unpackedSint32 to add.
        * @return This builder for chaining.
        */
@@ -19818,24 +17593,22 @@ public Builder addUnpackedSint32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-       *
        * @param values The unpackedSint32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedSint32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllUnpackedSint32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureUnpackedSint32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedSint32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedSint32_);
         bitField1_ |= 0x04000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint32 unpacked_sint32 = 93 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedSint32() {
@@ -19846,51 +17619,44 @@ public Builder clearUnpackedSint32() {
       }
 
       private com.google.protobuf.Internal.LongList unpackedSint64_ = emptyLongList();
-
       private void ensureUnpackedSint64IsMutable() {
         if (!unpackedSint64_.isModifiable()) {
           unpackedSint64_ = makeMutableCopy(unpackedSint64_);
         }
         bitField1_ |= 0x08000000;
       }
-
       /**
        * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-       *
        * @return A list containing the unpackedSint64.
        */
-      public java.util.List<java.lang.Long> getUnpackedSint64List() {
+      public java.util.List<java.lang.Long>
+          getUnpackedSint64List() {
         unpackedSint64_.makeImmutable();
         return unpackedSint64_;
       }
-
       /**
        * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-       *
        * @return The count of unpackedSint64.
        */
       public int getUnpackedSint64Count() {
         return unpackedSint64_.size();
       }
-
       /**
        * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedSint64 at the given index.
        */
       public long getUnpackedSint64(int index) {
         return unpackedSint64_.getLong(index);
       }
-
       /**
        * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedSint64 to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedSint64(int index, long value) {
+      public Builder setUnpackedSint64(
+          int index, long value) {
 
         ensureUnpackedSint64IsMutable();
         unpackedSint64_.setLong(index, value);
@@ -19898,10 +17664,8 @@ public Builder setUnpackedSint64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-       *
        * @param value The unpackedSint64 to add.
        * @return This builder for chaining.
        */
@@ -19913,24 +17677,22 @@ public Builder addUnpackedSint64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-       *
        * @param values The unpackedSint64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedSint64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllUnpackedSint64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensureUnpackedSint64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedSint64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedSint64_);
         bitField1_ |= 0x08000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sint64 unpacked_sint64 = 94 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedSint64() {
@@ -19941,58 +17703,50 @@ public Builder clearUnpackedSint64() {
       }
 
       private com.google.protobuf.Internal.IntList unpackedFixed32_ = emptyIntList();
-
       private void ensureUnpackedFixed32IsMutable() {
         if (!unpackedFixed32_.isModifiable()) {
           unpackedFixed32_ = makeMutableCopy(unpackedFixed32_);
         }
         bitField1_ |= 0x10000000;
       }
-
       private void ensureUnpackedFixed32IsMutable(int capacity) {
         if (!unpackedFixed32_.isModifiable()) {
           unpackedFixed32_ = makeMutableCopy(unpackedFixed32_, capacity);
         }
         bitField1_ |= 0x10000000;
       }
-
       /**
        * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-       *
        * @return A list containing the unpackedFixed32.
        */
-      public java.util.List<java.lang.Integer> getUnpackedFixed32List() {
+      public java.util.List<java.lang.Integer>
+          getUnpackedFixed32List() {
         unpackedFixed32_.makeImmutable();
         return unpackedFixed32_;
       }
-
       /**
        * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-       *
        * @return The count of unpackedFixed32.
        */
       public int getUnpackedFixed32Count() {
         return unpackedFixed32_.size();
       }
-
       /**
        * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedFixed32 at the given index.
        */
       public int getUnpackedFixed32(int index) {
         return unpackedFixed32_.getInt(index);
       }
-
       /**
        * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedFixed32 to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedFixed32(int index, int value) {
+      public Builder setUnpackedFixed32(
+          int index, int value) {
 
         ensureUnpackedFixed32IsMutable();
         unpackedFixed32_.setInt(index, value);
@@ -20000,10 +17754,8 @@ public Builder setUnpackedFixed32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-       *
        * @param value The unpackedFixed32 to add.
        * @return This builder for chaining.
        */
@@ -20015,24 +17767,22 @@ public Builder addUnpackedFixed32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-       *
        * @param values The unpackedFixed32 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedFixed32(java.lang.Iterable<? extends java.lang.Integer> values) {
+      public Builder addAllUnpackedFixed32(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureUnpackedFixed32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedFixed32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedFixed32_);
         bitField1_ |= 0x10000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed32 unpacked_fixed32 = 95 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedFixed32() {
@@ -20043,58 +17793,50 @@ public Builder clearUnpackedFixed32() {
       }
 
       private com.google.protobuf.Internal.LongList unpackedFixed64_ = emptyLongList();
-
       private void ensureUnpackedFixed64IsMutable() {
         if (!unpackedFixed64_.isModifiable()) {
           unpackedFixed64_ = makeMutableCopy(unpackedFixed64_);
         }
         bitField1_ |= 0x20000000;
       }
-
       private void ensureUnpackedFixed64IsMutable(int capacity) {
         if (!unpackedFixed64_.isModifiable()) {
           unpackedFixed64_ = makeMutableCopy(unpackedFixed64_, capacity);
         }
         bitField1_ |= 0x20000000;
       }
-
       /**
        * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-       *
        * @return A list containing the unpackedFixed64.
        */
-      public java.util.List<java.lang.Long> getUnpackedFixed64List() {
+      public java.util.List<java.lang.Long>
+          getUnpackedFixed64List() {
         unpackedFixed64_.makeImmutable();
         return unpackedFixed64_;
       }
-
       /**
        * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-       *
        * @return The count of unpackedFixed64.
        */
       public int getUnpackedFixed64Count() {
         return unpackedFixed64_.size();
       }
-
       /**
        * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedFixed64 at the given index.
        */
       public long getUnpackedFixed64(int index) {
         return unpackedFixed64_.getLong(index);
       }
-
       /**
        * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedFixed64 to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedFixed64(int index, long value) {
+      public Builder setUnpackedFixed64(
+          int index, long value) {
 
         ensureUnpackedFixed64IsMutable();
         unpackedFixed64_.setLong(index, value);
@@ -20102,10 +17844,8 @@ public Builder setUnpackedFixed64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-       *
        * @param value The unpackedFixed64 to add.
        * @return This builder for chaining.
        */
@@ -20117,24 +17857,22 @@ public Builder addUnpackedFixed64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-       *
        * @param values The unpackedFixed64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedFixed64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllUnpackedFixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensureUnpackedFixed64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedFixed64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedFixed64_);
         bitField1_ |= 0x20000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated fixed64 unpacked_fixed64 = 96 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedFixed64() {
@@ -20145,58 +17883,50 @@ public Builder clearUnpackedFixed64() {
       }
 
       private com.google.protobuf.Internal.IntList unpackedSfixed32_ = emptyIntList();
-
       private void ensureUnpackedSfixed32IsMutable() {
         if (!unpackedSfixed32_.isModifiable()) {
           unpackedSfixed32_ = makeMutableCopy(unpackedSfixed32_);
         }
         bitField1_ |= 0x40000000;
       }
-
       private void ensureUnpackedSfixed32IsMutable(int capacity) {
         if (!unpackedSfixed32_.isModifiable()) {
           unpackedSfixed32_ = makeMutableCopy(unpackedSfixed32_, capacity);
         }
         bitField1_ |= 0x40000000;
       }
-
       /**
        * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-       *
        * @return A list containing the unpackedSfixed32.
        */
-      public java.util.List<java.lang.Integer> getUnpackedSfixed32List() {
+      public java.util.List<java.lang.Integer>
+          getUnpackedSfixed32List() {
         unpackedSfixed32_.makeImmutable();
         return unpackedSfixed32_;
       }
-
       /**
        * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-       *
        * @return The count of unpackedSfixed32.
        */
       public int getUnpackedSfixed32Count() {
         return unpackedSfixed32_.size();
       }
-
       /**
        * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedSfixed32 at the given index.
        */
       public int getUnpackedSfixed32(int index) {
         return unpackedSfixed32_.getInt(index);
       }
-
       /**
        * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedSfixed32 to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedSfixed32(int index, int value) {
+      public Builder setUnpackedSfixed32(
+          int index, int value) {
 
         ensureUnpackedSfixed32IsMutable();
         unpackedSfixed32_.setInt(index, value);
@@ -20204,10 +17934,8 @@ public Builder setUnpackedSfixed32(int index, int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-       *
        * @param value The unpackedSfixed32 to add.
        * @return This builder for chaining.
        */
@@ -20219,25 +17947,22 @@ public Builder addUnpackedSfixed32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-       *
        * @param values The unpackedSfixed32 to add.
        * @return This builder for chaining.
        */
       public Builder addAllUnpackedSfixed32(
           java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureUnpackedSfixed32IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedSfixed32_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedSfixed32_);
         bitField1_ |= 0x40000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedSfixed32() {
@@ -20248,58 +17973,50 @@ public Builder clearUnpackedSfixed32() {
       }
 
       private com.google.protobuf.Internal.LongList unpackedSfixed64_ = emptyLongList();
-
       private void ensureUnpackedSfixed64IsMutable() {
         if (!unpackedSfixed64_.isModifiable()) {
           unpackedSfixed64_ = makeMutableCopy(unpackedSfixed64_);
         }
         bitField1_ |= 0x80000000;
       }
-
       private void ensureUnpackedSfixed64IsMutable(int capacity) {
         if (!unpackedSfixed64_.isModifiable()) {
           unpackedSfixed64_ = makeMutableCopy(unpackedSfixed64_, capacity);
         }
         bitField1_ |= 0x80000000;
       }
-
       /**
        * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-       *
        * @return A list containing the unpackedSfixed64.
        */
-      public java.util.List<java.lang.Long> getUnpackedSfixed64List() {
+      public java.util.List<java.lang.Long>
+          getUnpackedSfixed64List() {
         unpackedSfixed64_.makeImmutable();
         return unpackedSfixed64_;
       }
-
       /**
        * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-       *
        * @return The count of unpackedSfixed64.
        */
       public int getUnpackedSfixed64Count() {
         return unpackedSfixed64_.size();
       }
-
       /**
        * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedSfixed64 at the given index.
        */
       public long getUnpackedSfixed64(int index) {
         return unpackedSfixed64_.getLong(index);
       }
-
       /**
        * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedSfixed64 to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedSfixed64(int index, long value) {
+      public Builder setUnpackedSfixed64(
+          int index, long value) {
 
         ensureUnpackedSfixed64IsMutable();
         unpackedSfixed64_.setLong(index, value);
@@ -20307,10 +18024,8 @@ public Builder setUnpackedSfixed64(int index, long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-       *
        * @param value The unpackedSfixed64 to add.
        * @return This builder for chaining.
        */
@@ -20322,24 +18037,22 @@ public Builder addUnpackedSfixed64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-       *
        * @param values The unpackedSfixed64 to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedSfixed64(java.lang.Iterable<? extends java.lang.Long> values) {
+      public Builder addAllUnpackedSfixed64(
+          java.lang.Iterable<? extends java.lang.Long> values) {
         ensureUnpackedSfixed64IsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedSfixed64_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedSfixed64_);
         bitField1_ |= 0x80000000;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedSfixed64() {
@@ -20350,58 +18063,50 @@ public Builder clearUnpackedSfixed64() {
       }
 
       private com.google.protobuf.Internal.FloatList unpackedFloat_ = emptyFloatList();
-
       private void ensureUnpackedFloatIsMutable() {
         if (!unpackedFloat_.isModifiable()) {
           unpackedFloat_ = makeMutableCopy(unpackedFloat_);
         }
         bitField2_ |= 0x00000001;
       }
-
       private void ensureUnpackedFloatIsMutable(int capacity) {
         if (!unpackedFloat_.isModifiable()) {
           unpackedFloat_ = makeMutableCopy(unpackedFloat_, capacity);
         }
         bitField2_ |= 0x00000001;
       }
-
       /**
        * <code>repeated float unpacked_float = 99 [packed = false];</code>
-       *
        * @return A list containing the unpackedFloat.
        */
-      public java.util.List<java.lang.Float> getUnpackedFloatList() {
+      public java.util.List<java.lang.Float>
+          getUnpackedFloatList() {
         unpackedFloat_.makeImmutable();
         return unpackedFloat_;
       }
-
       /**
        * <code>repeated float unpacked_float = 99 [packed = false];</code>
-       *
        * @return The count of unpackedFloat.
        */
       public int getUnpackedFloatCount() {
         return unpackedFloat_.size();
       }
-
       /**
        * <code>repeated float unpacked_float = 99 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedFloat at the given index.
        */
       public float getUnpackedFloat(int index) {
         return unpackedFloat_.getFloat(index);
       }
-
       /**
        * <code>repeated float unpacked_float = 99 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedFloat to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedFloat(int index, float value) {
+      public Builder setUnpackedFloat(
+          int index, float value) {
 
         ensureUnpackedFloatIsMutable();
         unpackedFloat_.setFloat(index, value);
@@ -20409,10 +18114,8 @@ public Builder setUnpackedFloat(int index, float value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated float unpacked_float = 99 [packed = false];</code>
-       *
        * @param value The unpackedFloat to add.
        * @return This builder for chaining.
        */
@@ -20424,24 +18127,22 @@ public Builder addUnpackedFloat(float value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated float unpacked_float = 99 [packed = false];</code>
-       *
        * @param values The unpackedFloat to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedFloat(java.lang.Iterable<? extends java.lang.Float> values) {
+      public Builder addAllUnpackedFloat(
+          java.lang.Iterable<? extends java.lang.Float> values) {
         ensureUnpackedFloatIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedFloat_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedFloat_);
         bitField2_ |= 0x00000001;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated float unpacked_float = 99 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedFloat() {
@@ -20452,58 +18153,50 @@ public Builder clearUnpackedFloat() {
       }
 
       private com.google.protobuf.Internal.DoubleList unpackedDouble_ = emptyDoubleList();
-
       private void ensureUnpackedDoubleIsMutable() {
         if (!unpackedDouble_.isModifiable()) {
           unpackedDouble_ = makeMutableCopy(unpackedDouble_);
         }
         bitField2_ |= 0x00000002;
       }
-
       private void ensureUnpackedDoubleIsMutable(int capacity) {
         if (!unpackedDouble_.isModifiable()) {
           unpackedDouble_ = makeMutableCopy(unpackedDouble_, capacity);
         }
         bitField2_ |= 0x00000002;
       }
-
       /**
        * <code>repeated double unpacked_double = 100 [packed = false];</code>
-       *
        * @return A list containing the unpackedDouble.
        */
-      public java.util.List<java.lang.Double> getUnpackedDoubleList() {
+      public java.util.List<java.lang.Double>
+          getUnpackedDoubleList() {
         unpackedDouble_.makeImmutable();
         return unpackedDouble_;
       }
-
       /**
        * <code>repeated double unpacked_double = 100 [packed = false];</code>
-       *
        * @return The count of unpackedDouble.
        */
       public int getUnpackedDoubleCount() {
         return unpackedDouble_.size();
       }
-
       /**
        * <code>repeated double unpacked_double = 100 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedDouble at the given index.
        */
       public double getUnpackedDouble(int index) {
         return unpackedDouble_.getDouble(index);
       }
-
       /**
        * <code>repeated double unpacked_double = 100 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedDouble to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedDouble(int index, double value) {
+      public Builder setUnpackedDouble(
+          int index, double value) {
 
         ensureUnpackedDoubleIsMutable();
         unpackedDouble_.setDouble(index, value);
@@ -20511,10 +18204,8 @@ public Builder setUnpackedDouble(int index, double value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated double unpacked_double = 100 [packed = false];</code>
-       *
        * @param value The unpackedDouble to add.
        * @return This builder for chaining.
        */
@@ -20526,24 +18217,22 @@ public Builder addUnpackedDouble(double value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated double unpacked_double = 100 [packed = false];</code>
-       *
        * @param values The unpackedDouble to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedDouble(java.lang.Iterable<? extends java.lang.Double> values) {
+      public Builder addAllUnpackedDouble(
+          java.lang.Iterable<? extends java.lang.Double> values) {
         ensureUnpackedDoubleIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedDouble_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedDouble_);
         bitField2_ |= 0x00000002;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated double unpacked_double = 100 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedDouble() {
@@ -20554,58 +18243,50 @@ public Builder clearUnpackedDouble() {
       }
 
       private com.google.protobuf.Internal.BooleanList unpackedBool_ = emptyBooleanList();
-
       private void ensureUnpackedBoolIsMutable() {
         if (!unpackedBool_.isModifiable()) {
           unpackedBool_ = makeMutableCopy(unpackedBool_);
         }
         bitField2_ |= 0x00000004;
       }
-
       private void ensureUnpackedBoolIsMutable(int capacity) {
         if (!unpackedBool_.isModifiable()) {
           unpackedBool_ = makeMutableCopy(unpackedBool_, capacity);
         }
         bitField2_ |= 0x00000004;
       }
-
       /**
        * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-       *
        * @return A list containing the unpackedBool.
        */
-      public java.util.List<java.lang.Boolean> getUnpackedBoolList() {
+      public java.util.List<java.lang.Boolean>
+          getUnpackedBoolList() {
         unpackedBool_.makeImmutable();
         return unpackedBool_;
       }
-
       /**
        * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-       *
        * @return The count of unpackedBool.
        */
       public int getUnpackedBoolCount() {
         return unpackedBool_.size();
       }
-
       /**
        * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-       *
        * @param index The index of the element to return.
        * @return The unpackedBool at the given index.
        */
       public boolean getUnpackedBool(int index) {
         return unpackedBool_.getBoolean(index);
       }
-
       /**
        * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-       *
        * @param index The index to set the value at.
        * @param value The unpackedBool to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedBool(int index, boolean value) {
+      public Builder setUnpackedBool(
+          int index, boolean value) {
 
         ensureUnpackedBoolIsMutable();
         unpackedBool_.setBoolean(index, value);
@@ -20613,10 +18294,8 @@ public Builder setUnpackedBool(int index, boolean value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-       *
        * @param value The unpackedBool to add.
        * @return This builder for chaining.
        */
@@ -20628,24 +18307,22 @@ public Builder addUnpackedBool(boolean value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-       *
        * @param values The unpackedBool to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedBool(java.lang.Iterable<? extends java.lang.Boolean> values) {
+      public Builder addAllUnpackedBool(
+          java.lang.Iterable<? extends java.lang.Boolean> values) {
         ensureUnpackedBoolIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unpackedBool_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unpackedBool_);
         bitField2_ |= 0x00000004;
         onChanged();
         return this;
       }
-
       /**
        * <code>repeated bool unpacked_bool = 101 [packed = false];</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearUnpackedBool() {
@@ -20656,121 +18333,77 @@ public Builder clearUnpackedBool() {
       }
 
       private com.google.protobuf.Internal.IntList unpackedNestedEnum_ = emptyIntList();
-
       private void ensureUnpackedNestedEnumIsMutable() {
         if (!unpackedNestedEnum_.isModifiable()) {
           unpackedNestedEnum_ = makeMutableCopy(unpackedNestedEnum_);
         }
         bitField2_ |= 0x00000008;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @return A list containing the unpackedNestedEnum.
        */
-      public java.util.List<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-          getUnpackedNestedEnumList() {
+      public java.util.List<legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> getUnpackedNestedEnumList() {
         return new com.google.protobuf.Internal.IntListAdapter<
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(
-            unpackedNestedEnum_, unpackedNestedEnum_converter_);
+            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>(unpackedNestedEnum_, unpackedNestedEnum_converter_);
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @return The count of unpackedNestedEnum.
        */
       public int getUnpackedNestedEnumCount() {
         return unpackedNestedEnum_.size();
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @param index The index of the element to return.
        * @return The unpackedNestedEnum at the given index.
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-          getUnpackedNestedEnum(int index) {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getUnpackedNestedEnum(int index) {
         return unpackedNestedEnum_converter_.convert(unpackedNestedEnum_.getInt(index));
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @param index The index to set the value at.
        * @param value The unpackedNestedEnum to set.
        * @return This builder for chaining.
        */
       public Builder setUnpackedNestedEnum(
-          int index,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+          int index, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
+        if (value == null) { throw new NullPointerException(); }
         ensureUnpackedNestedEnumIsMutable();
         unpackedNestedEnum_.setInt(index, value.getNumber());
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @param value The unpackedNestedEnum to add.
        * @return This builder for chaining.
        */
-      public Builder addUnpackedNestedEnum(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder addUnpackedNestedEnum(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
+        if (value == null) { throw new NullPointerException(); }
         ensureUnpackedNestedEnumIsMutable();
         unpackedNestedEnum_.addInt(value.getNumber());
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @param values The unpackedNestedEnum to add.
        * @return This builder for chaining.
        */
       public Builder addAllUnpackedNestedEnum(
-          java.lang.Iterable<
-                  ? extends
-                      legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                          .NestedEnum>
-              values) {
+          java.lang.Iterable<? extends legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> values) {
         ensureUnpackedNestedEnumIsMutable();
-        for (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-            value : values) {
+        for (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value : values) {
           unpackedNestedEnum_.addInt(value.getNumber());
         }
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @return This builder for chaining.
        */
       public Builder clearUnpackedNestedEnum() {
@@ -20779,52 +18412,38 @@ public Builder clearUnpackedNestedEnum() {
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @return A list containing the enum numeric values on the wire for unpackedNestedEnum.
        */
-      public java.util.List<java.lang.Integer> getUnpackedNestedEnumValueList() {
+      public java.util.List<java.lang.Integer>
+      getUnpackedNestedEnumValueList() {
         unpackedNestedEnum_.makeImmutable();
         return unpackedNestedEnum_;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @param index The index of the value to return.
        * @return The enum numeric value on the wire of unpackedNestedEnum at the given index.
        */
       public int getUnpackedNestedEnumValue(int index) {
         return unpackedNestedEnum_.getInt(index);
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @param index The index to set the value at.
        * @param value The enum numeric value on the wire for unpackedNestedEnum to set.
        * @return This builder for chaining.
        */
-      public Builder setUnpackedNestedEnumValue(int index, int value) {
+      public Builder setUnpackedNestedEnumValue(
+          int index, int value) {
         ensureUnpackedNestedEnumIsMutable();
         unpackedNestedEnum_.setInt(index, value);
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @param value The enum numeric value on the wire for unpackedNestedEnum to add.
        * @return This builder for chaining.
        */
@@ -20834,16 +18453,13 @@ public Builder addUnpackedNestedEnumValue(int value) {
         onChanged();
         return this;
       }
-
       /**
-       * <code>
-       * repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];
-       * </code>
-       *
+       * <code>repeated .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum unpacked_nested_enum = 102 [packed = false];</code>
        * @param values The enum numeric values on the wire for unpackedNestedEnum to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnpackedNestedEnumValue(java.lang.Iterable<java.lang.Integer> values) {
+      public Builder addAllUnpackedNestedEnumValue(
+          java.lang.Iterable<java.lang.Integer> values) {
         ensureUnpackedNestedEnumIsMutable();
         for (int value : values) {
           unpackedNestedEnum_.addInt(value);
@@ -20852,8 +18468,8 @@ public Builder addAllUnpackedNestedEnumValue(java.lang.Iterable<java.lang.Intege
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer> mapInt32Int32_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> mapInt32Int32_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
           internalGetMapInt32Int32() {
         if (mapInt32Int32_ == null) {
@@ -20862,13 +18478,11 @@ public Builder addAllUnpackedNestedEnumValue(java.lang.Iterable<java.lang.Intege
         }
         return mapInt32Int32_;
       }
-
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
           internalGetMutableMapInt32Int32() {
         if (mapInt32Int32_ == null) {
-          mapInt32Int32_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapInt32Int32DefaultEntryHolder.defaultEntry);
+          mapInt32Int32_ = com.google.protobuf.MapField.newMapField(
+              MapInt32Int32DefaultEntryHolder.defaultEntry);
         }
         if (!mapInt32Int32_.isMutable()) {
           mapInt32Int32_ = mapInt32Int32_.copy();
@@ -20877,14 +18491,10 @@ public Builder addAllUnpackedNestedEnumValue(java.lang.Iterable<java.lang.Intege
         onChanged();
         return mapInt32Int32_;
       }
-
       public int getMapInt32Int32Count() {
         return internalGetMapInt32Int32().getMap().size();
       }
-
       /**
-       *
-       *
        * <pre>
        * Map
        * </pre>
@@ -20892,21 +18502,20 @@ public int getMapInt32Int32Count() {
        * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
        */
       @java.lang.Override
-      public boolean containsMapInt32Int32(int key) {
+      public boolean containsMapInt32Int32(
+          int key) {
 
         return internalGetMapInt32Int32().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapInt32Int32Map()} instead. */
+      /**
+       * Use {@link #getMapInt32Int32Map()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32() {
         return getMapInt32Int32Map();
       }
-
       /**
-       *
-       *
        * <pre>
        * Map
        * </pre>
@@ -20917,10 +18526,7 @@ public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32() {
       public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32Map() {
         return internalGetMapInt32Int32().getMap();
       }
-
       /**
-       *
-       *
        * <pre>
        * Map
        * </pre>
@@ -20928,16 +18534,15 @@ public java.util.Map<java.lang.Integer, java.lang.Integer> getMapInt32Int32Map()
        * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
        */
       @java.lang.Override
-      public int getMapInt32Int32OrDefault(int key, int defaultValue) {
+      public int getMapInt32Int32OrDefault(
+          int key,
+          int defaultValue) {
 
         java.util.Map<java.lang.Integer, java.lang.Integer> map =
             internalGetMapInt32Int32().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
       /**
-       *
-       *
        * <pre>
        * Map
        * </pre>
@@ -20945,7 +18550,8 @@ public int getMapInt32Int32OrDefault(int key, int defaultValue) {
        * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
        */
       @java.lang.Override
-      public int getMapInt32Int32OrThrow(int key) {
+      public int getMapInt32Int32OrThrow(
+          int key) {
 
         java.util.Map<java.lang.Integer, java.lang.Integer> map =
             internalGetMapInt32Int32().getMap();
@@ -20954,54 +18560,53 @@ public int getMapInt32Int32OrThrow(int key) {
         }
         return map.get(key);
       }
-
       public Builder clearMapInt32Int32() {
         bitField2_ = (bitField2_ & ~0x00000010);
-        internalGetMutableMapInt32Int32().getMutableMap().clear();
+        internalGetMutableMapInt32Int32().getMutableMap()
+            .clear();
         return this;
       }
-
       /**
-       *
-       *
        * <pre>
        * Map
        * </pre>
        *
        * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
        */
-      public Builder removeMapInt32Int32(int key) {
+      public Builder removeMapInt32Int32(
+          int key) {
 
-        internalGetMutableMapInt32Int32().getMutableMap().remove(key);
+        internalGetMutableMapInt32Int32().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getMutableMapInt32Int32() {
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+          getMutableMapInt32Int32() {
         bitField2_ |= 0x00000010;
         return internalGetMutableMapInt32Int32().getMutableMap();
       }
-
       /**
-       *
-       *
        * <pre>
        * Map
        * </pre>
        *
        * <code>map&lt;int32, int32&gt; map_int32_int32 = 56;</code>
        */
-      public Builder putMapInt32Int32(int key, int value) {
+      public Builder putMapInt32Int32(
+          int key,
+          int value) {
+
 
-        internalGetMutableMapInt32Int32().getMutableMap().put(key, value);
+        internalGetMutableMapInt32Int32().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00000010;
         return this;
       }
-
       /**
-       *
-       *
        * <pre>
        * Map
        * </pre>
@@ -21010,13 +18615,14 @@ public Builder putMapInt32Int32(int key, int value) {
        */
       public Builder putAllMapInt32Int32(
           java.util.Map<java.lang.Integer, java.lang.Integer> values) {
-        internalGetMutableMapInt32Int32().getMutableMap().putAll(values);
+        internalGetMutableMapInt32Int32().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00000010;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long> mapInt64Int64_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Long, java.lang.Long> mapInt64Int64_;
       private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
           internalGetMapInt64Int64() {
         if (mapInt64Int64_ == null) {
@@ -21025,13 +18631,11 @@ public Builder putAllMapInt32Int32(
         }
         return mapInt64Int64_;
       }
-
       private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
           internalGetMutableMapInt64Int64() {
         if (mapInt64Int64_ == null) {
-          mapInt64Int64_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapInt64Int64DefaultEntryHolder.defaultEntry);
+          mapInt64Int64_ = com.google.protobuf.MapField.newMapField(
+              MapInt64Int64DefaultEntryHolder.defaultEntry);
         }
         if (!mapInt64Int64_.isMutable()) {
           mapInt64Int64_ = mapInt64Int64_.copy();
@@ -21040,87 +18644,110 @@ public Builder putAllMapInt32Int32(
         onChanged();
         return mapInt64Int64_;
       }
-
       public int getMapInt64Int64Count() {
         return internalGetMapInt64Int64().getMap().size();
       }
-
-      /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
       @java.lang.Override
-      public boolean containsMapInt64Int64(long key) {
+      public boolean containsMapInt64Int64(
+          long key) {
 
         return internalGetMapInt64Int64().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapInt64Int64Map()} instead. */
+      /**
+       * Use {@link #getMapInt64Int64Map()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Long, java.lang.Long> getMapInt64Int64() {
         return getMapInt64Int64Map();
       }
-
-      /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Long, java.lang.Long> getMapInt64Int64Map() {
         return internalGetMapInt64Int64().getMap();
       }
-
-      /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
       @java.lang.Override
-      public long getMapInt64Int64OrDefault(long key, long defaultValue) {
+      public long getMapInt64Int64OrDefault(
+          long key,
+          long defaultValue) {
 
-        java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapInt64Int64().getMap();
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapInt64Int64().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
       @java.lang.Override
-      public long getMapInt64Int64OrThrow(long key) {
+      public long getMapInt64Int64OrThrow(
+          long key) {
 
-        java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapInt64Int64().getMap();
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapInt64Int64().getMap();
         if (!map.containsKey(key)) {
           throw new java.lang.IllegalArgumentException();
         }
         return map.get(key);
       }
-
       public Builder clearMapInt64Int64() {
         bitField2_ = (bitField2_ & ~0x00000020);
-        internalGetMutableMapInt64Int64().getMutableMap().clear();
+        internalGetMutableMapInt64Int64().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
+      public Builder removeMapInt64Int64(
+          long key) {
 
-      /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
-      public Builder removeMapInt64Int64(long key) {
-
-        internalGetMutableMapInt64Int64().getMutableMap().remove(key);
+        internalGetMutableMapInt64Int64().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Long, java.lang.Long> getMutableMapInt64Int64() {
+      public java.util.Map<java.lang.Long, java.lang.Long>
+          getMutableMapInt64Int64() {
         bitField2_ |= 0x00000020;
         return internalGetMutableMapInt64Int64().getMutableMap();
       }
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
+      public Builder putMapInt64Int64(
+          long key,
+          long value) {
 
-      /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
-      public Builder putMapInt64Int64(long key, long value) {
 
-        internalGetMutableMapInt64Int64().getMutableMap().put(key, value);
+        internalGetMutableMapInt64Int64().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00000020;
         return this;
       }
-
-      /** <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code> */
-      public Builder putAllMapInt64Int64(java.util.Map<java.lang.Long, java.lang.Long> values) {
-        internalGetMutableMapInt64Int64().getMutableMap().putAll(values);
+      /**
+       * <code>map&lt;int64, int64&gt; map_int64_int64 = 57;</code>
+       */
+      public Builder putAllMapInt64Int64(
+          java.util.Map<java.lang.Long, java.lang.Long> values) {
+        internalGetMutableMapInt64Int64().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00000020;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer> mapUint32Uint32_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> mapUint32Uint32_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
           internalGetMapUint32Uint32() {
         if (mapUint32Uint32_ == null) {
@@ -21129,13 +18756,11 @@ public Builder putAllMapInt64Int64(java.util.Map<java.lang.Long, java.lang.Long>
         }
         return mapUint32Uint32_;
       }
-
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
           internalGetMutableMapUint32Uint32() {
         if (mapUint32Uint32_ == null) {
-          mapUint32Uint32_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapUint32Uint32DefaultEntryHolder.defaultEntry);
+          mapUint32Uint32_ = com.google.protobuf.MapField.newMapField(
+              MapUint32Uint32DefaultEntryHolder.defaultEntry);
         }
         if (!mapUint32Uint32_.isMutable()) {
           mapUint32Uint32_ = mapUint32Uint32_.copy();
@@ -21144,43 +18769,51 @@ public Builder putAllMapInt64Int64(java.util.Map<java.lang.Long, java.lang.Long>
         onChanged();
         return mapUint32Uint32_;
       }
-
       public int getMapUint32Uint32Count() {
         return internalGetMapUint32Uint32().getMap().size();
       }
-
-      /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
       @java.lang.Override
-      public boolean containsMapUint32Uint32(int key) {
+      public boolean containsMapUint32Uint32(
+          int key) {
 
         return internalGetMapUint32Uint32().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapUint32Uint32Map()} instead. */
+      /**
+       * Use {@link #getMapUint32Uint32Map()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Integer, java.lang.Integer> getMapUint32Uint32() {
         return getMapUint32Uint32Map();
       }
-
-      /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Integer, java.lang.Integer> getMapUint32Uint32Map() {
         return internalGetMapUint32Uint32().getMap();
       }
-
-      /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
       @java.lang.Override
-      public int getMapUint32Uint32OrDefault(int key, int defaultValue) {
+      public int getMapUint32Uint32OrDefault(
+          int key,
+          int defaultValue) {
 
         java.util.Map<java.lang.Integer, java.lang.Integer> map =
             internalGetMapUint32Uint32().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
       @java.lang.Override
-      public int getMapUint32Uint32OrThrow(int key) {
+      public int getMapUint32Uint32OrThrow(
+          int key) {
 
         java.util.Map<java.lang.Integer, java.lang.Integer> map =
             internalGetMapUint32Uint32().getMap();
@@ -21189,45 +18822,57 @@ public int getMapUint32Uint32OrThrow(int key) {
         }
         return map.get(key);
       }
-
       public Builder clearMapUint32Uint32() {
         bitField2_ = (bitField2_ & ~0x00000040);
-        internalGetMutableMapUint32Uint32().getMutableMap().clear();
+        internalGetMutableMapUint32Uint32().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
+      public Builder removeMapUint32Uint32(
+          int key) {
 
-      /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
-      public Builder removeMapUint32Uint32(int key) {
-
-        internalGetMutableMapUint32Uint32().getMutableMap().remove(key);
+        internalGetMutableMapUint32Uint32().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getMutableMapUint32Uint32() {
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+          getMutableMapUint32Uint32() {
         bitField2_ |= 0x00000040;
         return internalGetMutableMapUint32Uint32().getMutableMap();
       }
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
+      public Builder putMapUint32Uint32(
+          int key,
+          int value) {
 
-      /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
-      public Builder putMapUint32Uint32(int key, int value) {
 
-        internalGetMutableMapUint32Uint32().getMutableMap().put(key, value);
+        internalGetMutableMapUint32Uint32().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00000040;
         return this;
       }
-
-      /** <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code> */
+      /**
+       * <code>map&lt;uint32, uint32&gt; map_uint32_uint32 = 58;</code>
+       */
       public Builder putAllMapUint32Uint32(
           java.util.Map<java.lang.Integer, java.lang.Integer> values) {
-        internalGetMutableMapUint32Uint32().getMutableMap().putAll(values);
+        internalGetMutableMapUint32Uint32().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00000040;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long> mapUint64Uint64_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Long, java.lang.Long> mapUint64Uint64_;
       private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
           internalGetMapUint64Uint64() {
         if (mapUint64Uint64_ == null) {
@@ -21236,13 +18881,11 @@ public Builder putAllMapUint32Uint32(
         }
         return mapUint64Uint64_;
       }
-
       private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
           internalGetMutableMapUint64Uint64() {
         if (mapUint64Uint64_ == null) {
-          mapUint64Uint64_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapUint64Uint64DefaultEntryHolder.defaultEntry);
+          mapUint64Uint64_ = com.google.protobuf.MapField.newMapField(
+              MapUint64Uint64DefaultEntryHolder.defaultEntry);
         }
         if (!mapUint64Uint64_.isMutable()) {
           mapUint64Uint64_ = mapUint64Uint64_.copy();
@@ -21251,87 +18894,110 @@ public Builder putAllMapUint32Uint32(
         onChanged();
         return mapUint64Uint64_;
       }
-
       public int getMapUint64Uint64Count() {
         return internalGetMapUint64Uint64().getMap().size();
       }
-
-      /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
       @java.lang.Override
-      public boolean containsMapUint64Uint64(long key) {
+      public boolean containsMapUint64Uint64(
+          long key) {
 
         return internalGetMapUint64Uint64().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapUint64Uint64Map()} instead. */
+      /**
+       * Use {@link #getMapUint64Uint64Map()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Long, java.lang.Long> getMapUint64Uint64() {
         return getMapUint64Uint64Map();
       }
-
-      /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Long, java.lang.Long> getMapUint64Uint64Map() {
         return internalGetMapUint64Uint64().getMap();
       }
-
-      /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
       @java.lang.Override
-      public long getMapUint64Uint64OrDefault(long key, long defaultValue) {
+      public long getMapUint64Uint64OrDefault(
+          long key,
+          long defaultValue) {
 
-        java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapUint64Uint64().getMap();
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapUint64Uint64().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
       @java.lang.Override
-      public long getMapUint64Uint64OrThrow(long key) {
+      public long getMapUint64Uint64OrThrow(
+          long key) {
 
-        java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapUint64Uint64().getMap();
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapUint64Uint64().getMap();
         if (!map.containsKey(key)) {
           throw new java.lang.IllegalArgumentException();
         }
         return map.get(key);
       }
-
       public Builder clearMapUint64Uint64() {
         bitField2_ = (bitField2_ & ~0x00000080);
-        internalGetMutableMapUint64Uint64().getMutableMap().clear();
+        internalGetMutableMapUint64Uint64().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
+      public Builder removeMapUint64Uint64(
+          long key) {
 
-      /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
-      public Builder removeMapUint64Uint64(long key) {
-
-        internalGetMutableMapUint64Uint64().getMutableMap().remove(key);
+        internalGetMutableMapUint64Uint64().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Long, java.lang.Long> getMutableMapUint64Uint64() {
+      public java.util.Map<java.lang.Long, java.lang.Long>
+          getMutableMapUint64Uint64() {
         bitField2_ |= 0x00000080;
         return internalGetMutableMapUint64Uint64().getMutableMap();
       }
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
+      public Builder putMapUint64Uint64(
+          long key,
+          long value) {
 
-      /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
-      public Builder putMapUint64Uint64(long key, long value) {
 
-        internalGetMutableMapUint64Uint64().getMutableMap().put(key, value);
+        internalGetMutableMapUint64Uint64().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00000080;
         return this;
       }
-
-      /** <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code> */
-      public Builder putAllMapUint64Uint64(java.util.Map<java.lang.Long, java.lang.Long> values) {
-        internalGetMutableMapUint64Uint64().getMutableMap().putAll(values);
+      /**
+       * <code>map&lt;uint64, uint64&gt; map_uint64_uint64 = 59;</code>
+       */
+      public Builder putAllMapUint64Uint64(
+          java.util.Map<java.lang.Long, java.lang.Long> values) {
+        internalGetMutableMapUint64Uint64().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00000080;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer> mapSint32Sint32_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> mapSint32Sint32_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
           internalGetMapSint32Sint32() {
         if (mapSint32Sint32_ == null) {
@@ -21340,13 +19006,11 @@ public Builder putAllMapUint64Uint64(java.util.Map<java.lang.Long, java.lang.Lon
         }
         return mapSint32Sint32_;
       }
-
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
           internalGetMutableMapSint32Sint32() {
         if (mapSint32Sint32_ == null) {
-          mapSint32Sint32_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapSint32Sint32DefaultEntryHolder.defaultEntry);
+          mapSint32Sint32_ = com.google.protobuf.MapField.newMapField(
+              MapSint32Sint32DefaultEntryHolder.defaultEntry);
         }
         if (!mapSint32Sint32_.isMutable()) {
           mapSint32Sint32_ = mapSint32Sint32_.copy();
@@ -21355,43 +19019,51 @@ public Builder putAllMapUint64Uint64(java.util.Map<java.lang.Long, java.lang.Lon
         onChanged();
         return mapSint32Sint32_;
       }
-
       public int getMapSint32Sint32Count() {
         return internalGetMapSint32Sint32().getMap().size();
       }
-
-      /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
       @java.lang.Override
-      public boolean containsMapSint32Sint32(int key) {
+      public boolean containsMapSint32Sint32(
+          int key) {
 
         return internalGetMapSint32Sint32().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapSint32Sint32Map()} instead. */
+      /**
+       * Use {@link #getMapSint32Sint32Map()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSint32Sint32() {
         return getMapSint32Sint32Map();
       }
-
-      /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSint32Sint32Map() {
         return internalGetMapSint32Sint32().getMap();
       }
-
-      /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
       @java.lang.Override
-      public int getMapSint32Sint32OrDefault(int key, int defaultValue) {
+      public int getMapSint32Sint32OrDefault(
+          int key,
+          int defaultValue) {
 
         java.util.Map<java.lang.Integer, java.lang.Integer> map =
             internalGetMapSint32Sint32().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
       @java.lang.Override
-      public int getMapSint32Sint32OrThrow(int key) {
+      public int getMapSint32Sint32OrThrow(
+          int key) {
 
         java.util.Map<java.lang.Integer, java.lang.Integer> map =
             internalGetMapSint32Sint32().getMap();
@@ -21400,45 +19072,57 @@ public int getMapSint32Sint32OrThrow(int key) {
         }
         return map.get(key);
       }
-
       public Builder clearMapSint32Sint32() {
         bitField2_ = (bitField2_ & ~0x00000100);
-        internalGetMutableMapSint32Sint32().getMutableMap().clear();
+        internalGetMutableMapSint32Sint32().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
+      public Builder removeMapSint32Sint32(
+          int key) {
 
-      /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
-      public Builder removeMapSint32Sint32(int key) {
-
-        internalGetMutableMapSint32Sint32().getMutableMap().remove(key);
+        internalGetMutableMapSint32Sint32().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getMutableMapSint32Sint32() {
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+          getMutableMapSint32Sint32() {
         bitField2_ |= 0x00000100;
         return internalGetMutableMapSint32Sint32().getMutableMap();
       }
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
+      public Builder putMapSint32Sint32(
+          int key,
+          int value) {
 
-      /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
-      public Builder putMapSint32Sint32(int key, int value) {
 
-        internalGetMutableMapSint32Sint32().getMutableMap().put(key, value);
+        internalGetMutableMapSint32Sint32().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00000100;
         return this;
       }
-
-      /** <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code> */
+      /**
+       * <code>map&lt;sint32, sint32&gt; map_sint32_sint32 = 60;</code>
+       */
       public Builder putAllMapSint32Sint32(
           java.util.Map<java.lang.Integer, java.lang.Integer> values) {
-        internalGetMutableMapSint32Sint32().getMutableMap().putAll(values);
+        internalGetMutableMapSint32Sint32().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00000100;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long> mapSint64Sint64_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Long, java.lang.Long> mapSint64Sint64_;
       private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
           internalGetMapSint64Sint64() {
         if (mapSint64Sint64_ == null) {
@@ -21447,13 +19131,11 @@ public Builder putAllMapSint32Sint32(
         }
         return mapSint64Sint64_;
       }
-
       private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
           internalGetMutableMapSint64Sint64() {
         if (mapSint64Sint64_ == null) {
-          mapSint64Sint64_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapSint64Sint64DefaultEntryHolder.defaultEntry);
+          mapSint64Sint64_ = com.google.protobuf.MapField.newMapField(
+              MapSint64Sint64DefaultEntryHolder.defaultEntry);
         }
         if (!mapSint64Sint64_.isMutable()) {
           mapSint64Sint64_ = mapSint64Sint64_.copy();
@@ -21462,87 +19144,110 @@ public Builder putAllMapSint32Sint32(
         onChanged();
         return mapSint64Sint64_;
       }
-
       public int getMapSint64Sint64Count() {
         return internalGetMapSint64Sint64().getMap().size();
       }
-
-      /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
       @java.lang.Override
-      public boolean containsMapSint64Sint64(long key) {
+      public boolean containsMapSint64Sint64(
+          long key) {
 
         return internalGetMapSint64Sint64().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapSint64Sint64Map()} instead. */
+      /**
+       * Use {@link #getMapSint64Sint64Map()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Long, java.lang.Long> getMapSint64Sint64() {
         return getMapSint64Sint64Map();
       }
-
-      /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Long, java.lang.Long> getMapSint64Sint64Map() {
         return internalGetMapSint64Sint64().getMap();
       }
-
-      /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
       @java.lang.Override
-      public long getMapSint64Sint64OrDefault(long key, long defaultValue) {
+      public long getMapSint64Sint64OrDefault(
+          long key,
+          long defaultValue) {
 
-        java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapSint64Sint64().getMap();
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapSint64Sint64().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
       @java.lang.Override
-      public long getMapSint64Sint64OrThrow(long key) {
+      public long getMapSint64Sint64OrThrow(
+          long key) {
 
-        java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapSint64Sint64().getMap();
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapSint64Sint64().getMap();
         if (!map.containsKey(key)) {
           throw new java.lang.IllegalArgumentException();
         }
         return map.get(key);
       }
-
       public Builder clearMapSint64Sint64() {
         bitField2_ = (bitField2_ & ~0x00000200);
-        internalGetMutableMapSint64Sint64().getMutableMap().clear();
+        internalGetMutableMapSint64Sint64().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
+      public Builder removeMapSint64Sint64(
+          long key) {
 
-      /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
-      public Builder removeMapSint64Sint64(long key) {
-
-        internalGetMutableMapSint64Sint64().getMutableMap().remove(key);
+        internalGetMutableMapSint64Sint64().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Long, java.lang.Long> getMutableMapSint64Sint64() {
+      public java.util.Map<java.lang.Long, java.lang.Long>
+          getMutableMapSint64Sint64() {
         bitField2_ |= 0x00000200;
         return internalGetMutableMapSint64Sint64().getMutableMap();
       }
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
+      public Builder putMapSint64Sint64(
+          long key,
+          long value) {
 
-      /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
-      public Builder putMapSint64Sint64(long key, long value) {
 
-        internalGetMutableMapSint64Sint64().getMutableMap().put(key, value);
+        internalGetMutableMapSint64Sint64().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00000200;
         return this;
       }
-
-      /** <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code> */
-      public Builder putAllMapSint64Sint64(java.util.Map<java.lang.Long, java.lang.Long> values) {
-        internalGetMutableMapSint64Sint64().getMutableMap().putAll(values);
+      /**
+       * <code>map&lt;sint64, sint64&gt; map_sint64_sint64 = 61;</code>
+       */
+      public Builder putAllMapSint64Sint64(
+          java.util.Map<java.lang.Long, java.lang.Long> values) {
+        internalGetMutableMapSint64Sint64().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00000200;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer> mapFixed32Fixed32_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> mapFixed32Fixed32_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
           internalGetMapFixed32Fixed32() {
         if (mapFixed32Fixed32_ == null) {
@@ -21551,13 +19256,11 @@ public Builder putAllMapSint64Sint64(java.util.Map<java.lang.Long, java.lang.Lon
         }
         return mapFixed32Fixed32_;
       }
-
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
           internalGetMutableMapFixed32Fixed32() {
         if (mapFixed32Fixed32_ == null) {
-          mapFixed32Fixed32_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapFixed32Fixed32DefaultEntryHolder.defaultEntry);
+          mapFixed32Fixed32_ = com.google.protobuf.MapField.newMapField(
+              MapFixed32Fixed32DefaultEntryHolder.defaultEntry);
         }
         if (!mapFixed32Fixed32_.isMutable()) {
           mapFixed32Fixed32_ = mapFixed32Fixed32_.copy();
@@ -21566,43 +19269,51 @@ public Builder putAllMapSint64Sint64(java.util.Map<java.lang.Long, java.lang.Lon
         onChanged();
         return mapFixed32Fixed32_;
       }
-
       public int getMapFixed32Fixed32Count() {
         return internalGetMapFixed32Fixed32().getMap().size();
       }
-
-      /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
       @java.lang.Override
-      public boolean containsMapFixed32Fixed32(int key) {
+      public boolean containsMapFixed32Fixed32(
+          int key) {
 
         return internalGetMapFixed32Fixed32().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapFixed32Fixed32Map()} instead. */
+      /**
+       * Use {@link #getMapFixed32Fixed32Map()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Integer, java.lang.Integer> getMapFixed32Fixed32() {
         return getMapFixed32Fixed32Map();
       }
-
-      /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Integer, java.lang.Integer> getMapFixed32Fixed32Map() {
         return internalGetMapFixed32Fixed32().getMap();
       }
-
-      /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
       @java.lang.Override
-      public int getMapFixed32Fixed32OrDefault(int key, int defaultValue) {
+      public int getMapFixed32Fixed32OrDefault(
+          int key,
+          int defaultValue) {
 
         java.util.Map<java.lang.Integer, java.lang.Integer> map =
             internalGetMapFixed32Fixed32().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
       @java.lang.Override
-      public int getMapFixed32Fixed32OrThrow(int key) {
+      public int getMapFixed32Fixed32OrThrow(
+          int key) {
 
         java.util.Map<java.lang.Integer, java.lang.Integer> map =
             internalGetMapFixed32Fixed32().getMap();
@@ -21611,45 +19322,57 @@ public int getMapFixed32Fixed32OrThrow(int key) {
         }
         return map.get(key);
       }
-
       public Builder clearMapFixed32Fixed32() {
         bitField2_ = (bitField2_ & ~0x00000400);
-        internalGetMutableMapFixed32Fixed32().getMutableMap().clear();
+        internalGetMutableMapFixed32Fixed32().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
+      public Builder removeMapFixed32Fixed32(
+          int key) {
 
-      /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
-      public Builder removeMapFixed32Fixed32(int key) {
-
-        internalGetMutableMapFixed32Fixed32().getMutableMap().remove(key);
+        internalGetMutableMapFixed32Fixed32().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getMutableMapFixed32Fixed32() {
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+          getMutableMapFixed32Fixed32() {
         bitField2_ |= 0x00000400;
         return internalGetMutableMapFixed32Fixed32().getMutableMap();
       }
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
+      public Builder putMapFixed32Fixed32(
+          int key,
+          int value) {
 
-      /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
-      public Builder putMapFixed32Fixed32(int key, int value) {
 
-        internalGetMutableMapFixed32Fixed32().getMutableMap().put(key, value);
+        internalGetMutableMapFixed32Fixed32().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00000400;
         return this;
       }
-
-      /** <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code> */
+      /**
+       * <code>map&lt;fixed32, fixed32&gt; map_fixed32_fixed32 = 62;</code>
+       */
       public Builder putAllMapFixed32Fixed32(
           java.util.Map<java.lang.Integer, java.lang.Integer> values) {
-        internalGetMutableMapFixed32Fixed32().getMutableMap().putAll(values);
+        internalGetMutableMapFixed32Fixed32().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00000400;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long> mapFixed64Fixed64_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Long, java.lang.Long> mapFixed64Fixed64_;
       private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
           internalGetMapFixed64Fixed64() {
         if (mapFixed64Fixed64_ == null) {
@@ -21658,13 +19381,11 @@ public Builder putAllMapFixed32Fixed32(
         }
         return mapFixed64Fixed64_;
       }
-
       private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
           internalGetMutableMapFixed64Fixed64() {
         if (mapFixed64Fixed64_ == null) {
-          mapFixed64Fixed64_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapFixed64Fixed64DefaultEntryHolder.defaultEntry);
+          mapFixed64Fixed64_ = com.google.protobuf.MapField.newMapField(
+              MapFixed64Fixed64DefaultEntryHolder.defaultEntry);
         }
         if (!mapFixed64Fixed64_.isMutable()) {
           mapFixed64Fixed64_ = mapFixed64Fixed64_.copy();
@@ -21673,88 +19394,110 @@ public Builder putAllMapFixed32Fixed32(
         onChanged();
         return mapFixed64Fixed64_;
       }
-
       public int getMapFixed64Fixed64Count() {
         return internalGetMapFixed64Fixed64().getMap().size();
       }
-
-      /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
       @java.lang.Override
-      public boolean containsMapFixed64Fixed64(long key) {
+      public boolean containsMapFixed64Fixed64(
+          long key) {
 
         return internalGetMapFixed64Fixed64().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapFixed64Fixed64Map()} instead. */
+      /**
+       * Use {@link #getMapFixed64Fixed64Map()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Long, java.lang.Long> getMapFixed64Fixed64() {
         return getMapFixed64Fixed64Map();
       }
-
-      /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Long, java.lang.Long> getMapFixed64Fixed64Map() {
         return internalGetMapFixed64Fixed64().getMap();
       }
-
-      /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
       @java.lang.Override
-      public long getMapFixed64Fixed64OrDefault(long key, long defaultValue) {
+      public long getMapFixed64Fixed64OrDefault(
+          long key,
+          long defaultValue) {
 
-        java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapFixed64Fixed64().getMap();
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapFixed64Fixed64().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
       @java.lang.Override
-      public long getMapFixed64Fixed64OrThrow(long key) {
+      public long getMapFixed64Fixed64OrThrow(
+          long key) {
 
-        java.util.Map<java.lang.Long, java.lang.Long> map = internalGetMapFixed64Fixed64().getMap();
+        java.util.Map<java.lang.Long, java.lang.Long> map =
+            internalGetMapFixed64Fixed64().getMap();
         if (!map.containsKey(key)) {
           throw new java.lang.IllegalArgumentException();
         }
         return map.get(key);
       }
-
       public Builder clearMapFixed64Fixed64() {
         bitField2_ = (bitField2_ & ~0x00000800);
-        internalGetMutableMapFixed64Fixed64().getMutableMap().clear();
+        internalGetMutableMapFixed64Fixed64().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
+      public Builder removeMapFixed64Fixed64(
+          long key) {
 
-      /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
-      public Builder removeMapFixed64Fixed64(long key) {
-
-        internalGetMutableMapFixed64Fixed64().getMutableMap().remove(key);
+        internalGetMutableMapFixed64Fixed64().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Long, java.lang.Long> getMutableMapFixed64Fixed64() {
+      public java.util.Map<java.lang.Long, java.lang.Long>
+          getMutableMapFixed64Fixed64() {
         bitField2_ |= 0x00000800;
         return internalGetMutableMapFixed64Fixed64().getMutableMap();
       }
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
+      public Builder putMapFixed64Fixed64(
+          long key,
+          long value) {
 
-      /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
-      public Builder putMapFixed64Fixed64(long key, long value) {
 
-        internalGetMutableMapFixed64Fixed64().getMutableMap().put(key, value);
+        internalGetMutableMapFixed64Fixed64().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00000800;
         return this;
       }
-
-      /** <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code> */
-      public Builder putAllMapFixed64Fixed64(java.util.Map<java.lang.Long, java.lang.Long> values) {
-        internalGetMutableMapFixed64Fixed64().getMutableMap().putAll(values);
+      /**
+       * <code>map&lt;fixed64, fixed64&gt; map_fixed64_fixed64 = 63;</code>
+       */
+      public Builder putAllMapFixed64Fixed64(
+          java.util.Map<java.lang.Long, java.lang.Long> values) {
+        internalGetMutableMapFixed64Fixed64().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00000800;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-          mapSfixed32Sfixed32_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> mapSfixed32Sfixed32_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
           internalGetMapSfixed32Sfixed32() {
         if (mapSfixed32Sfixed32_ == null) {
@@ -21763,13 +19506,11 @@ public Builder putAllMapFixed64Fixed64(java.util.Map<java.lang.Long, java.lang.L
         }
         return mapSfixed32Sfixed32_;
       }
-
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
           internalGetMutableMapSfixed32Sfixed32() {
         if (mapSfixed32Sfixed32_ == null) {
-          mapSfixed32Sfixed32_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry);
+          mapSfixed32Sfixed32_ = com.google.protobuf.MapField.newMapField(
+              MapSfixed32Sfixed32DefaultEntryHolder.defaultEntry);
         }
         if (!mapSfixed32Sfixed32_.isMutable()) {
           mapSfixed32Sfixed32_ = mapSfixed32Sfixed32_.copy();
@@ -21778,43 +19519,51 @@ public Builder putAllMapFixed64Fixed64(java.util.Map<java.lang.Long, java.lang.L
         onChanged();
         return mapSfixed32Sfixed32_;
       }
-
       public int getMapSfixed32Sfixed32Count() {
         return internalGetMapSfixed32Sfixed32().getMap().size();
       }
-
-      /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
       @java.lang.Override
-      public boolean containsMapSfixed32Sfixed32(int key) {
+      public boolean containsMapSfixed32Sfixed32(
+          int key) {
 
         return internalGetMapSfixed32Sfixed32().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapSfixed32Sfixed32Map()} instead. */
+      /**
+       * Use {@link #getMapSfixed32Sfixed32Map()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSfixed32Sfixed32() {
         return getMapSfixed32Sfixed32Map();
       }
-
-      /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Integer, java.lang.Integer> getMapSfixed32Sfixed32Map() {
         return internalGetMapSfixed32Sfixed32().getMap();
       }
-
-      /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
       @java.lang.Override
-      public int getMapSfixed32Sfixed32OrDefault(int key, int defaultValue) {
+      public int getMapSfixed32Sfixed32OrDefault(
+          int key,
+          int defaultValue) {
 
         java.util.Map<java.lang.Integer, java.lang.Integer> map =
             internalGetMapSfixed32Sfixed32().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
       @java.lang.Override
-      public int getMapSfixed32Sfixed32OrThrow(int key) {
+      public int getMapSfixed32Sfixed32OrThrow(
+          int key) {
 
         java.util.Map<java.lang.Integer, java.lang.Integer> map =
             internalGetMapSfixed32Sfixed32().getMap();
@@ -21823,45 +19572,57 @@ public int getMapSfixed32Sfixed32OrThrow(int key) {
         }
         return map.get(key);
       }
-
       public Builder clearMapSfixed32Sfixed32() {
         bitField2_ = (bitField2_ & ~0x00001000);
-        internalGetMutableMapSfixed32Sfixed32().getMutableMap().clear();
+        internalGetMutableMapSfixed32Sfixed32().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
+      public Builder removeMapSfixed32Sfixed32(
+          int key) {
 
-      /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
-      public Builder removeMapSfixed32Sfixed32(int key) {
-
-        internalGetMutableMapSfixed32Sfixed32().getMutableMap().remove(key);
+        internalGetMutableMapSfixed32Sfixed32().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getMutableMapSfixed32Sfixed32() {
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+          getMutableMapSfixed32Sfixed32() {
         bitField2_ |= 0x00001000;
         return internalGetMutableMapSfixed32Sfixed32().getMutableMap();
       }
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
+      public Builder putMapSfixed32Sfixed32(
+          int key,
+          int value) {
 
-      /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
-      public Builder putMapSfixed32Sfixed32(int key, int value) {
 
-        internalGetMutableMapSfixed32Sfixed32().getMutableMap().put(key, value);
+        internalGetMutableMapSfixed32Sfixed32().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00001000;
         return this;
       }
-
-      /** <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code> */
+      /**
+       * <code>map&lt;sfixed32, sfixed32&gt; map_sfixed32_sfixed32 = 64;</code>
+       */
       public Builder putAllMapSfixed32Sfixed32(
           java.util.Map<java.lang.Integer, java.lang.Integer> values) {
-        internalGetMutableMapSfixed32Sfixed32().getMutableMap().putAll(values);
+        internalGetMutableMapSfixed32Sfixed32().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00001000;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Long, java.lang.Long> mapSfixed64Sfixed64_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Long, java.lang.Long> mapSfixed64Sfixed64_;
       private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
           internalGetMapSfixed64Sfixed64() {
         if (mapSfixed64Sfixed64_ == null) {
@@ -21870,13 +19631,11 @@ public Builder putAllMapSfixed32Sfixed32(
         }
         return mapSfixed64Sfixed64_;
       }
-
       private com.google.protobuf.MapField<java.lang.Long, java.lang.Long>
           internalGetMutableMapSfixed64Sfixed64() {
         if (mapSfixed64Sfixed64_ == null) {
-          mapSfixed64Sfixed64_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry);
+          mapSfixed64Sfixed64_ = com.google.protobuf.MapField.newMapField(
+              MapSfixed64Sfixed64DefaultEntryHolder.defaultEntry);
         }
         if (!mapSfixed64Sfixed64_.isMutable()) {
           mapSfixed64Sfixed64_ = mapSfixed64Sfixed64_.copy();
@@ -21885,43 +19644,51 @@ public Builder putAllMapSfixed32Sfixed32(
         onChanged();
         return mapSfixed64Sfixed64_;
       }
-
       public int getMapSfixed64Sfixed64Count() {
         return internalGetMapSfixed64Sfixed64().getMap().size();
       }
-
-      /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
       @java.lang.Override
-      public boolean containsMapSfixed64Sfixed64(long key) {
+      public boolean containsMapSfixed64Sfixed64(
+          long key) {
 
         return internalGetMapSfixed64Sfixed64().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapSfixed64Sfixed64Map()} instead. */
+      /**
+       * Use {@link #getMapSfixed64Sfixed64Map()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Long, java.lang.Long> getMapSfixed64Sfixed64() {
         return getMapSfixed64Sfixed64Map();
       }
-
-      /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Long, java.lang.Long> getMapSfixed64Sfixed64Map() {
         return internalGetMapSfixed64Sfixed64().getMap();
       }
-
-      /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
       @java.lang.Override
-      public long getMapSfixed64Sfixed64OrDefault(long key, long defaultValue) {
+      public long getMapSfixed64Sfixed64OrDefault(
+          long key,
+          long defaultValue) {
 
         java.util.Map<java.lang.Long, java.lang.Long> map =
             internalGetMapSfixed64Sfixed64().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
       @java.lang.Override
-      public long getMapSfixed64Sfixed64OrThrow(long key) {
+      public long getMapSfixed64Sfixed64OrThrow(
+          long key) {
 
         java.util.Map<java.lang.Long, java.lang.Long> map =
             internalGetMapSfixed64Sfixed64().getMap();
@@ -21930,45 +19697,57 @@ public long getMapSfixed64Sfixed64OrThrow(long key) {
         }
         return map.get(key);
       }
-
       public Builder clearMapSfixed64Sfixed64() {
         bitField2_ = (bitField2_ & ~0x00002000);
-        internalGetMutableMapSfixed64Sfixed64().getMutableMap().clear();
+        internalGetMutableMapSfixed64Sfixed64().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
+      public Builder removeMapSfixed64Sfixed64(
+          long key) {
 
-      /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
-      public Builder removeMapSfixed64Sfixed64(long key) {
-
-        internalGetMutableMapSfixed64Sfixed64().getMutableMap().remove(key);
+        internalGetMutableMapSfixed64Sfixed64().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Long, java.lang.Long> getMutableMapSfixed64Sfixed64() {
+      public java.util.Map<java.lang.Long, java.lang.Long>
+          getMutableMapSfixed64Sfixed64() {
         bitField2_ |= 0x00002000;
         return internalGetMutableMapSfixed64Sfixed64().getMutableMap();
       }
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
+      public Builder putMapSfixed64Sfixed64(
+          long key,
+          long value) {
 
-      /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
-      public Builder putMapSfixed64Sfixed64(long key, long value) {
 
-        internalGetMutableMapSfixed64Sfixed64().getMutableMap().put(key, value);
+        internalGetMutableMapSfixed64Sfixed64().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00002000;
         return this;
       }
-
-      /** <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code> */
+      /**
+       * <code>map&lt;sfixed64, sfixed64&gt; map_sfixed64_sfixed64 = 65;</code>
+       */
       public Builder putAllMapSfixed64Sfixed64(
           java.util.Map<java.lang.Long, java.lang.Long> values) {
-        internalGetMutableMapSfixed64Sfixed64().getMutableMap().putAll(values);
+        internalGetMutableMapSfixed64Sfixed64().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00002000;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float> mapInt32Float_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Float> mapInt32Float_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float>
           internalGetMapInt32Float() {
         if (mapInt32Float_ == null) {
@@ -21977,13 +19756,11 @@ public Builder putAllMapSfixed64Sfixed64(
         }
         return mapInt32Float_;
       }
-
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float>
           internalGetMutableMapInt32Float() {
         if (mapInt32Float_ == null) {
-          mapInt32Float_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapInt32FloatDefaultEntryHolder.defaultEntry);
+          mapInt32Float_ = com.google.protobuf.MapField.newMapField(
+              MapInt32FloatDefaultEntryHolder.defaultEntry);
         }
         if (!mapInt32Float_.isMutable()) {
           mapInt32Float_ = mapInt32Float_.copy();
@@ -21992,87 +19769,110 @@ public Builder putAllMapSfixed64Sfixed64(
         onChanged();
         return mapInt32Float_;
       }
-
       public int getMapInt32FloatCount() {
         return internalGetMapInt32Float().getMap().size();
       }
-
-      /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
       @java.lang.Override
-      public boolean containsMapInt32Float(int key) {
+      public boolean containsMapInt32Float(
+          int key) {
 
         return internalGetMapInt32Float().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapInt32FloatMap()} instead. */
+      /**
+       * Use {@link #getMapInt32FloatMap()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Integer, java.lang.Float> getMapInt32Float() {
         return getMapInt32FloatMap();
       }
-
-      /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Integer, java.lang.Float> getMapInt32FloatMap() {
         return internalGetMapInt32Float().getMap();
       }
-
-      /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
       @java.lang.Override
-      public float getMapInt32FloatOrDefault(int key, float defaultValue) {
+      public float getMapInt32FloatOrDefault(
+          int key,
+          float defaultValue) {
 
-        java.util.Map<java.lang.Integer, java.lang.Float> map = internalGetMapInt32Float().getMap();
+        java.util.Map<java.lang.Integer, java.lang.Float> map =
+            internalGetMapInt32Float().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
       @java.lang.Override
-      public float getMapInt32FloatOrThrow(int key) {
+      public float getMapInt32FloatOrThrow(
+          int key) {
 
-        java.util.Map<java.lang.Integer, java.lang.Float> map = internalGetMapInt32Float().getMap();
+        java.util.Map<java.lang.Integer, java.lang.Float> map =
+            internalGetMapInt32Float().getMap();
         if (!map.containsKey(key)) {
           throw new java.lang.IllegalArgumentException();
         }
         return map.get(key);
       }
-
       public Builder clearMapInt32Float() {
         bitField2_ = (bitField2_ & ~0x00004000);
-        internalGetMutableMapInt32Float().getMutableMap().clear();
+        internalGetMutableMapInt32Float().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
+      public Builder removeMapInt32Float(
+          int key) {
 
-      /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
-      public Builder removeMapInt32Float(int key) {
-
-        internalGetMutableMapInt32Float().getMutableMap().remove(key);
+        internalGetMutableMapInt32Float().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Float> getMutableMapInt32Float() {
+      public java.util.Map<java.lang.Integer, java.lang.Float>
+          getMutableMapInt32Float() {
         bitField2_ |= 0x00004000;
         return internalGetMutableMapInt32Float().getMutableMap();
       }
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
+      public Builder putMapInt32Float(
+          int key,
+          float value) {
 
-      /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
-      public Builder putMapInt32Float(int key, float value) {
 
-        internalGetMutableMapInt32Float().getMutableMap().put(key, value);
+        internalGetMutableMapInt32Float().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00004000;
         return this;
       }
-
-      /** <code>map&lt;int32, float&gt; map_int32_float = 66;</code> */
-      public Builder putAllMapInt32Float(java.util.Map<java.lang.Integer, java.lang.Float> values) {
-        internalGetMutableMapInt32Float().getMutableMap().putAll(values);
+      /**
+       * <code>map&lt;int32, float&gt; map_int32_float = 66;</code>
+       */
+      public Builder putAllMapInt32Float(
+          java.util.Map<java.lang.Integer, java.lang.Float> values) {
+        internalGetMutableMapInt32Float().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00004000;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Double> mapInt32Double_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Double> mapInt32Double_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Double>
           internalGetMapInt32Double() {
         if (mapInt32Double_ == null) {
@@ -22081,13 +19881,11 @@ public Builder putAllMapInt32Float(java.util.Map<java.lang.Integer, java.lang.Fl
         }
         return mapInt32Double_;
       }
-
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Double>
           internalGetMutableMapInt32Double() {
         if (mapInt32Double_ == null) {
-          mapInt32Double_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapInt32DoubleDefaultEntryHolder.defaultEntry);
+          mapInt32Double_ = com.google.protobuf.MapField.newMapField(
+              MapInt32DoubleDefaultEntryHolder.defaultEntry);
         }
         if (!mapInt32Double_.isMutable()) {
           mapInt32Double_ = mapInt32Double_.copy();
@@ -22096,43 +19894,51 @@ public Builder putAllMapInt32Float(java.util.Map<java.lang.Integer, java.lang.Fl
         onChanged();
         return mapInt32Double_;
       }
-
       public int getMapInt32DoubleCount() {
         return internalGetMapInt32Double().getMap().size();
       }
-
-      /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
       @java.lang.Override
-      public boolean containsMapInt32Double(int key) {
+      public boolean containsMapInt32Double(
+          int key) {
 
         return internalGetMapInt32Double().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapInt32DoubleMap()} instead. */
+      /**
+       * Use {@link #getMapInt32DoubleMap()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Integer, java.lang.Double> getMapInt32Double() {
         return getMapInt32DoubleMap();
       }
-
-      /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Integer, java.lang.Double> getMapInt32DoubleMap() {
         return internalGetMapInt32Double().getMap();
       }
-
-      /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
       @java.lang.Override
-      public double getMapInt32DoubleOrDefault(int key, double defaultValue) {
+      public double getMapInt32DoubleOrDefault(
+          int key,
+          double defaultValue) {
 
         java.util.Map<java.lang.Integer, java.lang.Double> map =
             internalGetMapInt32Double().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
       @java.lang.Override
-      public double getMapInt32DoubleOrThrow(int key) {
+      public double getMapInt32DoubleOrThrow(
+          int key) {
 
         java.util.Map<java.lang.Integer, java.lang.Double> map =
             internalGetMapInt32Double().getMap();
@@ -22141,45 +19947,57 @@ public double getMapInt32DoubleOrThrow(int key) {
         }
         return map.get(key);
       }
-
       public Builder clearMapInt32Double() {
         bitField2_ = (bitField2_ & ~0x00008000);
-        internalGetMutableMapInt32Double().getMutableMap().clear();
+        internalGetMutableMapInt32Double().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
+      public Builder removeMapInt32Double(
+          int key) {
 
-      /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
-      public Builder removeMapInt32Double(int key) {
-
-        internalGetMutableMapInt32Double().getMutableMap().remove(key);
+        internalGetMutableMapInt32Double().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Double> getMutableMapInt32Double() {
+      public java.util.Map<java.lang.Integer, java.lang.Double>
+          getMutableMapInt32Double() {
         bitField2_ |= 0x00008000;
         return internalGetMutableMapInt32Double().getMutableMap();
       }
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
+      public Builder putMapInt32Double(
+          int key,
+          double value) {
 
-      /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
-      public Builder putMapInt32Double(int key, double value) {
 
-        internalGetMutableMapInt32Double().getMutableMap().put(key, value);
+        internalGetMutableMapInt32Double().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00008000;
         return this;
       }
-
-      /** <code>map&lt;int32, double&gt; map_int32_double = 67;</code> */
+      /**
+       * <code>map&lt;int32, double&gt; map_int32_double = 67;</code>
+       */
       public Builder putAllMapInt32Double(
           java.util.Map<java.lang.Integer, java.lang.Double> values) {
-        internalGetMutableMapInt32Double().getMutableMap().putAll(values);
+        internalGetMutableMapInt32Double().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00008000;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.Boolean, java.lang.Boolean> mapBoolBool_;
-
+      private com.google.protobuf.MapField<
+          java.lang.Boolean, java.lang.Boolean> mapBoolBool_;
       private com.google.protobuf.MapField<java.lang.Boolean, java.lang.Boolean>
           internalGetMapBoolBool() {
         if (mapBoolBool_ == null) {
@@ -22188,12 +20006,11 @@ public Builder putAllMapInt32Double(
         }
         return mapBoolBool_;
       }
-
       private com.google.protobuf.MapField<java.lang.Boolean, java.lang.Boolean>
           internalGetMutableMapBoolBool() {
         if (mapBoolBool_ == null) {
-          mapBoolBool_ =
-              com.google.protobuf.MapField.newMapField(MapBoolBoolDefaultEntryHolder.defaultEntry);
+          mapBoolBool_ = com.google.protobuf.MapField.newMapField(
+              MapBoolBoolDefaultEntryHolder.defaultEntry);
         }
         if (!mapBoolBool_.isMutable()) {
           mapBoolBool_ = mapBoolBool_.copy();
@@ -22202,87 +20019,110 @@ public Builder putAllMapInt32Double(
         onChanged();
         return mapBoolBool_;
       }
-
       public int getMapBoolBoolCount() {
         return internalGetMapBoolBool().getMap().size();
       }
-
-      /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
       @java.lang.Override
-      public boolean containsMapBoolBool(boolean key) {
+      public boolean containsMapBoolBool(
+          boolean key) {
 
         return internalGetMapBoolBool().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapBoolBoolMap()} instead. */
+      /**
+       * Use {@link #getMapBoolBoolMap()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.Boolean, java.lang.Boolean> getMapBoolBool() {
         return getMapBoolBoolMap();
       }
-
-      /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.Boolean, java.lang.Boolean> getMapBoolBoolMap() {
         return internalGetMapBoolBool().getMap();
       }
-
-      /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
       @java.lang.Override
-      public boolean getMapBoolBoolOrDefault(boolean key, boolean defaultValue) {
+      public boolean getMapBoolBoolOrDefault(
+          boolean key,
+          boolean defaultValue) {
 
-        java.util.Map<java.lang.Boolean, java.lang.Boolean> map = internalGetMapBoolBool().getMap();
+        java.util.Map<java.lang.Boolean, java.lang.Boolean> map =
+            internalGetMapBoolBool().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
       @java.lang.Override
-      public boolean getMapBoolBoolOrThrow(boolean key) {
+      public boolean getMapBoolBoolOrThrow(
+          boolean key) {
 
-        java.util.Map<java.lang.Boolean, java.lang.Boolean> map = internalGetMapBoolBool().getMap();
+        java.util.Map<java.lang.Boolean, java.lang.Boolean> map =
+            internalGetMapBoolBool().getMap();
         if (!map.containsKey(key)) {
           throw new java.lang.IllegalArgumentException();
         }
         return map.get(key);
       }
-
       public Builder clearMapBoolBool() {
         bitField2_ = (bitField2_ & ~0x00010000);
-        internalGetMutableMapBoolBool().getMutableMap().clear();
+        internalGetMutableMapBoolBool().getMutableMap()
+            .clear();
         return this;
       }
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
+      public Builder removeMapBoolBool(
+          boolean key) {
 
-      /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
-      public Builder removeMapBoolBool(boolean key) {
-
-        internalGetMutableMapBoolBool().getMutableMap().remove(key);
+        internalGetMutableMapBoolBool().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Boolean, java.lang.Boolean> getMutableMapBoolBool() {
+      public java.util.Map<java.lang.Boolean, java.lang.Boolean>
+          getMutableMapBoolBool() {
         bitField2_ |= 0x00010000;
         return internalGetMutableMapBoolBool().getMutableMap();
       }
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
+      public Builder putMapBoolBool(
+          boolean key,
+          boolean value) {
 
-      /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
-      public Builder putMapBoolBool(boolean key, boolean value) {
 
-        internalGetMutableMapBoolBool().getMutableMap().put(key, value);
+        internalGetMutableMapBoolBool().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00010000;
         return this;
       }
-
-      /** <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code> */
-      public Builder putAllMapBoolBool(java.util.Map<java.lang.Boolean, java.lang.Boolean> values) {
-        internalGetMutableMapBoolBool().getMutableMap().putAll(values);
+      /**
+       * <code>map&lt;bool, bool&gt; map_bool_bool = 68;</code>
+       */
+      public Builder putAllMapBoolBool(
+          java.util.Map<java.lang.Boolean, java.lang.Boolean> values) {
+        internalGetMutableMapBoolBool().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00010000;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.String, java.lang.String> mapStringString_;
-
+      private com.google.protobuf.MapField<
+          java.lang.String, java.lang.String> mapStringString_;
       private com.google.protobuf.MapField<java.lang.String, java.lang.String>
           internalGetMapStringString() {
         if (mapStringString_ == null) {
@@ -22291,13 +20131,11 @@ public Builder putAllMapBoolBool(java.util.Map<java.lang.Boolean, java.lang.Bool
         }
         return mapStringString_;
       }
-
       private com.google.protobuf.MapField<java.lang.String, java.lang.String>
           internalGetMutableMapStringString() {
         if (mapStringString_ == null) {
-          mapStringString_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapStringStringDefaultEntryHolder.defaultEntry);
+          mapStringString_ = com.google.protobuf.MapField.newMapField(
+              MapStringStringDefaultEntryHolder.defaultEntry);
         }
         if (!mapStringString_.isMutable()) {
           mapStringString_ = mapStringString_.copy();
@@ -22306,53 +20144,54 @@ public Builder putAllMapBoolBool(java.util.Map<java.lang.Boolean, java.lang.Bool
         onChanged();
         return mapStringString_;
       }
-
       public int getMapStringStringCount() {
         return internalGetMapStringString().getMap().size();
       }
-
-      /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
       @java.lang.Override
-      public boolean containsMapStringString(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public boolean containsMapStringString(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         return internalGetMapStringString().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapStringStringMap()} instead. */
+      /**
+       * Use {@link #getMapStringStringMap()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.String, java.lang.String> getMapStringString() {
         return getMapStringStringMap();
       }
-
-      /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
       @java.lang.Override
       public java.util.Map<java.lang.String, java.lang.String> getMapStringStringMap() {
         return internalGetMapStringString().getMap();
       }
-
-      /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
       @java.lang.Override
-      public /* nullable */ java.lang.String getMapStringStringOrDefault(
+      public /* nullable */
+java.lang.String getMapStringStringOrDefault(
           java.lang.String key,
           /* nullable */
-          java.lang.String defaultValue) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+java.lang.String defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, java.lang.String> map =
             internalGetMapStringString().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
       @java.lang.Override
-      public java.lang.String getMapStringStringOrThrow(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public java.lang.String getMapStringStringOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, java.lang.String> map =
             internalGetMapStringString().getMap();
         if (!map.containsKey(key)) {
@@ -22360,53 +20199,57 @@ public java.lang.String getMapStringStringOrThrow(java.lang.String key) {
         }
         return map.get(key);
       }
-
       public Builder clearMapStringString() {
         bitField2_ = (bitField2_ & ~0x00020000);
-        internalGetMutableMapStringString().getMutableMap().clear();
+        internalGetMutableMapStringString().getMutableMap()
+            .clear();
         return this;
       }
-
-      /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
-      public Builder removeMapStringString(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        internalGetMutableMapStringString().getMutableMap().remove(key);
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
+      public Builder removeMapStringString(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringString().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<java.lang.String, java.lang.String> getMutableMapStringString() {
+      public java.util.Map<java.lang.String, java.lang.String>
+          getMutableMapStringString() {
         bitField2_ |= 0x00020000;
         return internalGetMutableMapStringString().getMutableMap();
       }
-
-      /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
-      public Builder putMapStringString(java.lang.String key, java.lang.String value) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        if (value == null) {
-          throw new NullPointerException("map value");
-        }
-        internalGetMutableMapStringString().getMutableMap().put(key, value);
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
+      public Builder putMapStringString(
+          java.lang.String key,
+          java.lang.String value) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        if (value == null) { throw new NullPointerException("map value"); }
+        internalGetMutableMapStringString().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00020000;
         return this;
       }
-
-      /** <code>map&lt;string, string&gt; map_string_string = 69;</code> */
+      /**
+       * <code>map&lt;string, string&gt; map_string_string = 69;</code>
+       */
       public Builder putAllMapStringString(
           java.util.Map<java.lang.String, java.lang.String> values) {
-        internalGetMutableMapStringString().getMutableMap().putAll(values);
+        internalGetMutableMapStringString().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00020000;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.String, com.google.protobuf.ByteString>
-          mapStringBytes_;
-
+      private com.google.protobuf.MapField<
+          java.lang.String, com.google.protobuf.ByteString> mapStringBytes_;
       private com.google.protobuf.MapField<java.lang.String, com.google.protobuf.ByteString>
           internalGetMapStringBytes() {
         if (mapStringBytes_ == null) {
@@ -22415,13 +20258,11 @@ public Builder putAllMapStringString(
         }
         return mapStringBytes_;
       }
-
       private com.google.protobuf.MapField<java.lang.String, com.google.protobuf.ByteString>
           internalGetMutableMapStringBytes() {
         if (mapStringBytes_ == null) {
-          mapStringBytes_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapStringBytesDefaultEntryHolder.defaultEntry);
+          mapStringBytes_ = com.google.protobuf.MapField.newMapField(
+              MapStringBytesDefaultEntryHolder.defaultEntry);
         }
         if (!mapStringBytes_.isMutable()) {
           mapStringBytes_ = mapStringBytes_.copy();
@@ -22430,54 +20271,54 @@ public Builder putAllMapStringString(
         onChanged();
         return mapStringBytes_;
       }
-
       public int getMapStringBytesCount() {
         return internalGetMapStringBytes().getMap().size();
       }
-
-      /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
       @java.lang.Override
-      public boolean containsMapStringBytes(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public boolean containsMapStringBytes(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         return internalGetMapStringBytes().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapStringBytesMap()} instead. */
+      /**
+       * Use {@link #getMapStringBytesMap()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
       public java.util.Map<java.lang.String, com.google.protobuf.ByteString> getMapStringBytes() {
         return getMapStringBytesMap();
       }
-
-      /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
       @java.lang.Override
-      public java.util.Map<java.lang.String, com.google.protobuf.ByteString>
-          getMapStringBytesMap() {
+      public java.util.Map<java.lang.String, com.google.protobuf.ByteString> getMapStringBytesMap() {
         return internalGetMapStringBytes().getMap();
       }
-
-      /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
       @java.lang.Override
-      public /* nullable */ com.google.protobuf.ByteString getMapStringBytesOrDefault(
+      public /* nullable */
+com.google.protobuf.ByteString getMapStringBytesOrDefault(
           java.lang.String key,
           /* nullable */
-          com.google.protobuf.ByteString defaultValue) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+com.google.protobuf.ByteString defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, com.google.protobuf.ByteString> map =
             internalGetMapStringBytes().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
-      /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
       @java.lang.Override
-      public com.google.protobuf.ByteString getMapStringBytesOrThrow(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public com.google.protobuf.ByteString getMapStringBytesOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, com.google.protobuf.ByteString> map =
             internalGetMapStringBytes().getMap();
         if (!map.containsKey(key)) {
@@ -22485,566 +20326,367 @@ public com.google.protobuf.ByteString getMapStringBytesOrThrow(java.lang.String
         }
         return map.get(key);
       }
-
       public Builder clearMapStringBytes() {
         bitField2_ = (bitField2_ & ~0x00040000);
-        internalGetMutableMapStringBytes().getMutableMap().clear();
+        internalGetMutableMapStringBytes().getMutableMap()
+            .clear();
         return this;
       }
-
-      /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
-      public Builder removeMapStringBytes(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        internalGetMutableMapStringBytes().getMutableMap().remove(key);
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
+      public Builder removeMapStringBytes(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringBytes().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
       public java.util.Map<java.lang.String, com.google.protobuf.ByteString>
           getMutableMapStringBytes() {
         bitField2_ |= 0x00040000;
         return internalGetMutableMapStringBytes().getMutableMap();
       }
-
-      /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
-      public Builder putMapStringBytes(java.lang.String key, com.google.protobuf.ByteString value) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        if (value == null) {
-          throw new NullPointerException("map value");
-        }
-        internalGetMutableMapStringBytes().getMutableMap().put(key, value);
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
+      public Builder putMapStringBytes(
+          java.lang.String key,
+          com.google.protobuf.ByteString value) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        if (value == null) { throw new NullPointerException("map value"); }
+        internalGetMutableMapStringBytes().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00040000;
         return this;
       }
-
-      /** <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code> */
+      /**
+       * <code>map&lt;string, bytes&gt; map_string_bytes = 70;</code>
+       */
       public Builder putAllMapStringBytes(
           java.util.Map<java.lang.String, com.google.protobuf.ByteString> values) {
-        internalGetMutableMapStringBytes().getMutableMap().putAll(values);
+        internalGetMutableMapStringBytes().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00040000;
         return this;
       }
 
-      private static final class MapStringNestedMessageConverter
-          implements com.google.protobuf.MapFieldBuilder.Converter<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .NestedMessageOrBuilder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> {
+      private static final class MapStringNestedMessageConverter implements com.google.protobuf.MapFieldBuilder.Converter<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> {
         @java.lang.Override
-        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-            build(
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                        .NestedMessageOrBuilder
-                    val) {
-          if (val
-              instanceof
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) {
-            return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .NestedMessage)
-                val;
-          }
-          return ((legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage.Builder)
-                  val)
-              .build();
+        public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage build(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder val) {
+          if (val instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) { return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) val; }
+          return ((legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder) val).build();
         }
 
         @java.lang.Override
-        public com.google.protobuf.MapEntry<
-                java.lang.String,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-            defaultEntry() {
+        public com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> defaultEntry() {
           return MapStringNestedMessageDefaultEntryHolder.defaultEntry;
         }
-      }
-      ;
-
-      private static final MapStringNestedMessageConverter mapStringNestedMessageConverter =
-          new MapStringNestedMessageConverter();
-
-      private com.google.protobuf.MapFieldBuilder<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .NestedMessageOrBuilder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder>
-          mapStringNestedMessage_;
+      };
+      private static final MapStringNestedMessageConverter mapStringNestedMessageConverter = new MapStringNestedMessageConverter();
 
       private com.google.protobuf.MapFieldBuilder<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .NestedMessageOrBuilder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder>
+          java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder> mapStringNestedMessage_;
+      private com.google.protobuf.MapFieldBuilder<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder>
           internalGetMapStringNestedMessage() {
         if (mapStringNestedMessage_ == null) {
           return new com.google.protobuf.MapFieldBuilder<>(mapStringNestedMessageConverter);
         }
         return mapStringNestedMessage_;
       }
-
-      private com.google.protobuf.MapFieldBuilder<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .NestedMessageOrBuilder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder>
+      private com.google.protobuf.MapFieldBuilder<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder>
           internalGetMutableMapStringNestedMessage() {
         if (mapStringNestedMessage_ == null) {
-          mapStringNestedMessage_ =
-              new com.google.protobuf.MapFieldBuilder<>(mapStringNestedMessageConverter);
+          mapStringNestedMessage_ = new com.google.protobuf.MapFieldBuilder<>(mapStringNestedMessageConverter);
         }
         bitField2_ |= 0x00080000;
         onChanged();
         return mapStringNestedMessage_;
       }
-
       public int getMapStringNestedMessageCount() {
         return internalGetMapStringNestedMessage().ensureBuilderMap().size();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
        */
       @java.lang.Override
-      public boolean containsMapStringNestedMessage(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public boolean containsMapStringNestedMessage(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         return internalGetMapStringNestedMessage().ensureBuilderMap().containsKey(key);
       }
-
-      /** Use {@link #getMapStringNestedMessageMap()} instead. */
+      /**
+       * Use {@link #getMapStringNestedMessageMap()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
-      public java.util.Map<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-          getMapStringNestedMessage() {
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> getMapStringNestedMessage() {
         return getMapStringNestedMessageMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
        */
       @java.lang.Override
-      public java.util.Map<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-          getMapStringNestedMessageMap() {
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> getMapStringNestedMessageMap() {
         return internalGetMapStringNestedMessage().getImmutableMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
        */
       @java.lang.Override
-      public /* nullable */ legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessage
-          getMapStringNestedMessageOrDefault(
-              java.lang.String key,
-              /* nullable */
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  defaultValue) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        java.util.Map<
-                java.lang.String,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .NestedMessageOrBuilder>
-            map = internalGetMutableMapStringNestedMessage().ensureBuilderMap();
-        return map.containsKey(key)
-            ? mapStringNestedMessageConverter.build(map.get(key))
-            : defaultValue;
+      public /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getMapStringNestedMessageOrDefault(
+          java.lang.String key,
+          /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> map = internalGetMutableMapStringNestedMessage().ensureBuilderMap();
+        return map.containsKey(key) ? mapStringNestedMessageConverter.build(map.get(key)) : defaultValue;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
        */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-          getMapStringNestedMessageOrThrow(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        java.util.Map<
-                java.lang.String,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .NestedMessageOrBuilder>
-            map = internalGetMutableMapStringNestedMessage().ensureBuilderMap();
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getMapStringNestedMessageOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> map = internalGetMutableMapStringNestedMessage().ensureBuilderMap();
         if (!map.containsKey(key)) {
           throw new java.lang.IllegalArgumentException();
         }
         return mapStringNestedMessageConverter.build(map.get(key));
       }
-
       public Builder clearMapStringNestedMessage() {
         bitField2_ = (bitField2_ & ~0x00080000);
         internalGetMutableMapStringNestedMessage().clear();
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
        */
-      public Builder removeMapStringNestedMessage(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        internalGetMutableMapStringNestedMessage().ensureBuilderMap().remove(key);
+      public Builder removeMapStringNestedMessage(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringNestedMessage().ensureBuilderMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
           getMutableMapStringNestedMessage() {
         bitField2_ |= 0x00080000;
         return internalGetMutableMapStringNestedMessage().ensureMessageMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
        */
       public Builder putMapStringNestedMessage(
           java.lang.String key,
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              value) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        if (value == null) {
-          throw new NullPointerException("map value");
-        }
-        internalGetMutableMapStringNestedMessage().ensureBuilderMap().put(key, value);
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage value) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        if (value == null) { throw new NullPointerException("map value"); }
+        internalGetMutableMapStringNestedMessage().ensureBuilderMap()
+            .put(key, value);
         bitField2_ |= 0x00080000;
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
        */
       public Builder putAllMapStringNestedMessage(
-          java.util.Map<
-                  java.lang.String,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage>
-              values) {
-        for (java.util.Map.Entry<
-                java.lang.String,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage>
-            e : values.entrySet()) {
+          java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> values) {
+        for (java.util.Map.Entry<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage> e : values.entrySet()) {
           if (e.getKey() == null || e.getValue() == null) {
             throw new NullPointerException();
           }
         }
-        internalGetMutableMapStringNestedMessage().ensureBuilderMap().putAll(values);
+        internalGetMutableMapStringNestedMessage().ensureBuilderMap()
+            .putAll(values);
         bitField2_ |= 0x00080000;
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage&gt; map_string_nested_message = 71;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .Builder
-          putMapStringNestedMessageBuilderIfAbsent(java.lang.String key) {
-        java.util.Map<
-                java.lang.String,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .NestedMessageOrBuilder>
-            builderMap = internalGetMutableMapStringNestedMessage().ensureBuilderMap();
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder
-            entry = builderMap.get(key);
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder putMapStringNestedMessageBuilderIfAbsent(
+          java.lang.String key) {
+        java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> builderMap = internalGetMutableMapStringNestedMessage().ensureBuilderMap();
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder entry = builderMap.get(key);
         if (entry == null) {
-          entry =
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .newBuilder();
+          entry = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.newBuilder();
           builderMap.put(key, entry);
         }
-        if (entry
-            instanceof
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) {
-          entry =
-              ((legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage)
-                      entry)
-                  .toBuilder();
+        if (entry instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) {
+          entry = ((legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) entry).toBuilder();
           builderMap.put(key, entry);
         }
-        return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                .Builder)
-            entry;
+        return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder) entry;
       }
 
-      private static final class MapStringForeignMessageConverter
-          implements com.google.protobuf.MapFieldBuilder.Converter<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> {
+      private static final class MapStringForeignMessageConverter implements com.google.protobuf.MapFieldBuilder.Converter<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> {
         @java.lang.Override
-        public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage build(
-            legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder val) {
-          if (val instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage) {
-            return (legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage) val;
-          }
-          return ((legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder) val)
-              .build();
+        public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage build(legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder val) {
+          if (val instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage) { return (legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage) val; }
+          return ((legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder) val).build();
         }
 
         @java.lang.Override
-        public com.google.protobuf.MapEntry<
-                java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-            defaultEntry() {
+        public com.google.protobuf.MapEntry<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> defaultEntry() {
           return MapStringForeignMessageDefaultEntryHolder.defaultEntry;
         }
-      }
-      ;
-
-      private static final MapStringForeignMessageConverter mapStringForeignMessageConverter =
-          new MapStringForeignMessageConverter();
-
-      private com.google.protobuf.MapFieldBuilder<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder>
-          mapStringForeignMessage_;
+      };
+      private static final MapStringForeignMessageConverter mapStringForeignMessageConverter = new MapStringForeignMessageConverter();
 
       private com.google.protobuf.MapFieldBuilder<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder>
+          java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder> mapStringForeignMessage_;
+      private com.google.protobuf.MapFieldBuilder<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder>
           internalGetMapStringForeignMessage() {
         if (mapStringForeignMessage_ == null) {
           return new com.google.protobuf.MapFieldBuilder<>(mapStringForeignMessageConverter);
         }
         return mapStringForeignMessage_;
       }
-
-      private com.google.protobuf.MapFieldBuilder<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder>
+      private com.google.protobuf.MapFieldBuilder<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder>
           internalGetMutableMapStringForeignMessage() {
         if (mapStringForeignMessage_ == null) {
-          mapStringForeignMessage_ =
-              new com.google.protobuf.MapFieldBuilder<>(mapStringForeignMessageConverter);
+          mapStringForeignMessage_ = new com.google.protobuf.MapFieldBuilder<>(mapStringForeignMessageConverter);
         }
         bitField2_ |= 0x00100000;
         onChanged();
         return mapStringForeignMessage_;
       }
-
       public int getMapStringForeignMessageCount() {
         return internalGetMapStringForeignMessage().ensureBuilderMap().size();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
        */
       @java.lang.Override
-      public boolean containsMapStringForeignMessage(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public boolean containsMapStringForeignMessage(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         return internalGetMapStringForeignMessage().ensureBuilderMap().containsKey(key);
       }
-
-      /** Use {@link #getMapStringForeignMessageMap()} instead. */
+      /**
+       * Use {@link #getMapStringForeignMessageMap()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
-      public java.util.Map<
-              java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-          getMapStringForeignMessage() {
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> getMapStringForeignMessage() {
         return getMapStringForeignMessageMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
        */
       @java.lang.Override
-      public java.util.Map<
-              java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-          getMapStringForeignMessageMap() {
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> getMapStringForeignMessageMap() {
         return internalGetMapStringForeignMessage().getImmutableMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
        */
       @java.lang.Override
-      public /* nullable */ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-          getMapStringForeignMessageOrDefault(
-              java.lang.String key,
-              /* nullable */
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage defaultValue) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        java.util.Map<
-                java.lang.String,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>
-            map = internalGetMutableMapStringForeignMessage().ensureBuilderMap();
-        return map.containsKey(key)
-            ? mapStringForeignMessageConverter.build(map.get(key))
-            : defaultValue;
+      public /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getMapStringForeignMessageOrDefault(
+          java.lang.String key,
+          /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder> map = internalGetMutableMapStringForeignMessage().ensureBuilderMap();
+        return map.containsKey(key) ? mapStringForeignMessageConverter.build(map.get(key)) : defaultValue;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
        */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-          getMapStringForeignMessageOrThrow(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        java.util.Map<
-                java.lang.String,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>
-            map = internalGetMutableMapStringForeignMessage().ensureBuilderMap();
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getMapStringForeignMessageOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder> map = internalGetMutableMapStringForeignMessage().ensureBuilderMap();
         if (!map.containsKey(key)) {
           throw new java.lang.IllegalArgumentException();
         }
         return mapStringForeignMessageConverter.build(map.get(key));
       }
-
       public Builder clearMapStringForeignMessage() {
         bitField2_ = (bitField2_ & ~0x00100000);
         internalGetMutableMapStringForeignMessage().clear();
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
        */
-      public Builder removeMapStringForeignMessage(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        internalGetMutableMapStringForeignMessage().ensureBuilderMap().remove(key);
+      public Builder removeMapStringForeignMessage(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringForeignMessage().ensureBuilderMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<
-              java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
           getMutableMapStringForeignMessage() {
         bitField2_ |= 0x00100000;
         return internalGetMutableMapStringForeignMessage().ensureMessageMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
        */
       public Builder putMapStringForeignMessage(
           java.lang.String key,
           legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage value) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        if (value == null) {
-          throw new NullPointerException("map value");
-        }
-        internalGetMutableMapStringForeignMessage().ensureBuilderMap().put(key, value);
+        if (key == null) { throw new NullPointerException("map key"); }
+        if (value == null) { throw new NullPointerException("map value"); }
+        internalGetMutableMapStringForeignMessage().ensureBuilderMap()
+            .put(key, value);
         bitField2_ |= 0x00100000;
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
        */
       public Builder putAllMapStringForeignMessage(
-          java.util.Map<
-                  java.lang.String,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-              values) {
-        for (java.util.Map.Entry<
-                java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage>
-            e : values.entrySet()) {
+          java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> values) {
+        for (java.util.Map.Entry<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage> e : values.entrySet()) {
           if (e.getKey() == null || e.getValue() == null) {
             throw new NullPointerException();
           }
         }
-        internalGetMutableMapStringForeignMessage().ensureBuilderMap().putAll(values);
+        internalGetMutableMapStringForeignMessage().ensureBuilderMap()
+            .putAll(values);
         bitField2_ |= 0x00100000;
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignMessage&gt; map_string_foreign_message = 72;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder
-          putMapStringForeignMessageBuilderIfAbsent(java.lang.String key) {
-        java.util.Map<
-                java.lang.String,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder>
-            builderMap = internalGetMutableMapStringForeignMessage().ensureBuilderMap();
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder entry =
-            builderMap.get(key);
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder putMapStringForeignMessageBuilderIfAbsent(
+          java.lang.String key) {
+        java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder> builderMap = internalGetMutableMapStringForeignMessage().ensureBuilderMap();
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder entry = builderMap.get(key);
         if (entry == null) {
           entry = legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.newBuilder();
           builderMap.put(key, entry);
         }
         if (entry instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage) {
-          entry =
-              ((legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage) entry)
-                  .toBuilder();
+          entry = ((legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage) entry).toBuilder();
           builderMap.put(key, entry);
         }
         return (legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder) entry;
       }
 
-      private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
-          mapStringNestedEnum_;
-
+      private com.google.protobuf.MapField<
+          java.lang.String, java.lang.Integer> mapStringNestedEnum_;
       private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
           internalGetMapStringNestedEnum() {
         if (mapStringNestedEnum_ == null) {
@@ -23053,13 +20695,11 @@ public Builder putAllMapStringForeignMessage(
         }
         return mapStringNestedEnum_;
       }
-
       private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
           internalGetMutableMapStringNestedEnum() {
         if (mapStringNestedEnum_ == null) {
-          mapStringNestedEnum_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapStringNestedEnumDefaultEntryHolder.defaultEntry);
+          mapStringNestedEnum_ = com.google.protobuf.MapField.newMapField(
+              MapStringNestedEnumDefaultEntryHolder.defaultEntry);
         }
         if (!mapStringNestedEnum_.isMutable()) {
           mapStringNestedEnum_ = mapStringNestedEnum_.copy();
@@ -23068,81 +20708,58 @@ public Builder putAllMapStringForeignMessage(
         onChanged();
         return mapStringNestedEnum_;
       }
-
       public int getMapStringNestedEnumCount() {
         return internalGetMapStringNestedEnum().getMap().size();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
       @java.lang.Override
-      public boolean containsMapStringNestedEnum(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public boolean containsMapStringNestedEnum(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         return internalGetMapStringNestedEnum().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapStringNestedEnumMap()} instead. */
+      /**
+       * Use {@link #getMapStringNestedEnumMap()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
-      public java.util.Map<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-          getMapStringNestedEnum() {
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
+      getMapStringNestedEnum() {
         return getMapStringNestedEnumMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
       @java.lang.Override
-      public java.util.Map<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-          getMapStringNestedEnumMap() {
-        return internalGetAdaptedMapStringNestedEnumMap(internalGetMapStringNestedEnum().getMap());
-      }
-
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
+      getMapStringNestedEnumMap() {
+        return internalGetAdaptedMapStringNestedEnumMap(
+            internalGetMapStringNestedEnum().getMap());}
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
       @java.lang.Override
-      public /* nullable */ legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedEnum
-          getMapStringNestedEnumOrDefault(
-              java.lang.String key,
-              /* nullable */
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                  defaultValue) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getMapStringNestedEnumOrDefault(
+          java.lang.String key,
+          /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, java.lang.Integer> map =
             internalGetMapStringNestedEnum().getMap();
         return map.containsKey(key)
-            ? mapStringNestedEnumValueConverter.doForward(map.get(key))
-            : defaultValue;
+               ? mapStringNestedEnumValueConverter.doForward(map.get(key))
+               : defaultValue;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-          getMapStringNestedEnumOrThrow(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getMapStringNestedEnumOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, java.lang.Integer> map =
             internalGetMapStringNestedEnum().getMap();
         if (!map.containsKey(key)) {
@@ -23150,49 +20767,42 @@ public boolean containsMapStringNestedEnum(java.lang.String key) {
         }
         return mapStringNestedEnumValueConverter.doForward(map.get(key));
       }
-
-      /** Use {@link #getMapStringNestedEnumValueMap()} instead. */
+      /**
+       * Use {@link #getMapStringNestedEnumValueMap()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
-      public java.util.Map<java.lang.String, java.lang.Integer> getMapStringNestedEnumValue() {
+      public java.util.Map<java.lang.String, java.lang.Integer>
+      getMapStringNestedEnumValue() {
         return getMapStringNestedEnumValueMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
       @java.lang.Override
-      public java.util.Map<java.lang.String, java.lang.Integer> getMapStringNestedEnumValueMap() {
+      public java.util.Map<java.lang.String, java.lang.Integer>
+      getMapStringNestedEnumValueMap() {
         return internalGetMapStringNestedEnum().getMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
       @java.lang.Override
-      public int getMapStringNestedEnumValueOrDefault(java.lang.String key, int defaultValue) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public int getMapStringNestedEnumValueOrDefault(
+          java.lang.String key,
+          int defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, java.lang.Integer> map =
             internalGetMapStringNestedEnum().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
       @java.lang.Override
-      public int getMapStringNestedEnumValueOrThrow(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public int getMapStringNestedEnumValueOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, java.lang.Integer> map =
             internalGetMapStringNestedEnum().getMap();
         if (!map.containsKey(key)) {
@@ -23200,111 +20810,91 @@ public int getMapStringNestedEnumValueOrThrow(java.lang.String key) {
         }
         return map.get(key);
       }
-
       public Builder clearMapStringNestedEnum() {
         bitField2_ = (bitField2_ & ~0x00200000);
-        internalGetMutableMapStringNestedEnum().getMutableMap().clear();
+        internalGetMutableMapStringNestedEnum().getMutableMap()
+            .clear();
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
-      public Builder removeMapStringNestedEnum(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        internalGetMutableMapStringNestedEnum().getMutableMap().remove(key);
+      public Builder removeMapStringNestedEnum(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringNestedEnum().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<
-              java.lang.String,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
           getMutableMapStringNestedEnum() {
         bitField2_ |= 0x00200000;
         return internalGetAdaptedMapStringNestedEnumMap(
-            internalGetMutableMapStringNestedEnum().getMutableMap());
+             internalGetMutableMapStringNestedEnum().getMutableMap());
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
       public Builder putMapStringNestedEnum(
           java.lang.String key,
           legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+        if (key == null) { throw new NullPointerException("map key"); }
 
-        internalGetMutableMapStringNestedEnum()
-            .getMutableMap()
+        internalGetMutableMapStringNestedEnum().getMutableMap()
             .put(key, mapStringNestedEnumValueConverter.doBackward(value));
         bitField2_ |= 0x00200000;
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
       public Builder putAllMapStringNestedEnum(
-          java.util.Map<
-                  java.lang.String,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum>
-              values) {
+          java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum> values) {
         internalGetAdaptedMapStringNestedEnumMap(
-                internalGetMutableMapStringNestedEnum().getMutableMap())
-            .putAll(values);
+            internalGetMutableMapStringNestedEnum().getMutableMap())
+                .putAll(values);
         bitField2_ |= 0x00200000;
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
       public java.util.Map<java.lang.String, java.lang.Integer>
-          getMutableMapStringNestedEnumValue() {
+      getMutableMapStringNestedEnumValue() {
         bitField2_ |= 0x00200000;
         return internalGetMutableMapStringNestedEnum().getMutableMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
-      public Builder putMapStringNestedEnumValue(java.lang.String key, int value) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public Builder putMapStringNestedEnumValue(
+          java.lang.String key,
+          int value) {
+        if (key == null) { throw new NullPointerException("map key"); }
 
-        internalGetMutableMapStringNestedEnum().getMutableMap().put(key, value);
+        internalGetMutableMapStringNestedEnum().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00200000;
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum&gt; map_string_nested_enum = 73;</code>
        */
       public Builder putAllMapStringNestedEnumValue(
           java.util.Map<java.lang.String, java.lang.Integer> values) {
-        internalGetMutableMapStringNestedEnum().getMutableMap().putAll(values);
+        internalGetMutableMapStringNestedEnum().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00200000;
         return this;
       }
 
-      private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
-          mapStringForeignEnum_;
-
+      private com.google.protobuf.MapField<
+          java.lang.String, java.lang.Integer> mapStringForeignEnum_;
       private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
           internalGetMapStringForeignEnum() {
         if (mapStringForeignEnum_ == null) {
@@ -23313,13 +20903,11 @@ public Builder putAllMapStringNestedEnumValue(
         }
         return mapStringForeignEnum_;
       }
-
       private com.google.protobuf.MapField<java.lang.String, java.lang.Integer>
           internalGetMutableMapStringForeignEnum() {
         if (mapStringForeignEnum_ == null) {
-          mapStringForeignEnum_ =
-              com.google.protobuf.MapField.newMapField(
-                  MapStringForeignEnumDefaultEntryHolder.defaultEntry);
+          mapStringForeignEnum_ = com.google.protobuf.MapField.newMapField(
+              MapStringForeignEnumDefaultEntryHolder.defaultEntry);
         }
         if (!mapStringForeignEnum_.isMutable()) {
           mapStringForeignEnum_ = mapStringForeignEnum_.copy();
@@ -23328,78 +20916,58 @@ public Builder putAllMapStringNestedEnumValue(
         onChanged();
         return mapStringForeignEnum_;
       }
-
       public int getMapStringForeignEnumCount() {
         return internalGetMapStringForeignEnum().getMap().size();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
       @java.lang.Override
-      public boolean containsMapStringForeignEnum(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public boolean containsMapStringForeignEnum(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         return internalGetMapStringForeignEnum().getMap().containsKey(key);
       }
-
-      /** Use {@link #getMapStringForeignEnumMap()} instead. */
+      /**
+       * Use {@link #getMapStringForeignEnumMap()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
-      public java.util.Map<
-              java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-          getMapStringForeignEnum() {
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
+      getMapStringForeignEnum() {
         return getMapStringForeignEnumMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
       @java.lang.Override
-      public java.util.Map<
-              java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-          getMapStringForeignEnumMap() {
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
+      getMapStringForeignEnumMap() {
         return internalGetAdaptedMapStringForeignEnumMap(
-            internalGetMapStringForeignEnum().getMap());
-      }
-
+            internalGetMapStringForeignEnum().getMap());}
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
       @java.lang.Override
-      public /* nullable */ legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum
-          getMapStringForeignEnumOrDefault(
-              java.lang.String key,
-              /* nullable */
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum defaultValue) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getMapStringForeignEnumOrDefault(
+          java.lang.String key,
+          /* nullable */
+legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, java.lang.Integer> map =
             internalGetMapStringForeignEnum().getMap();
         return map.containsKey(key)
-            ? mapStringForeignEnumValueConverter.doForward(map.get(key))
-            : defaultValue;
+               ? mapStringForeignEnumValueConverter.doForward(map.get(key))
+               : defaultValue;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum
-          getMapStringForeignEnumOrThrow(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum getMapStringForeignEnumOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, java.lang.Integer> map =
             internalGetMapStringForeignEnum().getMap();
         if (!map.containsKey(key)) {
@@ -23407,49 +20975,42 @@ public boolean containsMapStringForeignEnum(java.lang.String key) {
         }
         return mapStringForeignEnumValueConverter.doForward(map.get(key));
       }
-
-      /** Use {@link #getMapStringForeignEnumValueMap()} instead. */
+      /**
+       * Use {@link #getMapStringForeignEnumValueMap()} instead.
+       */
       @java.lang.Override
       @java.lang.Deprecated
-      public java.util.Map<java.lang.String, java.lang.Integer> getMapStringForeignEnumValue() {
+      public java.util.Map<java.lang.String, java.lang.Integer>
+      getMapStringForeignEnumValue() {
         return getMapStringForeignEnumValueMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
       @java.lang.Override
-      public java.util.Map<java.lang.String, java.lang.Integer> getMapStringForeignEnumValueMap() {
+      public java.util.Map<java.lang.String, java.lang.Integer>
+      getMapStringForeignEnumValueMap() {
         return internalGetMapStringForeignEnum().getMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
       @java.lang.Override
-      public int getMapStringForeignEnumValueOrDefault(java.lang.String key, int defaultValue) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public int getMapStringForeignEnumValueOrDefault(
+          java.lang.String key,
+          int defaultValue) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, java.lang.Integer> map =
             internalGetMapStringForeignEnum().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
       @java.lang.Override
-      public int getMapStringForeignEnumValueOrThrow(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public int getMapStringForeignEnumValueOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
         java.util.Map<java.lang.String, java.lang.Integer> map =
             internalGetMapStringForeignEnum().getMap();
         if (!map.containsKey(key)) {
@@ -23457,118 +21018,98 @@ public int getMapStringForeignEnumValueOrThrow(java.lang.String key) {
         }
         return map.get(key);
       }
-
       public Builder clearMapStringForeignEnum() {
         bitField2_ = (bitField2_ & ~0x00400000);
-        internalGetMutableMapStringForeignEnum().getMutableMap().clear();
+        internalGetMutableMapStringForeignEnum().getMutableMap()
+            .clear();
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
-      public Builder removeMapStringForeignEnum(java.lang.String key) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
-        internalGetMutableMapStringForeignEnum().getMutableMap().remove(key);
+      public Builder removeMapStringForeignEnum(
+          java.lang.String key) {
+        if (key == null) { throw new NullPointerException("map key"); }
+        internalGetMutableMapStringForeignEnum().getMutableMap()
+            .remove(key);
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
-      public java.util.Map<
-              java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
+      public java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
           getMutableMapStringForeignEnum() {
         bitField2_ |= 0x00400000;
         return internalGetAdaptedMapStringForeignEnumMap(
-            internalGetMutableMapStringForeignEnum().getMutableMap());
+             internalGetMutableMapStringForeignEnum().getMutableMap());
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
       public Builder putMapStringForeignEnum(
           java.lang.String key,
           legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum value) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+        if (key == null) { throw new NullPointerException("map key"); }
 
-        internalGetMutableMapStringForeignEnum()
-            .getMutableMap()
+        internalGetMutableMapStringForeignEnum().getMutableMap()
             .put(key, mapStringForeignEnumValueConverter.doBackward(value));
         bitField2_ |= 0x00400000;
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
       public Builder putAllMapStringForeignEnum(
-          java.util.Map<
-                  java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum>
-              values) {
+          java.util.Map<java.lang.String, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignEnum> values) {
         internalGetAdaptedMapStringForeignEnumMap(
-                internalGetMutableMapStringForeignEnum().getMutableMap())
-            .putAll(values);
+            internalGetMutableMapStringForeignEnum().getMutableMap())
+                .putAll(values);
         bitField2_ |= 0x00400000;
         return this;
       }
-
-      /** Use alternate mutation accessors instead. */
+      /**
+       * Use alternate mutation accessors instead.
+       */
       @java.lang.Deprecated
       public java.util.Map<java.lang.String, java.lang.Integer>
-          getMutableMapStringForeignEnumValue() {
+      getMutableMapStringForeignEnumValue() {
         bitField2_ |= 0x00400000;
         return internalGetMutableMapStringForeignEnum().getMutableMap();
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
-      public Builder putMapStringForeignEnumValue(java.lang.String key, int value) {
-        if (key == null) {
-          throw new NullPointerException("map key");
-        }
+      public Builder putMapStringForeignEnumValue(
+          java.lang.String key,
+          int value) {
+        if (key == null) { throw new NullPointerException("map key"); }
 
-        internalGetMutableMapStringForeignEnum().getMutableMap().put(key, value);
+        internalGetMutableMapStringForeignEnum().getMutableMap()
+            .put(key, value);
         bitField2_ |= 0x00400000;
         return this;
       }
-
       /**
-       * <code>
-       * map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;
-       * </code>
+       * <code>map&lt;string, .legacy_gencode_test.proto3.ForeignEnum&gt; map_string_foreign_enum = 74;</code>
        */
       public Builder putAllMapStringForeignEnumValue(
           java.util.Map<java.lang.String, java.lang.Integer> values) {
-        internalGetMutableMapStringForeignEnum().getMutableMap().putAll(values);
+        internalGetMutableMapStringForeignEnum().getMutableMap()
+            .putAll(values);
         bitField2_ |= 0x00400000;
         return this;
       }
 
       /**
        * <code>uint32 oneof_uint32 = 111;</code>
-       *
        * @return Whether the oneofUint32 field is set.
        */
       public boolean hasOneofUint32() {
         return oneofFieldCase_ == 111;
       }
-
       /**
        * <code>uint32 oneof_uint32 = 111;</code>
-       *
        * @return The oneofUint32.
        */
       public int getOneofUint32() {
@@ -23577,10 +21118,8 @@ public int getOneofUint32() {
         }
         return 0;
       }
-
       /**
        * <code>uint32 oneof_uint32 = 111;</code>
-       *
        * @param value The oneofUint32 to set.
        * @return This builder for chaining.
        */
@@ -23591,10 +21130,8 @@ public Builder setOneofUint32(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>uint32 oneof_uint32 = 111;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOneofUint32() {
@@ -23607,60 +21144,37 @@ public Builder clearOneofUint32() {
       }
 
       private com.google.protobuf.SingleFieldBuilder<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .NestedMessageOrBuilder>
-          oneofNestedMessageBuilder_;
-
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> oneofNestedMessageBuilder_;
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
        * @return Whether the oneofNestedMessage field is set.
        */
       @java.lang.Override
       public boolean hasOneofNestedMessage() {
         return oneofFieldCase_ == 112;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-       * </code>
-       *
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
        * @return The oneofNestedMessage.
        */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-          getOneofNestedMessage() {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage getOneofNestedMessage() {
         if (oneofNestedMessageBuilder_ == null) {
           if (oneofFieldCase_ == 112) {
-            return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .NestedMessage)
-                oneofField_;
+            return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) oneofField_;
           }
-          return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .getDefaultInstance();
+          return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance();
         } else {
           if (oneofFieldCase_ == 112) {
             return oneofNestedMessageBuilder_.getMessage();
           }
-          return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .getDefaultInstance();
+          return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance();
         }
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
        */
-      public Builder setOneofNestedMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              value) {
+      public Builder setOneofNestedMessage(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage value) {
         if (oneofNestedMessageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -23673,16 +21187,11 @@ public Builder setOneofNestedMessage(
         oneofFieldCase_ = 112;
         return this;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
        */
       public Builder setOneofNestedMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder
-              builderForValue) {
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder builderForValue) {
         if (oneofNestedMessageBuilder_ == null) {
           oneofField_ = builderForValue.build();
           onChanged();
@@ -23692,28 +21201,15 @@ public Builder setOneofNestedMessage(
         oneofFieldCase_ = 112;
         return this;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
        */
-      public Builder mergeOneofNestedMessage(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              value) {
+      public Builder mergeOneofNestedMessage(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage value) {
         if (oneofNestedMessageBuilder_ == null) {
-          if (oneofFieldCase_ == 112
-              && oneofField_
-                  != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage.getDefaultInstance()) {
-            oneofField_ =
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                    .newBuilder(
-                        (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                                .NestedMessage)
-                            oneofField_)
-                    .mergeFrom(value)
-                    .buildPartial();
+          if (oneofFieldCase_ == 112 &&
+              oneofField_ != legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance()) {
+            oneofField_ = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.newBuilder((legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) oneofField_)
+                .mergeFrom(value).buildPartial();
           } else {
             oneofField_ = value;
           }
@@ -23728,11 +21224,8 @@ public Builder mergeOneofNestedMessage(
         oneofFieldCase_ = 112;
         return this;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
        */
       public Builder clearOneofNestedMessage() {
         if (oneofNestedMessageBuilder_ == null) {
@@ -23750,69 +21243,39 @@ public Builder clearOneofNestedMessage() {
         }
         return this;
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
        */
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .Builder
-          getOneofNestedMessageBuilder() {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder getOneofNestedMessageBuilder() {
         return internalGetOneofNestedMessageFieldBuilder().getBuilder();
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
        */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-              .NestedMessageOrBuilder
-          getOneofNestedMessageOrBuilder() {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder getOneofNestedMessageOrBuilder() {
         if ((oneofFieldCase_ == 112) && (oneofNestedMessageBuilder_ != null)) {
           return oneofNestedMessageBuilder_.getMessageOrBuilder();
         } else {
           if (oneofFieldCase_ == 112) {
-            return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                    .NestedMessage)
-                oneofField_;
+            return (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) oneofField_;
           }
-          return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-              .getDefaultInstance();
+          return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance();
         }
       }
-
       /**
-       * <code>
-       * .legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;
-       * </code>
+       * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage oneof_nested_message = 112;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                  .Builder,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                  .NestedMessageOrBuilder>
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder> 
           internalGetOneofNestedMessageFieldBuilder() {
         if (oneofNestedMessageBuilder_ == null) {
           if (!(oneofFieldCase_ == 112)) {
-            oneofField_ =
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage
-                    .getDefaultInstance();
+            oneofField_ = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.getDefaultInstance();
           }
-          oneofNestedMessageBuilder_ =
-              new com.google.protobuf.SingleFieldBuilder<
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessage.Builder,
-                  legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                      .NestedMessageOrBuilder>(
-                  (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-                          .NestedMessage)
-                      oneofField_,
+          oneofNestedMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage.Builder, legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessageOrBuilder>(
+                  (legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedMessage) oneofField_,
                   getParentForChildren(),
                   isClean());
           oneofField_ = null;
@@ -23824,17 +21287,14 @@ public Builder clearOneofNestedMessage() {
 
       /**
        * <code>string oneof_string = 113;</code>
-       *
        * @return Whether the oneofString field is set.
        */
       @java.lang.Override
       public boolean hasOneofString() {
         return oneofFieldCase_ == 113;
       }
-
       /**
        * <code>string oneof_string = 113;</code>
-       *
        * @return The oneofString.
        */
       @java.lang.Override
@@ -23844,7 +21304,8 @@ public java.lang.String getOneofString() {
           ref = oneofField_;
         }
         if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (oneofFieldCase_ == 113) {
             oneofField_ = s;
@@ -23854,21 +21315,21 @@ public java.lang.String getOneofString() {
           return (java.lang.String) ref;
         }
       }
-
       /**
        * <code>string oneof_string = 113;</code>
-       *
        * @return The bytes for oneofString.
        */
       @java.lang.Override
-      public com.google.protobuf.ByteString getOneofStringBytes() {
+      public com.google.protobuf.ByteString
+          getOneofStringBytes() {
         java.lang.Object ref = "";
         if (oneofFieldCase_ == 113) {
           ref = oneofField_;
         }
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
-              com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
           if (oneofFieldCase_ == 113) {
             oneofField_ = b;
           }
@@ -23877,26 +21338,21 @@ public com.google.protobuf.ByteString getOneofStringBytes() {
           return (com.google.protobuf.ByteString) ref;
         }
       }
-
       /**
        * <code>string oneof_string = 113;</code>
-       *
        * @param value The oneofString to set.
        * @return This builder for chaining.
        */
-      public Builder setOneofString(java.lang.String value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setOneofString(
+          java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
         oneofFieldCase_ = 113;
         oneofField_ = value;
         onChanged();
         return this;
       }
-
       /**
        * <code>string oneof_string = 113;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOneofString() {
@@ -23907,17 +21363,14 @@ public Builder clearOneofString() {
         }
         return this;
       }
-
       /**
        * <code>string oneof_string = 113;</code>
-       *
        * @param value The bytes for oneofString to set.
        * @return This builder for chaining.
        */
-      public Builder setOneofStringBytes(com.google.protobuf.ByteString value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setOneofStringBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
         checkByteStringIsUtf8(value);
         oneofFieldCase_ = 113;
         oneofField_ = value;
@@ -23927,16 +21380,13 @@ public Builder setOneofStringBytes(com.google.protobuf.ByteString value) {
 
       /**
        * <code>bytes oneof_bytes = 114;</code>
-       *
        * @return Whether the oneofBytes field is set.
        */
       public boolean hasOneofBytes() {
         return oneofFieldCase_ == 114;
       }
-
       /**
        * <code>bytes oneof_bytes = 114;</code>
-       *
        * @return The oneofBytes.
        */
       public com.google.protobuf.ByteString getOneofBytes() {
@@ -23945,26 +21395,20 @@ public com.google.protobuf.ByteString getOneofBytes() {
         }
         return com.google.protobuf.ByteString.EMPTY;
       }
-
       /**
        * <code>bytes oneof_bytes = 114;</code>
-       *
        * @param value The oneofBytes to set.
        * @return This builder for chaining.
        */
       public Builder setOneofBytes(com.google.protobuf.ByteString value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         oneofFieldCase_ = 114;
         oneofField_ = value;
         onChanged();
         return this;
       }
-
       /**
        * <code>bytes oneof_bytes = 114;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOneofBytes() {
@@ -23978,16 +21422,13 @@ public Builder clearOneofBytes() {
 
       /**
        * <code>bool oneof_bool = 115;</code>
-       *
        * @return Whether the oneofBool field is set.
        */
       public boolean hasOneofBool() {
         return oneofFieldCase_ == 115;
       }
-
       /**
        * <code>bool oneof_bool = 115;</code>
-       *
        * @return The oneofBool.
        */
       public boolean getOneofBool() {
@@ -23996,10 +21437,8 @@ public boolean getOneofBool() {
         }
         return false;
       }
-
       /**
        * <code>bool oneof_bool = 115;</code>
-       *
        * @param value The oneofBool to set.
        * @return This builder for chaining.
        */
@@ -24010,10 +21449,8 @@ public Builder setOneofBool(boolean value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>bool oneof_bool = 115;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOneofBool() {
@@ -24027,16 +21464,13 @@ public Builder clearOneofBool() {
 
       /**
        * <code>uint64 oneof_uint64 = 116;</code>
-       *
        * @return Whether the oneofUint64 field is set.
        */
       public boolean hasOneofUint64() {
         return oneofFieldCase_ == 116;
       }
-
       /**
        * <code>uint64 oneof_uint64 = 116;</code>
-       *
        * @return The oneofUint64.
        */
       public long getOneofUint64() {
@@ -24045,10 +21479,8 @@ public long getOneofUint64() {
         }
         return 0L;
       }
-
       /**
        * <code>uint64 oneof_uint64 = 116;</code>
-       *
        * @param value The oneofUint64 to set.
        * @return This builder for chaining.
        */
@@ -24059,10 +21491,8 @@ public Builder setOneofUint64(long value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>uint64 oneof_uint64 = 116;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOneofUint64() {
@@ -24076,16 +21506,13 @@ public Builder clearOneofUint64() {
 
       /**
        * <code>float oneof_float = 117;</code>
-       *
        * @return Whether the oneofFloat field is set.
        */
       public boolean hasOneofFloat() {
         return oneofFieldCase_ == 117;
       }
-
       /**
        * <code>float oneof_float = 117;</code>
-       *
        * @return The oneofFloat.
        */
       public float getOneofFloat() {
@@ -24094,10 +21521,8 @@ public float getOneofFloat() {
         }
         return 0F;
       }
-
       /**
        * <code>float oneof_float = 117;</code>
-       *
        * @param value The oneofFloat to set.
        * @return This builder for chaining.
        */
@@ -24108,10 +21533,8 @@ public Builder setOneofFloat(float value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>float oneof_float = 117;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOneofFloat() {
@@ -24125,16 +21548,13 @@ public Builder clearOneofFloat() {
 
       /**
        * <code>double oneof_double = 118;</code>
-       *
        * @return Whether the oneofDouble field is set.
        */
       public boolean hasOneofDouble() {
         return oneofFieldCase_ == 118;
       }
-
       /**
        * <code>double oneof_double = 118;</code>
-       *
        * @return The oneofDouble.
        */
       public double getOneofDouble() {
@@ -24143,10 +21563,8 @@ public double getOneofDouble() {
         }
         return 0D;
       }
-
       /**
        * <code>double oneof_double = 118;</code>
-       *
        * @param value The oneofDouble to set.
        * @return This builder for chaining.
        */
@@ -24157,10 +21575,8 @@ public Builder setOneofDouble(double value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>double oneof_double = 118;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOneofDouble() {
@@ -24174,17 +21590,14 @@ public Builder clearOneofDouble() {
 
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-       *
        * @return Whether the oneofEnum field is set.
        */
       @java.lang.Override
       public boolean hasOneofEnum() {
         return oneofFieldCase_ == 119;
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-       *
        * @return The enum numeric value on the wire for oneofEnum.
        */
       @java.lang.Override
@@ -24194,10 +21607,8 @@ public int getOneofEnumValue() {
         }
         return 0;
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-       *
        * @param value The enum numeric value on the wire for oneofEnum to set.
        * @return This builder for chaining.
        */
@@ -24207,47 +21618,33 @@ public Builder setOneofEnumValue(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-       *
        * @return The oneofEnum.
        */
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-          getOneofEnum() {
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum getOneofEnum() {
         if (oneofFieldCase_ == 119) {
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum result =
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                  .forNumber((java.lang.Integer) oneofField_);
-          return result == null
-              ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum
-                  .UNRECOGNIZED
-              : result;
+          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum result = legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.forNumber(
+              (java.lang.Integer) oneofField_);
+          return result == null ? legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.UNRECOGNIZED : result;
         }
         return legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum.FOO;
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-       *
        * @param value The oneofEnum to set.
        * @return This builder for chaining.
        */
-      public Builder setOneofEnum(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setOneofEnum(legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3.NestedEnum value) {
+        if (value == null) { throw new NullPointerException(); }
         oneofFieldCase_ = 119;
         oneofField_ = value.getNumber();
         onChanged();
         return this;
       }
-
       /**
        * <code>.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum oneof_enum = 119;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearOneofEnum() {
@@ -24263,41 +21660,36 @@ public Builder clearOneofEnum() {
     }
 
     // @@protoc_insertion_point(class_scope:legacy_gencode_test.proto3.TestMostTypesProto3)
-    private static final legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-        DEFAULT_INSTANCE;
-
+    private static final legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE =
-          new legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3();
+      DEFAULT_INSTANCE = new legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3();
     }
 
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-        getDefaultInstance() {
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    private static final com.google.protobuf.Parser<TestMostTypesProto3> PARSER =
-        new com.google.protobuf.AbstractParser<TestMostTypesProto3>() {
-          @java.lang.Override
-          public TestMostTypesProto3 parsePartialFrom(
-              com.google.protobuf.CodedInputStream input,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
-          }
-        };
+    private static final com.google.protobuf.Parser<TestMostTypesProto3>
+        PARSER = new com.google.protobuf.AbstractParser<TestMostTypesProto3>() {
+      @java.lang.Override
+      public TestMostTypesProto3 parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (com.google.protobuf.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new com.google.protobuf.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
+      }
+    };
 
     public static com.google.protobuf.Parser<TestMostTypesProto3> parser() {
       return PARSER;
@@ -24309,70 +21701,63 @@ public com.google.protobuf.Parser<TestMostTypesProto3> getParserForType() {
     }
 
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3
-        getDefaultInstanceForType() {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.TestMostTypesProto3 getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
+
   }
 
-  public interface ForeignMessageOrBuilder
-      extends
+  public interface ForeignMessageOrBuilder extends
       // @@protoc_insertion_point(interface_extends:legacy_gencode_test.proto3.ForeignMessage)
       com.google.protobuf.MessageOrBuilder {
 
     /**
      * <code>int32 c = 1;</code>
-     *
      * @return The c.
      */
     int getC();
   }
-
-  /** Protobuf type {@code legacy_gencode_test.proto3.ForeignMessage} */
-  public static final class ForeignMessage extends com.google.protobuf.GeneratedMessage
-      implements
+  /**
+   * Protobuf type {@code legacy_gencode_test.proto3.ForeignMessage}
+   */
+  public static final class ForeignMessage extends
+      com.google.protobuf.GeneratedMessage implements
       // @@protoc_insertion_point(message_implements:legacy_gencode_test.proto3.ForeignMessage)
       ForeignMessageOrBuilder {
-    private static final long serialVersionUID = 0L;
-
+  private static final long serialVersionUID = 0L;
     static {
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
-          com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
-          /* major= */ 4,
-          /* minor= */ 32,
-          /* patch= */ 1,
-          /* suffix= */ "",
-          ForeignMessage.class.getName());
+        com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+        /* major= */ 4,
+        /* minor= */ 32,
+        /* patch= */ 1,
+        /* suffix= */ "",
+        ForeignMessage.class.getName());
     }
-
     // Use ForeignMessage.newBuilder() to construct.
     private ForeignMessage(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
     }
+    private ForeignMessage() {
+    }
 
-    private ForeignMessage() {}
-
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return legacy_gencode_test.proto3.Proto3GencodeTestProto
-          .internal_static_legacy_gencode_test_proto3_ForeignMessage_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_ForeignMessage_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return legacy_gencode_test.proto3.Proto3GencodeTestProto
-          .internal_static_legacy_gencode_test_proto3_ForeignMessage_fieldAccessorTable
+      return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_ForeignMessage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.class,
-              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder.class);
+              legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.class, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder.class);
     }
 
     public static final int C_FIELD_NUMBER = 1;
     private int c_ = 0;
-
     /**
      * <code>int32 c = 1;</code>
-     *
      * @return The c.
      */
     @java.lang.Override
@@ -24381,7 +21766,6 @@ public int getC() {
     }
 
     private byte memoizedIsInitialized = -1;
-
     @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
@@ -24393,7 +21777,8 @@ public final boolean isInitialized() {
     }
 
     @java.lang.Override
-    public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
       if (c_ != 0) {
         output.writeInt32(1, c_);
       }
@@ -24407,7 +21792,8 @@ public int getSerializedSize() {
 
       size = 0;
       if (c_ != 0) {
-        size += com.google.protobuf.CodedOutputStream.computeInt32Size(1, c_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(1, c_);
       }
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
@@ -24417,15 +21803,15 @@ public int getSerializedSize() {
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
-        return true;
+       return true;
       }
       if (!(obj instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage)) {
         return super.equals(obj);
       }
-      legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage other =
-          (legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage) obj;
+      legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage other = (legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage) obj;
 
-      if (getC() != other.getC()) return false;
+      if (getC()
+          != other.getC()) return false;
       if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
@@ -24445,131 +21831,127 @@ public int hashCode() {
     }
 
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(
-        java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(
-        java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(
-        byte[] data) throws com.google.protobuf.InvalidProtocolBufferException {
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(
-        byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(
-        java.io.InputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input);
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(
-        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseDelimitedWithIOException(PARSER, input);
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        parseDelimitedFrom(
-            java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseDelimitedWithIOException(
-          PARSER, input, extensionRegistry);
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(
-        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input);
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input);
     }
-
     public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessage.parseWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessage
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
     @java.lang.Override
-    public Builder newBuilderForType() {
-      return newBuilder();
-    }
-
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-
-    public static Builder newBuilder(
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage prototype) {
+    public static Builder newBuilder(legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-
     @java.lang.Override
     public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
 
     @java.lang.Override
-    protected Builder newBuilderForType(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
-
-    /** Protobuf type {@code legacy_gencode_test.proto3.ForeignMessage} */
-    public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder<Builder>
-        implements
+    /**
+     * Protobuf type {@code legacy_gencode_test.proto3.ForeignMessage}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:legacy_gencode_test.proto3.ForeignMessage)
         legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessageOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_ForeignMessage_descriptor;
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_ForeignMessage_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_ForeignMessage_fieldAccessorTable
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_ForeignMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.class,
-                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder.class);
+                legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.class, legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.Builder.class);
       }
 
-      // Construct using
-      // legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.newBuilder()
-      private Builder() {}
+      // Construct using legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.newBuilder()
+      private Builder() {
 
-      private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
-        super(parent);
       }
 
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        super(parent);
+
+      }
       @java.lang.Override
       public Builder clear() {
         super.clear();
@@ -24579,16 +21961,14 @@ public Builder clear() {
       }
 
       @java.lang.Override
-      public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto
-            .internal_static_legacy_gencode_test_proto3_ForeignMessage_descriptor;
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.internal_static_legacy_gencode_test_proto3_ForeignMessage_descriptor;
       }
 
       @java.lang.Override
-      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-          getDefaultInstanceForType() {
-        return legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-            .getDefaultInstance();
+      public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getDefaultInstanceForType() {
+        return legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance();
       }
 
       @java.lang.Override
@@ -24602,17 +21982,13 @@ public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage build()
 
       @java.lang.Override
       public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage buildPartial() {
-        legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage result =
-            new legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
+        legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage result = new legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage result) {
+      private void buildPartial0(legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.c_ = c_;
@@ -24622,19 +21998,15 @@ private void buildPartial0(
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage) {
-          return mergeFrom(
-              (legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage) other);
+          return mergeFrom((legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(
-          legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage other) {
-        if (other
-            == legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-                .getDefaultInstance()) return this;
+      public Builder mergeFrom(legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage other) {
+        if (other == legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage.getDefaultInstance()) return this;
         if (other.getC() != 0) {
           setC(other.getC());
         }
@@ -24664,19 +22036,17 @@ public Builder mergeFrom(
               case 0:
                 done = true;
                 break;
-              case 8:
-                {
-                  c_ = input.readInt32();
-                  bitField0_ |= 0x00000001;
-                  break;
-                } // case 8
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
+              case 8: {
+                c_ = input.readInt32();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
             } // switch (tag)
           } // while (!done)
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -24686,24 +22056,19 @@ public Builder mergeFrom(
         } // finally
         return this;
       }
-
       private int bitField0_;
 
-      private int c_;
-
+      private int c_ ;
       /**
        * <code>int32 c = 1;</code>
-       *
        * @return The c.
        */
       @java.lang.Override
       public int getC() {
         return c_;
       }
-
       /**
        * <code>int32 c = 1;</code>
-       *
        * @param value The c to set.
        * @return This builder for chaining.
        */
@@ -24714,10 +22079,8 @@ public Builder setC(int value) {
         onChanged();
         return this;
       }
-
       /**
        * <code>int32 c = 1;</code>
-       *
        * @return This builder for chaining.
        */
       public Builder clearC() {
@@ -24731,40 +22094,36 @@ public Builder clearC() {
     }
 
     // @@protoc_insertion_point(class_scope:legacy_gencode_test.proto3.ForeignMessage)
-    private static final legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        DEFAULT_INSTANCE;
-
+    private static final legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage DEFAULT_INSTANCE;
     static {
       DEFAULT_INSTANCE = new legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage();
     }
 
-    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        getDefaultInstance() {
+    public static legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    private static final com.google.protobuf.Parser<ForeignMessage> PARSER =
-        new com.google.protobuf.AbstractParser<ForeignMessage>() {
-          @java.lang.Override
-          public ForeignMessage parsePartialFrom(
-              com.google.protobuf.CodedInputStream input,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
-          }
-        };
+    private static final com.google.protobuf.Parser<ForeignMessage>
+        PARSER = new com.google.protobuf.AbstractParser<ForeignMessage>() {
+      @java.lang.Override
+      public ForeignMessage parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (com.google.protobuf.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new com.google.protobuf.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
+      }
+    };
 
     public static com.google.protobuf.Parser<ForeignMessage> parser() {
       return PARSER;
@@ -24776,680 +22135,456 @@ public com.google.protobuf.Parser<ForeignMessage> getParserForType() {
     }
 
     @java.lang.Override
-    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage
-        getDefaultInstanceForType() {
+    public legacy_gencode_test.proto3.Proto3GencodeTestProto.ForeignMessage getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
+
   }
 
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMessage_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMessage_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMessage_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_NestedTestMessage_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_NestedTestMessage_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_NestedTestMessage_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32Int32Entry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32Int32Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32Int32Entry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt64Int64Entry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt64Int64Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt64Int64Entry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint32Uint32Entry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint32Uint32Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint32Uint32Entry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint64Uint64Entry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint64Uint64Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint64Uint64Entry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint32Sint32Entry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint32Sint32Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint32Sint32Entry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint64Sint64Entry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint64Sint64Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint64Sint64Entry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed32Fixed32Entry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed32Fixed32Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed32Fixed32Entry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed64Fixed64Entry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed64Fixed64Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed64Fixed64Entry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed32Sfixed32Entry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed32Sfixed32Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed32Sfixed32Entry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed64Sfixed64Entry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed64Sfixed64Entry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed64Sfixed64Entry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32FloatEntry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32FloatEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32FloatEntry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32DoubleEntry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32DoubleEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32DoubleEntry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapBoolBoolEntry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapBoolBoolEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapBoolBoolEntry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringStringEntry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringStringEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringStringEntry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringBytesEntry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringBytesEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringBytesEntry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedMessageEntry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedMessageEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedMessageEntry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignMessageEntry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignMessageEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignMessageEntry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedEnumEntry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedEnumEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedEnumEntry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignEnumEntry_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignEnumEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignEnumEntry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_legacy_gencode_test_proto3_ForeignMessage_descriptor;
-  private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    internal_static_legacy_gencode_test_proto3_ForeignMessage_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_legacy_gencode_test_proto3_ForeignMessage_fieldAccessorTable;
 
-  public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
     return descriptor;
   }
-
-  private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
-
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n"
-          + "\031proto3_gencode_test.proto\022\032legacy_gencode_test.proto3\"R\n"
-          + "\013TestMessage\022\t\n"
-          + "\001x\030\002 \001(\t\0228\n"
-          + "\001y\030\003 \001(\0132-.legacy_gencode_test.proto3.NestedTestMessage\"\036\n"
-          + "\021NestedTestMessage\022\t\n"
-          + "\001z\030\001 \003(\005\"\2621\n"
-          + "\023TestMostTypesProto3\022\026\n"
-          + "\016optional_int32\030\001 \001(\005\022\026\n"
-          + "\016optional_int64\030\002 \001(\003\022\027\n"
-          + "\017optional_uint32\030\003 \001(\r"
-          + "\022\027\n"
-          + "\017optional_uint64\030\004 \001(\004\022\027\n"
-          + "\017optional_sint32\030\005 \001(\021\022\027\n"
-          + "\017optional_sint64\030\006 \001(\022\022\030\n"
-          + "\020optional_fixed32\030\007 \001(\007\022\030\n"
-          + "\020optional_fixed64\030\010 \001(\006\022\031\n"
-          + "\021optional_sfixed32\030\t \001(\017\022\031\n"
-          + "\021optional_sfixed64\030\n"
-          + " \001(\020\022\026\n"
-          + "\016optional_float\030\013 \001(\002\022\027\n"
-          + "\017optional_double\030\014 \001(\001\022\025\n\r"
-          + "optional_bool\030\r"
-          + " \001(\010\022\027\n"
-          + "\017optional_string\030\016 \001(\t\022\026\n"
-          + "\016optional_bytes\030\017 \001(\014\022^\n"
-          + "\027optional_nested_message\030\022 "
-          + "\001(\0132=.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage\022L\n"
-          + "\030optional_foreign_message\030\023"
-          + " \001(\0132*.legacy_gencode_test.proto3.ForeignMessage\022X\n"
-          + "\024optional_nested_enum\030\025"
-          + " \001(\0162:.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum\022F\n"
-          + "\025optional_foreign_enum\030\026"
-          + " \001(\0162\'.legacy_gencode_test.proto3.ForeignEnum\022Z\n"
-          + "\025optional_aliased_enum\030\027 \001(\0162;.legacy_gencode_test."
-          + "proto3.TestMostTypesProto3.AliasedEnum\022J\n"
-          + "\021recursive_message\030\033"
-          + " \001(\0132/.legacy_gencode_test.proto3.TestMostTypesProto3\022\026\n"
-          + "\016repeated_int32\030\037 \003(\005\022\026\n"
-          + "\016repeated_int64\030  \003(\003\022\027\n"
-          + "\017repeated_uint32\030! \003(\r"
-          + "\022\027\n"
-          + "\017repeated_uint64\030\" \003(\004\022\027\n"
-          + "\017repeated_sint32\030# \003(\021\022\027\n"
-          + "\017repeated_sint64\030$ \003(\022\022\030\n"
-          + "\020repeated_fixed32\030% \003(\007\022\030\n"
-          + "\020repeated_fixed64\030& \003(\006\022\031\n"
-          + "\021repeated_sfixed32\030\' \003(\017\022\031\n"
-          + "\021repeated_sfixed64\030( \003(\020\022\026\n"
-          + "\016repeated_float\030) \003(\002\022\027\n"
-          + "\017repeated_double\030* \003(\001\022\025\n\r"
-          + "repeated_bool\030+ \003(\010\022\027\n"
-          + "\017repeated_string\030, \003(\t\022\026\n"
-          + "\016repeated_bytes\030- \003(\014\022^\n"
-          + "\027repeated_nested_message\0300 \003"
-          + "(\0132=.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessage\022L\n"
-          + "\030repeated_foreign_message\0301"
-          + " \003(\0132*.legacy_gencode_test.proto3.ForeignMessage\022X\n"
-          + "\024repeated_nested_enum\0303"
-          + " \003(\0162:.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum\022F\n"
-          + "\025repeated_foreign_enum\0304"
-          + " \003(\0162\'.legacy_gencode_test.proto3.ForeignEnum\022\030\n"
-          + "\014packed_int32\030K \003(\005B\002\020\001\022\030\n"
-          + "\014packed_int64\030L \003(\003B\002\020\001\022\031\n"
-          + "\r"
-          + "packed_uint32\030M \003(\r"
-          + "B\002\020\001\022\031\n\r"
-          + "packed_uint64\030N \003(\004B\002\020\001\022\031\n\r"
-          + "packed_sint32\030O \003(\021B\002\020\001\022\031\n\r"
-          + "packed_sint64\030P \003(\022B\002\020\001\022\032\n"
-          + "\016packed_fixed32\030Q \003(\007B\002\020\001\022\032\n"
-          + "\016packed_fixed64\030R \003(\006B\002\020\001\022\033\n"
-          + "\017packed_sfixed32\030S \003(\017B\002\020\001\022\033\n"
-          + "\017packed_sfixed64\030T \003(\020B\002\020\001\022\030\n"
-          + "\014packed_float\030U \003(\002B\002\020\001\022\031\n\r"
-          + "packed_double\030V \003(\001B\002\020\001\022\027\n"
-          + "\013packed_bool\030W \003(\010B\002\020\001\022Z\n"
-          + "\022packed_nested_enum\030X"
-          + " \003(\0162:.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnumB\002\020\001\022\032\n"
-          + "\016unpacked_int32\030Y \003(\005B\002\020\000\022\032\n"
-          + "\016unpacked_int64\030Z \003(\003B\002\020\000\022\033\n"
-          + "\017unpacked_uint32\030[ \003(\r"
-          + "B\002\020\000\022\033\n"
-          + "\017unpacked_uint64\030\\ \003(\004B\002\020\000\022\033\n"
-          + "\017unpacked_sint32\030] \003(\021B\002\020\000\022\033\n"
-          + "\017unpacked_sint64\030^ \003(\022B\002\020\000\022\034\n"
-          + "\020unpacked_fixed32\030_ \003(\007B\002\020\000\022\034\n"
-          + "\020unpacked_fixed64\030` \003(\006B\002\020\000\022\035\n"
-          + "\021unpacked_sfixed32\030a \003(\017B\002\020\000\022\035\n"
-          + "\021unpacked_sfixed64\030b \003(\020B\002\020\000\022\032\n"
-          + "\016unpacked_float\030c \003(\002B\002\020\000\022\033\n"
-          + "\017unpacked_double\030d \003(\001B\002\020\000\022\031\n\r"
-          + "unpacked_bool\030e \003(\010B\002\020\000\022\\\n"
-          + "\024unpacked_nested_enum\030f \003(\0162:."
-          + "legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnumB\002\020\000\022[\n"
-          + "\017map_int32_int32\0308"
-          + " \003(\0132B.legacy_gencode_test.proto3.TestMostTypesProto3.MapInt32Int32Entry\022[\n"
-          + "\017map_int64_int64\0309 \003(\0132B.legacy_gencode_tes"
-          + "t.proto3.TestMostTypesProto3.MapInt64Int64Entry\022_\n"
-          + "\021map_uint32_uint32\030: \003(\0132D.leg"
-          + "acy_gencode_test.proto3.TestMostTypesProto3.MapUint32Uint32Entry\022_\n"
-          + "\021map_uint64_uint64\030; \003(\0132D.legacy_gencode_test.proto3"
-          + ".TestMostTypesProto3.MapUint64Uint64Entry\022_\n"
-          + "\021map_sint32_sint32\030< \003(\0132D.legacy_ge"
-          + "ncode_test.proto3.TestMostTypesProto3.MapSint32Sint32Entry\022_\n"
-          + "\021map_sint64_sint64\030="
-          + " \003(\0132D.legacy_gencode_test.proto3.TestMostTypesProto3.MapSint64Sint64Entry\022c\n"
-          + "\023map_fixed32_fixed32\030> \003(\0132F.legacy_gencod"
-          + "e_test.proto3.TestMostTypesProto3.MapFixed32Fixed32Entry\022c\n"
-          + "\023map_fixed64_fixed64\030?"
-          + " \003(\0132F.legacy_gencode_test.proto3.TestMostTypesProto3.MapFixed64Fixed64Entry\022g\n"
-          + "\025map_sfixed32_sfixed32\030@ \003(\0132H.legacy_ge"
-          + "ncode_test.proto3.TestMostTypesProto3.MapSfixed32Sfixed32Entry\022g\n"
-          + "\025map_sfixed64_sfixed64\030A \003(\0132H.legacy_gencode_test.prot"
-          + "o3.TestMostTypesProto3.MapSfixed64Sfixed64Entry\022[\n"
-          + "\017map_int32_float\030B \003(\0132B.legac"
-          + "y_gencode_test.proto3.TestMostTypesProto3.MapInt32FloatEntry\022]\n"
-          + "\020map_int32_double\030C"
-          + " \003(\0132C.legacy_gencode_test.proto3.TestMostTypesProto3.MapInt32DoubleEntry\022W\n\r"
-          + "map_bool_bool\030D \003(\0132@.legacy_gencode_test"
-          + ".proto3.TestMostTypesProto3.MapBoolBoolEntry\022_\n"
-          + "\021map_string_string\030E \003(\0132D.legacy"
-          + "_gencode_test.proto3.TestMostTypesProto3.MapStringStringEntry\022]\n"
-          + "\020map_string_bytes\030F"
-          + " \003(\0132C.legacy_gencode_test.proto3.TestMostTypesProto3.MapStringBytesEntry\022n\n"
-          + "\031map_string_nested_message\030G \003(\0132K.legacy"
-          + "_gencode_test.proto3.TestMostTypesProto3.MapStringNestedMessageEntry\022p\n"
-          + "\032map_string_foreign_message\030H \003(\0132L.legacy_gencod"
-          + "e_test.proto3.TestMostTypesProto3.MapStringForeignMessageEntry\022h\n"
-          + "\026map_string_nested_enum\030I \003(\0132H.legacy_gencode_test.pro"
-          + "to3.TestMostTypesProto3.MapStringNestedEnumEntry\022j\n"
-          + "\027map_string_foreign_enum\030J \003("
-          + "\0132I.legacy_gencode_test.proto3.TestMostTypesProto3.MapStringForeignEnumEntry\022\026\n"
-          + "\014oneof_uint32\030o \001(\r"
-          + "H\000\022]\n"
-          + "\024oneof_nested_message\030p"
-          + " \001(\0132=.legacy_gencode_test.proto3.TestMostTypesProto3.NestedMessageH\000\022\026\n"
-          + "\014oneof_string\030q \001(\tH\000\022\025\n"
-          + "\013oneof_bytes\030r \001(\014H\000\022\024\n\n"
-          + "oneof_bool\030s \001(\010H\000\022\026\n"
-          + "\014oneof_uint64\030t \001(\004H\000\022\025\n"
-          + "\013oneof_float\030u \001(\002H\000\022\026\n"
-          + "\014oneof_double\030v \001(\001H\000\022P\n\n"
-          + "oneof_enum\030w \001(\0162:.le"
-          + "gacy_gencode_test.proto3.TestMostTypesProto3.NestedEnumH\000\032`\n\r"
-          + "NestedMessage\022\t\n"
-          + "\001a\030\001 \001(\005\022D\n"
-          + "\013corecursive\030\002"
-          + " \001(\0132/.legacy_gencode_test.proto3.TestMostTypesProto3\0324\n"
-          + "\022MapInt32Int32Entry\022\013\n"
-          + "\003key\030\001 \001(\005\022\r\n"
-          + "\005value\030\002 \001(\005:\0028\001\0324\n"
-          + "\022MapInt64Int64Entry\022\013\n"
-          + "\003key\030\001 \001(\003\022\r\n"
-          + "\005value\030\002 \001(\003:\0028\001\0326\n"
-          + "\024MapUint32Uint32Entry\022\013\n"
-          + "\003key\030\001 \001(\r"
-          + "\022\r\n"
-          + "\005value\030\002 \001(\r"
-          + ":\0028\001\0326\n"
-          + "\024MapUint64Uint64Entry\022\013\n"
-          + "\003key\030\001 \001(\004\022\r\n"
-          + "\005value\030\002 \001(\004:\0028\001\0326\n"
-          + "\024MapSint32Sint32Entry\022\013\n"
-          + "\003key\030\001 \001(\021\022\r\n"
-          + "\005value\030\002 \001(\021:\0028\001\0326\n"
-          + "\024MapSint64Sint64Entry\022\013\n"
-          + "\003key\030\001 \001(\022\022\r\n"
-          + "\005value\030\002 \001(\022:\0028\001\0328\n"
-          + "\026MapFixed32Fixed32Entry\022\013\n"
-          + "\003key\030\001 \001(\007\022\r\n"
-          + "\005value\030\002 \001(\007:\0028\001\0328\n"
-          + "\026MapFixed64Fixed64Entry\022\013\n"
-          + "\003key\030\001 \001(\006\022\r\n"
-          + "\005value\030\002 \001(\006:\0028\001\032:\n"
-          + "\030MapSfixed32Sfixed32Entry\022\013\n"
-          + "\003key\030\001 \001(\017\022\r\n"
-          + "\005value\030\002 \001(\017:\0028\001\032:\n"
-          + "\030MapSfixed64Sfixed64Entry\022\013\n"
-          + "\003key\030\001 \001(\020\022\r\n"
-          + "\005value\030\002 \001(\020:\0028\001\0324\n"
-          + "\022MapInt32FloatEntry\022\013\n"
-          + "\003key\030\001 \001(\005\022\r"
-          + "\n"
-          + "\005value\030\002 \001(\002:\0028\001\0325\n"
-          + "\023MapInt32DoubleEntry\022\013\n"
-          + "\003key\030\001 \001(\005\022\r\n"
-          + "\005value\030\002 \001(\001:\0028\001\0322\n"
-          + "\020MapBoolBoolEntry\022\013\n"
-          + "\003key\030\001 \001(\010\022\r\n"
-          + "\005value\030\002 \001(\010:\0028\001\0326\n"
-          + "\024MapStringStringEntry\022\013\n"
-          + "\003key\030\001 \001(\t\022\r\n"
-          + "\005value\030\002 \001(\t:\0028\001\0325\n"
-          + "\023MapStringBytesEntry\022\013\n"
-          + "\003key\030\001 \001(\t\022\r\n"
-          + "\005value\030\002 \001(\014:\0028\001\032|\n"
-          + "\033MapStringNestedMessageEntry\022\013\n"
-          + "\003key\030\001 \001(\t\022L\n"
-          + "\005value\030\002 \001(\0132=.legacy_gencode_test.pro"
-          + "to3.TestMostTypesProto3.NestedMessage:\0028\001\032j\n"
-          + "\034MapStringForeignMessageEntry\022\013\n"
-          + "\003key\030\001 \001(\t\0229\n"
-          + "\005value\030\002"
-          + " \001(\0132*.legacy_gencode_test.proto3.ForeignMessage:\0028\001\032v\n"
-          + "\030MapStringNestedEnumEntry\022\013\n"
-          + "\003key\030\001 \001(\t\022I\n"
-          + "\005value\030\002"
-          + " \001(\0162:.legacy_gencode_test.proto3.TestMostTypesProto3.NestedEnum:\0028\001\032d\n"
-          + "\031MapStringForeignEnumEntry\022\013\n"
-          + "\003key\030\001 \001(\t\0226\n"
-          + "\005value\030\002 \001(\0162\'.legacy_gencode_test.proto3.ForeignEnum:\0028\001\"9\n\n"
-          + "NestedEnum\022\007\n"
-          + "\003FOO\020\000\022\007\n"
-          + "\003BAR\020\001\022\007\n"
-          + "\003BAZ\020\002\022\020\n"
-          + "\003NEG\020\377\377\377\377\377\377\377\377\377\001\"Y\n"
-          + "\013AliasedEnum\022\r\n"
-          + "\tALIAS_FOO\020\000\022\r\n"
-          + "\tALIAS_BAR\020\001\022\r\n"
-          + "\tALIAS_BAZ\020\002\022\007\n"
-          + "\003MOO\020\002\022\007\n"
-          + "\003moo\020\002\022\007\n"
-          + "\003bAz\020\002\032\002\020\001B\r\n"
-          + "\013oneof_field\"\033\n"
-          + "\016ForeignMessage\022\t\n"
-          + "\001c\030\001 \001(\005*@\n"
-          + "\013ForeignEnum\022\017\n"
-          + "\013FOREIGN_FOO\020\000\022\017\n"
-          + "\013FOREIGN_BAR\020\001\022\017\n"
-          + "\013FOREIGN_BAZ\020\002B\030B\026Proto3GencodeTestProtob\006proto3"
+      "\n\031proto3_gencode_test.proto\022\032legacy_genc" +
+      "ode_test.proto3\"R\n\013TestMessage\022\t\n\001x\030\002 \001(" +
+      "\t\0228\n\001y\030\003 \001(\0132-.legacy_gencode_test.proto" +
+      "3.NestedTestMessage\"\036\n\021NestedTestMessage" +
+      "\022\t\n\001z\030\001 \003(\005\"\2621\n\023TestMostTypesProto3\022\026\n\016o" +
+      "ptional_int32\030\001 \001(\005\022\026\n\016optional_int64\030\002 " +
+      "\001(\003\022\027\n\017optional_uint32\030\003 \001(\r\022\027\n\017optional" +
+      "_uint64\030\004 \001(\004\022\027\n\017optional_sint32\030\005 \001(\021\022\027" +
+      "\n\017optional_sint64\030\006 \001(\022\022\030\n\020optional_fixe" +
+      "d32\030\007 \001(\007\022\030\n\020optional_fixed64\030\010 \001(\006\022\031\n\021o" +
+      "ptional_sfixed32\030\t \001(\017\022\031\n\021optional_sfixe" +
+      "d64\030\n \001(\020\022\026\n\016optional_float\030\013 \001(\002\022\027\n\017opt" +
+      "ional_double\030\014 \001(\001\022\025\n\roptional_bool\030\r \001(" +
+      "\010\022\027\n\017optional_string\030\016 \001(\t\022\026\n\016optional_b" +
+      "ytes\030\017 \001(\014\022^\n\027optional_nested_message\030\022 " +
+      "\001(\0132=.legacy_gencode_test.proto3.TestMos" +
+      "tTypesProto3.NestedMessage\022L\n\030optional_f" +
+      "oreign_message\030\023 \001(\0132*.legacy_gencode_te" +
+      "st.proto3.ForeignMessage\022X\n\024optional_nes" +
+      "ted_enum\030\025 \001(\0162:.legacy_gencode_test.pro" +
+      "to3.TestMostTypesProto3.NestedEnum\022F\n\025op" +
+      "tional_foreign_enum\030\026 \001(\0162\'.legacy_genco" +
+      "de_test.proto3.ForeignEnum\022Z\n\025optional_a" +
+      "liased_enum\030\027 \001(\0162;.legacy_gencode_test." +
+      "proto3.TestMostTypesProto3.AliasedEnum\022J" +
+      "\n\021recursive_message\030\033 \001(\0132/.legacy_genco" +
+      "de_test.proto3.TestMostTypesProto3\022\026\n\016re" +
+      "peated_int32\030\037 \003(\005\022\026\n\016repeated_int64\030  \003" +
+      "(\003\022\027\n\017repeated_uint32\030! \003(\r\022\027\n\017repeated_" +
+      "uint64\030\" \003(\004\022\027\n\017repeated_sint32\030# \003(\021\022\027\n" +
+      "\017repeated_sint64\030$ \003(\022\022\030\n\020repeated_fixed" +
+      "32\030% \003(\007\022\030\n\020repeated_fixed64\030& \003(\006\022\031\n\021re" +
+      "peated_sfixed32\030\' \003(\017\022\031\n\021repeated_sfixed" +
+      "64\030( \003(\020\022\026\n\016repeated_float\030) \003(\002\022\027\n\017repe" +
+      "ated_double\030* \003(\001\022\025\n\rrepeated_bool\030+ \003(\010" +
+      "\022\027\n\017repeated_string\030, \003(\t\022\026\n\016repeated_by" +
+      "tes\030- \003(\014\022^\n\027repeated_nested_message\0300 \003" +
+      "(\0132=.legacy_gencode_test.proto3.TestMost" +
+      "TypesProto3.NestedMessage\022L\n\030repeated_fo" +
+      "reign_message\0301 \003(\0132*.legacy_gencode_tes" +
+      "t.proto3.ForeignMessage\022X\n\024repeated_nest" +
+      "ed_enum\0303 \003(\0162:.legacy_gencode_test.prot" +
+      "o3.TestMostTypesProto3.NestedEnum\022F\n\025rep" +
+      "eated_foreign_enum\0304 \003(\0162\'.legacy_gencod" +
+      "e_test.proto3.ForeignEnum\022\030\n\014packed_int3" +
+      "2\030K \003(\005B\002\020\001\022\030\n\014packed_int64\030L \003(\003B\002\020\001\022\031\n" +
+      "\rpacked_uint32\030M \003(\rB\002\020\001\022\031\n\rpacked_uint6" +
+      "4\030N \003(\004B\002\020\001\022\031\n\rpacked_sint32\030O \003(\021B\002\020\001\022\031" +
+      "\n\rpacked_sint64\030P \003(\022B\002\020\001\022\032\n\016packed_fixe" +
+      "d32\030Q \003(\007B\002\020\001\022\032\n\016packed_fixed64\030R \003(\006B\002\020" +
+      "\001\022\033\n\017packed_sfixed32\030S \003(\017B\002\020\001\022\033\n\017packed" +
+      "_sfixed64\030T \003(\020B\002\020\001\022\030\n\014packed_float\030U \003(" +
+      "\002B\002\020\001\022\031\n\rpacked_double\030V \003(\001B\002\020\001\022\027\n\013pack" +
+      "ed_bool\030W \003(\010B\002\020\001\022Z\n\022packed_nested_enum\030" +
+      "X \003(\0162:.legacy_gencode_test.proto3.TestM" +
+      "ostTypesProto3.NestedEnumB\002\020\001\022\032\n\016unpacke" +
+      "d_int32\030Y \003(\005B\002\020\000\022\032\n\016unpacked_int64\030Z \003(" +
+      "\003B\002\020\000\022\033\n\017unpacked_uint32\030[ \003(\rB\002\020\000\022\033\n\017un" +
+      "packed_uint64\030\\ \003(\004B\002\020\000\022\033\n\017unpacked_sint" +
+      "32\030] \003(\021B\002\020\000\022\033\n\017unpacked_sint64\030^ \003(\022B\002\020" +
+      "\000\022\034\n\020unpacked_fixed32\030_ \003(\007B\002\020\000\022\034\n\020unpac" +
+      "ked_fixed64\030` \003(\006B\002\020\000\022\035\n\021unpacked_sfixed" +
+      "32\030a \003(\017B\002\020\000\022\035\n\021unpacked_sfixed64\030b \003(\020B" +
+      "\002\020\000\022\032\n\016unpacked_float\030c \003(\002B\002\020\000\022\033\n\017unpac" +
+      "ked_double\030d \003(\001B\002\020\000\022\031\n\runpacked_bool\030e " +
+      "\003(\010B\002\020\000\022\\\n\024unpacked_nested_enum\030f \003(\0162:." +
+      "legacy_gencode_test.proto3.TestMostTypes" +
+      "Proto3.NestedEnumB\002\020\000\022[\n\017map_int32_int32" +
+      "\0308 \003(\0132B.legacy_gencode_test.proto3.Test" +
+      "MostTypesProto3.MapInt32Int32Entry\022[\n\017ma" +
+      "p_int64_int64\0309 \003(\0132B.legacy_gencode_tes" +
+      "t.proto3.TestMostTypesProto3.MapInt64Int" +
+      "64Entry\022_\n\021map_uint32_uint32\030: \003(\0132D.leg" +
+      "acy_gencode_test.proto3.TestMostTypesPro" +
+      "to3.MapUint32Uint32Entry\022_\n\021map_uint64_u" +
+      "int64\030; \003(\0132D.legacy_gencode_test.proto3" +
+      ".TestMostTypesProto3.MapUint64Uint64Entr" +
+      "y\022_\n\021map_sint32_sint32\030< \003(\0132D.legacy_ge" +
+      "ncode_test.proto3.TestMostTypesProto3.Ma" +
+      "pSint32Sint32Entry\022_\n\021map_sint64_sint64\030" +
+      "= \003(\0132D.legacy_gencode_test.proto3.TestM" +
+      "ostTypesProto3.MapSint64Sint64Entry\022c\n\023m" +
+      "ap_fixed32_fixed32\030> \003(\0132F.legacy_gencod" +
+      "e_test.proto3.TestMostTypesProto3.MapFix" +
+      "ed32Fixed32Entry\022c\n\023map_fixed64_fixed64\030" +
+      "? \003(\0132F.legacy_gencode_test.proto3.TestM" +
+      "ostTypesProto3.MapFixed64Fixed64Entry\022g\n" +
+      "\025map_sfixed32_sfixed32\030@ \003(\0132H.legacy_ge" +
+      "ncode_test.proto3.TestMostTypesProto3.Ma" +
+      "pSfixed32Sfixed32Entry\022g\n\025map_sfixed64_s" +
+      "fixed64\030A \003(\0132H.legacy_gencode_test.prot" +
+      "o3.TestMostTypesProto3.MapSfixed64Sfixed" +
+      "64Entry\022[\n\017map_int32_float\030B \003(\0132B.legac" +
+      "y_gencode_test.proto3.TestMostTypesProto" +
+      "3.MapInt32FloatEntry\022]\n\020map_int32_double" +
+      "\030C \003(\0132C.legacy_gencode_test.proto3.Test" +
+      "MostTypesProto3.MapInt32DoubleEntry\022W\n\rm" +
+      "ap_bool_bool\030D \003(\0132@.legacy_gencode_test" +
+      ".proto3.TestMostTypesProto3.MapBoolBoolE" +
+      "ntry\022_\n\021map_string_string\030E \003(\0132D.legacy" +
+      "_gencode_test.proto3.TestMostTypesProto3" +
+      ".MapStringStringEntry\022]\n\020map_string_byte" +
+      "s\030F \003(\0132C.legacy_gencode_test.proto3.Tes" +
+      "tMostTypesProto3.MapStringBytesEntry\022n\n\031" +
+      "map_string_nested_message\030G \003(\0132K.legacy" +
+      "_gencode_test.proto3.TestMostTypesProto3" +
+      ".MapStringNestedMessageEntry\022p\n\032map_stri" +
+      "ng_foreign_message\030H \003(\0132L.legacy_gencod" +
+      "e_test.proto3.TestMostTypesProto3.MapStr" +
+      "ingForeignMessageEntry\022h\n\026map_string_nes" +
+      "ted_enum\030I \003(\0132H.legacy_gencode_test.pro" +
+      "to3.TestMostTypesProto3.MapStringNestedE" +
+      "numEntry\022j\n\027map_string_foreign_enum\030J \003(" +
+      "\0132I.legacy_gencode_test.proto3.TestMostT" +
+      "ypesProto3.MapStringForeignEnumEntry\022\026\n\014" +
+      "oneof_uint32\030o \001(\rH\000\022]\n\024oneof_nested_mes" +
+      "sage\030p \001(\0132=.legacy_gencode_test.proto3." +
+      "TestMostTypesProto3.NestedMessageH\000\022\026\n\014o" +
+      "neof_string\030q \001(\tH\000\022\025\n\013oneof_bytes\030r \001(\014" +
+      "H\000\022\024\n\noneof_bool\030s \001(\010H\000\022\026\n\014oneof_uint64" +
+      "\030t \001(\004H\000\022\025\n\013oneof_float\030u \001(\002H\000\022\026\n\014oneof" +
+      "_double\030v \001(\001H\000\022P\n\noneof_enum\030w \001(\0162:.le" +
+      "gacy_gencode_test.proto3.TestMostTypesPr" +
+      "oto3.NestedEnumH\000\032`\n\rNestedMessage\022\t\n\001a\030" +
+      "\001 \001(\005\022D\n\013corecursive\030\002 \001(\0132/.legacy_genc" +
+      "ode_test.proto3.TestMostTypesProto3\0324\n\022M" +
+      "apInt32Int32Entry\022\013\n\003key\030\001 \001(\005\022\r\n\005value\030" +
+      "\002 \001(\005:\0028\001\0324\n\022MapInt64Int64Entry\022\013\n\003key\030\001" +
+      " \001(\003\022\r\n\005value\030\002 \001(\003:\0028\001\0326\n\024MapUint32Uint" +
+      "32Entry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001\032" +
+      "6\n\024MapUint64Uint64Entry\022\013\n\003key\030\001 \001(\004\022\r\n\005" +
+      "value\030\002 \001(\004:\0028\001\0326\n\024MapSint32Sint32Entry\022" +
+      "\013\n\003key\030\001 \001(\021\022\r\n\005value\030\002 \001(\021:\0028\001\0326\n\024MapSi" +
+      "nt64Sint64Entry\022\013\n\003key\030\001 \001(\022\022\r\n\005value\030\002 " +
+      "\001(\022:\0028\001\0328\n\026MapFixed32Fixed32Entry\022\013\n\003key" +
+      "\030\001 \001(\007\022\r\n\005value\030\002 \001(\007:\0028\001\0328\n\026MapFixed64F" +
+      "ixed64Entry\022\013\n\003key\030\001 \001(\006\022\r\n\005value\030\002 \001(\006:" +
+      "\0028\001\032:\n\030MapSfixed32Sfixed32Entry\022\013\n\003key\030\001" +
+      " \001(\017\022\r\n\005value\030\002 \001(\017:\0028\001\032:\n\030MapSfixed64Sf" +
+      "ixed64Entry\022\013\n\003key\030\001 \001(\020\022\r\n\005value\030\002 \001(\020:" +
+      "\0028\001\0324\n\022MapInt32FloatEntry\022\013\n\003key\030\001 \001(\005\022\r" +
+      "\n\005value\030\002 \001(\002:\0028\001\0325\n\023MapInt32DoubleEntry" +
+      "\022\013\n\003key\030\001 \001(\005\022\r\n\005value\030\002 \001(\001:\0028\001\0322\n\020MapB" +
+      "oolBoolEntry\022\013\n\003key\030\001 \001(\010\022\r\n\005value\030\002 \001(\010" +
+      ":\0028\001\0326\n\024MapStringStringEntry\022\013\n\003key\030\001 \001(" +
+      "\t\022\r\n\005value\030\002 \001(\t:\0028\001\0325\n\023MapStringBytesEn" +
+      "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\014:\0028\001\032|\n\033M" +
+      "apStringNestedMessageEntry\022\013\n\003key\030\001 \001(\t\022" +
+      "L\n\005value\030\002 \001(\0132=.legacy_gencode_test.pro" +
+      "to3.TestMostTypesProto3.NestedMessage:\0028" +
+      "\001\032j\n\034MapStringForeignMessageEntry\022\013\n\003key" +
+      "\030\001 \001(\t\0229\n\005value\030\002 \001(\0132*.legacy_gencode_t" +
+      "est.proto3.ForeignMessage:\0028\001\032v\n\030MapStri" +
+      "ngNestedEnumEntry\022\013\n\003key\030\001 \001(\t\022I\n\005value\030" +
+      "\002 \001(\0162:.legacy_gencode_test.proto3.TestM" +
+      "ostTypesProto3.NestedEnum:\0028\001\032d\n\031MapStri" +
+      "ngForeignEnumEntry\022\013\n\003key\030\001 \001(\t\0226\n\005value" +
+      "\030\002 \001(\0162\'.legacy_gencode_test.proto3.Fore" +
+      "ignEnum:\0028\001\"9\n\nNestedEnum\022\007\n\003FOO\020\000\022\007\n\003BA" +
+      "R\020\001\022\007\n\003BAZ\020\002\022\020\n\003NEG\020\377\377\377\377\377\377\377\377\377\001\"Y\n\013Aliase" +
+      "dEnum\022\r\n\tALIAS_FOO\020\000\022\r\n\tALIAS_BAR\020\001\022\r\n\tA" +
+      "LIAS_BAZ\020\002\022\007\n\003MOO\020\002\022\007\n\003moo\020\002\022\007\n\003bAz\020\002\032\002\020" +
+      "\001B\r\n\013oneof_field\"\033\n\016ForeignMessage\022\t\n\001c\030" +
+      "\001 \001(\005*@\n\013ForeignEnum\022\017\n\013FOREIGN_FOO\020\000\022\017\n" +
+      "\013FOREIGN_BAR\020\001\022\017\n\013FOREIGN_BAZ\020\002B\030B\026Proto" +
+      "3GencodeTestProtob\006proto3"
     };
-    descriptor =
-        com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
-            descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] {});
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
     internal_static_legacy_gencode_test_proto3_TestMessage_descriptor =
-        getDescriptor().getMessageTypes().get(0);
-    internal_static_legacy_gencode_test_proto3_TestMessage_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMessage_descriptor,
-            new java.lang.String[] {
-              "X", "Y",
-            });
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_legacy_gencode_test_proto3_TestMessage_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMessage_descriptor,
+        new java.lang.String[] { "X", "Y", });
     internal_static_legacy_gencode_test_proto3_NestedTestMessage_descriptor =
-        getDescriptor().getMessageTypes().get(1);
-    internal_static_legacy_gencode_test_proto3_NestedTestMessage_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_NestedTestMessage_descriptor,
-            new java.lang.String[] {
-              "Z",
-            });
+      getDescriptor().getMessageTypes().get(1);
+    internal_static_legacy_gencode_test_proto3_NestedTestMessage_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_NestedTestMessage_descriptor,
+        new java.lang.String[] { "Z", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor =
-        getDescriptor().getMessageTypes().get(2);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor,
-            new java.lang.String[] {
-              "OptionalInt32",
-              "OptionalInt64",
-              "OptionalUint32",
-              "OptionalUint64",
-              "OptionalSint32",
-              "OptionalSint64",
-              "OptionalFixed32",
-              "OptionalFixed64",
-              "OptionalSfixed32",
-              "OptionalSfixed64",
-              "OptionalFloat",
-              "OptionalDouble",
-              "OptionalBool",
-              "OptionalString",
-              "OptionalBytes",
-              "OptionalNestedMessage",
-              "OptionalForeignMessage",
-              "OptionalNestedEnum",
-              "OptionalForeignEnum",
-              "OptionalAliasedEnum",
-              "RecursiveMessage",
-              "RepeatedInt32",
-              "RepeatedInt64",
-              "RepeatedUint32",
-              "RepeatedUint64",
-              "RepeatedSint32",
-              "RepeatedSint64",
-              "RepeatedFixed32",
-              "RepeatedFixed64",
-              "RepeatedSfixed32",
-              "RepeatedSfixed64",
-              "RepeatedFloat",
-              "RepeatedDouble",
-              "RepeatedBool",
-              "RepeatedString",
-              "RepeatedBytes",
-              "RepeatedNestedMessage",
-              "RepeatedForeignMessage",
-              "RepeatedNestedEnum",
-              "RepeatedForeignEnum",
-              "PackedInt32",
-              "PackedInt64",
-              "PackedUint32",
-              "PackedUint64",
-              "PackedSint32",
-              "PackedSint64",
-              "PackedFixed32",
-              "PackedFixed64",
-              "PackedSfixed32",
-              "PackedSfixed64",
-              "PackedFloat",
-              "PackedDouble",
-              "PackedBool",
-              "PackedNestedEnum",
-              "UnpackedInt32",
-              "UnpackedInt64",
-              "UnpackedUint32",
-              "UnpackedUint64",
-              "UnpackedSint32",
-              "UnpackedSint64",
-              "UnpackedFixed32",
-              "UnpackedFixed64",
-              "UnpackedSfixed32",
-              "UnpackedSfixed64",
-              "UnpackedFloat",
-              "UnpackedDouble",
-              "UnpackedBool",
-              "UnpackedNestedEnum",
-              "MapInt32Int32",
-              "MapInt64Int64",
-              "MapUint32Uint32",
-              "MapUint64Uint64",
-              "MapSint32Sint32",
-              "MapSint64Sint64",
-              "MapFixed32Fixed32",
-              "MapFixed64Fixed64",
-              "MapSfixed32Sfixed32",
-              "MapSfixed64Sfixed64",
-              "MapInt32Float",
-              "MapInt32Double",
-              "MapBoolBool",
-              "MapStringString",
-              "MapStringBytes",
-              "MapStringNestedMessage",
-              "MapStringForeignMessage",
-              "MapStringNestedEnum",
-              "MapStringForeignEnum",
-              "OneofUint32",
-              "OneofNestedMessage",
-              "OneofString",
-              "OneofBytes",
-              "OneofBool",
-              "OneofUint64",
-              "OneofFloat",
-              "OneofDouble",
-              "OneofEnum",
-              "OneofField",
-            });
+      getDescriptor().getMessageTypes().get(2);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor,
+        new java.lang.String[] { "OptionalInt32", "OptionalInt64", "OptionalUint32", "OptionalUint64", "OptionalSint32", "OptionalSint64", "OptionalFixed32", "OptionalFixed64", "OptionalSfixed32", "OptionalSfixed64", "OptionalFloat", "OptionalDouble", "OptionalBool", "OptionalString", "OptionalBytes", "OptionalNestedMessage", "OptionalForeignMessage", "OptionalNestedEnum", "OptionalForeignEnum", "OptionalAliasedEnum", "RecursiveMessage", "RepeatedInt32", "RepeatedInt64", "RepeatedUint32", "RepeatedUint64", "RepeatedSint32", "RepeatedSint64", "RepeatedFixed32", "RepeatedFixed64", "RepeatedSfixed32", "RepeatedSfixed64", "RepeatedFloat", "RepeatedDouble", "RepeatedBool", "RepeatedString", "RepeatedBytes", "RepeatedNestedMessage", "RepeatedForeignMessage", "RepeatedNestedEnum", "RepeatedForeignEnum", "PackedInt32", "PackedInt64", "PackedUint32", "PackedUint64", "PackedSint32", "PackedSint64", "PackedFixed32", "PackedFixed64", "PackedSfixed32", "PackedSfixed64", "PackedFloat", "PackedDouble", "PackedBool", "PackedNestedEnum", "UnpackedInt32", "UnpackedInt64", "UnpackedUint32", "UnpackedUint64", "UnpackedSint32", "UnpackedSint64", "UnpackedFixed32", "UnpackedFixed64", "UnpackedSfixed32", "UnpackedSfixed64", "UnpackedFloat", "UnpackedDouble", "UnpackedBool", "UnpackedNestedEnum", "MapInt32Int32", "MapInt64Int64", "MapUint32Uint32", "MapUint64Uint64", "MapSint32Sint32", "MapSint64Sint64", "MapFixed32Fixed32", "MapFixed64Fixed64", "MapSfixed32Sfixed32", "MapSfixed64Sfixed64", "MapInt32Float", "MapInt32Double", "MapBoolBool", "MapStringString", "MapStringBytes", "MapStringNestedMessage", "MapStringForeignMessage", "MapStringNestedEnum", "MapStringForeignEnum", "OneofUint32", "OneofNestedMessage", "OneofString", "OneofBytes", "OneofBool", "OneofUint64", "OneofFloat", "OneofDouble", "OneofEnum", "OneofField", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(0);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_descriptor,
-            new java.lang.String[] {
-              "A", "Corecursive",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(0);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_NestedMessage_descriptor,
+        new java.lang.String[] { "A", "Corecursive", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32Int32Entry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(1);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32Int32Entry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32Int32Entry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(1);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32Int32Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32Int32Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt64Int64Entry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(2);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt64Int64Entry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt64Int64Entry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(2);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt64Int64Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt64Int64Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint32Uint32Entry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(3);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint32Uint32Entry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint32Uint32Entry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(3);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint32Uint32Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint32Uint32Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint64Uint64Entry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(4);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint64Uint64Entry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint64Uint64Entry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(4);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint64Uint64Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapUint64Uint64Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint32Sint32Entry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(5);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint32Sint32Entry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint32Sint32Entry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(5);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint32Sint32Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint32Sint32Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint64Sint64Entry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(6);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint64Sint64Entry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint64Sint64Entry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(6);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint64Sint64Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSint64Sint64Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed32Fixed32Entry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(7);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed32Fixed32Entry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed32Fixed32Entry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(7);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed32Fixed32Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed32Fixed32Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed64Fixed64Entry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(8);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed64Fixed64Entry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed64Fixed64Entry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(8);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed64Fixed64Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapFixed64Fixed64Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed32Sfixed32Entry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(9);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed32Sfixed32Entry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed32Sfixed32Entry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(9);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed32Sfixed32Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed32Sfixed32Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed64Sfixed64Entry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(10);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed64Sfixed64Entry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed64Sfixed64Entry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(10);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed64Sfixed64Entry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapSfixed64Sfixed64Entry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32FloatEntry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(11);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32FloatEntry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32FloatEntry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(11);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32FloatEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32FloatEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32DoubleEntry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(12);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32DoubleEntry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32DoubleEntry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(12);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32DoubleEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapInt32DoubleEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapBoolBoolEntry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(13);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapBoolBoolEntry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapBoolBoolEntry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(13);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapBoolBoolEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapBoolBoolEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringStringEntry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(14);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringStringEntry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringStringEntry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(14);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringStringEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringStringEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringBytesEntry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(15);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringBytesEntry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringBytesEntry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(15);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringBytesEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringBytesEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedMessageEntry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(16);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedMessageEntry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedMessageEntry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(16);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedMessageEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedMessageEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignMessageEntry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(17);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignMessageEntry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignMessageEntry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(17);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignMessageEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignMessageEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedEnumEntry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(18);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedEnumEntry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedEnumEntry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(18);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedEnumEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringNestedEnumEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignEnumEntry_descriptor =
-        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor
-            .getNestedTypes()
-            .get(19);
-    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignEnumEntry_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignEnumEntry_descriptor,
-            new java.lang.String[] {
-              "Key", "Value",
-            });
+      internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_descriptor.getNestedTypes().get(19);
+    internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignEnumEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_TestMostTypesProto3_MapStringForeignEnumEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_legacy_gencode_test_proto3_ForeignMessage_descriptor =
-        getDescriptor().getMessageTypes().get(3);
-    internal_static_legacy_gencode_test_proto3_ForeignMessage_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_legacy_gencode_test_proto3_ForeignMessage_descriptor,
-            new java.lang.String[] {
-              "C",
-            });
+      getDescriptor().getMessageTypes().get(3);
+    internal_static_legacy_gencode_test_proto3_ForeignMessage_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_legacy_gencode_test_proto3_ForeignMessage_descriptor,
+        new java.lang.String[] { "C", });
     descriptor.resolveAllFeaturesImmutable();
   }