all: update to proto 3.4.0

58 files changed, 2123 insertions, 863 deletions

diff --git a/.travis.yml b/.travis.yml
index 9c4bfac98..772d2ca12 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ language: java
 env:
   global:
     - GRADLE_OPTS=-Xmx512m
-    - PROTOBUF_VERSION=3.3.1
+    - PROTOBUF_VERSION=3.4.0
     - LDFLAGS=-L/tmp/protobuf/lib
     - CXXFLAGS=-I/tmp/protobuf/include
     - LD_LIBRARY_PATH=/tmp/protobuf/lib
diff --git a/COMPILING.md b/COMPILING.md
index 1346516e5..40d21b1e6 100644
--- a/COMPILING.md
+++ b/COMPILING.md
@@ -33,7 +33,7 @@ For Linux, Mac and MinGW:
 ```
 $ git clone https://github.com/google/protobuf.git
 $ cd protobuf
-$ git checkout v3.3.1
+$ git checkout v3.4.0
 $ ./autogen.sh
 $ ./configure
 $ make
@@ -72,16 +72,16 @@ When building on Windows and VC++, you need to specify project properties for
 Gradle to find protobuf:
 ```
 .\gradlew install ^
-    -PvcProtobufInclude=C:\path\to\protobuf-3.3.1\src ^
-    -PvcProtobufLibs=C:\path\to\protobuf-3.3.1\vsprojects\Release ^
+    -PvcProtobufInclude=C:\path\to\protobuf-3.4.0\src ^
+    -PvcProtobufLibs=C:\path\to\protobuf-3.4.0\vsprojects\Release ^
     -PtargetArch=x86_32
 ```
 
 Since specifying those properties every build is bothersome, you can instead
 create ``<project-root>\gradle.properties`` with contents like:
 ```
-vcProtobufInclude=C:\\path\\to\\protobuf-3.3.1\\src
-vcProtobufLibs=C:\\path\\to\\protobuf-3.3.1\\vsprojects\\Release
+vcProtobufInclude=C:\\path\\to\\protobuf-3.4.0\\src
+vcProtobufLibs=C:\\path\\to\\protobuf-3.4.0\\vsprojects\\Release
 targetArch=x86_32
 ```
 
diff --git a/android-interop-testing/app/build.gradle b/android-interop-testing/app/build.gradle
index 720f3d751..08dc50b8d 100644
--- a/android-interop-testing/app/build.gradle
+++ b/android-interop-testing/app/build.gradle
@@ -29,7 +29,7 @@ android {
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.3.0'
+        artifact = 'com.google.protobuf:protoc:3.4.0'
     }
     plugins {
         grpc {
diff --git a/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Control.java b/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Control.java
index 47bdfa0f5..691b438ea 100644
--- a/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Control.java
+++ b/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Control.java
@@ -413,6 +413,7 @@ public final class Control {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.PoissonParams)
       PoissonParamsOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use PoissonParams.newBuilder() to construct.
     private PoissonParams(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -424,7 +425,7 @@ public final class Control {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private PoissonParams(
         com.google.protobuf.CodedInputStream input,
@@ -432,6 +433,8 @@ public final class Control {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -441,7 +444,8 @@ public final class Control {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -459,6 +463,7 @@ public final class Control {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -502,6 +507,7 @@ public final class Control {
       if (offeredLoad_ != 0D) {
         output.writeDouble(1, offeredLoad_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -513,11 +519,11 @@ public final class Control {
         size += com.google.protobuf.CodedOutputStream
           .computeDoubleSize(1, offeredLoad_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -533,6 +539,7 @@ public final class Control {
           java.lang.Double.doubleToLongBits(getOfferedLoad())
           == java.lang.Double.doubleToLongBits(
               other.getOfferedLoad()));
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -714,7 +721,7 @@ public final class Control {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -727,12 +734,12 @@ public final class Control {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -749,6 +756,7 @@ public final class Control {
         if (other.getOfferedLoad() != 0D) {
           setOfferedLoad(other.getOfferedLoad());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -814,12 +822,12 @@ public final class Control {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -877,6 +885,7 @@ public final class Control {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.ClosedLoopParams)
       ClosedLoopParamsOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ClosedLoopParams.newBuilder() to construct.
     private ClosedLoopParams(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -887,13 +896,15 @@ public final class Control {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private ClosedLoopParams(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -903,7 +914,8 @@ public final class Control {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -916,6 +928,7 @@ public final class Control {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -943,6 +956,7 @@ public final class Control {
 
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -950,11 +964,11 @@ public final class Control {
       if (size != -1) return size;
 
       size = 0;
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -966,6 +980,7 @@ public final class Control {
       io.grpc.benchmarks.proto.Control.ClosedLoopParams other = (io.grpc.benchmarks.proto.Control.ClosedLoopParams) obj;
 
       boolean result = true;
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -1141,7 +1156,7 @@ public final class Control {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -1154,12 +1169,12 @@ public final class Control {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -1173,6 +1188,7 @@ public final class Control {
 
       public Builder mergeFrom(io.grpc.benchmarks.proto.Control.ClosedLoopParams other) {
         if (other == io.grpc.benchmarks.proto.Control.ClosedLoopParams.getDefaultInstance()) return this;
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -1200,12 +1216,12 @@ public final class Control {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -1254,6 +1270,10 @@ public final class Control {
     /**
      * <code>.grpc.testing.ClosedLoopParams closed_loop = 1;</code>
      */
+    boolean hasClosedLoop();
+    /**
+     * <code>.grpc.testing.ClosedLoopParams closed_loop = 1;</code>
+     */
     io.grpc.benchmarks.proto.Control.ClosedLoopParams getClosedLoop();
     /**
      * <code>.grpc.testing.ClosedLoopParams closed_loop = 1;</code>
@@ -1263,6 +1283,10 @@ public final class Control {
     /**
      * <code>.grpc.testing.PoissonParams poisson = 2;</code>
      */
+    boolean hasPoisson();
+    /**
+     * <code>.grpc.testing.PoissonParams poisson = 2;</code>
+     */
     io.grpc.benchmarks.proto.Control.PoissonParams getPoisson();
     /**
      * <code>.grpc.testing.PoissonParams poisson = 2;</code>
@@ -1278,6 +1302,7 @@ public final class Control {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.LoadParams)
       LoadParamsOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use LoadParams.newBuilder() to construct.
     private LoadParams(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -1288,7 +1313,7 @@ public final class Control {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private LoadParams(
         com.google.protobuf.CodedInputStream input,
@@ -1296,6 +1321,8 @@ public final class Control {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -1305,7 +1332,8 @@ public final class Control {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -1346,6 +1374,7 @@ public final class Control {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -1403,6 +1432,12 @@ public final class Control {
     /**
      * <code>.grpc.testing.ClosedLoopParams closed_loop = 1;</code>
      */
+    public boolean hasClosedLoop() {
+      return loadCase_ == 1;
+    }
+    /**
+     * <code>.grpc.testing.ClosedLoopParams closed_loop = 1;</code>
+     */
     public io.grpc.benchmarks.proto.Control.ClosedLoopParams getClosedLoop() {
       if (loadCase_ == 1) {
          return (io.grpc.benchmarks.proto.Control.ClosedLoopParams) load_;
@@ -1423,6 +1458,12 @@ public final class Control {
     /**
      * <code>.grpc.testing.PoissonParams poisson = 2;</code>
      */
+    public boolean hasPoisson() {
+      return loadCase_ == 2;
+    }
+    /**
+     * <code>.grpc.testing.PoissonParams poisson = 2;</code>
+     */
     public io.grpc.benchmarks.proto.Control.PoissonParams getPoisson() {
       if (loadCase_ == 2) {
          return (io.grpc.benchmarks.proto.Control.PoissonParams) load_;
@@ -1457,6 +1498,7 @@ public final class Control {
       if (loadCase_ == 2) {
         output.writeMessage(2, (io.grpc.benchmarks.proto.Control.PoissonParams) load_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -1472,11 +1514,11 @@ public final class Control {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(2, (io.grpc.benchmarks.proto.Control.PoissonParams) load_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -1503,6 +1545,7 @@ public final class Control {
         case 0:
         default:
       }
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -1702,7 +1745,7 @@ public final class Control {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -1715,12 +1758,12 @@ public final class Control {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -1747,6 +1790,7 @@ public final class Control {
             break;
           }
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -1793,6 +1837,12 @@ public final class Control {
       /**
        * <code>.grpc.testing.ClosedLoopParams closed_loop = 1;</code>
        */
+      public boolean hasClosedLoop() {
+        return loadCase_ == 1;
+      }
+      /**
+       * <code>.grpc.testing.ClosedLoopParams closed_loop = 1;</code>
+       */
       public io.grpc.benchmarks.proto.Control.ClosedLoopParams getClosedLoop() {
         if (closedLoopBuilder_ == null) {
           if (loadCase_ == 1) {
@@ -1923,6 +1973,12 @@ public final class Control {
       /**
        * <code>.grpc.testing.PoissonParams poisson = 2;</code>
        */
+      public boolean hasPoisson() {
+        return loadCase_ == 2;
+      }
+      /**
+       * <code>.grpc.testing.PoissonParams poisson = 2;</code>
+       */
       public io.grpc.benchmarks.proto.Control.PoissonParams getPoisson() {
         if (poissonBuilder_ == null) {
           if (loadCase_ == 2) {
@@ -2049,12 +2105,12 @@ public final class Control {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -2126,6 +2182,7 @@ public final class Control {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.SecurityParams)
       SecurityParamsOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use SecurityParams.newBuilder() to construct.
     private SecurityParams(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -2138,7 +2195,7 @@ public final class Control {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private SecurityParams(
         com.google.protobuf.CodedInputStream input,
@@ -2146,6 +2203,8 @@ public final class Control {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -2155,7 +2214,8 @@ public final class Control {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -2179,6 +2239,7 @@ public final class Control {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -2255,6 +2316,7 @@ public final class Control {
       if (!getServerHostOverrideBytes().isEmpty()) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 2, serverHostOverride_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -2269,11 +2331,11 @@ public final class Control {
       if (!getServerHostOverrideBytes().isEmpty()) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, serverHostOverride_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -2289,6 +2351,7 @@ public final class Control {
           == other.getUseTestCa());
       result = result && getServerHostOverride()
           .equals(other.getServerHostOverride());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -2474,7 +2537,7 @@ public final class Control {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -2487,12 +2550,12 @@ public final class Control {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -2513,6 +2576,7 @@ public final class Control {
           serverHostOverride_ = other.serverHostOverride_;
           onChanged();
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -2635,12 +2699,12 @@ public final class Control {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -2720,6 +2784,7 @@ public final class Control {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.ChannelArg)
       ChannelArgOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ChannelArg.newBuilder() to construct.
     private ChannelArg(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -2731,7 +2796,7 @@ public final class Control {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private ChannelArg(
         com.google.protobuf.CodedInputStream input,
@@ -2739,6 +2804,8 @@ public final class Control {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -2748,7 +2815,8 @@ public final class Control {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -2778,6 +2846,7 @@ public final class Control {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -2941,6 +3010,7 @@ public final class Control {
         output.writeInt32(
             3, (int)((java.lang.Integer) value_));
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -2959,11 +3029,11 @@ public final class Control {
           .computeInt32Size(
               3, (int)((java.lang.Integer) value_));
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -2992,6 +3062,7 @@ public final class Control {
         case 0:
         default:
       }
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -3188,7 +3259,7 @@ public final class Control {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -3201,12 +3272,12 @@ public final class Control {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -3239,6 +3310,7 @@ public final class Control {
             break;
           }
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -3460,12 +3532,12 @@ public final class Control {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -3745,6 +3817,7 @@ public final class Control {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.ClientConfig)
       ClientConfigOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ClientConfig.newBuilder() to construct.
     private ClientConfig(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -3766,7 +3839,7 @@ public final class Control {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private ClientConfig(
         com.google.protobuf.CodedInputStream input,
@@ -3774,6 +3847,8 @@ public final class Control {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -3783,7 +3858,8 @@ public final class Control {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -3939,6 +4015,7 @@ public final class Control {
         if (((mutable_bitField0_ & 0x00002000) == 0x00002000)) {
           channelArgs_ = java.util.Collections.unmodifiableList(channelArgs_);
         }
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -4365,6 +4442,7 @@ public final class Control {
       if (messagesPerStream_ != 0) {
         output.writeInt32(18, messagesPerStream_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -4445,11 +4523,11 @@ public final class Control {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(18, messagesPerStream_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -4501,6 +4579,7 @@ public final class Control {
           .equals(other.getChannelArgsList());
       result = result && (getMessagesPerStream()
           == other.getMessagesPerStream());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -4816,7 +4895,7 @@ public final class Control {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -4829,12 +4908,12 @@ public final class Control {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -4931,6 +5010,7 @@ public final class Control {
         if (other.getMessagesPerStream() != 0) {
           setMessagesPerStream(other.getMessagesPerStream());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -6288,12 +6368,12 @@ public final class Control {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -6359,6 +6439,7 @@ public final class Control {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.ClientStatus)
       ClientStatusOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ClientStatus.newBuilder() to construct.
     private ClientStatus(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -6369,7 +6450,7 @@ public final class Control {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private ClientStatus(
         com.google.protobuf.CodedInputStream input,
@@ -6377,6 +6458,8 @@ public final class Control {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -6386,7 +6469,8 @@ public final class Control {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -6412,6 +6496,7 @@ public final class Control {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -6463,6 +6548,7 @@ public final class Control {
       if (stats_ != null) {
         output.writeMessage(1, getStats());
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -6474,11 +6560,11 @@ public final class Control {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(1, getStats());
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -6495,6 +6581,7 @@ public final class Control {
         result = result && getStats()
             .equals(other.getStats());
       }
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -6680,7 +6767,7 @@ public final class Control {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -6693,12 +6780,12 @@ public final class Control {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -6715,6 +6802,7 @@ public final class Control {
         if (other.hasStats()) {
           mergeStats(other.getStats());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -6859,12 +6947,12 @@ public final class Control {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -6930,6 +7018,7 @@ public final class Control {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.Mark)
       MarkOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use Mark.newBuilder() to construct.
     private Mark(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -6941,7 +7030,7 @@ public final class Control {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private Mark(
         com.google.protobuf.CodedInputStream input,
@@ -6949,6 +7038,8 @@ public final class Control {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -6958,7 +7049,8 @@ public final class Control {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -6976,6 +7068,7 @@ public final class Control {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -7019,6 +7112,7 @@ public final class Control {
       if (reset_ != false) {
         output.writeBool(1, reset_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -7030,11 +7124,11 @@ public final class Control {
         size += com.google.protobuf.CodedOutputStream
           .computeBoolSize(1, reset_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -7048,6 +7142,7 @@ public final class Control {
       boolean result = true;
       result = result && (getReset()
           == other.getReset());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -7228,7 +7323,7 @@ public final class Control {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -7241,12 +7336,12 @@ public final class Control {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -7263,6 +7358,7 @@ public final class Control {
         if (other.getReset() != false) {
           setReset(other.getReset());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -7328,12 +7424,12 @@ public final class Control {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -7382,6 +7478,10 @@ public final class Control {
     /**
      * <code>.grpc.testing.ClientConfig setup = 1;</code>
      */
+    boolean hasSetup();
+    /**
+     * <code>.grpc.testing.ClientConfig setup = 1;</code>
+     */
     io.grpc.benchmarks.proto.Control.ClientConfig getSetup();
     /**
      * <code>.grpc.testing.ClientConfig setup = 1;</code>
@@ -7391,6 +7491,10 @@ public final class Control {
     /**
      * <code>.grpc.testing.Mark mark = 2;</code>
      */
+    boolean hasMark();
+    /**
+     * <code>.grpc.testing.Mark mark = 2;</code>
+     */
     io.grpc.benchmarks.proto.Control.Mark getMark();
     /**
      * <code>.grpc.testing.Mark mark = 2;</code>
@@ -7406,6 +7510,7 @@ public final class Control {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.ClientArgs)
       ClientArgsOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ClientArgs.newBuilder() to construct.
     private ClientArgs(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -7416,7 +7521,7 @@ public final class Control {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private ClientArgs(
         com.google.protobuf.CodedInputStream input,
@@ -7424,6 +7529,8 @@ public final class Control {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -7433,7 +7540,8 @@ public final class Control {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -7474,6 +7582,7 @@ public final class Control {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -7531,6 +7640,12 @@ public final class Control {
     /**
      * <code>.grpc.testing.ClientConfig setup = 1;</code>
      */
+    public boolean hasSetup() {
+      return argtypeCase_ == 1;
+    }
+    /**
+     * <code>.grpc.testing.ClientConfig setup = 1;</code>
+     */
     public io.grpc.benchmarks.proto.Control.ClientConfig getSetup() {
       if (argtypeCase_ == 1) {
          return (io.grpc.benchmarks.proto.Control.ClientConfig) argtype_;
@@ -7551,6 +7666,12 @@ public final class Control {
     /**
      * <code>.grpc.testing.Mark mark = 2;</code>
      */
+    public boolean hasMark() {
+      return argtypeCase_ == 2;
+    }
+    /**
+     * <code>.grpc.testing.Mark mark = 2;</code>
+     */
     public io.grpc.benchmarks.proto.Control.Mark getMark() {
       if (argtypeCase_ == 2) {
          return (io.grpc.benchmarks.proto.Control.Mark) argtype_;
@@ -7585,6 +7706,7 @@ public final class Control {
       if (argtypeCase_ == 2) {
         output.writeMessage(2, (io.grpc.benchmarks.proto.Control.Mark) argtype_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -7600,11 +7722,11 @@ public final class Control {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(2, (io.grpc.benchmarks.proto.Control.Mark) argtype_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -7631,6 +7753,7 @@ public final class Control {
         case 0:
         default:
       }
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -7830,7 +7953,7 @@ public final class Control {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -7843,12 +7966,12 @@ public final class Control {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -7875,6 +7998,7 @@ public final class Control {
             break;
           }
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -7921,6 +8045,12 @@ public final class Control {
       /**
        * <code>.grpc.testing.ClientConfig setup = 1;</code>
        */
+      public boolean hasSetup() {
+        return argtypeCase_ == 1;
+      }
+      /**
+       * <code>.grpc.testing.ClientConfig setup = 1;</code>
+       */
       public io.grpc.benchmarks.proto.Control.ClientConfig getSetup() {
         if (setupBuilder_ == null) {
           if (argtypeCase_ == 1) {
@@ -8051,6 +8181,12 @@ public final class Control {
       /**
        * <code>.grpc.testing.Mark mark = 2;</code>
        */
+      public boolean hasMark() {
+        return argtypeCase_ == 2;
+      }
+      /**
+       * <code>.grpc.testing.Mark mark = 2;</code>
+       */
       public io.grpc.benchmarks.proto.Control.Mark getMark() {
         if (markBuilder_ == null) {
           if (argtypeCase_ == 2) {
@@ -8177,12 +8313,12 @@ public final class Control {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -8370,6 +8506,7 @@ public final class Control {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.ServerConfig)
       ServerConfigOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ServerConfig.newBuilder() to construct.
     private ServerConfig(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -8387,7 +8524,7 @@ public final class Control {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private ServerConfig(
         com.google.protobuf.CodedInputStream input,
@@ -8395,6 +8532,8 @@ public final class Control {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -8404,7 +8543,8 @@ public final class Control {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -8499,6 +8639,7 @@ public final class Control {
         if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
           coreList_ = java.util.Collections.unmodifiableList(coreList_);
         }
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -8767,6 +8908,7 @@ public final class Control {
       if (resourceQuotaSize_ != 0) {
         output.writeInt32(1001, resourceQuotaSize_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -8819,11 +8961,11 @@ public final class Control {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(1001, resourceQuotaSize_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -8858,6 +9000,7 @@ public final class Control {
           .equals(other.getOtherServerApi());
       result = result && (getResourceQuotaSize()
           == other.getResourceQuotaSize());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -9102,7 +9245,7 @@ public final class Control {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -9115,12 +9258,12 @@ public final class Control {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -9169,6 +9312,7 @@ public final class Control {
         if (other.getResourceQuotaSize() != 0) {
           setResourceQuotaSize(other.getResourceQuotaSize());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -9873,12 +10017,12 @@ public final class Control {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -9927,6 +10071,10 @@ public final class Control {
     /**
      * <code>.grpc.testing.ServerConfig setup = 1;</code>
      */
+    boolean hasSetup();
+    /**
+     * <code>.grpc.testing.ServerConfig setup = 1;</code>
+     */
     io.grpc.benchmarks.proto.Control.ServerConfig getSetup();
     /**
      * <code>.grpc.testing.ServerConfig setup = 1;</code>
@@ -9936,6 +10084,10 @@ public final class Control {
     /**
      * <code>.grpc.testing.Mark mark = 2;</code>
      */
+    boolean hasMark();
+    /**
+     * <code>.grpc.testing.Mark mark = 2;</code>
+     */
     io.grpc.benchmarks.proto.Control.Mark getMark();
     /**
      * <code>.grpc.testing.Mark mark = 2;</code>
@@ -9951,6 +10103,7 @@ public final class Control {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.ServerArgs)
       ServerArgsOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ServerArgs.newBuilder() to construct.
     private ServerArgs(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -9961,7 +10114,7 @@ public final class Control {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private ServerArgs(
         com.google.protobuf.CodedInputStream input,
@@ -9969,6 +10122,8 @@ public final class Control {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -9978,7 +10133,8 @@ public final class Control {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -10019,6 +10175,7 @@ public final class Control {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -10076,6 +10233,12 @@ public final class Control {
     /**
      * <code>.grpc.testing.ServerConfig setup = 1;</code>
      */
+    public boolean hasSetup() {
+      return argtypeCase_ == 1;
+    }
+    /**
+     * <code>.grpc.testing.ServerConfig setup = 1;</code>
+     */
     public io.grpc.benchmarks.proto.Control.ServerConfig getSetup() {
       if (argtypeCase_ == 1) {
          return (io.grpc.benchmarks.proto.Control.ServerConfig) argtype_;
@@ -10096,6 +10259,12 @@ public final class Control {
     /**
      * <code>.grpc.testing.Mark mark = 2;</code>
      */
+    public boolean hasMark() {
+      return argtypeCase_ == 2;
+    }
+    /**
+     * <code>.grpc.testing.Mark mark = 2;</code>
+     */
     public io.grpc.benchmarks.proto.Control.Mark getMark() {
       if (argtypeCase_ == 2) {
          return (io.grpc.benchmarks.proto.Control.Mark) argtype_;
@@ -10130,6 +10299,7 @@ public final class Control {
       if (argtypeCase_ == 2) {
         output.writeMessage(2, (io.grpc.benchmarks.proto.Control.Mark) argtype_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -10145,11 +10315,11 @@ public final class Control {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(2, (io.grpc.benchmarks.proto.Control.Mark) argtype_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -10176,6 +10346,7 @@ public final class Control {
         case 0:
         default:
       }
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -10375,7 +10546,7 @@ public final class Control {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -10388,12 +10559,12 @@ public final class Control {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -10420,6 +10591,7 @@ public final class Control {
             break;
           }
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -10466,6 +10638,12 @@ public final class Control {
       /**
        * <code>.grpc.testing.ServerConfig setup = 1;</code>
        */
+      public boolean hasSetup() {
+        return argtypeCase_ == 1;
+      }
+      /**
+       * <code>.grpc.testing.ServerConfig setup = 1;</code>
+       */
       public io.grpc.benchmarks.proto.Control.ServerConfig getSetup() {
         if (setupBuilder_ == null) {
           if (argtypeCase_ == 1) {
@@ -10596,6 +10774,12 @@ public final class Control {
       /**
        * <code>.grpc.testing.Mark mark = 2;</code>
        */
+      public boolean hasMark() {
+        return argtypeCase_ == 2;
+      }
+      /**
+       * <code>.grpc.testing.Mark mark = 2;</code>
+       */
       public io.grpc.benchmarks.proto.Control.Mark getMark() {
         if (markBuilder_ == null) {
           if (argtypeCase_ == 2) {
@@ -10722,12 +10906,12 @@ public final class Control {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -10811,6 +10995,7 @@ public final class Control {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.ServerStatus)
       ServerStatusOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ServerStatus.newBuilder() to construct.
     private ServerStatus(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -10823,7 +11008,7 @@ public final class Control {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private ServerStatus(
         com.google.protobuf.CodedInputStream input,
@@ -10831,6 +11016,8 @@ public final class Control {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -10840,7 +11027,8 @@ public final class Control {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -10876,6 +11064,7 @@ public final class Control {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -10959,6 +11148,7 @@ public final class Control {
       if (cores_ != 0) {
         output.writeInt32(3, cores_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -10978,11 +11168,11 @@ public final class Control {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(3, cores_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -11003,6 +11193,7 @@ public final class Control {
           == other.getPort());
       result = result && (getCores()
           == other.getCores());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -11198,7 +11389,7 @@ public final class Control {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -11211,12 +11402,12 @@ public final class Control {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -11239,6 +11430,7 @@ public final class Control {
         if (other.getCores() != 0) {
           setCores(other.getCores());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -11459,12 +11651,12 @@ public final class Control {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -11517,6 +11709,7 @@ public final class Control {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.CoreRequest)
       CoreRequestOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use CoreRequest.newBuilder() to construct.
     private CoreRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -11527,13 +11720,15 @@ public final class Control {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private CoreRequest(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -11543,7 +11738,8 @@ public final class Control {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -11556,6 +11752,7 @@ public final class Control {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -11583,6 +11780,7 @@ public final class Control {
 
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -11590,11 +11788,11 @@ public final class Control {
       if (size != -1) return size;
 
       size = 0;
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -11606,6 +11804,7 @@ public final class Control {
       io.grpc.benchmarks.proto.Control.CoreRequest other = (io.grpc.benchmarks.proto.Control.CoreRequest) obj;
 
       boolean result = true;
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -11776,7 +11975,7 @@ public final class Control {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -11789,12 +11988,12 @@ public final class Control {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -11808,6 +12007,7 @@ public final class Control {
 
       public Builder mergeFrom(io.grpc.benchmarks.proto.Control.CoreRequest other) {
         if (other == io.grpc.benchmarks.proto.Control.CoreRequest.getDefaultInstance()) return this;
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -11835,12 +12035,12 @@ public final class Control {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -11902,6 +12102,7 @@ public final class Control {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.CoreResponse)
       CoreResponseOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use CoreResponse.newBuilder() to construct.
     private CoreResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -11913,7 +12114,7 @@ public final class Control {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private CoreResponse(
         com.google.protobuf.CodedInputStream input,
@@ -11921,6 +12122,8 @@ public final class Control {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -11930,7 +12133,8 @@ public final class Control {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -11948,6 +12152,7 @@ public final class Control {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -11991,6 +12196,7 @@ public final class Control {
       if (cores_ != 0) {
         output.writeInt32(1, cores_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -12002,11 +12208,11 @@ public final class Control {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(1, cores_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -12020,6 +12226,7 @@ public final class Control {
       boolean result = true;
       result = result && (getCores()
           == other.getCores());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -12195,7 +12402,7 @@ public final class Control {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -12208,12 +12415,12 @@ public final class Control {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -12230,6 +12437,7 @@ public final class Control {
         if (other.getCores() != 0) {
           setCores(other.getCores());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -12295,12 +12503,12 @@ public final class Control {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -12353,6 +12561,7 @@ public final class Control {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.Void)
       VoidOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use Void.newBuilder() to construct.
     private Void(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -12363,13 +12572,15 @@ public final class Control {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private Void(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -12379,7 +12590,8 @@ public final class Control {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -12392,6 +12604,7 @@ public final class Control {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -12419,6 +12632,7 @@ public final class Control {
 
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -12426,11 +12640,11 @@ public final class Control {
       if (size != -1) return size;
 
       size = 0;
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -12442,6 +12656,7 @@ public final class Control {
       io.grpc.benchmarks.proto.Control.Void other = (io.grpc.benchmarks.proto.Control.Void) obj;
 
       boolean result = true;
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -12612,7 +12827,7 @@ public final class Control {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -12625,12 +12840,12 @@ public final class Control {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -12644,6 +12859,7 @@ public final class Control {
 
       public Builder mergeFrom(io.grpc.benchmarks.proto.Control.Void other) {
         if (other == io.grpc.benchmarks.proto.Control.Void.getDefaultInstance()) return this;
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -12671,12 +12887,12 @@ public final class Control {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -12846,6 +13062,7 @@ public final class Control {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.Scenario)
       ScenarioOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use Scenario.newBuilder() to construct.
     private Scenario(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -12862,7 +13079,7 @@ public final class Control {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private Scenario(
         com.google.protobuf.CodedInputStream input,
@@ -12870,6 +13087,8 @@ public final class Control {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -12879,7 +13098,8 @@ public final class Control {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -12949,6 +13169,7 @@ public final class Control {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -13173,6 +13394,7 @@ public final class Control {
       if (spawnLocalWorkerCount_ != 0) {
         output.writeInt32(8, spawnLocalWorkerCount_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -13211,11 +13433,11 @@ public final class Control {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(8, spawnLocalWorkerCount_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -13249,6 +13471,7 @@ public final class Control {
           == other.getBenchmarkSeconds());
       result = result && (getSpawnLocalWorkerCount()
           == other.getSpawnLocalWorkerCount());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -13483,7 +13706,7 @@ public final class Control {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -13496,12 +13719,12 @@ public final class Control {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -13540,6 +13763,7 @@ public final class Control {
         if (other.getSpawnLocalWorkerCount() != 0) {
           setSpawnLocalWorkerCount(other.getSpawnLocalWorkerCount());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -14152,12 +14376,12 @@ public final class Control {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -14238,6 +14462,7 @@ public final class Control {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.Scenarios)
       ScenariosOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use Scenarios.newBuilder() to construct.
     private Scenarios(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -14249,7 +14474,7 @@ public final class Control {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private Scenarios(
         com.google.protobuf.CodedInputStream input,
@@ -14257,6 +14482,8 @@ public final class Control {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -14266,7 +14493,8 @@ public final class Control {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -14291,6 +14519,7 @@ public final class Control {
         if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
           scenarios_ = java.util.Collections.unmodifiableList(scenarios_);
         }
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -14356,6 +14585,7 @@ public final class Control {
       for (int i = 0; i < scenarios_.size(); i++) {
         output.writeMessage(1, scenarios_.get(i));
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -14367,11 +14597,11 @@ public final class Control {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(1, scenarios_.get(i));
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -14385,6 +14615,7 @@ public final class Control {
       boolean result = true;
       result = result && getScenariosList()
           .equals(other.getScenariosList());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -14580,7 +14811,7 @@ public final class Control {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -14593,12 +14824,12 @@ public final class Control {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -14638,6 +14869,7 @@ public final class Control {
             }
           }
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -14906,12 +15138,12 @@ public final class Control {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -15089,6 +15321,7 @@ public final class Control {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.ScenarioResultSummary)
       ScenarioResultSummaryOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ScenarioResultSummary.newBuilder() to construct.
     private ScenarioResultSummary(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -15115,7 +15348,7 @@ public final class Control {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private ScenarioResultSummary(
         com.google.protobuf.CodedInputStream input,
@@ -15123,6 +15356,8 @@ public final class Control {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -15132,7 +15367,8 @@ public final class Control {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -15225,6 +15461,7 @@ public final class Control {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -15484,6 +15721,7 @@ public final class Control {
       if (serverPollsPerRequest_ != 0D) {
         output.writeDouble(16, serverPollsPerRequest_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -15555,11 +15793,11 @@ public final class Control {
         size += com.google.protobuf.CodedOutputStream
           .computeDoubleSize(16, serverPollsPerRequest_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -15635,6 +15873,7 @@ public final class Control {
           java.lang.Double.doubleToLongBits(getServerPollsPerRequest())
           == java.lang.Double.doubleToLongBits(
               other.getServerPollsPerRequest()));
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -15906,7 +16145,7 @@ public final class Control {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -15919,12 +16158,12 @@ public final class Control {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -15986,6 +16225,7 @@ public final class Control {
         if (other.getServerPollsPerRequest() != 0D) {
           setServerPollsPerRequest(other.getServerPollsPerRequest());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -16549,12 +16789,12 @@ public final class Control {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -16881,6 +17121,7 @@ public final class Control {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.ScenarioResult)
       ScenarioResultOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ScenarioResult.newBuilder() to construct.
     private ScenarioResult(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -16897,7 +17138,7 @@ public final class Control {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private ScenarioResult(
         com.google.protobuf.CodedInputStream input,
@@ -16905,6 +17146,8 @@ public final class Control {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -16914,7 +17157,8 @@ public final class Control {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -17074,6 +17318,7 @@ public final class Control {
         if (((mutable_bitField0_ & 0x00000100) == 0x00000100)) {
           requestResults_ = java.util.Collections.unmodifiableList(requestResults_);
         }
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -17499,6 +17744,7 @@ public final class Control {
       for (int i = 0; i < requestResults_.size(); i++) {
         output.writeMessage(9, requestResults_.get(i));
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -17566,11 +17812,11 @@ public final class Control {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(9, requestResults_.get(i));
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -17609,6 +17855,7 @@ public final class Control {
           .equals(other.getServerSuccessList());
       result = result && getRequestResultsList()
           .equals(other.getRequestResultsList());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -17924,7 +18171,7 @@ public final class Control {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -17937,12 +18184,12 @@ public final class Control {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -18073,6 +18320,7 @@ public final class Control {
             }
           }
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -19750,12 +19998,12 @@ public final class Control {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
diff --git a/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Messages.java b/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Messages.java
index 51284e3e6..f2f026ded 100644
--- a/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Messages.java
+++ b/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Messages.java
@@ -142,6 +142,7 @@ public final class Messages {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.BoolValue)
       BoolValueOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use BoolValue.newBuilder() to construct.
     private BoolValue(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -153,7 +154,7 @@ public final class Messages {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private BoolValue(
         com.google.protobuf.CodedInputStream input,
@@ -161,6 +162,8 @@ public final class Messages {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -170,7 +173,8 @@ public final class Messages {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -188,6 +192,7 @@ public final class Messages {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -231,6 +236,7 @@ public final class Messages {
       if (value_ != false) {
         output.writeBool(1, value_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -242,11 +248,11 @@ public final class Messages {
         size += com.google.protobuf.CodedOutputStream
           .computeBoolSize(1, value_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -260,6 +266,7 @@ public final class Messages {
       boolean result = true;
       result = result && (getValue()
           == other.getValue());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -442,7 +449,7 @@ public final class Messages {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -455,12 +462,12 @@ public final class Messages {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -477,6 +484,7 @@ public final class Messages {
         if (other.getValue() != false) {
           setValue(other.getValue());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -542,12 +550,12 @@ public final class Messages {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -632,6 +640,7 @@ public final class Messages {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.Payload)
       PayloadOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use Payload.newBuilder() to construct.
     private Payload(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -644,7 +653,7 @@ public final class Messages {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private Payload(
         com.google.protobuf.CodedInputStream input,
@@ -652,6 +661,8 @@ public final class Messages {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -661,7 +672,8 @@ public final class Messages {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -685,6 +697,7 @@ public final class Messages {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -757,6 +770,7 @@ public final class Messages {
       if (!body_.isEmpty()) {
         output.writeBytes(2, body_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -772,11 +786,11 @@ public final class Messages {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(2, body_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -791,6 +805,7 @@ public final class Messages {
       result = result && type_ == other.type_;
       result = result && getBody()
           .equals(other.getBody());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -975,7 +990,7 @@ public final class Messages {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -988,12 +1003,12 @@ public final class Messages {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -1013,6 +1028,7 @@ public final class Messages {
         if (other.getBody() != com.google.protobuf.ByteString.EMPTY) {
           setBody(other.getBody());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -1150,12 +1166,12 @@ public final class Messages {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -1228,6 +1244,7 @@ public final class Messages {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.EchoStatus)
       EchoStatusOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use EchoStatus.newBuilder() to construct.
     private EchoStatus(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -1240,7 +1257,7 @@ public final class Messages {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private EchoStatus(
         com.google.protobuf.CodedInputStream input,
@@ -1248,6 +1265,8 @@ public final class Messages {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -1257,7 +1276,8 @@ public final class Messages {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -1281,6 +1301,7 @@ public final class Messages {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -1357,6 +1378,7 @@ public final class Messages {
       if (!getMessageBytes().isEmpty()) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 2, message_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -1371,11 +1393,11 @@ public final class Messages {
       if (!getMessageBytes().isEmpty()) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, message_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -1391,6 +1413,7 @@ public final class Messages {
           == other.getCode());
       result = result && getMessage()
           .equals(other.getMessage());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -1576,7 +1599,7 @@ public final class Messages {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -1589,12 +1612,12 @@ public final class Messages {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -1615,6 +1638,7 @@ public final class Messages {
           message_ = other.message_;
           onChanged();
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -1737,12 +1761,12 @@ public final class Messages {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -1956,6 +1980,7 @@ public final class Messages {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.SimpleRequest)
       SimpleRequestOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use SimpleRequest.newBuilder() to construct.
     private SimpleRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -1970,7 +1995,7 @@ public final class Messages {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private SimpleRequest(
         com.google.protobuf.CodedInputStream input,
@@ -1978,6 +2003,8 @@ public final class Messages {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -1987,7 +2014,8 @@ public final class Messages {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -2073,6 +2101,7 @@ public final class Messages {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -2332,6 +2361,7 @@ public final class Messages {
       if (expectCompressed_ != null) {
         output.writeMessage(8, getExpectCompressed());
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -2371,11 +2401,11 @@ public final class Messages {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(8, getExpectCompressed());
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -2414,6 +2444,7 @@ public final class Messages {
         result = result && getExpectCompressed()
             .equals(other.getExpectCompressed());
       }
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -2670,7 +2701,7 @@ public final class Messages {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -2683,12 +2714,12 @@ public final class Messages {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -2726,6 +2757,7 @@ public final class Messages {
         if (other.hasExpectCompressed()) {
           mergeExpectCompressed(other.getExpectCompressed());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -3580,12 +3612,12 @@ public final class Messages {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -3705,6 +3737,7 @@ public final class Messages {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.SimpleResponse)
       SimpleResponseOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use SimpleResponse.newBuilder() to construct.
     private SimpleResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -3717,7 +3750,7 @@ public final class Messages {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private SimpleResponse(
         com.google.protobuf.CodedInputStream input,
@@ -3725,6 +3758,8 @@ public final class Messages {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -3734,7 +3769,8 @@ public final class Messages {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -3772,6 +3808,7 @@ public final class Messages {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -3927,6 +3964,7 @@ public final class Messages {
       if (!getOauthScopeBytes().isEmpty()) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 3, oauthScope_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -3944,11 +3982,11 @@ public final class Messages {
       if (!getOauthScopeBytes().isEmpty()) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, oauthScope_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -3969,6 +4007,7 @@ public final class Messages {
           .equals(other.getUsername());
       result = result && getOauthScope()
           .equals(other.getOauthScope());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -4168,7 +4207,7 @@ public final class Messages {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -4181,12 +4220,12 @@ public final class Messages {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -4211,6 +4250,7 @@ public final class Messages {
           oauthScope_ = other.oauthScope_;
           onChanged();
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -4574,12 +4614,12 @@ public final class Messages {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -4695,6 +4735,7 @@ public final class Messages {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.StreamingInputCallRequest)
       StreamingInputCallRequestOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use StreamingInputCallRequest.newBuilder() to construct.
     private StreamingInputCallRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -4705,7 +4746,7 @@ public final class Messages {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private StreamingInputCallRequest(
         com.google.protobuf.CodedInputStream input,
@@ -4713,6 +4754,8 @@ public final class Messages {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -4722,7 +4765,8 @@ public final class Messages {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -4761,6 +4805,7 @@ public final class Messages {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -4869,6 +4914,7 @@ public final class Messages {
       if (expectCompressed_ != null) {
         output.writeMessage(2, getExpectCompressed());
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -4884,11 +4930,11 @@ public final class Messages {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(2, getExpectCompressed());
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -4910,6 +4956,7 @@ public final class Messages {
         result = result && getExpectCompressed()
             .equals(other.getExpectCompressed());
       }
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -5114,7 +5161,7 @@ public final class Messages {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -5127,12 +5174,12 @@ public final class Messages {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -5152,6 +5199,7 @@ public final class Messages {
         if (other.hasExpectCompressed()) {
           mergeExpectCompressed(other.getExpectCompressed());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -5512,12 +5560,12 @@ public final class Messages {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -5583,6 +5631,7 @@ public final class Messages {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.StreamingInputCallResponse)
       StreamingInputCallResponseOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use StreamingInputCallResponse.newBuilder() to construct.
     private StreamingInputCallResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -5594,7 +5643,7 @@ public final class Messages {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private StreamingInputCallResponse(
         com.google.protobuf.CodedInputStream input,
@@ -5602,6 +5651,8 @@ public final class Messages {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -5611,7 +5662,8 @@ public final class Messages {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -5629,6 +5681,7 @@ public final class Messages {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -5672,6 +5725,7 @@ public final class Messages {
       if (aggregatedPayloadSize_ != 0) {
         output.writeInt32(1, aggregatedPayloadSize_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -5683,11 +5737,11 @@ public final class Messages {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(1, aggregatedPayloadSize_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -5701,6 +5755,7 @@ public final class Messages {
       boolean result = true;
       result = result && (getAggregatedPayloadSize()
           == other.getAggregatedPayloadSize());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -5880,7 +5935,7 @@ public final class Messages {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -5893,12 +5948,12 @@ public final class Messages {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -5915,6 +5970,7 @@ public final class Messages {
         if (other.getAggregatedPayloadSize() != 0) {
           setAggregatedPayloadSize(other.getAggregatedPayloadSize());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -5980,12 +6036,12 @@ public final class Messages {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -6095,6 +6151,7 @@ public final class Messages {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.ResponseParameters)
       ResponseParametersOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ResponseParameters.newBuilder() to construct.
     private ResponseParameters(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -6107,7 +6164,7 @@ public final class Messages {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private ResponseParameters(
         com.google.protobuf.CodedInputStream input,
@@ -6115,6 +6172,8 @@ public final class Messages {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -6124,7 +6183,8 @@ public final class Messages {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -6160,6 +6220,7 @@ public final class Messages {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -6265,6 +6326,7 @@ public final class Messages {
       if (compressed_ != null) {
         output.writeMessage(3, getCompressed());
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -6284,11 +6346,11 @@ public final class Messages {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(3, getCompressed());
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -6309,6 +6371,7 @@ public final class Messages {
         result = result && getCompressed()
             .equals(other.getCompressed());
       }
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -6508,7 +6571,7 @@ public final class Messages {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -6521,12 +6584,12 @@ public final class Messages {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -6549,6 +6612,7 @@ public final class Messages {
         if (other.hasCompressed()) {
           mergeCompressed(other.getCompressed());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -6835,12 +6899,12 @@ public final class Messages {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -7016,6 +7080,7 @@ public final class Messages {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.StreamingOutputCallRequest)
       StreamingOutputCallRequestOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use StreamingOutputCallRequest.newBuilder() to construct.
     private StreamingOutputCallRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -7028,7 +7093,7 @@ public final class Messages {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private StreamingOutputCallRequest(
         com.google.protobuf.CodedInputStream input,
@@ -7036,6 +7101,8 @@ public final class Messages {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -7045,7 +7112,8 @@ public final class Messages {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -7102,6 +7170,7 @@ public final class Messages {
         if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
           responseParameters_ = java.util.Collections.unmodifiableList(responseParameters_);
         }
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -7295,6 +7364,7 @@ public final class Messages {
       if (responseStatus_ != null) {
         output.writeMessage(7, getResponseStatus());
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -7318,11 +7388,11 @@ public final class Messages {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(7, getResponseStatus());
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -7347,6 +7417,7 @@ public final class Messages {
         result = result && getResponseStatus()
             .equals(other.getResponseStatus());
       }
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -7579,7 +7650,7 @@ public final class Messages {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -7592,12 +7663,12 @@ public final class Messages {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -7646,6 +7717,7 @@ public final class Messages {
         if (other.hasResponseStatus()) {
           mergeResponseStatus(other.getResponseStatus());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -8376,12 +8448,12 @@ public final class Messages {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -8463,6 +8535,7 @@ public final class Messages {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.StreamingOutputCallResponse)
       StreamingOutputCallResponseOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use StreamingOutputCallResponse.newBuilder() to construct.
     private StreamingOutputCallResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -8473,7 +8546,7 @@ public final class Messages {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private StreamingOutputCallResponse(
         com.google.protobuf.CodedInputStream input,
@@ -8481,6 +8554,8 @@ public final class Messages {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -8490,7 +8565,8 @@ public final class Messages {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -8516,6 +8592,7 @@ public final class Messages {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -8579,6 +8656,7 @@ public final class Messages {
       if (payload_ != null) {
         output.writeMessage(1, getPayload());
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -8590,11 +8668,11 @@ public final class Messages {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(1, getPayload());
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -8611,6 +8689,7 @@ public final class Messages {
         result = result && getPayload()
             .equals(other.getPayload());
       }
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -8800,7 +8879,7 @@ public final class Messages {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -8813,12 +8892,12 @@ public final class Messages {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -8835,6 +8914,7 @@ public final class Messages {
         if (other.hasPayload()) {
           mergePayload(other.getPayload());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -9015,12 +9095,12 @@ public final class Messages {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -9083,6 +9163,7 @@ public final class Messages {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.ReconnectParams)
       ReconnectParamsOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ReconnectParams.newBuilder() to construct.
     private ReconnectParams(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -9094,7 +9175,7 @@ public final class Messages {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private ReconnectParams(
         com.google.protobuf.CodedInputStream input,
@@ -9102,6 +9183,8 @@ public final class Messages {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -9111,7 +9194,8 @@ public final class Messages {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -9129,6 +9213,7 @@ public final class Messages {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -9168,6 +9253,7 @@ public final class Messages {
       if (maxReconnectBackoffMs_ != 0) {
         output.writeInt32(1, maxReconnectBackoffMs_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -9179,11 +9265,11 @@ public final class Messages {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(1, maxReconnectBackoffMs_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -9197,6 +9283,7 @@ public final class Messages {
       boolean result = true;
       result = result && (getMaxReconnectBackoffMs()
           == other.getMaxReconnectBackoffMs());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -9377,7 +9464,7 @@ public final class Messages {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -9390,12 +9477,12 @@ public final class Messages {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -9412,6 +9499,7 @@ public final class Messages {
         if (other.getMaxReconnectBackoffMs() != 0) {
           setMaxReconnectBackoffMs(other.getMaxReconnectBackoffMs());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -9465,12 +9553,12 @@ public final class Messages {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -9547,6 +9635,7 @@ public final class Messages {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.ReconnectInfo)
       ReconnectInfoOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ReconnectInfo.newBuilder() to construct.
     private ReconnectInfo(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -9559,7 +9648,7 @@ public final class Messages {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private ReconnectInfo(
         com.google.protobuf.CodedInputStream input,
@@ -9567,6 +9656,8 @@ public final class Messages {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -9576,7 +9667,8 @@ public final class Messages {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -9618,6 +9710,7 @@ public final class Messages {
         if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
           backoffMs_ = java.util.Collections.unmodifiableList(backoffMs_);
         }
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -9689,6 +9782,7 @@ public final class Messages {
       for (int i = 0; i < backoffMs_.size(); i++) {
         output.writeInt32NoTag(backoffMs_.get(i));
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -9714,11 +9808,11 @@ public final class Messages {
         }
         backoffMsMemoizedSerializedSize = dataSize;
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -9734,6 +9828,7 @@ public final class Messages {
           == other.getPassed());
       result = result && getBackoffMsList()
           .equals(other.getBackoffMsList());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -9930,7 +10025,7 @@ public final class Messages {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -9943,12 +10038,12 @@ public final class Messages {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -9975,6 +10070,7 @@ public final class Messages {
           }
           onChanged();
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -10095,12 +10191,12 @@ public final class Messages {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
diff --git a/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Payloads.java b/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Payloads.java
index c39711249..02e3def63 100644
--- a/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Payloads.java
+++ b/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Payloads.java
@@ -35,6 +35,7 @@ public final class Payloads {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.ByteBufferParams)
       ByteBufferParamsOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ByteBufferParams.newBuilder() to construct.
     private ByteBufferParams(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -47,7 +48,7 @@ public final class Payloads {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private ByteBufferParams(
         com.google.protobuf.CodedInputStream input,
@@ -55,6 +56,8 @@ public final class Payloads {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -64,7 +67,8 @@ public final class Payloads {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -87,6 +91,7 @@ public final class Payloads {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -138,6 +143,7 @@ public final class Payloads {
       if (respSize_ != 0) {
         output.writeInt32(2, respSize_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -153,11 +159,11 @@ public final class Payloads {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(2, respSize_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -173,6 +179,7 @@ public final class Payloads {
           == other.getReqSize());
       result = result && (getRespSize()
           == other.getRespSize());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -353,7 +360,7 @@ public final class Payloads {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -366,12 +373,12 @@ public final class Payloads {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -391,6 +398,7 @@ public final class Payloads {
         if (other.getRespSize() != 0) {
           setRespSize(other.getRespSize());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -470,12 +478,12 @@ public final class Payloads {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -538,6 +546,7 @@ public final class Payloads {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.SimpleProtoParams)
       SimpleProtoParamsOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use SimpleProtoParams.newBuilder() to construct.
     private SimpleProtoParams(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -550,7 +559,7 @@ public final class Payloads {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private SimpleProtoParams(
         com.google.protobuf.CodedInputStream input,
@@ -558,6 +567,8 @@ public final class Payloads {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -567,7 +578,8 @@ public final class Payloads {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -590,6 +602,7 @@ public final class Payloads {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -641,6 +654,7 @@ public final class Payloads {
       if (respSize_ != 0) {
         output.writeInt32(2, respSize_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -656,11 +670,11 @@ public final class Payloads {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(2, respSize_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -676,6 +690,7 @@ public final class Payloads {
           == other.getReqSize());
       result = result && (getRespSize()
           == other.getRespSize());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -856,7 +871,7 @@ public final class Payloads {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -869,12 +884,12 @@ public final class Payloads {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -894,6 +909,7 @@ public final class Payloads {
         if (other.getRespSize() != 0) {
           setRespSize(other.getRespSize());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -973,12 +989,12 @@ public final class Payloads {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -1036,6 +1052,7 @@ public final class Payloads {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.ComplexProtoParams)
       ComplexProtoParamsOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ComplexProtoParams.newBuilder() to construct.
     private ComplexProtoParams(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -1046,13 +1063,15 @@ public final class Payloads {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private ComplexProtoParams(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -1062,7 +1081,8 @@ public final class Payloads {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -1075,6 +1095,7 @@ public final class Payloads {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -1102,6 +1123,7 @@ public final class Payloads {
 
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -1109,11 +1131,11 @@ public final class Payloads {
       if (size != -1) return size;
 
       size = 0;
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -1125,6 +1147,7 @@ public final class Payloads {
       io.grpc.benchmarks.proto.Payloads.ComplexProtoParams other = (io.grpc.benchmarks.proto.Payloads.ComplexProtoParams) obj;
 
       boolean result = true;
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -1300,7 +1323,7 @@ public final class Payloads {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -1313,12 +1336,12 @@ public final class Payloads {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -1332,6 +1355,7 @@ public final class Payloads {
 
       public Builder mergeFrom(io.grpc.benchmarks.proto.Payloads.ComplexProtoParams other) {
         if (other == io.grpc.benchmarks.proto.Payloads.ComplexProtoParams.getDefaultInstance()) return this;
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -1359,12 +1383,12 @@ public final class Payloads {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -1413,6 +1437,10 @@ public final class Payloads {
     /**
      * <code>.grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
      */
+    boolean hasBytebufParams();
+    /**
+     * <code>.grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
+     */
     io.grpc.benchmarks.proto.Payloads.ByteBufferParams getBytebufParams();
     /**
      * <code>.grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
@@ -1422,6 +1450,10 @@ public final class Payloads {
     /**
      * <code>.grpc.testing.SimpleProtoParams simple_params = 2;</code>
      */
+    boolean hasSimpleParams();
+    /**
+     * <code>.grpc.testing.SimpleProtoParams simple_params = 2;</code>
+     */
     io.grpc.benchmarks.proto.Payloads.SimpleProtoParams getSimpleParams();
     /**
      * <code>.grpc.testing.SimpleProtoParams simple_params = 2;</code>
@@ -1431,6 +1463,10 @@ public final class Payloads {
     /**
      * <code>.grpc.testing.ComplexProtoParams complex_params = 3;</code>
      */
+    boolean hasComplexParams();
+    /**
+     * <code>.grpc.testing.ComplexProtoParams complex_params = 3;</code>
+     */
     io.grpc.benchmarks.proto.Payloads.ComplexProtoParams getComplexParams();
     /**
      * <code>.grpc.testing.ComplexProtoParams complex_params = 3;</code>
@@ -1446,6 +1482,7 @@ public final class Payloads {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.PayloadConfig)
       PayloadConfigOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use PayloadConfig.newBuilder() to construct.
     private PayloadConfig(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -1456,7 +1493,7 @@ public final class Payloads {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private PayloadConfig(
         com.google.protobuf.CodedInputStream input,
@@ -1464,6 +1501,8 @@ public final class Payloads {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -1473,7 +1512,8 @@ public final class Payloads {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -1528,6 +1568,7 @@ public final class Payloads {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -1587,6 +1628,12 @@ public final class Payloads {
     /**
      * <code>.grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
      */
+    public boolean hasBytebufParams() {
+      return payloadCase_ == 1;
+    }
+    /**
+     * <code>.grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
+     */
     public io.grpc.benchmarks.proto.Payloads.ByteBufferParams getBytebufParams() {
       if (payloadCase_ == 1) {
          return (io.grpc.benchmarks.proto.Payloads.ByteBufferParams) payload_;
@@ -1607,6 +1654,12 @@ public final class Payloads {
     /**
      * <code>.grpc.testing.SimpleProtoParams simple_params = 2;</code>
      */
+    public boolean hasSimpleParams() {
+      return payloadCase_ == 2;
+    }
+    /**
+     * <code>.grpc.testing.SimpleProtoParams simple_params = 2;</code>
+     */
     public io.grpc.benchmarks.proto.Payloads.SimpleProtoParams getSimpleParams() {
       if (payloadCase_ == 2) {
          return (io.grpc.benchmarks.proto.Payloads.SimpleProtoParams) payload_;
@@ -1627,6 +1680,12 @@ public final class Payloads {
     /**
      * <code>.grpc.testing.ComplexProtoParams complex_params = 3;</code>
      */
+    public boolean hasComplexParams() {
+      return payloadCase_ == 3;
+    }
+    /**
+     * <code>.grpc.testing.ComplexProtoParams complex_params = 3;</code>
+     */
     public io.grpc.benchmarks.proto.Payloads.ComplexProtoParams getComplexParams() {
       if (payloadCase_ == 3) {
          return (io.grpc.benchmarks.proto.Payloads.ComplexProtoParams) payload_;
@@ -1664,6 +1723,7 @@ public final class Payloads {
       if (payloadCase_ == 3) {
         output.writeMessage(3, (io.grpc.benchmarks.proto.Payloads.ComplexProtoParams) payload_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -1683,11 +1743,11 @@ public final class Payloads {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(3, (io.grpc.benchmarks.proto.Payloads.ComplexProtoParams) payload_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -1718,6 +1778,7 @@ public final class Payloads {
         case 0:
         default:
       }
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -1928,7 +1989,7 @@ public final class Payloads {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -1941,12 +2002,12 @@ public final class Payloads {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -1977,6 +2038,7 @@ public final class Payloads {
             break;
           }
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -2023,6 +2085,12 @@ public final class Payloads {
       /**
        * <code>.grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
        */
+      public boolean hasBytebufParams() {
+        return payloadCase_ == 1;
+      }
+      /**
+       * <code>.grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
+       */
       public io.grpc.benchmarks.proto.Payloads.ByteBufferParams getBytebufParams() {
         if (bytebufParamsBuilder_ == null) {
           if (payloadCase_ == 1) {
@@ -2153,6 +2221,12 @@ public final class Payloads {
       /**
        * <code>.grpc.testing.SimpleProtoParams simple_params = 2;</code>
        */
+      public boolean hasSimpleParams() {
+        return payloadCase_ == 2;
+      }
+      /**
+       * <code>.grpc.testing.SimpleProtoParams simple_params = 2;</code>
+       */
       public io.grpc.benchmarks.proto.Payloads.SimpleProtoParams getSimpleParams() {
         if (simpleParamsBuilder_ == null) {
           if (payloadCase_ == 2) {
@@ -2283,6 +2357,12 @@ public final class Payloads {
       /**
        * <code>.grpc.testing.ComplexProtoParams complex_params = 3;</code>
        */
+      public boolean hasComplexParams() {
+        return payloadCase_ == 3;
+      }
+      /**
+       * <code>.grpc.testing.ComplexProtoParams complex_params = 3;</code>
+       */
       public io.grpc.benchmarks.proto.Payloads.ComplexProtoParams getComplexParams() {
         if (complexParamsBuilder_ == null) {
           if (payloadCase_ == 3) {
@@ -2409,12 +2489,12 @@ public final class Payloads {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
diff --git a/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Stats.java b/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Stats.java
index bd2c3db44..6e8719382 100644
--- a/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Stats.java
+++ b/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Stats.java
@@ -80,6 +80,7 @@ public final class Stats {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.ServerStats)
       ServerStatsOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ServerStats.newBuilder() to construct.
     private ServerStats(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -96,7 +97,7 @@ public final class Stats {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private ServerStats(
         com.google.protobuf.CodedInputStream input,
@@ -104,6 +105,8 @@ public final class Stats {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -113,7 +116,8 @@ public final class Stats {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -156,6 +160,7 @@ public final class Stats {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -280,6 +285,7 @@ public final class Stats {
       if (cqPollCount_ != 0L) {
         output.writeUInt64(6, cqPollCount_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -311,11 +317,11 @@ public final class Stats {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(6, cqPollCount_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -345,6 +351,7 @@ public final class Stats {
           == other.getIdleCpuTime());
       result = result && (getCqPollCount()
           == other.getCqPollCount());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -551,7 +558,7 @@ public final class Stats {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -564,12 +571,12 @@ public final class Stats {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -601,6 +608,7 @@ public final class Stats {
         if (other.getCqPollCount() != 0L) {
           setCqPollCount(other.getCqPollCount());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -859,12 +867,12 @@ public final class Stats {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -939,6 +947,7 @@ public final class Stats {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.HistogramParams)
       HistogramParamsOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use HistogramParams.newBuilder() to construct.
     private HistogramParams(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -951,7 +960,7 @@ public final class Stats {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private HistogramParams(
         com.google.protobuf.CodedInputStream input,
@@ -959,6 +968,8 @@ public final class Stats {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -968,7 +979,8 @@ public final class Stats {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -991,6 +1003,7 @@ public final class Stats {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -1050,6 +1063,7 @@ public final class Stats {
       if (maxPossible_ != 0D) {
         output.writeDouble(2, maxPossible_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -1065,11 +1079,11 @@ public final class Stats {
         size += com.google.protobuf.CodedOutputStream
           .computeDoubleSize(2, maxPossible_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -1089,6 +1103,7 @@ public final class Stats {
           java.lang.Double.doubleToLongBits(getMaxPossible())
           == java.lang.Double.doubleToLongBits(
               other.getMaxPossible()));
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -1275,7 +1290,7 @@ public final class Stats {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -1288,12 +1303,12 @@ public final class Stats {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -1313,6 +1328,7 @@ public final class Stats {
         if (other.getMaxPossible() != 0D) {
           setMaxPossible(other.getMaxPossible());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -1416,12 +1432,12 @@ public final class Stats {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -1516,6 +1532,7 @@ public final class Stats {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.HistogramData)
       HistogramDataOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use HistogramData.newBuilder() to construct.
     private HistogramData(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -1532,7 +1549,7 @@ public final class Stats {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private HistogramData(
         com.google.protobuf.CodedInputStream input,
@@ -1540,6 +1557,8 @@ public final class Stats {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -1549,7 +1568,8 @@ public final class Stats {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -1611,6 +1631,7 @@ public final class Stats {
         if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
           bucket_ = java.util.Collections.unmodifiableList(bucket_);
         }
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -1730,6 +1751,7 @@ public final class Stats {
       if (count_ != 0D) {
         output.writeDouble(6, count_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -1771,11 +1793,11 @@ public final class Stats {
         size += com.google.protobuf.CodedOutputStream
           .computeDoubleSize(6, count_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -1809,6 +1831,7 @@ public final class Stats {
           java.lang.Double.doubleToLongBits(getCount())
           == java.lang.Double.doubleToLongBits(
               other.getCount()));
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -2027,7 +2050,7 @@ public final class Stats {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -2040,12 +2063,12 @@ public final class Stats {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -2084,6 +2107,7 @@ public final class Stats {
         if (other.getCount() != 0D) {
           setCount(other.getCount());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -2308,12 +2332,12 @@ public final class Stats {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -2376,6 +2400,7 @@ public final class Stats {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.RequestResultCount)
       RequestResultCountOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use RequestResultCount.newBuilder() to construct.
     private RequestResultCount(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -2388,7 +2413,7 @@ public final class Stats {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private RequestResultCount(
         com.google.protobuf.CodedInputStream input,
@@ -2396,6 +2421,8 @@ public final class Stats {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -2405,7 +2432,8 @@ public final class Stats {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -2428,6 +2456,7 @@ public final class Stats {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -2479,6 +2508,7 @@ public final class Stats {
       if (count_ != 0L) {
         output.writeInt64(2, count_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -2494,11 +2524,11 @@ public final class Stats {
         size += com.google.protobuf.CodedOutputStream
           .computeInt64Size(2, count_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -2514,6 +2544,7 @@ public final class Stats {
           == other.getStatusCode());
       result = result && (getCount()
           == other.getCount());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -2695,7 +2726,7 @@ public final class Stats {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -2708,12 +2739,12 @@ public final class Stats {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -2733,6 +2764,7 @@ public final class Stats {
         if (other.getCount() != 0L) {
           setCount(other.getCount());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -2812,12 +2844,12 @@ public final class Stats {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -2967,6 +2999,7 @@ public final class Stats {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.ClientStats)
       ClientStatsOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ClientStats.newBuilder() to construct.
     private ClientStats(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -2982,7 +3015,7 @@ public final class Stats {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private ClientStats(
         com.google.protobuf.CodedInputStream input,
@@ -2990,6 +3023,8 @@ public final class Stats {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -2999,7 +3034,8 @@ public final class Stats {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -3057,6 +3093,7 @@ public final class Stats {
         if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
           requestResults_ = java.util.Collections.unmodifiableList(requestResults_);
         }
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -3235,6 +3272,7 @@ public final class Stats {
       if (cqPollCount_ != 0L) {
         output.writeUInt64(6, cqPollCount_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -3266,11 +3304,11 @@ public final class Stats {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(6, cqPollCount_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -3303,6 +3341,7 @@ public final class Stats {
           .equals(other.getRequestResultsList());
       result = result && (getCqPollCount()
           == other.getCqPollCount());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -3535,7 +3574,7 @@ public final class Stats {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -3548,12 +3587,12 @@ public final class Stats {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -3608,6 +3647,7 @@ public final class Stats {
         if (other.getCqPollCount() != 0L) {
           setCqPollCount(other.getCqPollCount());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -4229,12 +4269,12 @@ public final class Stats {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
diff --git a/build.gradle b/build.gradle
index 406efd321..1e1cc5bb7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -92,8 +92,8 @@ subprojects {
 
         nettyVersion = '4.1.14.Final'
         guavaVersion = '19.0'
-        protobufVersion = '3.3.1'
-        protocVersion = '3.3.0' // TODO(carl-mastrangelo): set this from protobufVersion when versions align again
+        protobufVersion = '3.4.0'
+        protocVersion = protobufVersion
         protobufNanoVersion = '3.0.0-alpha-5'
 
         configureProtoCompilation = {
diff --git a/buildscripts/make_dependencies.bat b/buildscripts/make_dependencies.bat
index 885e116df..e4447cc30 100644
--- a/buildscripts/make_dependencies.bat
+++ b/buildscripts/make_dependencies.bat
@@ -4,7 +4,7 @@ REM 7za is in http://www.7-zip.org/a/7z1507-extra.7z
 REM Prerequisite:
 REM   7za.exe in current directory or PATH
 
-set PROTOBUF_VER=3.3.1
+set PROTOBUF_VER=3.4.0
 set CMAKE_NAME=cmake-3.3.2-win32-x86
 
 if not exist "protobuf-%PROTOBUF_VER%\cmake\build\Release\" (
diff --git a/compiler/Dockerfile b/compiler/Dockerfile
index d5e0cf650..c873b75ad 100644
--- a/compiler/Dockerfile
+++ b/compiler/Dockerfile
@@ -2,7 +2,7 @@ FROM protoc-artifacts:latest
 
 RUN scl enable devtoolset-1.1 'bash -c "cd /protobuf && \
     git fetch && \
-    git checkout v3.3.1 && \
+    git checkout v3.4.0 && \
     ./autogen.sh && \
     CXXFLAGS=-m32 ./configure --disable-shared --prefix=/protobuf-32 && \
     make clean && make -j$(nproc) && make -j$(nproc) install"'
diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle
index 5b8797875..a848ff77e 100644
--- a/examples/android/helloworld/app/build.gradle
+++ b/examples/android/helloworld/app/build.gradle
@@ -27,7 +27,7 @@ android {
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.3.0'
+        artifact = 'com.google.protobuf:protoc:3.4.0'
     }
     plugins {
         javalite {
diff --git a/examples/android/routeguide/app/build.gradle b/examples/android/routeguide/app/build.gradle
index 939705644..d4eb50df8 100644
--- a/examples/android/routeguide/app/build.gradle
+++ b/examples/android/routeguide/app/build.gradle
@@ -25,7 +25,7 @@ android {
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.3.0'
+        artifact = 'com.google.protobuf:protoc:3.4.0'
     }
     plugins {
         javalite {
diff --git a/examples/build.gradle b/examples/build.gradle
index 0153e67ca..b2eafc8cd 100644
--- a/examples/build.gradle
+++ b/examples/build.gradle
@@ -37,7 +37,7 @@ dependencies {
 
 protobuf {
   protoc {
-    artifact = 'com.google.protobuf:protoc:3.3.0'
+    artifact = 'com.google.protobuf:protoc:3.4.0'
   }
   plugins {
     grpc {
diff --git a/examples/pom.xml b/examples/pom.xml
index 9e18eacc9..6b7549ddb 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -66,7 +66,7 @@
         <artifactId>protobuf-maven-plugin</artifactId>
         <version>0.5.0</version>
         <configuration>
-          <protocArtifact>com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier}</protocArtifact>
+          <protocArtifact>com.google.protobuf:protoc:3.4.0:exe:${os.detected.classifier}</protocArtifact>
           <pluginId>grpc-java</pluginId>
           <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
         </configuration>
diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/ClientStats.java b/grpclb/src/generated/main/java/io/grpc/grpclb/ClientStats.java
index a6fa38d38..82a878ec3 100644
--- a/grpclb/src/generated/main/java/io/grpc/grpclb/ClientStats.java
+++ b/grpclb/src/generated/main/java/io/grpc/grpclb/ClientStats.java
@@ -15,6 +15,7 @@ public  final class ClientStats extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.lb.v1.ClientStats)
     ClientStatsOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use ClientStats.newBuilder() to construct.
   private ClientStats(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -30,7 +31,7 @@ public  final class ClientStats extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private ClientStats(
       com.google.protobuf.CodedInputStream input,
@@ -38,6 +39,8 @@ public  final class ClientStats extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -47,7 +50,8 @@ public  final class ClientStats extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -105,6 +109,7 @@ public  final class ClientStats extends
       if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
         callsFinishedWithDrop_ = java.util.Collections.unmodifiableList(callsFinishedWithDrop_);
       }
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -292,6 +297,7 @@ public  final class ClientStats extends
     for (int i = 0; i < callsFinishedWithDrop_.size(); i++) {
       output.writeMessage(8, callsFinishedWithDrop_.get(i));
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -323,11 +329,11 @@ public  final class ClientStats extends
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(8, callsFinishedWithDrop_.get(i));
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -354,6 +360,7 @@ public  final class ClientStats extends
         == other.getNumCallsFinishedKnownReceived());
     result = result && getCallsFinishedWithDropList()
         .equals(other.getCallsFinishedWithDropList());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -591,7 +598,7 @@ public  final class ClientStats extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -604,12 +611,12 @@ public  final class ClientStats extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -664,6 +671,7 @@ public  final class ClientStats extends
           }
         }
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1312,12 +1320,12 @@ public  final class ClientStats extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/ClientStatsPerToken.java b/grpclb/src/generated/main/java/io/grpc/grpclb/ClientStatsPerToken.java
index 13644c177..a9f5871c8 100644
--- a/grpclb/src/generated/main/java/io/grpc/grpclb/ClientStatsPerToken.java
+++ b/grpclb/src/generated/main/java/io/grpc/grpclb/ClientStatsPerToken.java
@@ -14,6 +14,7 @@ public  final class ClientStatsPerToken extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.lb.v1.ClientStatsPerToken)
     ClientStatsPerTokenOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use ClientStatsPerToken.newBuilder() to construct.
   private ClientStatsPerToken(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -26,7 +27,7 @@ public  final class ClientStatsPerToken extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private ClientStatsPerToken(
       com.google.protobuf.CodedInputStream input,
@@ -34,6 +35,8 @@ public  final class ClientStatsPerToken extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -43,7 +46,8 @@ public  final class ClientStatsPerToken extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -67,6 +71,7 @@ public  final class ClientStatsPerToken extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -155,6 +160,7 @@ public  final class ClientStatsPerToken extends
     if (numCalls_ != 0L) {
       output.writeInt64(2, numCalls_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -169,11 +175,11 @@ public  final class ClientStatsPerToken extends
       size += com.google.protobuf.CodedOutputStream
         .computeInt64Size(2, numCalls_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -189,6 +195,7 @@ public  final class ClientStatsPerToken extends
         .equals(other.getLoadBalanceToken());
     result = result && (getNumCalls()
         == other.getNumCalls());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -374,7 +381,7 @@ public  final class ClientStatsPerToken extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -387,12 +394,12 @@ public  final class ClientStatsPerToken extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -413,6 +420,7 @@ public  final class ClientStatsPerToken extends
       if (other.getNumCalls() != 0L) {
         setNumCalls(other.getNumCalls());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -567,12 +575,12 @@ public  final class ClientStatsPerToken extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequest.java b/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequest.java
index 9f72def7e..96162e76d 100644
--- a/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequest.java
+++ b/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequest.java
@@ -10,6 +10,7 @@ public  final class InitialLoadBalanceRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.lb.v1.InitialLoadBalanceRequest)
     InitialLoadBalanceRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use InitialLoadBalanceRequest.newBuilder() to construct.
   private InitialLoadBalanceRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -21,7 +22,7 @@ public  final class InitialLoadBalanceRequest extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private InitialLoadBalanceRequest(
       com.google.protobuf.CodedInputStream input,
@@ -29,6 +30,8 @@ public  final class InitialLoadBalanceRequest extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -38,7 +41,8 @@ public  final class InitialLoadBalanceRequest extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -57,6 +61,7 @@ public  final class InitialLoadBalanceRequest extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -131,6 +136,7 @@ public  final class InitialLoadBalanceRequest extends
     if (!getNameBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -141,11 +147,11 @@ public  final class InitialLoadBalanceRequest extends
     if (!getNameBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -159,6 +165,7 @@ public  final class InitialLoadBalanceRequest extends
     boolean result = true;
     result = result && getName()
         .equals(other.getName());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -334,7 +341,7 @@ public  final class InitialLoadBalanceRequest extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -347,12 +354,12 @@ public  final class InitialLoadBalanceRequest extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -370,6 +377,7 @@ public  final class InitialLoadBalanceRequest extends
         name_ = other.name_;
         onChanged();
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -491,12 +499,12 @@ public  final class InitialLoadBalanceRequest extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceResponse.java b/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceResponse.java
index 0f25cef15..f43f63df9 100644
--- a/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceResponse.java
+++ b/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceResponse.java
@@ -10,6 +10,7 @@ public  final class InitialLoadBalanceResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.lb.v1.InitialLoadBalanceResponse)
     InitialLoadBalanceResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use InitialLoadBalanceResponse.newBuilder() to construct.
   private InitialLoadBalanceResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -21,7 +22,7 @@ public  final class InitialLoadBalanceResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private InitialLoadBalanceResponse(
       com.google.protobuf.CodedInputStream input,
@@ -29,6 +30,8 @@ public  final class InitialLoadBalanceResponse extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -38,7 +41,8 @@ public  final class InitialLoadBalanceResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -70,6 +74,7 @@ public  final class InitialLoadBalanceResponse extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -192,6 +197,7 @@ public  final class InitialLoadBalanceResponse extends
     if (clientStatsReportInterval_ != null) {
       output.writeMessage(2, getClientStatsReportInterval());
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -206,11 +212,11 @@ public  final class InitialLoadBalanceResponse extends
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(2, getClientStatsReportInterval());
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -229,6 +235,7 @@ public  final class InitialLoadBalanceResponse extends
       result = result && getClientStatsReportInterval()
           .equals(other.getClientStatsReportInterval());
     }
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -419,7 +426,7 @@ public  final class InitialLoadBalanceResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -432,12 +439,12 @@ public  final class InitialLoadBalanceResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -458,6 +465,7 @@ public  final class InitialLoadBalanceResponse extends
       if (other.hasClientStatsReportInterval()) {
         mergeClientStatsReportInterval(other.getClientStatsReportInterval());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -765,12 +773,12 @@ public  final class InitialLoadBalanceResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceRequest.java b/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceRequest.java
index 3f28f4a22..3522a5f94 100644
--- a/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceRequest.java
+++ b/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceRequest.java
@@ -10,6 +10,7 @@ public  final class LoadBalanceRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.lb.v1.LoadBalanceRequest)
     LoadBalanceRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use LoadBalanceRequest.newBuilder() to construct.
   private LoadBalanceRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -20,7 +21,7 @@ public  final class LoadBalanceRequest extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private LoadBalanceRequest(
       com.google.protobuf.CodedInputStream input,
@@ -28,6 +29,8 @@ public  final class LoadBalanceRequest extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -37,7 +40,8 @@ public  final class LoadBalanceRequest extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -78,6 +82,7 @@ public  final class LoadBalanceRequest extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -139,6 +144,16 @@ public  final class LoadBalanceRequest extends
    *
    * <code>.grpc.lb.v1.InitialLoadBalanceRequest initial_request = 1;</code>
    */
+  public boolean hasInitialRequest() {
+    return loadBalanceRequestTypeCase_ == 1;
+  }
+  /**
+   * <pre>
+   * This message should be sent on the first request to the load balancer.
+   * </pre>
+   *
+   * <code>.grpc.lb.v1.InitialLoadBalanceRequest initial_request = 1;</code>
+   */
   public io.grpc.grpclb.InitialLoadBalanceRequest getInitialRequest() {
     if (loadBalanceRequestTypeCase_ == 1) {
        return (io.grpc.grpclb.InitialLoadBalanceRequest) loadBalanceRequestType_;
@@ -168,6 +183,17 @@ public  final class LoadBalanceRequest extends
    *
    * <code>.grpc.lb.v1.ClientStats client_stats = 2;</code>
    */
+  public boolean hasClientStats() {
+    return loadBalanceRequestTypeCase_ == 2;
+  }
+  /**
+   * <pre>
+   * The client stats should be periodically reported to the load balancer
+   * based on the duration defined in the InitialLoadBalanceResponse.
+   * </pre>
+   *
+   * <code>.grpc.lb.v1.ClientStats client_stats = 2;</code>
+   */
   public io.grpc.grpclb.ClientStats getClientStats() {
     if (loadBalanceRequestTypeCase_ == 2) {
        return (io.grpc.grpclb.ClientStats) loadBalanceRequestType_;
@@ -207,6 +233,7 @@ public  final class LoadBalanceRequest extends
     if (loadBalanceRequestTypeCase_ == 2) {
       output.writeMessage(2, (io.grpc.grpclb.ClientStats) loadBalanceRequestType_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -222,11 +249,11 @@ public  final class LoadBalanceRequest extends
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(2, (io.grpc.grpclb.ClientStats) loadBalanceRequestType_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -253,6 +280,7 @@ public  final class LoadBalanceRequest extends
       case 0:
       default:
     }
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -452,7 +480,7 @@ public  final class LoadBalanceRequest extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -465,12 +493,12 @@ public  final class LoadBalanceRequest extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -497,6 +525,7 @@ public  final class LoadBalanceRequest extends
           break;
         }
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -547,6 +576,16 @@ public  final class LoadBalanceRequest extends
      *
      * <code>.grpc.lb.v1.InitialLoadBalanceRequest initial_request = 1;</code>
      */
+    public boolean hasInitialRequest() {
+      return loadBalanceRequestTypeCase_ == 1;
+    }
+    /**
+     * <pre>
+     * This message should be sent on the first request to the load balancer.
+     * </pre>
+     *
+     * <code>.grpc.lb.v1.InitialLoadBalanceRequest initial_request = 1;</code>
+     */
     public io.grpc.grpclb.InitialLoadBalanceRequest getInitialRequest() {
       if (initialRequestBuilder_ == null) {
         if (loadBalanceRequestTypeCase_ == 1) {
@@ -710,6 +749,17 @@ public  final class LoadBalanceRequest extends
      *
      * <code>.grpc.lb.v1.ClientStats client_stats = 2;</code>
      */
+    public boolean hasClientStats() {
+      return loadBalanceRequestTypeCase_ == 2;
+    }
+    /**
+     * <pre>
+     * The client stats should be periodically reported to the load balancer
+     * based on the duration defined in the InitialLoadBalanceResponse.
+     * </pre>
+     *
+     * <code>.grpc.lb.v1.ClientStats client_stats = 2;</code>
+     */
     public io.grpc.grpclb.ClientStats getClientStats() {
       if (clientStatsBuilder_ == null) {
         if (loadBalanceRequestTypeCase_ == 2) {
@@ -871,12 +921,12 @@ public  final class LoadBalanceRequest extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceRequestOrBuilder.java b/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceRequestOrBuilder.java
index 6afc7b68f..b6dcd7eb4 100644
--- a/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceRequestOrBuilder.java
+++ b/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceRequestOrBuilder.java
@@ -14,6 +14,14 @@ public interface LoadBalanceRequestOrBuilder extends
    *
    * <code>.grpc.lb.v1.InitialLoadBalanceRequest initial_request = 1;</code>
    */
+  boolean hasInitialRequest();
+  /**
+   * <pre>
+   * This message should be sent on the first request to the load balancer.
+   * </pre>
+   *
+   * <code>.grpc.lb.v1.InitialLoadBalanceRequest initial_request = 1;</code>
+   */
   io.grpc.grpclb.InitialLoadBalanceRequest getInitialRequest();
   /**
    * <pre>
@@ -32,6 +40,15 @@ public interface LoadBalanceRequestOrBuilder extends
    *
    * <code>.grpc.lb.v1.ClientStats client_stats = 2;</code>
    */
+  boolean hasClientStats();
+  /**
+   * <pre>
+   * The client stats should be periodically reported to the load balancer
+   * based on the duration defined in the InitialLoadBalanceResponse.
+   * </pre>
+   *
+   * <code>.grpc.lb.v1.ClientStats client_stats = 2;</code>
+   */
   io.grpc.grpclb.ClientStats getClientStats();
   /**
    * <pre>
diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceResponse.java b/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceResponse.java
index 6b7eedeec..a3715a648 100644
--- a/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceResponse.java
+++ b/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceResponse.java
@@ -10,6 +10,7 @@ public  final class LoadBalanceResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.lb.v1.LoadBalanceResponse)
     LoadBalanceResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use LoadBalanceResponse.newBuilder() to construct.
   private LoadBalanceResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -20,7 +21,7 @@ public  final class LoadBalanceResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private LoadBalanceResponse(
       com.google.protobuf.CodedInputStream input,
@@ -28,6 +29,8 @@ public  final class LoadBalanceResponse extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -37,7 +40,8 @@ public  final class LoadBalanceResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -78,6 +82,7 @@ public  final class LoadBalanceResponse extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -139,6 +144,16 @@ public  final class LoadBalanceResponse extends
    *
    * <code>.grpc.lb.v1.InitialLoadBalanceResponse initial_response = 1;</code>
    */
+  public boolean hasInitialResponse() {
+    return loadBalanceResponseTypeCase_ == 1;
+  }
+  /**
+   * <pre>
+   * This message should be sent on the first response to the client.
+   * </pre>
+   *
+   * <code>.grpc.lb.v1.InitialLoadBalanceResponse initial_response = 1;</code>
+   */
   public io.grpc.grpclb.InitialLoadBalanceResponse getInitialResponse() {
     if (loadBalanceResponseTypeCase_ == 1) {
        return (io.grpc.grpclb.InitialLoadBalanceResponse) loadBalanceResponseType_;
@@ -168,6 +183,17 @@ public  final class LoadBalanceResponse extends
    *
    * <code>.grpc.lb.v1.ServerList server_list = 2;</code>
    */
+  public boolean hasServerList() {
+    return loadBalanceResponseTypeCase_ == 2;
+  }
+  /**
+   * <pre>
+   * Contains the list of servers selected by the load balancer. The client
+   * should send requests to these servers in the specified order.
+   * </pre>
+   *
+   * <code>.grpc.lb.v1.ServerList server_list = 2;</code>
+   */
   public io.grpc.grpclb.ServerList getServerList() {
     if (loadBalanceResponseTypeCase_ == 2) {
        return (io.grpc.grpclb.ServerList) loadBalanceResponseType_;
@@ -207,6 +233,7 @@ public  final class LoadBalanceResponse extends
     if (loadBalanceResponseTypeCase_ == 2) {
       output.writeMessage(2, (io.grpc.grpclb.ServerList) loadBalanceResponseType_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -222,11 +249,11 @@ public  final class LoadBalanceResponse extends
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(2, (io.grpc.grpclb.ServerList) loadBalanceResponseType_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -253,6 +280,7 @@ public  final class LoadBalanceResponse extends
       case 0:
       default:
     }
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -452,7 +480,7 @@ public  final class LoadBalanceResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -465,12 +493,12 @@ public  final class LoadBalanceResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -497,6 +525,7 @@ public  final class LoadBalanceResponse extends
           break;
         }
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -547,6 +576,16 @@ public  final class LoadBalanceResponse extends
      *
      * <code>.grpc.lb.v1.InitialLoadBalanceResponse initial_response = 1;</code>
      */
+    public boolean hasInitialResponse() {
+      return loadBalanceResponseTypeCase_ == 1;
+    }
+    /**
+     * <pre>
+     * This message should be sent on the first response to the client.
+     * </pre>
+     *
+     * <code>.grpc.lb.v1.InitialLoadBalanceResponse initial_response = 1;</code>
+     */
     public io.grpc.grpclb.InitialLoadBalanceResponse getInitialResponse() {
       if (initialResponseBuilder_ == null) {
         if (loadBalanceResponseTypeCase_ == 1) {
@@ -710,6 +749,17 @@ public  final class LoadBalanceResponse extends
      *
      * <code>.grpc.lb.v1.ServerList server_list = 2;</code>
      */
+    public boolean hasServerList() {
+      return loadBalanceResponseTypeCase_ == 2;
+    }
+    /**
+     * <pre>
+     * Contains the list of servers selected by the load balancer. The client
+     * should send requests to these servers in the specified order.
+     * </pre>
+     *
+     * <code>.grpc.lb.v1.ServerList server_list = 2;</code>
+     */
     public io.grpc.grpclb.ServerList getServerList() {
       if (serverListBuilder_ == null) {
         if (loadBalanceResponseTypeCase_ == 2) {
@@ -871,12 +921,12 @@ public  final class LoadBalanceResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceResponseOrBuilder.java b/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceResponseOrBuilder.java
index 9c8bd6387..68ea194ef 100644
--- a/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceResponseOrBuilder.java
+++ b/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceResponseOrBuilder.java
@@ -14,6 +14,14 @@ public interface LoadBalanceResponseOrBuilder extends
    *
    * <code>.grpc.lb.v1.InitialLoadBalanceResponse initial_response = 1;</code>
    */
+  boolean hasInitialResponse();
+  /**
+   * <pre>
+   * This message should be sent on the first response to the client.
+   * </pre>
+   *
+   * <code>.grpc.lb.v1.InitialLoadBalanceResponse initial_response = 1;</code>
+   */
   io.grpc.grpclb.InitialLoadBalanceResponse getInitialResponse();
   /**
    * <pre>
@@ -32,6 +40,15 @@ public interface LoadBalanceResponseOrBuilder extends
    *
    * <code>.grpc.lb.v1.ServerList server_list = 2;</code>
    */
+  boolean hasServerList();
+  /**
+   * <pre>
+   * Contains the list of servers selected by the load balancer. The client
+   * should send requests to these servers in the specified order.
+   * </pre>
+   *
+   * <code>.grpc.lb.v1.ServerList server_list = 2;</code>
+   */
   io.grpc.grpclb.ServerList getServerList();
   /**
    * <pre>
diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/Server.java b/grpclb/src/generated/main/java/io/grpc/grpclb/Server.java
index 037bc87a6..e5501c1ab 100644
--- a/grpclb/src/generated/main/java/io/grpc/grpclb/Server.java
+++ b/grpclb/src/generated/main/java/io/grpc/grpclb/Server.java
@@ -15,6 +15,7 @@ public  final class Server extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.lb.v1.Server)
     ServerOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use Server.newBuilder() to construct.
   private Server(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -29,7 +30,7 @@ public  final class Server extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private Server(
       com.google.protobuf.CodedInputStream input,
@@ -37,6 +38,8 @@ public  final class Server extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -46,7 +49,8 @@ public  final class Server extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -80,6 +84,7 @@ public  final class Server extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -211,6 +216,7 @@ public  final class Server extends
     if (drop_ != false) {
       output.writeBool(4, drop_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -233,11 +239,11 @@ public  final class Server extends
       size += com.google.protobuf.CodedOutputStream
         .computeBoolSize(4, drop_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -257,6 +263,7 @@ public  final class Server extends
         .equals(other.getLoadBalanceToken());
     result = result && (getDrop()
         == other.getDrop());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -453,7 +460,7 @@ public  final class Server extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -466,12 +473,12 @@ public  final class Server extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -498,6 +505,7 @@ public  final class Server extends
       if (other.getDrop() != false) {
         setDrop(other.getDrop());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -760,12 +768,12 @@ public  final class Server extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/ServerList.java b/grpclb/src/generated/main/java/io/grpc/grpclb/ServerList.java
index 5c5fc45e4..29fe3c615 100644
--- a/grpclb/src/generated/main/java/io/grpc/grpclb/ServerList.java
+++ b/grpclb/src/generated/main/java/io/grpc/grpclb/ServerList.java
@@ -10,6 +10,7 @@ public  final class ServerList extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.lb.v1.ServerList)
     ServerListOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use ServerList.newBuilder() to construct.
   private ServerList(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -21,7 +22,7 @@ public  final class ServerList extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private ServerList(
       com.google.protobuf.CodedInputStream input,
@@ -29,6 +30,8 @@ public  final class ServerList extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -38,7 +41,8 @@ public  final class ServerList extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -63,6 +67,7 @@ public  final class ServerList extends
       if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
         servers_ = java.util.Collections.unmodifiableList(servers_);
       }
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -163,6 +168,7 @@ public  final class ServerList extends
     for (int i = 0; i < servers_.size(); i++) {
       output.writeMessage(1, servers_.get(i));
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -174,11 +180,11 @@ public  final class ServerList extends
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(1, servers_.get(i));
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -192,6 +198,7 @@ public  final class ServerList extends
     boolean result = true;
     result = result && getServersList()
         .equals(other.getServersList());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -383,7 +390,7 @@ public  final class ServerList extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -396,12 +403,12 @@ public  final class ServerList extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -441,6 +448,7 @@ public  final class ServerList extends
           }
         }
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -835,12 +843,12 @@ public  final class ServerList extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
diff --git a/interop-testing/src/generated/main/java/com/google/protobuf/EmptyProtos.java b/interop-testing/src/generated/main/java/com/google/protobuf/EmptyProtos.java
index b5cdcab56..23d7e6a88 100644
--- a/interop-testing/src/generated/main/java/com/google/protobuf/EmptyProtos.java
+++ b/interop-testing/src/generated/main/java/com/google/protobuf/EmptyProtos.java
@@ -34,6 +34,7 @@ public final class EmptyProtos {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.Empty)
       EmptyOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use Empty.newBuilder() to construct.
     private Empty(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -62,8 +63,8 @@ public final class EmptyProtos {
               done = true;
               break;
             default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -117,7 +118,6 @@ public final class EmptyProtos {
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -309,7 +309,7 @@ public final class EmptyProtos {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -322,12 +322,12 @@ public final class EmptyProtos {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
diff --git a/interop-testing/src/generated/main/java/io/grpc/testing/integration/Messages.java b/interop-testing/src/generated/main/java/io/grpc/testing/integration/Messages.java
index 7535c6ce6..65587b636 100644
--- a/interop-testing/src/generated/main/java/io/grpc/testing/integration/Messages.java
+++ b/interop-testing/src/generated/main/java/io/grpc/testing/integration/Messages.java
@@ -193,6 +193,7 @@ public final class Messages {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.Payload)
       PayloadOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use Payload.newBuilder() to construct.
     private Payload(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -205,7 +206,7 @@ public final class Messages {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private Payload(
         com.google.protobuf.CodedInputStream input,
@@ -213,6 +214,8 @@ public final class Messages {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -222,7 +225,8 @@ public final class Messages {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -246,6 +250,7 @@ public final class Messages {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -318,6 +323,7 @@ public final class Messages {
       if (!body_.isEmpty()) {
         output.writeBytes(2, body_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -333,11 +339,11 @@ public final class Messages {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(2, body_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -352,6 +358,7 @@ public final class Messages {
       result = result && type_ == other.type_;
       result = result && getBody()
           .equals(other.getBody());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -536,7 +543,7 @@ public final class Messages {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -549,12 +556,12 @@ public final class Messages {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -574,6 +581,7 @@ public final class Messages {
         if (other.getBody() != com.google.protobuf.ByteString.EMPTY) {
           setBody(other.getBody());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -711,12 +719,12 @@ public final class Messages {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -789,6 +797,7 @@ public final class Messages {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.EchoStatus)
       EchoStatusOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use EchoStatus.newBuilder() to construct.
     private EchoStatus(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -801,7 +810,7 @@ public final class Messages {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private EchoStatus(
         com.google.protobuf.CodedInputStream input,
@@ -809,6 +818,8 @@ public final class Messages {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -818,7 +829,8 @@ public final class Messages {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -842,6 +854,7 @@ public final class Messages {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -918,6 +931,7 @@ public final class Messages {
       if (!getMessageBytes().isEmpty()) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 2, message_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -932,11 +946,11 @@ public final class Messages {
       if (!getMessageBytes().isEmpty()) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, message_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -952,6 +966,7 @@ public final class Messages {
           == other.getCode());
       result = result && getMessage()
           .equals(other.getMessage());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -1137,7 +1152,7 @@ public final class Messages {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -1150,12 +1165,12 @@ public final class Messages {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -1176,6 +1191,7 @@ public final class Messages {
           message_ = other.message_;
           onChanged();
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -1298,12 +1314,12 @@ public final class Messages {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -1517,6 +1533,7 @@ public final class Messages {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.SimpleRequest)
       SimpleRequestOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use SimpleRequest.newBuilder() to construct.
     private SimpleRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -1531,7 +1548,7 @@ public final class Messages {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private SimpleRequest(
         com.google.protobuf.CodedInputStream input,
@@ -1539,6 +1556,8 @@ public final class Messages {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -1548,7 +1567,8 @@ public final class Messages {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -1634,6 +1654,7 @@ public final class Messages {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -1893,6 +1914,7 @@ public final class Messages {
       if (expectCompressed_ != null) {
         output.writeMessage(8, getExpectCompressed());
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -1932,11 +1954,11 @@ public final class Messages {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(8, getExpectCompressed());
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -1975,6 +1997,7 @@ public final class Messages {
         result = result && getExpectCompressed()
             .equals(other.getExpectCompressed());
       }
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -2231,7 +2254,7 @@ public final class Messages {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -2244,12 +2267,12 @@ public final class Messages {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -2287,6 +2310,7 @@ public final class Messages {
         if (other.hasExpectCompressed()) {
           mergeExpectCompressed(other.getExpectCompressed());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -3141,12 +3165,12 @@ public final class Messages {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -3266,6 +3290,7 @@ public final class Messages {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.SimpleResponse)
       SimpleResponseOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use SimpleResponse.newBuilder() to construct.
     private SimpleResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -3278,7 +3303,7 @@ public final class Messages {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private SimpleResponse(
         com.google.protobuf.CodedInputStream input,
@@ -3286,6 +3311,8 @@ public final class Messages {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -3295,7 +3322,8 @@ public final class Messages {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -3333,6 +3361,7 @@ public final class Messages {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -3488,6 +3517,7 @@ public final class Messages {
       if (!getOauthScopeBytes().isEmpty()) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 3, oauthScope_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -3505,11 +3535,11 @@ public final class Messages {
       if (!getOauthScopeBytes().isEmpty()) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, oauthScope_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -3530,6 +3560,7 @@ public final class Messages {
           .equals(other.getUsername());
       result = result && getOauthScope()
           .equals(other.getOauthScope());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -3729,7 +3760,7 @@ public final class Messages {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -3742,12 +3773,12 @@ public final class Messages {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -3772,6 +3803,7 @@ public final class Messages {
           oauthScope_ = other.oauthScope_;
           onChanged();
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -4135,12 +4167,12 @@ public final class Messages {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -4203,6 +4235,7 @@ public final class Messages {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.SimpleContext)
       SimpleContextOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use SimpleContext.newBuilder() to construct.
     private SimpleContext(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -4214,7 +4247,7 @@ public final class Messages {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private SimpleContext(
         com.google.protobuf.CodedInputStream input,
@@ -4222,6 +4255,8 @@ public final class Messages {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -4231,7 +4266,8 @@ public final class Messages {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -4250,6 +4286,7 @@ public final class Messages {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -4314,6 +4351,7 @@ public final class Messages {
       if (!getValueBytes().isEmpty()) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1, value_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -4324,11 +4362,11 @@ public final class Messages {
       if (!getValueBytes().isEmpty()) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, value_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -4342,6 +4380,7 @@ public final class Messages {
       boolean result = true;
       result = result && getValue()
           .equals(other.getValue());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -4517,7 +4556,7 @@ public final class Messages {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -4530,12 +4569,12 @@ public final class Messages {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -4553,6 +4592,7 @@ public final class Messages {
           value_ = other.value_;
           onChanged();
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -4649,12 +4689,12 @@ public final class Messages {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -4770,6 +4810,7 @@ public final class Messages {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.StreamingInputCallRequest)
       StreamingInputCallRequestOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use StreamingInputCallRequest.newBuilder() to construct.
     private StreamingInputCallRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -4780,7 +4821,7 @@ public final class Messages {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private StreamingInputCallRequest(
         com.google.protobuf.CodedInputStream input,
@@ -4788,6 +4829,8 @@ public final class Messages {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -4797,7 +4840,8 @@ public final class Messages {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -4836,6 +4880,7 @@ public final class Messages {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -4944,6 +4989,7 @@ public final class Messages {
       if (expectCompressed_ != null) {
         output.writeMessage(2, getExpectCompressed());
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -4959,11 +5005,11 @@ public final class Messages {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(2, getExpectCompressed());
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -4985,6 +5031,7 @@ public final class Messages {
         result = result && getExpectCompressed()
             .equals(other.getExpectCompressed());
       }
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -5189,7 +5236,7 @@ public final class Messages {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -5202,12 +5249,12 @@ public final class Messages {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -5227,6 +5274,7 @@ public final class Messages {
         if (other.hasExpectCompressed()) {
           mergeExpectCompressed(other.getExpectCompressed());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -5587,12 +5635,12 @@ public final class Messages {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -5658,6 +5706,7 @@ public final class Messages {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.StreamingInputCallResponse)
       StreamingInputCallResponseOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use StreamingInputCallResponse.newBuilder() to construct.
     private StreamingInputCallResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -5669,7 +5718,7 @@ public final class Messages {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private StreamingInputCallResponse(
         com.google.protobuf.CodedInputStream input,
@@ -5677,6 +5726,8 @@ public final class Messages {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -5686,7 +5737,8 @@ public final class Messages {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -5704,6 +5756,7 @@ public final class Messages {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -5747,6 +5800,7 @@ public final class Messages {
       if (aggregatedPayloadSize_ != 0) {
         output.writeInt32(1, aggregatedPayloadSize_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -5758,11 +5812,11 @@ public final class Messages {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(1, aggregatedPayloadSize_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -5776,6 +5830,7 @@ public final class Messages {
       boolean result = true;
       result = result && (getAggregatedPayloadSize()
           == other.getAggregatedPayloadSize());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -5955,7 +6010,7 @@ public final class Messages {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -5968,12 +6023,12 @@ public final class Messages {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -5990,6 +6045,7 @@ public final class Messages {
         if (other.getAggregatedPayloadSize() != 0) {
           setAggregatedPayloadSize(other.getAggregatedPayloadSize());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -6055,12 +6111,12 @@ public final class Messages {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -6170,6 +6226,7 @@ public final class Messages {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.ResponseParameters)
       ResponseParametersOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ResponseParameters.newBuilder() to construct.
     private ResponseParameters(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -6182,7 +6239,7 @@ public final class Messages {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private ResponseParameters(
         com.google.protobuf.CodedInputStream input,
@@ -6190,6 +6247,8 @@ public final class Messages {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -6199,7 +6258,8 @@ public final class Messages {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -6235,6 +6295,7 @@ public final class Messages {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -6340,6 +6401,7 @@ public final class Messages {
       if (compressed_ != null) {
         output.writeMessage(3, getCompressed());
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -6359,11 +6421,11 @@ public final class Messages {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(3, getCompressed());
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -6384,6 +6446,7 @@ public final class Messages {
         result = result && getCompressed()
             .equals(other.getCompressed());
       }
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -6583,7 +6646,7 @@ public final class Messages {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -6596,12 +6659,12 @@ public final class Messages {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -6624,6 +6687,7 @@ public final class Messages {
         if (other.hasCompressed()) {
           mergeCompressed(other.getCompressed());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -6910,12 +6974,12 @@ public final class Messages {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -7091,6 +7155,7 @@ public final class Messages {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.StreamingOutputCallRequest)
       StreamingOutputCallRequestOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use StreamingOutputCallRequest.newBuilder() to construct.
     private StreamingOutputCallRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -7103,7 +7168,7 @@ public final class Messages {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private StreamingOutputCallRequest(
         com.google.protobuf.CodedInputStream input,
@@ -7111,6 +7176,8 @@ public final class Messages {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -7120,7 +7187,8 @@ public final class Messages {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -7177,6 +7245,7 @@ public final class Messages {
         if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
           responseParameters_ = java.util.Collections.unmodifiableList(responseParameters_);
         }
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -7370,6 +7439,7 @@ public final class Messages {
       if (responseStatus_ != null) {
         output.writeMessage(7, getResponseStatus());
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -7393,11 +7463,11 @@ public final class Messages {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(7, getResponseStatus());
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -7422,6 +7492,7 @@ public final class Messages {
         result = result && getResponseStatus()
             .equals(other.getResponseStatus());
       }
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -7654,7 +7725,7 @@ public final class Messages {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -7667,12 +7738,12 @@ public final class Messages {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -7721,6 +7792,7 @@ public final class Messages {
         if (other.hasResponseStatus()) {
           mergeResponseStatus(other.getResponseStatus());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -8451,12 +8523,12 @@ public final class Messages {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -8538,6 +8610,7 @@ public final class Messages {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.StreamingOutputCallResponse)
       StreamingOutputCallResponseOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use StreamingOutputCallResponse.newBuilder() to construct.
     private StreamingOutputCallResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -8548,7 +8621,7 @@ public final class Messages {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private StreamingOutputCallResponse(
         com.google.protobuf.CodedInputStream input,
@@ -8556,6 +8629,8 @@ public final class Messages {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -8565,7 +8640,8 @@ public final class Messages {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -8591,6 +8667,7 @@ public final class Messages {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -8654,6 +8731,7 @@ public final class Messages {
       if (payload_ != null) {
         output.writeMessage(1, getPayload());
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -8665,11 +8743,11 @@ public final class Messages {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(1, getPayload());
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -8686,6 +8764,7 @@ public final class Messages {
         result = result && getPayload()
             .equals(other.getPayload());
       }
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -8875,7 +8954,7 @@ public final class Messages {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -8888,12 +8967,12 @@ public final class Messages {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -8910,6 +8989,7 @@ public final class Messages {
         if (other.hasPayload()) {
           mergePayload(other.getPayload());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -9090,12 +9170,12 @@ public final class Messages {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -9158,6 +9238,7 @@ public final class Messages {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.ReconnectParams)
       ReconnectParamsOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ReconnectParams.newBuilder() to construct.
     private ReconnectParams(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -9169,7 +9250,7 @@ public final class Messages {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private ReconnectParams(
         com.google.protobuf.CodedInputStream input,
@@ -9177,6 +9258,8 @@ public final class Messages {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -9186,7 +9269,8 @@ public final class Messages {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -9204,6 +9288,7 @@ public final class Messages {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -9243,6 +9328,7 @@ public final class Messages {
       if (maxReconnectBackoffMs_ != 0) {
         output.writeInt32(1, maxReconnectBackoffMs_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -9254,11 +9340,11 @@ public final class Messages {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(1, maxReconnectBackoffMs_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -9272,6 +9358,7 @@ public final class Messages {
       boolean result = true;
       result = result && (getMaxReconnectBackoffMs()
           == other.getMaxReconnectBackoffMs());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -9452,7 +9539,7 @@ public final class Messages {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -9465,12 +9552,12 @@ public final class Messages {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -9487,6 +9574,7 @@ public final class Messages {
         if (other.getMaxReconnectBackoffMs() != 0) {
           setMaxReconnectBackoffMs(other.getMaxReconnectBackoffMs());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -9540,12 +9628,12 @@ public final class Messages {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -9622,6 +9710,7 @@ public final class Messages {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.ReconnectInfo)
       ReconnectInfoOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ReconnectInfo.newBuilder() to construct.
     private ReconnectInfo(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -9634,7 +9723,7 @@ public final class Messages {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private ReconnectInfo(
         com.google.protobuf.CodedInputStream input,
@@ -9642,6 +9731,8 @@ public final class Messages {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -9651,7 +9742,8 @@ public final class Messages {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -9693,6 +9785,7 @@ public final class Messages {
         if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
           backoffMs_ = java.util.Collections.unmodifiableList(backoffMs_);
         }
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -9764,6 +9857,7 @@ public final class Messages {
       for (int i = 0; i < backoffMs_.size(); i++) {
         output.writeInt32NoTag(backoffMs_.get(i));
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -9789,11 +9883,11 @@ public final class Messages {
         }
         backoffMsMemoizedSerializedSize = dataSize;
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -9809,6 +9903,7 @@ public final class Messages {
           == other.getPassed());
       result = result && getBackoffMsList()
           .equals(other.getBackoffMsList());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -10005,7 +10100,7 @@ public final class Messages {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -10018,12 +10113,12 @@ public final class Messages {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -10050,6 +10145,7 @@ public final class Messages {
           }
           onChanged();
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -10170,12 +10266,12 @@ public final class Messages {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
diff --git a/interop-testing/src/generated/main/java/io/grpc/testing/integration/Metrics.java b/interop-testing/src/generated/main/java/io/grpc/testing/integration/Metrics.java
index f40fee246..2a9f84e62 100644
--- a/interop-testing/src/generated/main/java/io/grpc/testing/integration/Metrics.java
+++ b/interop-testing/src/generated/main/java/io/grpc/testing/integration/Metrics.java
@@ -61,6 +61,7 @@ public final class Metrics {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.GaugeResponse)
       GaugeResponseOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use GaugeResponse.newBuilder() to construct.
     private GaugeResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -72,7 +73,7 @@ public final class Metrics {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private GaugeResponse(
         com.google.protobuf.CodedInputStream input,
@@ -80,6 +81,8 @@ public final class Metrics {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -89,7 +92,8 @@ public final class Metrics {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -124,6 +128,7 @@ public final class Metrics {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -304,6 +309,7 @@ public final class Metrics {
       if (valueCase_ == 4) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 4, value_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -327,11 +333,11 @@ public final class Metrics {
       if (valueCase_ == 4) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, value_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -366,6 +372,7 @@ public final class Metrics {
         case 0:
         default:
       }
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -575,7 +582,7 @@ public final class Metrics {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -588,12 +595,12 @@ public final class Metrics {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -630,6 +637,7 @@ public final class Metrics {
             break;
           }
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -881,12 +889,12 @@ public final class Metrics {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -953,6 +961,7 @@ public final class Metrics {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.GaugeRequest)
       GaugeRequestOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use GaugeRequest.newBuilder() to construct.
     private GaugeRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -964,7 +973,7 @@ public final class Metrics {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private GaugeRequest(
         com.google.protobuf.CodedInputStream input,
@@ -972,6 +981,8 @@ public final class Metrics {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -981,7 +992,8 @@ public final class Metrics {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -1000,6 +1012,7 @@ public final class Metrics {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -1064,6 +1077,7 @@ public final class Metrics {
       if (!getNameBytes().isEmpty()) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -1074,11 +1088,11 @@ public final class Metrics {
       if (!getNameBytes().isEmpty()) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -1092,6 +1106,7 @@ public final class Metrics {
       boolean result = true;
       result = result && getName()
           .equals(other.getName());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -1271,7 +1286,7 @@ public final class Metrics {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -1284,12 +1299,12 @@ public final class Metrics {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -1307,6 +1322,7 @@ public final class Metrics {
           name_ = other.name_;
           onChanged();
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -1403,12 +1419,12 @@ public final class Metrics {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -1461,6 +1477,7 @@ public final class Metrics {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.EmptyMessage)
       EmptyMessageOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use EmptyMessage.newBuilder() to construct.
     private EmptyMessage(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -1471,13 +1488,15 @@ public final class Metrics {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private EmptyMessage(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -1487,7 +1506,8 @@ public final class Metrics {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -1500,6 +1520,7 @@ public final class Metrics {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -1527,6 +1548,7 @@ public final class Metrics {
 
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -1534,11 +1556,11 @@ public final class Metrics {
       if (size != -1) return size;
 
       size = 0;
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -1550,6 +1572,7 @@ public final class Metrics {
       io.grpc.testing.integration.Metrics.EmptyMessage other = (io.grpc.testing.integration.Metrics.EmptyMessage) obj;
 
       boolean result = true;
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -1720,7 +1743,7 @@ public final class Metrics {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -1733,12 +1756,12 @@ public final class Metrics {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -1752,6 +1775,7 @@ public final class Metrics {
 
       public Builder mergeFrom(io.grpc.testing.integration.Metrics.EmptyMessage other) {
         if (other == io.grpc.testing.integration.Metrics.EmptyMessage.getDefaultInstance()) return this;
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -1779,12 +1803,12 @@ public final class Metrics {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
diff --git a/repositories.bzl b/repositories.bzl
index d200db4e6..acbc87d2c 100644
--- a/repositories.bzl
+++ b/repositories.bzl
@@ -128,9 +128,9 @@ def com_google_protobuf():
   # This statement defines the @com_google_protobuf repo.
   native.http_archive(
       name = "com_google_protobuf",
-      sha256 = "df77b0e60afcd3d90b2654cd305e61ae8ae2e2281b4d6540c7093da4c4245d75",
-      strip_prefix = "protobuf-3.3.1",
-      urls = ["https://github.com/google/protobuf/archive/v3.3.1.zip"],
+      sha256 = "542703acadc3f690d998f4641e1b988f15ba57ebca05fdfb1cd9095bec007948",
+      strip_prefix = "protobuf-3.4.0",
+      urls = ["https://github.com/google/protobuf/archive/v3.4.0.zip"],
   )
 
 def com_google_protobuf_java():
@@ -138,9 +138,9 @@ def com_google_protobuf_java():
   # which is the Java proto runtime (base classes and common utilities).
   native.http_archive(
       name = "com_google_protobuf_java",
-      sha256 = "df77b0e60afcd3d90b2654cd305e61ae8ae2e2281b4d6540c7093da4c4245d75",
-      strip_prefix = "protobuf-3.3.1",
-      urls = ["https://github.com/google/protobuf/archive/v3.3.1.zip"],
+      sha256 = "542703acadc3f690d998f4641e1b988f15ba57ebca05fdfb1cd9095bec007948",
+      strip_prefix = "protobuf-3.4.0",
+      urls = ["https://github.com/google/protobuf/archive/v3.4.0.zip"],
   )
 
 def com_google_protobuf_nano_protobuf_javanano():
diff --git a/services/src/generated/main/java/com/google/instrumentation/stats/proto/CensusProto.java b/services/src/generated/main/java/com/google/instrumentation/stats/proto/CensusProto.java
index 9c02a3bef..533acebe9 100644
--- a/services/src/generated/main/java/com/google/instrumentation/stats/proto/CensusProto.java
+++ b/services/src/generated/main/java/com/google/instrumentation/stats/proto/CensusProto.java
@@ -49,6 +49,7 @@ public final class CensusProto {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:google.instrumentation.Duration)
       DurationOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use Duration.newBuilder() to construct.
     private Duration(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -61,7 +62,7 @@ public final class CensusProto {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private Duration(
         com.google.protobuf.CodedInputStream input,
@@ -69,6 +70,8 @@ public final class CensusProto {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -78,7 +81,8 @@ public final class CensusProto {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -101,6 +105,7 @@ public final class CensusProto {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -166,6 +171,7 @@ public final class CensusProto {
       if (nanos_ != 0) {
         output.writeInt32(2, nanos_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -181,11 +187,11 @@ public final class CensusProto {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(2, nanos_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -201,6 +207,7 @@ public final class CensusProto {
           == other.getSeconds());
       result = result && (getNanos()
           == other.getNanos());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -382,7 +389,7 @@ public final class CensusProto {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -395,12 +402,12 @@ public final class CensusProto {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -420,6 +427,7 @@ public final class CensusProto {
         if (other.getNanos() != 0) {
           setNanos(other.getNanos());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -541,12 +549,12 @@ public final class CensusProto {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -622,6 +630,7 @@ public final class CensusProto {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:google.instrumentation.Timestamp)
       TimestampOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use Timestamp.newBuilder() to construct.
     private Timestamp(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -634,7 +643,7 @@ public final class CensusProto {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private Timestamp(
         com.google.protobuf.CodedInputStream input,
@@ -642,6 +651,8 @@ public final class CensusProto {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -651,7 +662,8 @@ public final class CensusProto {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -674,6 +686,7 @@ public final class CensusProto {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -738,6 +751,7 @@ public final class CensusProto {
       if (nanos_ != 0) {
         output.writeInt32(2, nanos_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -753,11 +767,11 @@ public final class CensusProto {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(2, nanos_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -773,6 +787,7 @@ public final class CensusProto {
           == other.getSeconds());
       result = result && (getNanos()
           == other.getNanos());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -954,7 +969,7 @@ public final class CensusProto {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -967,12 +982,12 @@ public final class CensusProto {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -992,6 +1007,7 @@ public final class CensusProto {
         if (other.getNanos() != 0) {
           setNanos(other.getNanos());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -1110,12 +1126,12 @@ public final class CensusProto {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -1233,6 +1249,7 @@ public final class CensusProto {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:google.instrumentation.MeasurementDescriptor)
       MeasurementDescriptorOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use MeasurementDescriptor.newBuilder() to construct.
     private MeasurementDescriptor(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -1245,7 +1262,7 @@ public final class CensusProto {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private MeasurementDescriptor(
         com.google.protobuf.CodedInputStream input,
@@ -1253,6 +1270,8 @@ public final class CensusProto {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -1262,7 +1281,8 @@ public final class CensusProto {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -1300,6 +1320,7 @@ public final class CensusProto {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -1604,6 +1625,7 @@ public final class CensusProto {
         com.google.protobuf.GeneratedMessageV3 implements
         // @@protoc_insertion_point(message_implements:google.instrumentation.MeasurementDescriptor.MeasurementUnit)
         MeasurementUnitOrBuilder {
+    private static final long serialVersionUID = 0L;
       // Use MeasurementUnit.newBuilder() to construct.
       private MeasurementUnit(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
         super(builder);
@@ -1617,7 +1639,7 @@ public final class CensusProto {
       @java.lang.Override
       public final com.google.protobuf.UnknownFieldSet
       getUnknownFields() {
-        return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+        return this.unknownFields;
       }
       private MeasurementUnit(
           com.google.protobuf.CodedInputStream input,
@@ -1625,6 +1647,8 @@ public final class CensusProto {
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
         int mutable_bitField0_ = 0;
+        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+            com.google.protobuf.UnknownFieldSet.newBuilder();
         try {
           boolean done = false;
           while (!done) {
@@ -1634,7 +1658,8 @@ public final class CensusProto {
                 done = true;
                 break;
               default: {
-                if (!input.skipField(tag)) {
+                if (!parseUnknownFieldProto3(
+                    input, unknownFields, extensionRegistry, tag)) {
                   done = true;
                 }
                 break;
@@ -1704,6 +1729,7 @@ public final class CensusProto {
           if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
             denominators_ = java.util.Collections.unmodifiableList(denominators_);
           }
+          this.unknownFields = unknownFields.build();
           makeExtensionsImmutable();
         }
       }
@@ -1849,6 +1875,7 @@ public final class CensusProto {
         for (int i = 0; i < denominators_.size(); i++) {
           output.writeEnumNoTag(denominators_.get(i));
         }
+        unknownFields.writeTo(output);
       }
 
       public int getSerializedSize() {
@@ -1884,11 +1911,11 @@ public final class CensusProto {
               .computeUInt32SizeNoTag(dataSize);
           }denominatorsMemoizedSerializedSize = dataSize;
         }
+        size += unknownFields.getSerializedSize();
         memoizedSize = size;
         return size;
       }
 
-      private static final long serialVersionUID = 0L;
       @java.lang.Override
       public boolean equals(final java.lang.Object obj) {
         if (obj == this) {
@@ -1904,6 +1931,7 @@ public final class CensusProto {
             == other.getPower10());
         result = result && numerators_.equals(other.numerators_);
         result = result && denominators_.equals(other.denominators_);
+        result = result && unknownFields.equals(other.unknownFields);
         return result;
       }
 
@@ -2129,7 +2157,7 @@ public final class CensusProto {
         }
         public Builder setField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
-            Object value) {
+            java.lang.Object value) {
           return (Builder) super.setField(field, value);
         }
         public Builder clearField(
@@ -2142,12 +2170,12 @@ public final class CensusProto {
         }
         public Builder setRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
-            int index, Object value) {
+            int index, java.lang.Object value) {
           return (Builder) super.setRepeatedField(field, index, value);
         }
         public Builder addRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
-            Object value) {
+            java.lang.Object value) {
           return (Builder) super.addRepeatedField(field, value);
         }
         public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -2184,6 +2212,7 @@ public final class CensusProto {
             }
             onChanged();
           }
+          this.mergeUnknownFields(other.unknownFields);
           onChanged();
           return this;
         }
@@ -2474,12 +2503,12 @@ public final class CensusProto {
         }
         public final Builder setUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
-          return this;
+          return super.setUnknownFieldsProto3(unknownFields);
         }
 
         public final Builder mergeUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
-          return this;
+          return super.mergeUnknownFields(unknownFields);
         }
 
 
@@ -2659,6 +2688,7 @@ public final class CensusProto {
       if (unit_ != null) {
         output.writeMessage(3, getUnit());
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -2676,11 +2706,11 @@ public final class CensusProto {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(3, getUnit());
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -2701,6 +2731,7 @@ public final class CensusProto {
         result = result && getUnit()
             .equals(other.getUnit());
       }
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -2900,7 +2931,7 @@ public final class CensusProto {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -2913,12 +2944,12 @@ public final class CensusProto {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -2943,6 +2974,7 @@ public final class CensusProto {
         if (other.hasUnit()) {
           mergeUnit(other.getUnit());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -3301,12 +3333,12 @@ public final class CensusProto {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -3532,6 +3564,7 @@ public final class CensusProto {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:google.instrumentation.DistributionAggregation)
       DistributionAggregationOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use DistributionAggregation.newBuilder() to construct.
     private DistributionAggregation(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -3547,7 +3580,7 @@ public final class CensusProto {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private DistributionAggregation(
         com.google.protobuf.CodedInputStream input,
@@ -3555,6 +3588,8 @@ public final class CensusProto {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -3564,7 +3599,8 @@ public final class CensusProto {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -3641,6 +3677,7 @@ public final class CensusProto {
         if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
           tags_ = java.util.Collections.unmodifiableList(tags_);
         }
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -3689,6 +3726,7 @@ public final class CensusProto {
         com.google.protobuf.GeneratedMessageV3 implements
         // @@protoc_insertion_point(message_implements:google.instrumentation.DistributionAggregation.Range)
         RangeOrBuilder {
+    private static final long serialVersionUID = 0L;
       // Use Range.newBuilder() to construct.
       private Range(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
         super(builder);
@@ -3701,7 +3739,7 @@ public final class CensusProto {
       @java.lang.Override
       public final com.google.protobuf.UnknownFieldSet
       getUnknownFields() {
-        return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+        return this.unknownFields;
       }
       private Range(
           com.google.protobuf.CodedInputStream input,
@@ -3709,6 +3747,8 @@ public final class CensusProto {
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
         int mutable_bitField0_ = 0;
+        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+            com.google.protobuf.UnknownFieldSet.newBuilder();
         try {
           boolean done = false;
           while (!done) {
@@ -3718,7 +3758,8 @@ public final class CensusProto {
                 done = true;
                 break;
               default: {
-                if (!input.skipField(tag)) {
+                if (!parseUnknownFieldProto3(
+                    input, unknownFields, extensionRegistry, tag)) {
                   done = true;
                 }
                 break;
@@ -3741,6 +3782,7 @@ public final class CensusProto {
           throw new com.google.protobuf.InvalidProtocolBufferException(
               e).setUnfinishedMessage(this);
         } finally {
+          this.unknownFields = unknownFields.build();
           makeExtensionsImmutable();
         }
       }
@@ -3800,6 +3842,7 @@ public final class CensusProto {
         if (max_ != 0D) {
           output.writeDouble(2, max_);
         }
+        unknownFields.writeTo(output);
       }
 
       public int getSerializedSize() {
@@ -3815,11 +3858,11 @@ public final class CensusProto {
           size += com.google.protobuf.CodedOutputStream
             .computeDoubleSize(2, max_);
         }
+        size += unknownFields.getSerializedSize();
         memoizedSize = size;
         return size;
       }
 
-      private static final long serialVersionUID = 0L;
       @java.lang.Override
       public boolean equals(final java.lang.Object obj) {
         if (obj == this) {
@@ -3839,6 +3882,7 @@ public final class CensusProto {
             java.lang.Double.doubleToLongBits(getMax())
             == java.lang.Double.doubleToLongBits(
                 other.getMax()));
+        result = result && unknownFields.equals(other.unknownFields);
         return result;
       }
 
@@ -4025,7 +4069,7 @@ public final class CensusProto {
         }
         public Builder setField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
-            Object value) {
+            java.lang.Object value) {
           return (Builder) super.setField(field, value);
         }
         public Builder clearField(
@@ -4038,12 +4082,12 @@ public final class CensusProto {
         }
         public Builder setRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
-            int index, Object value) {
+            int index, java.lang.Object value) {
           return (Builder) super.setRepeatedField(field, index, value);
         }
         public Builder addRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
-            Object value) {
+            java.lang.Object value) {
           return (Builder) super.addRepeatedField(field, value);
         }
         public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -4063,6 +4107,7 @@ public final class CensusProto {
           if (other.getMax() != 0D) {
             setMax(other.getMax());
           }
+          this.mergeUnknownFields(other.unknownFields);
           onChanged();
           return this;
         }
@@ -4166,12 +4211,12 @@ public final class CensusProto {
         }
         public final Builder setUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
-          return this;
+          return super.setUnknownFieldsProto3(unknownFields);
         }
 
         public final Builder mergeUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
-          return this;
+          return super.mergeUnknownFields(unknownFields);
         }
 
 
@@ -4451,6 +4496,7 @@ public final class CensusProto {
       for (int i = 0; i < tags_.size(); i++) {
         output.writeMessage(6, tags_.get(i));
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -4492,11 +4538,11 @@ public final class CensusProto {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(6, tags_.get(i));
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -4527,6 +4573,7 @@ public final class CensusProto {
           .equals(other.getBucketCountsList());
       result = result && getTagsList()
           .equals(other.getTagsList());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -4776,7 +4823,7 @@ public final class CensusProto {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -4789,12 +4836,12 @@ public final class CensusProto {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -4856,6 +4903,7 @@ public final class CensusProto {
             }
           }
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -5660,12 +5708,12 @@ public final class CensusProto {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -5785,6 +5833,7 @@ public final class CensusProto {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:google.instrumentation.DistributionAggregationDescriptor)
       DistributionAggregationDescriptorOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use DistributionAggregationDescriptor.newBuilder() to construct.
     private DistributionAggregationDescriptor(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -5796,7 +5845,7 @@ public final class CensusProto {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private DistributionAggregationDescriptor(
         com.google.protobuf.CodedInputStream input,
@@ -5804,6 +5853,8 @@ public final class CensusProto {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -5813,7 +5864,8 @@ public final class CensusProto {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -5850,6 +5902,7 @@ public final class CensusProto {
         if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
           bucketBounds_ = java.util.Collections.unmodifiableList(bucketBounds_);
         }
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -5962,6 +6015,7 @@ public final class CensusProto {
       for (int i = 0; i < bucketBounds_.size(); i++) {
         output.writeDoubleNoTag(bucketBounds_.get(i));
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -5980,11 +6034,11 @@ public final class CensusProto {
         }
         bucketBoundsMemoizedSerializedSize = dataSize;
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -5998,6 +6052,7 @@ public final class CensusProto {
       boolean result = true;
       result = result && getBucketBoundsList()
           .equals(other.getBucketBoundsList());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -6180,7 +6235,7 @@ public final class CensusProto {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -6193,12 +6248,12 @@ public final class CensusProto {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -6222,6 +6277,7 @@ public final class CensusProto {
           }
           onChanged();
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -6442,12 +6498,12 @@ public final class CensusProto {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -6600,6 +6656,7 @@ public final class CensusProto {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:google.instrumentation.IntervalAggregation)
       IntervalAggregationOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use IntervalAggregation.newBuilder() to construct.
     private IntervalAggregation(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -6612,7 +6669,7 @@ public final class CensusProto {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private IntervalAggregation(
         com.google.protobuf.CodedInputStream input,
@@ -6620,6 +6677,8 @@ public final class CensusProto {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -6629,7 +6688,8 @@ public final class CensusProto {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -6666,6 +6726,7 @@ public final class CensusProto {
         if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
           tags_ = java.util.Collections.unmodifiableList(tags_);
         }
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -6739,6 +6800,7 @@ public final class CensusProto {
         com.google.protobuf.GeneratedMessageV3 implements
         // @@protoc_insertion_point(message_implements:google.instrumentation.IntervalAggregation.Interval)
         IntervalOrBuilder {
+    private static final long serialVersionUID = 0L;
       // Use Interval.newBuilder() to construct.
       private Interval(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
         super(builder);
@@ -6751,7 +6813,7 @@ public final class CensusProto {
       @java.lang.Override
       public final com.google.protobuf.UnknownFieldSet
       getUnknownFields() {
-        return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+        return this.unknownFields;
       }
       private Interval(
           com.google.protobuf.CodedInputStream input,
@@ -6759,6 +6821,8 @@ public final class CensusProto {
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
         int mutable_bitField0_ = 0;
+        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+            com.google.protobuf.UnknownFieldSet.newBuilder();
         try {
           boolean done = false;
           while (!done) {
@@ -6768,7 +6832,8 @@ public final class CensusProto {
                 done = true;
                 break;
               default: {
-                if (!input.skipField(tag)) {
+                if (!parseUnknownFieldProto3(
+                    input, unknownFields, extensionRegistry, tag)) {
                   done = true;
                 }
                 break;
@@ -6804,6 +6869,7 @@ public final class CensusProto {
           throw new com.google.protobuf.InvalidProtocolBufferException(
               e).setUnfinishedMessage(this);
         } finally {
+          this.unknownFields = unknownFields.build();
           makeExtensionsImmutable();
         }
       }
@@ -6899,6 +6965,7 @@ public final class CensusProto {
         if (sum_ != 0D) {
           output.writeDouble(3, sum_);
         }
+        unknownFields.writeTo(output);
       }
 
       public int getSerializedSize() {
@@ -6918,11 +6985,11 @@ public final class CensusProto {
           size += com.google.protobuf.CodedOutputStream
             .computeDoubleSize(3, sum_);
         }
+        size += unknownFields.getSerializedSize();
         memoizedSize = size;
         return size;
       }
 
-      private static final long serialVersionUID = 0L;
       @java.lang.Override
       public boolean equals(final java.lang.Object obj) {
         if (obj == this) {
@@ -6947,6 +7014,7 @@ public final class CensusProto {
             java.lang.Double.doubleToLongBits(getSum())
             == java.lang.Double.doubleToLongBits(
                 other.getSum()));
+        result = result && unknownFields.equals(other.unknownFields);
         return result;
       }
 
@@ -7148,7 +7216,7 @@ public final class CensusProto {
         }
         public Builder setField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
-            Object value) {
+            java.lang.Object value) {
           return (Builder) super.setField(field, value);
         }
         public Builder clearField(
@@ -7161,12 +7229,12 @@ public final class CensusProto {
         }
         public Builder setRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
-            int index, Object value) {
+            int index, java.lang.Object value) {
           return (Builder) super.setRepeatedField(field, index, value);
         }
         public Builder addRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
-            Object value) {
+            java.lang.Object value) {
           return (Builder) super.addRepeatedField(field, value);
         }
         public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -7189,6 +7257,7 @@ public final class CensusProto {
           if (other.getSum() != 0D) {
             setSum(other.getSum());
           }
+          this.mergeUnknownFields(other.unknownFields);
           onChanged();
           return this;
         }
@@ -7445,12 +7514,12 @@ public final class CensusProto {
         }
         public final Builder setUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
-          return this;
+          return super.setUnknownFieldsProto3(unknownFields);
         }
 
         public final Builder mergeUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
-          return this;
+          return super.mergeUnknownFields(unknownFields);
         }
 
 
@@ -7625,6 +7694,7 @@ public final class CensusProto {
       for (int i = 0; i < tags_.size(); i++) {
         output.writeMessage(2, tags_.get(i));
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -7640,11 +7710,11 @@ public final class CensusProto {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(2, tags_.get(i));
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -7660,6 +7730,7 @@ public final class CensusProto {
           .equals(other.getIntervalsList());
       result = result && getTagsList()
           .equals(other.getTagsList());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -7878,7 +7949,7 @@ public final class CensusProto {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -7891,12 +7962,12 @@ public final class CensusProto {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -7962,6 +8033,7 @@ public final class CensusProto {
             }
           }
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -8632,12 +8704,12 @@ public final class CensusProto {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -8759,6 +8831,7 @@ public final class CensusProto {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:google.instrumentation.IntervalAggregationDescriptor)
       IntervalAggregationDescriptorOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use IntervalAggregationDescriptor.newBuilder() to construct.
     private IntervalAggregationDescriptor(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -8771,7 +8844,7 @@ public final class CensusProto {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private IntervalAggregationDescriptor(
         com.google.protobuf.CodedInputStream input,
@@ -8779,6 +8852,8 @@ public final class CensusProto {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -8788,7 +8863,8 @@ public final class CensusProto {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -8818,6 +8894,7 @@ public final class CensusProto {
         if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
           intervalSizes_ = java.util.Collections.unmodifiableList(intervalSizes_);
         }
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -8931,6 +9008,7 @@ public final class CensusProto {
       for (int i = 0; i < intervalSizes_.size(); i++) {
         output.writeMessage(2, intervalSizes_.get(i));
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -8946,11 +9024,11 @@ public final class CensusProto {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(2, intervalSizes_.get(i));
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -8966,6 +9044,7 @@ public final class CensusProto {
           == other.getNSubIntervals());
       result = result && getIntervalSizesList()
           .equals(other.getIntervalSizesList());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -9169,7 +9248,7 @@ public final class CensusProto {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -9182,12 +9261,12 @@ public final class CensusProto {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -9230,6 +9309,7 @@ public final class CensusProto {
             }
           }
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -9644,12 +9724,12 @@ public final class CensusProto {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -9726,6 +9806,7 @@ public final class CensusProto {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:google.instrumentation.Tag)
       TagOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use Tag.newBuilder() to construct.
     private Tag(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -9738,7 +9819,7 @@ public final class CensusProto {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private Tag(
         com.google.protobuf.CodedInputStream input,
@@ -9746,6 +9827,8 @@ public final class CensusProto {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -9755,7 +9838,8 @@ public final class CensusProto {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -9780,6 +9864,7 @@ public final class CensusProto {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -9881,6 +9966,7 @@ public final class CensusProto {
       if (!getValueBytes().isEmpty()) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 2, value_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -9894,11 +9980,11 @@ public final class CensusProto {
       if (!getValueBytes().isEmpty()) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, value_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -9914,6 +10000,7 @@ public final class CensusProto {
           .equals(other.getKey());
       result = result && getValue()
           .equals(other.getValue());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -10098,7 +10185,7 @@ public final class CensusProto {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -10111,12 +10198,12 @@ public final class CensusProto {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -10138,6 +10225,7 @@ public final class CensusProto {
           value_ = other.value_;
           onChanged();
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -10303,12 +10391,12 @@ public final class CensusProto {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -10411,6 +10499,10 @@ public final class CensusProto {
     /**
      * <code>.google.instrumentation.IntervalAggregationDescriptor interval_aggregation = 4;</code>
      */
+    boolean hasIntervalAggregation();
+    /**
+     * <code>.google.instrumentation.IntervalAggregationDescriptor interval_aggregation = 4;</code>
+     */
     com.google.instrumentation.stats.proto.CensusProto.IntervalAggregationDescriptor getIntervalAggregation();
     /**
      * <code>.google.instrumentation.IntervalAggregationDescriptor interval_aggregation = 4;</code>
@@ -10420,6 +10512,10 @@ public final class CensusProto {
     /**
      * <code>.google.instrumentation.DistributionAggregationDescriptor distribution_aggregation = 5;</code>
      */
+    boolean hasDistributionAggregation();
+    /**
+     * <code>.google.instrumentation.DistributionAggregationDescriptor distribution_aggregation = 5;</code>
+     */
     com.google.instrumentation.stats.proto.CensusProto.DistributionAggregationDescriptor getDistributionAggregation();
     /**
      * <code>.google.instrumentation.DistributionAggregationDescriptor distribution_aggregation = 5;</code>
@@ -10480,6 +10576,7 @@ public final class CensusProto {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:google.instrumentation.ViewDescriptor)
       ViewDescriptorOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ViewDescriptor.newBuilder() to construct.
     private ViewDescriptor(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -10494,7 +10591,7 @@ public final class CensusProto {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private ViewDescriptor(
         com.google.protobuf.CodedInputStream input,
@@ -10502,6 +10599,8 @@ public final class CensusProto {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -10511,7 +10610,8 @@ public final class CensusProto {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -10582,6 +10682,7 @@ public final class CensusProto {
         if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
           tagKeys_ = tagKeys_.getUnmodifiableView();
         }
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -10766,6 +10867,12 @@ public final class CensusProto {
     /**
      * <code>.google.instrumentation.IntervalAggregationDescriptor interval_aggregation = 4;</code>
      */
+    public boolean hasIntervalAggregation() {
+      return aggregationCase_ == 4;
+    }
+    /**
+     * <code>.google.instrumentation.IntervalAggregationDescriptor interval_aggregation = 4;</code>
+     */
     public com.google.instrumentation.stats.proto.CensusProto.IntervalAggregationDescriptor getIntervalAggregation() {
       if (aggregationCase_ == 4) {
          return (com.google.instrumentation.stats.proto.CensusProto.IntervalAggregationDescriptor) aggregation_;
@@ -10786,6 +10893,12 @@ public final class CensusProto {
     /**
      * <code>.google.instrumentation.DistributionAggregationDescriptor distribution_aggregation = 5;</code>
      */
+    public boolean hasDistributionAggregation() {
+      return aggregationCase_ == 5;
+    }
+    /**
+     * <code>.google.instrumentation.DistributionAggregationDescriptor distribution_aggregation = 5;</code>
+     */
     public com.google.instrumentation.stats.proto.CensusProto.DistributionAggregationDescriptor getDistributionAggregation() {
       if (aggregationCase_ == 5) {
          return (com.google.instrumentation.stats.proto.CensusProto.DistributionAggregationDescriptor) aggregation_;
@@ -10881,6 +10994,7 @@ public final class CensusProto {
       for (int i = 0; i < tagKeys_.size(); i++) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 6, tagKeys_.getRaw(i));
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -10913,11 +11027,11 @@ public final class CensusProto {
         size += dataSize;
         size += 1 * getTagKeysList().size();
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -10952,6 +11066,7 @@ public final class CensusProto {
         case 0:
         default:
       }
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -11186,7 +11301,7 @@ public final class CensusProto {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -11199,12 +11314,12 @@ public final class CensusProto {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -11253,6 +11368,7 @@ public final class CensusProto {
             break;
           }
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -11567,6 +11683,12 @@ public final class CensusProto {
       /**
        * <code>.google.instrumentation.IntervalAggregationDescriptor interval_aggregation = 4;</code>
        */
+      public boolean hasIntervalAggregation() {
+        return aggregationCase_ == 4;
+      }
+      /**
+       * <code>.google.instrumentation.IntervalAggregationDescriptor interval_aggregation = 4;</code>
+       */
       public com.google.instrumentation.stats.proto.CensusProto.IntervalAggregationDescriptor getIntervalAggregation() {
         if (intervalAggregationBuilder_ == null) {
           if (aggregationCase_ == 4) {
@@ -11697,6 +11819,12 @@ public final class CensusProto {
       /**
        * <code>.google.instrumentation.DistributionAggregationDescriptor distribution_aggregation = 5;</code>
        */
+      public boolean hasDistributionAggregation() {
+        return aggregationCase_ == 5;
+      }
+      /**
+       * <code>.google.instrumentation.DistributionAggregationDescriptor distribution_aggregation = 5;</code>
+       */
       public com.google.instrumentation.stats.proto.CensusProto.DistributionAggregationDescriptor getDistributionAggregation() {
         if (distributionAggregationBuilder_ == null) {
           if (aggregationCase_ == 5) {
@@ -11962,12 +12090,12 @@ public final class CensusProto {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -12112,6 +12240,7 @@ public final class CensusProto {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:google.instrumentation.DistributionView)
       DistributionViewOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use DistributionView.newBuilder() to construct.
     private DistributionView(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -12123,7 +12252,7 @@ public final class CensusProto {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private DistributionView(
         com.google.protobuf.CodedInputStream input,
@@ -12131,6 +12260,8 @@ public final class CensusProto {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -12140,7 +12271,8 @@ public final class CensusProto {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -12191,6 +12323,7 @@ public final class CensusProto {
         if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
           aggregations_ = java.util.Collections.unmodifiableList(aggregations_);
         }
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -12342,6 +12475,7 @@ public final class CensusProto {
       if (end_ != null) {
         output.writeMessage(3, getEnd());
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -12361,11 +12495,11 @@ public final class CensusProto {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(3, getEnd());
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -12389,6 +12523,7 @@ public final class CensusProto {
         result = result && getEnd()
             .equals(other.getEnd());
       }
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -12617,7 +12752,7 @@ public final class CensusProto {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -12630,12 +12765,12 @@ public final class CensusProto {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -12681,6 +12816,7 @@ public final class CensusProto {
         if (other.hasEnd()) {
           mergeEnd(other.getEnd());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -13309,12 +13445,12 @@ public final class CensusProto {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -13421,6 +13557,7 @@ public final class CensusProto {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:google.instrumentation.IntervalView)
       IntervalViewOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use IntervalView.newBuilder() to construct.
     private IntervalView(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -13432,7 +13569,7 @@ public final class CensusProto {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private IntervalView(
         com.google.protobuf.CodedInputStream input,
@@ -13440,6 +13577,8 @@ public final class CensusProto {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -13449,7 +13588,8 @@ public final class CensusProto {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -13474,6 +13614,7 @@ public final class CensusProto {
         if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
           aggregations_ = java.util.Collections.unmodifiableList(aggregations_);
         }
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -13564,6 +13705,7 @@ public final class CensusProto {
       for (int i = 0; i < aggregations_.size(); i++) {
         output.writeMessage(1, aggregations_.get(i));
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -13575,11 +13717,11 @@ public final class CensusProto {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(1, aggregations_.get(i));
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -13593,6 +13735,7 @@ public final class CensusProto {
       boolean result = true;
       result = result && getAggregationsList()
           .equals(other.getAggregationsList());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -13789,7 +13932,7 @@ public final class CensusProto {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -13802,12 +13945,12 @@ public final class CensusProto {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -13847,6 +13990,7 @@ public final class CensusProto {
             }
           }
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -14205,12 +14349,12 @@ public final class CensusProto {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -14277,6 +14421,10 @@ public final class CensusProto {
     /**
      * <code>.google.instrumentation.DistributionView distribution_view = 2;</code>
      */
+    boolean hasDistributionView();
+    /**
+     * <code>.google.instrumentation.DistributionView distribution_view = 2;</code>
+     */
     com.google.instrumentation.stats.proto.CensusProto.DistributionView getDistributionView();
     /**
      * <code>.google.instrumentation.DistributionView distribution_view = 2;</code>
@@ -14286,6 +14434,10 @@ public final class CensusProto {
     /**
      * <code>.google.instrumentation.IntervalView interval_view = 3;</code>
      */
+    boolean hasIntervalView();
+    /**
+     * <code>.google.instrumentation.IntervalView interval_view = 3;</code>
+     */
     com.google.instrumentation.stats.proto.CensusProto.IntervalView getIntervalView();
     /**
      * <code>.google.instrumentation.IntervalView interval_view = 3;</code>
@@ -14305,6 +14457,7 @@ public final class CensusProto {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:google.instrumentation.View)
       ViewOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use View.newBuilder() to construct.
     private View(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -14316,7 +14469,7 @@ public final class CensusProto {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private View(
         com.google.protobuf.CodedInputStream input,
@@ -14324,6 +14477,8 @@ public final class CensusProto {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -14333,7 +14488,8 @@ public final class CensusProto {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -14380,6 +14536,7 @@ public final class CensusProto {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -14479,6 +14636,12 @@ public final class CensusProto {
     /**
      * <code>.google.instrumentation.DistributionView distribution_view = 2;</code>
      */
+    public boolean hasDistributionView() {
+      return viewCase_ == 2;
+    }
+    /**
+     * <code>.google.instrumentation.DistributionView distribution_view = 2;</code>
+     */
     public com.google.instrumentation.stats.proto.CensusProto.DistributionView getDistributionView() {
       if (viewCase_ == 2) {
          return (com.google.instrumentation.stats.proto.CensusProto.DistributionView) view_;
@@ -14499,6 +14662,12 @@ public final class CensusProto {
     /**
      * <code>.google.instrumentation.IntervalView interval_view = 3;</code>
      */
+    public boolean hasIntervalView() {
+      return viewCase_ == 3;
+    }
+    /**
+     * <code>.google.instrumentation.IntervalView interval_view = 3;</code>
+     */
     public com.google.instrumentation.stats.proto.CensusProto.IntervalView getIntervalView() {
       if (viewCase_ == 3) {
          return (com.google.instrumentation.stats.proto.CensusProto.IntervalView) view_;
@@ -14536,6 +14705,7 @@ public final class CensusProto {
       if (viewCase_ == 3) {
         output.writeMessage(3, (com.google.instrumentation.stats.proto.CensusProto.IntervalView) view_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -14554,11 +14724,11 @@ public final class CensusProto {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(3, (com.google.instrumentation.stats.proto.CensusProto.IntervalView) view_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -14587,6 +14757,7 @@ public final class CensusProto {
         case 0:
         default:
       }
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -14795,7 +14966,7 @@ public final class CensusProto {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -14808,12 +14979,12 @@ public final class CensusProto {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -14844,6 +15015,7 @@ public final class CensusProto {
             break;
           }
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -14979,6 +15151,12 @@ public final class CensusProto {
       /**
        * <code>.google.instrumentation.DistributionView distribution_view = 2;</code>
        */
+      public boolean hasDistributionView() {
+        return viewCase_ == 2;
+      }
+      /**
+       * <code>.google.instrumentation.DistributionView distribution_view = 2;</code>
+       */
       public com.google.instrumentation.stats.proto.CensusProto.DistributionView getDistributionView() {
         if (distributionViewBuilder_ == null) {
           if (viewCase_ == 2) {
@@ -15109,6 +15287,12 @@ public final class CensusProto {
       /**
        * <code>.google.instrumentation.IntervalView interval_view = 3;</code>
        */
+      public boolean hasIntervalView() {
+        return viewCase_ == 3;
+      }
+      /**
+       * <code>.google.instrumentation.IntervalView interval_view = 3;</code>
+       */
       public com.google.instrumentation.stats.proto.CensusProto.IntervalView getIntervalView() {
         if (intervalViewBuilder_ == null) {
           if (viewCase_ == 3) {
@@ -15235,12 +15419,12 @@ public final class CensusProto {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
diff --git a/services/src/generated/main/java/io/grpc/health/v1/HealthCheckRequest.java b/services/src/generated/main/java/io/grpc/health/v1/HealthCheckRequest.java
index bf2400eb6..3117f5b28 100644
--- a/services/src/generated/main/java/io/grpc/health/v1/HealthCheckRequest.java
+++ b/services/src/generated/main/java/io/grpc/health/v1/HealthCheckRequest.java
@@ -10,6 +10,7 @@ public  final class HealthCheckRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.health.v1.HealthCheckRequest)
     HealthCheckRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use HealthCheckRequest.newBuilder() to construct.
   private HealthCheckRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -21,7 +22,7 @@ public  final class HealthCheckRequest extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private HealthCheckRequest(
       com.google.protobuf.CodedInputStream input,
@@ -29,6 +30,8 @@ public  final class HealthCheckRequest extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -38,7 +41,8 @@ public  final class HealthCheckRequest extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -57,6 +61,7 @@ public  final class HealthCheckRequest extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -121,6 +126,7 @@ public  final class HealthCheckRequest extends
     if (!getServiceBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, service_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -131,11 +137,11 @@ public  final class HealthCheckRequest extends
     if (!getServiceBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, service_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -149,6 +155,7 @@ public  final class HealthCheckRequest extends
     boolean result = true;
     result = result && getService()
         .equals(other.getService());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -324,7 +331,7 @@ public  final class HealthCheckRequest extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -337,12 +344,12 @@ public  final class HealthCheckRequest extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -360,6 +367,7 @@ public  final class HealthCheckRequest extends
         service_ = other.service_;
         onChanged();
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -456,12 +464,12 @@ public  final class HealthCheckRequest extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
diff --git a/services/src/generated/main/java/io/grpc/health/v1/HealthCheckResponse.java b/services/src/generated/main/java/io/grpc/health/v1/HealthCheckResponse.java
index 66d561ede..ba65088e8 100644
--- a/services/src/generated/main/java/io/grpc/health/v1/HealthCheckResponse.java
+++ b/services/src/generated/main/java/io/grpc/health/v1/HealthCheckResponse.java
@@ -10,6 +10,7 @@ public  final class HealthCheckResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.health.v1.HealthCheckResponse)
     HealthCheckResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use HealthCheckResponse.newBuilder() to construct.
   private HealthCheckResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -21,7 +22,7 @@ public  final class HealthCheckResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private HealthCheckResponse(
       com.google.protobuf.CodedInputStream input,
@@ -29,6 +30,8 @@ public  final class HealthCheckResponse extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -38,7 +41,8 @@ public  final class HealthCheckResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -57,6 +61,7 @@ public  final class HealthCheckResponse extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -210,6 +215,7 @@ public  final class HealthCheckResponse extends
     if (status_ != io.grpc.health.v1.HealthCheckResponse.ServingStatus.UNKNOWN.getNumber()) {
       output.writeEnum(1, status_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -221,11 +227,11 @@ public  final class HealthCheckResponse extends
       size += com.google.protobuf.CodedOutputStream
         .computeEnumSize(1, status_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -238,6 +244,7 @@ public  final class HealthCheckResponse extends
 
     boolean result = true;
     result = result && status_ == other.status_;
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -413,7 +420,7 @@ public  final class HealthCheckResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -426,12 +433,12 @@ public  final class HealthCheckResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -448,6 +455,7 @@ public  final class HealthCheckResponse extends
       if (other.status_ != 0) {
         setStatusValue(other.getStatusValue());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -519,12 +527,12 @@ public  final class HealthCheckResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
diff --git a/services/src/generated/main/java/io/grpc/instrumentation/v1alpha/CanonicalRpcStats.java b/services/src/generated/main/java/io/grpc/instrumentation/v1alpha/CanonicalRpcStats.java
index de8470f8f..b494ac256 100644
--- a/services/src/generated/main/java/io/grpc/instrumentation/v1alpha/CanonicalRpcStats.java
+++ b/services/src/generated/main/java/io/grpc/instrumentation/v1alpha/CanonicalRpcStats.java
@@ -14,6 +14,7 @@ public  final class CanonicalRpcStats extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.instrumentation.v1alpha.CanonicalRpcStats)
     CanonicalRpcStatsOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use CanonicalRpcStats.newBuilder() to construct.
   private CanonicalRpcStats(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -24,7 +25,7 @@ public  final class CanonicalRpcStats extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private CanonicalRpcStats(
       com.google.protobuf.CodedInputStream input,
@@ -32,6 +33,8 @@ public  final class CanonicalRpcStats extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -41,7 +44,8 @@ public  final class CanonicalRpcStats extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -275,6 +279,7 @@ public  final class CanonicalRpcStats extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -722,6 +727,7 @@ public  final class CanonicalRpcStats extends
     if (rpcServerElapsedTime_ != null) {
       output.writeMessage(17, getRpcServerElapsedTime());
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -797,11 +803,11 @@ public  final class CanonicalRpcStats extends
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(17, getRpcServerElapsedTime());
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -898,6 +904,7 @@ public  final class CanonicalRpcStats extends
       result = result && getRpcServerElapsedTime()
           .equals(other.getRpcServerElapsedTime());
     }
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -1327,7 +1334,7 @@ public  final class CanonicalRpcStats extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -1340,12 +1347,12 @@ public  final class CanonicalRpcStats extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -1410,6 +1417,7 @@ public  final class CanonicalRpcStats extends
       if (other.hasRpcServerElapsedTime()) {
         mergeRpcServerElapsedTime(other.getRpcServerElapsedTime());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -3462,12 +3470,12 @@ public  final class CanonicalRpcStats extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
diff --git a/services/src/generated/main/java/io/grpc/instrumentation/v1alpha/CustomMonitoringData.java b/services/src/generated/main/java/io/grpc/instrumentation/v1alpha/CustomMonitoringData.java
index d76bd6fa9..93bd286af 100644
--- a/services/src/generated/main/java/io/grpc/instrumentation/v1alpha/CustomMonitoringData.java
+++ b/services/src/generated/main/java/io/grpc/instrumentation/v1alpha/CustomMonitoringData.java
@@ -14,6 +14,7 @@ public  final class CustomMonitoringData extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.instrumentation.v1alpha.CustomMonitoringData)
     CustomMonitoringDataOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use CustomMonitoringData.newBuilder() to construct.
   private CustomMonitoringData(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -24,7 +25,7 @@ public  final class CustomMonitoringData extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private CustomMonitoringData(
       com.google.protobuf.CodedInputStream input,
@@ -32,6 +33,8 @@ public  final class CustomMonitoringData extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -41,7 +44,8 @@ public  final class CustomMonitoringData extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -67,6 +71,7 @@ public  final class CustomMonitoringData extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -130,6 +135,7 @@ public  final class CustomMonitoringData extends
     if (contents_ != null) {
       output.writeMessage(1, getContents());
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -141,11 +147,11 @@ public  final class CustomMonitoringData extends
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(1, getContents());
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -162,6 +168,7 @@ public  final class CustomMonitoringData extends
       result = result && getContents()
           .equals(other.getContents());
     }
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -351,7 +358,7 @@ public  final class CustomMonitoringData extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -364,12 +371,12 @@ public  final class CustomMonitoringData extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -386,6 +393,7 @@ public  final class CustomMonitoringData extends
       if (other.hasContents()) {
         mergeContents(other.getContents());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -566,12 +574,12 @@ public  final class CustomMonitoringData extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
diff --git a/services/src/generated/main/java/io/grpc/instrumentation/v1alpha/MonitoringDataGroup.java b/services/src/generated/main/java/io/grpc/instrumentation/v1alpha/MonitoringDataGroup.java
index 771528ac8..5a73a294d 100644
--- a/services/src/generated/main/java/io/grpc/instrumentation/v1alpha/MonitoringDataGroup.java
+++ b/services/src/generated/main/java/io/grpc/instrumentation/v1alpha/MonitoringDataGroup.java
@@ -10,6 +10,7 @@ public  final class MonitoringDataGroup extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.instrumentation.v1alpha.MonitoringDataGroup)
     MonitoringDataGroupOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use MonitoringDataGroup.newBuilder() to construct.
   private MonitoringDataGroup(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -21,7 +22,7 @@ public  final class MonitoringDataGroup extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private MonitoringDataGroup(
       com.google.protobuf.CodedInputStream input,
@@ -29,6 +30,8 @@ public  final class MonitoringDataGroup extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -38,7 +41,8 @@ public  final class MonitoringDataGroup extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -57,6 +61,7 @@ public  final class MonitoringDataGroup extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -129,6 +134,7 @@ public  final class MonitoringDataGroup extends
     if (!getNameBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -139,11 +145,11 @@ public  final class MonitoringDataGroup extends
     if (!getNameBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -157,6 +163,7 @@ public  final class MonitoringDataGroup extends
     boolean result = true;
     result = result && getName()
         .equals(other.getName());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -332,7 +339,7 @@ public  final class MonitoringDataGroup extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -345,12 +352,12 @@ public  final class MonitoringDataGroup extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -368,6 +375,7 @@ public  final class MonitoringDataGroup extends
         name_ = other.name_;
         onChanged();
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -484,12 +492,12 @@ public  final class MonitoringDataGroup extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
diff --git a/services/src/generated/main/java/io/grpc/instrumentation/v1alpha/StatsRequest.java b/services/src/generated/main/java/io/grpc/instrumentation/v1alpha/StatsRequest.java
index 25f211aa4..2a045e4d3 100644
--- a/services/src/generated/main/java/io/grpc/instrumentation/v1alpha/StatsRequest.java
+++ b/services/src/generated/main/java/io/grpc/instrumentation/v1alpha/StatsRequest.java
@@ -15,6 +15,7 @@ public  final class StatsRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.instrumentation.v1alpha.StatsRequest)
     StatsRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use StatsRequest.newBuilder() to construct.
   private StatsRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -28,7 +29,7 @@ public  final class StatsRequest extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private StatsRequest(
       com.google.protobuf.CodedInputStream input,
@@ -36,6 +37,8 @@ public  final class StatsRequest extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -45,7 +48,8 @@ public  final class StatsRequest extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -87,6 +91,7 @@ public  final class StatsRequest extends
       if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
         measurementNames_ = measurementNames_.getUnmodifiableView();
       }
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -277,6 +282,7 @@ public  final class StatsRequest extends
     if (dontIncludeDescriptorsInFirstResponse_ != false) {
       output.writeBool(3, dontIncludeDescriptorsInFirstResponse_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -304,11 +310,11 @@ public  final class StatsRequest extends
       size += com.google.protobuf.CodedOutputStream
         .computeBoolSize(3, dontIncludeDescriptorsInFirstResponse_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -326,6 +332,7 @@ public  final class StatsRequest extends
         .equals(other.getMeasurementNamesList());
     result = result && (getDontIncludeDescriptorsInFirstResponse()
         == other.getDontIncludeDescriptorsInFirstResponse());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -532,7 +539,7 @@ public  final class StatsRequest extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -545,12 +552,12 @@ public  final class StatsRequest extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -587,6 +594,7 @@ public  final class StatsRequest extends
       if (other.getDontIncludeDescriptorsInFirstResponse() != false) {
         setDontIncludeDescriptorsInFirstResponse(other.getDontIncludeDescriptorsInFirstResponse());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1027,12 +1035,12 @@ public  final class StatsRequest extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
diff --git a/services/src/generated/main/java/io/grpc/instrumentation/v1alpha/StatsResponse.java b/services/src/generated/main/java/io/grpc/instrumentation/v1alpha/StatsResponse.java
index aee84d5d4..f3e9f2435 100644
--- a/services/src/generated/main/java/io/grpc/instrumentation/v1alpha/StatsResponse.java
+++ b/services/src/generated/main/java/io/grpc/instrumentation/v1alpha/StatsResponse.java
@@ -15,6 +15,7 @@ public  final class StatsResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.instrumentation.v1alpha.StatsResponse)
     StatsResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use StatsResponse.newBuilder() to construct.
   private StatsResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -25,7 +26,7 @@ public  final class StatsResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private StatsResponse(
       com.google.protobuf.CodedInputStream input,
@@ -33,6 +34,8 @@ public  final class StatsResponse extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -42,7 +45,8 @@ public  final class StatsResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -94,6 +98,7 @@ public  final class StatsResponse extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -232,6 +237,7 @@ public  final class StatsResponse extends
     if (view_ != null) {
       output.writeMessage(3, getView());
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -251,11 +257,11 @@ public  final class StatsResponse extends
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(3, getView());
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -282,6 +288,7 @@ public  final class StatsResponse extends
       result = result && getView()
           .equals(other.getView());
     }
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -502,7 +509,7 @@ public  final class StatsResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -515,12 +522,12 @@ public  final class StatsResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -543,6 +550,7 @@ public  final class StatsResponse extends
       if (other.hasView()) {
         mergeView(other.getView());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1038,12 +1046,12 @@ public  final class StatsResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
diff --git a/services/src/generated/main/java/io/grpc/instrumentation/v1alpha/TraceRequest.java b/services/src/generated/main/java/io/grpc/instrumentation/v1alpha/TraceRequest.java
index ef4c794ed..4b27ce8c9 100644
--- a/services/src/generated/main/java/io/grpc/instrumentation/v1alpha/TraceRequest.java
+++ b/services/src/generated/main/java/io/grpc/instrumentation/v1alpha/TraceRequest.java
@@ -14,6 +14,7 @@ public  final class TraceRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.instrumentation.v1alpha.TraceRequest)
     TraceRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use TraceRequest.newBuilder() to construct.
   private TraceRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -24,13 +25,15 @@ public  final class TraceRequest extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private TraceRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -40,7 +43,8 @@ public  final class TraceRequest extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -53,6 +57,7 @@ public  final class TraceRequest extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -80,6 +85,7 @@ public  final class TraceRequest extends
 
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -87,11 +93,11 @@ public  final class TraceRequest extends
     if (size != -1) return size;
 
     size = 0;
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -103,6 +109,7 @@ public  final class TraceRequest extends
     io.grpc.instrumentation.v1alpha.TraceRequest other = (io.grpc.instrumentation.v1alpha.TraceRequest) obj;
 
     boolean result = true;
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -277,7 +284,7 @@ public  final class TraceRequest extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -290,12 +297,12 @@ public  final class TraceRequest extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -309,6 +316,7 @@ public  final class TraceRequest extends
 
     public Builder mergeFrom(io.grpc.instrumentation.v1alpha.TraceRequest other) {
       if (other == io.grpc.instrumentation.v1alpha.TraceRequest.getDefaultInstance()) return this;
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -336,12 +344,12 @@ public  final class TraceRequest extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
diff --git a/services/src/generated/main/java/io/grpc/instrumentation/v1alpha/TraceResponse.java b/services/src/generated/main/java/io/grpc/instrumentation/v1alpha/TraceResponse.java
index 573a4d0ca..69488a10d 100644
--- a/services/src/generated/main/java/io/grpc/instrumentation/v1alpha/TraceResponse.java
+++ b/services/src/generated/main/java/io/grpc/instrumentation/v1alpha/TraceResponse.java
@@ -14,6 +14,7 @@ public  final class TraceResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.instrumentation.v1alpha.TraceResponse)
     TraceResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use TraceResponse.newBuilder() to construct.
   private TraceResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -24,13 +25,15 @@ public  final class TraceResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private TraceResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -40,7 +43,8 @@ public  final class TraceResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -53,6 +57,7 @@ public  final class TraceResponse extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -80,6 +85,7 @@ public  final class TraceResponse extends
 
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -87,11 +93,11 @@ public  final class TraceResponse extends
     if (size != -1) return size;
 
     size = 0;
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -103,6 +109,7 @@ public  final class TraceResponse extends
     io.grpc.instrumentation.v1alpha.TraceResponse other = (io.grpc.instrumentation.v1alpha.TraceResponse) obj;
 
     boolean result = true;
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -277,7 +284,7 @@ public  final class TraceResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -290,12 +297,12 @@ public  final class TraceResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -309,6 +316,7 @@ public  final class TraceResponse extends
 
     public Builder mergeFrom(io.grpc.instrumentation.v1alpha.TraceResponse other) {
       if (other == io.grpc.instrumentation.v1alpha.TraceResponse.getDefaultInstance()) return this;
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -336,12 +344,12 @@ public  final class TraceResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
diff --git a/services/src/generated/main/java/io/grpc/reflection/v1alpha/ErrorResponse.java b/services/src/generated/main/java/io/grpc/reflection/v1alpha/ErrorResponse.java
index 5b50edb6a..c95cea731 100644
--- a/services/src/generated/main/java/io/grpc/reflection/v1alpha/ErrorResponse.java
+++ b/services/src/generated/main/java/io/grpc/reflection/v1alpha/ErrorResponse.java
@@ -14,6 +14,7 @@ public  final class ErrorResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.reflection.v1alpha.ErrorResponse)
     ErrorResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use ErrorResponse.newBuilder() to construct.
   private ErrorResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -26,7 +27,7 @@ public  final class ErrorResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private ErrorResponse(
       com.google.protobuf.CodedInputStream input,
@@ -34,6 +35,8 @@ public  final class ErrorResponse extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -43,7 +46,8 @@ public  final class ErrorResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -67,6 +71,7 @@ public  final class ErrorResponse extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -147,6 +152,7 @@ public  final class ErrorResponse extends
     if (!getErrorMessageBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, errorMessage_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -161,11 +167,11 @@ public  final class ErrorResponse extends
     if (!getErrorMessageBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, errorMessage_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -181,6 +187,7 @@ public  final class ErrorResponse extends
         == other.getErrorCode());
     result = result && getErrorMessage()
         .equals(other.getErrorMessage());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -365,7 +372,7 @@ public  final class ErrorResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -378,12 +385,12 @@ public  final class ErrorResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -404,6 +411,7 @@ public  final class ErrorResponse extends
         errorMessage_ = other.errorMessage_;
         onChanged();
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -538,12 +546,12 @@ public  final class ErrorResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
diff --git a/services/src/generated/main/java/io/grpc/reflection/v1alpha/ExtensionNumberResponse.java b/services/src/generated/main/java/io/grpc/reflection/v1alpha/ExtensionNumberResponse.java
index fa361f804..bcf1f636e 100644
--- a/services/src/generated/main/java/io/grpc/reflection/v1alpha/ExtensionNumberResponse.java
+++ b/services/src/generated/main/java/io/grpc/reflection/v1alpha/ExtensionNumberResponse.java
@@ -15,6 +15,7 @@ public  final class ExtensionNumberResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.reflection.v1alpha.ExtensionNumberResponse)
     ExtensionNumberResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use ExtensionNumberResponse.newBuilder() to construct.
   private ExtensionNumberResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -27,7 +28,7 @@ public  final class ExtensionNumberResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private ExtensionNumberResponse(
       com.google.protobuf.CodedInputStream input,
@@ -35,6 +36,8 @@ public  final class ExtensionNumberResponse extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -44,7 +47,8 @@ public  final class ExtensionNumberResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -87,6 +91,7 @@ public  final class ExtensionNumberResponse extends
       if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
         extensionNumber_ = java.util.Collections.unmodifiableList(extensionNumber_);
       }
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -193,6 +198,7 @@ public  final class ExtensionNumberResponse extends
     for (int i = 0; i < extensionNumber_.size(); i++) {
       output.writeInt32NoTag(extensionNumber_.get(i));
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -217,11 +223,11 @@ public  final class ExtensionNumberResponse extends
       }
       extensionNumberMemoizedSerializedSize = dataSize;
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -237,6 +243,7 @@ public  final class ExtensionNumberResponse extends
         .equals(other.getBaseTypeName());
     result = result && getExtensionNumberList()
         .equals(other.getExtensionNumberList());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -431,7 +438,7 @@ public  final class ExtensionNumberResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -444,12 +451,12 @@ public  final class ExtensionNumberResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -477,6 +484,7 @@ public  final class ExtensionNumberResponse extends
         }
         onChanged();
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -665,12 +673,12 @@ public  final class ExtensionNumberResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
diff --git a/services/src/generated/main/java/io/grpc/reflection/v1alpha/ExtensionRequest.java b/services/src/generated/main/java/io/grpc/reflection/v1alpha/ExtensionRequest.java
index 35ea0ea66..55b63f30e 100644
--- a/services/src/generated/main/java/io/grpc/reflection/v1alpha/ExtensionRequest.java
+++ b/services/src/generated/main/java/io/grpc/reflection/v1alpha/ExtensionRequest.java
@@ -15,6 +15,7 @@ public  final class ExtensionRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.reflection.v1alpha.ExtensionRequest)
     ExtensionRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use ExtensionRequest.newBuilder() to construct.
   private ExtensionRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -27,7 +28,7 @@ public  final class ExtensionRequest extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private ExtensionRequest(
       com.google.protobuf.CodedInputStream input,
@@ -35,6 +36,8 @@ public  final class ExtensionRequest extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -44,7 +47,8 @@ public  final class ExtensionRequest extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -68,6 +72,7 @@ public  final class ExtensionRequest extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -152,6 +157,7 @@ public  final class ExtensionRequest extends
     if (extensionNumber_ != 0) {
       output.writeInt32(2, extensionNumber_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -166,11 +172,11 @@ public  final class ExtensionRequest extends
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(2, extensionNumber_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -186,6 +192,7 @@ public  final class ExtensionRequest extends
         .equals(other.getContainingType());
     result = result && (getExtensionNumber()
         == other.getExtensionNumber());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -371,7 +378,7 @@ public  final class ExtensionRequest extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -384,12 +391,12 @@ public  final class ExtensionRequest extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -410,6 +417,7 @@ public  final class ExtensionRequest extends
       if (other.getExtensionNumber() != 0) {
         setExtensionNumber(other.getExtensionNumber());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -552,12 +560,12 @@ public  final class ExtensionRequest extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
diff --git a/services/src/generated/main/java/io/grpc/reflection/v1alpha/FileDescriptorResponse.java b/services/src/generated/main/java/io/grpc/reflection/v1alpha/FileDescriptorResponse.java
index 272f5d967..435722db7 100644
--- a/services/src/generated/main/java/io/grpc/reflection/v1alpha/FileDescriptorResponse.java
+++ b/services/src/generated/main/java/io/grpc/reflection/v1alpha/FileDescriptorResponse.java
@@ -16,6 +16,7 @@ public  final class FileDescriptorResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.reflection.v1alpha.FileDescriptorResponse)
     FileDescriptorResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use FileDescriptorResponse.newBuilder() to construct.
   private FileDescriptorResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -27,7 +28,7 @@ public  final class FileDescriptorResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private FileDescriptorResponse(
       com.google.protobuf.CodedInputStream input,
@@ -35,6 +36,8 @@ public  final class FileDescriptorResponse extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -44,7 +47,8 @@ public  final class FileDescriptorResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -68,6 +72,7 @@ public  final class FileDescriptorResponse extends
       if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
         fileDescriptorProto_ = java.util.Collections.unmodifiableList(fileDescriptorProto_);
       }
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -138,6 +143,7 @@ public  final class FileDescriptorResponse extends
     for (int i = 0; i < fileDescriptorProto_.size(); i++) {
       output.writeBytes(1, fileDescriptorProto_.get(i));
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -154,11 +160,11 @@ public  final class FileDescriptorResponse extends
       size += dataSize;
       size += 1 * getFileDescriptorProtoList().size();
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -172,6 +178,7 @@ public  final class FileDescriptorResponse extends
     boolean result = true;
     result = result && getFileDescriptorProtoList()
         .equals(other.getFileDescriptorProtoList());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -360,7 +367,7 @@ public  final class FileDescriptorResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -373,12 +380,12 @@ public  final class FileDescriptorResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -402,6 +409,7 @@ public  final class FileDescriptorResponse extends
         }
         onChanged();
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -544,12 +552,12 @@ public  final class FileDescriptorResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
diff --git a/services/src/generated/main/java/io/grpc/reflection/v1alpha/ListServiceResponse.java b/services/src/generated/main/java/io/grpc/reflection/v1alpha/ListServiceResponse.java
index e7b952e33..b314a31cf 100644
--- a/services/src/generated/main/java/io/grpc/reflection/v1alpha/ListServiceResponse.java
+++ b/services/src/generated/main/java/io/grpc/reflection/v1alpha/ListServiceResponse.java
@@ -14,6 +14,7 @@ public  final class ListServiceResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.reflection.v1alpha.ListServiceResponse)
     ListServiceResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use ListServiceResponse.newBuilder() to construct.
   private ListServiceResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -25,7 +26,7 @@ public  final class ListServiceResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private ListServiceResponse(
       com.google.protobuf.CodedInputStream input,
@@ -33,6 +34,8 @@ public  final class ListServiceResponse extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -42,7 +45,8 @@ public  final class ListServiceResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -67,6 +71,7 @@ public  final class ListServiceResponse extends
       if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
         service_ = java.util.Collections.unmodifiableList(service_);
       }
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -157,6 +162,7 @@ public  final class ListServiceResponse extends
     for (int i = 0; i < service_.size(); i++) {
       output.writeMessage(1, service_.get(i));
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -168,11 +174,11 @@ public  final class ListServiceResponse extends
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(1, service_.get(i));
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -186,6 +192,7 @@ public  final class ListServiceResponse extends
     boolean result = true;
     result = result && getServiceList()
         .equals(other.getServiceList());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -381,7 +388,7 @@ public  final class ListServiceResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -394,12 +401,12 @@ public  final class ListServiceResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -439,6 +446,7 @@ public  final class ListServiceResponse extends
           }
         }
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -797,12 +805,12 @@ public  final class ListServiceResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
diff --git a/services/src/generated/main/java/io/grpc/reflection/v1alpha/ServerReflectionRequest.java b/services/src/generated/main/java/io/grpc/reflection/v1alpha/ServerReflectionRequest.java
index e4722191f..eab3c3e94 100644
--- a/services/src/generated/main/java/io/grpc/reflection/v1alpha/ServerReflectionRequest.java
+++ b/services/src/generated/main/java/io/grpc/reflection/v1alpha/ServerReflectionRequest.java
@@ -14,6 +14,7 @@ public  final class ServerReflectionRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.reflection.v1alpha.ServerReflectionRequest)
     ServerReflectionRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use ServerReflectionRequest.newBuilder() to construct.
   private ServerReflectionRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -25,7 +26,7 @@ public  final class ServerReflectionRequest extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private ServerReflectionRequest(
       com.google.protobuf.CodedInputStream input,
@@ -33,6 +34,8 @@ public  final class ServerReflectionRequest extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -42,7 +45,8 @@ public  final class ServerReflectionRequest extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -99,6 +103,7 @@ public  final class ServerReflectionRequest extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -307,6 +312,17 @@ public  final class ServerReflectionRequest extends
    *
    * <code>.grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;</code>
    */
+  public boolean hasFileContainingExtension() {
+    return messageRequestCase_ == 5;
+  }
+  /**
+   * <pre>
+   * Find the proto file which defines an extension extending the given
+   * message type with the given field number.
+   * </pre>
+   *
+   * <code>.grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;</code>
+   */
   public io.grpc.reflection.v1alpha.ExtensionRequest getFileContainingExtension() {
     if (messageRequestCase_ == 5) {
        return (io.grpc.reflection.v1alpha.ExtensionRequest) messageRequest_;
@@ -476,6 +492,7 @@ public  final class ServerReflectionRequest extends
     if (messageRequestCase_ == 7) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 7, messageRequest_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -502,11 +519,11 @@ public  final class ServerReflectionRequest extends
     if (messageRequestCase_ == 7) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, messageRequest_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -547,6 +564,7 @@ public  final class ServerReflectionRequest extends
       case 0:
       default:
     }
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -772,7 +790,7 @@ public  final class ServerReflectionRequest extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -785,12 +803,12 @@ public  final class ServerReflectionRequest extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -841,6 +859,7 @@ public  final class ServerReflectionRequest extends
           break;
         }
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1171,6 +1190,17 @@ public  final class ServerReflectionRequest extends
      *
      * <code>.grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;</code>
      */
+    public boolean hasFileContainingExtension() {
+      return messageRequestCase_ == 5;
+    }
+    /**
+     * <pre>
+     * Find the proto file which defines an extension extending the given
+     * message type with the given field number.
+     * </pre>
+     *
+     * <code>.grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;</code>
+     */
     public io.grpc.reflection.v1alpha.ExtensionRequest getFileContainingExtension() {
       if (fileContainingExtensionBuilder_ == null) {
         if (messageRequestCase_ == 5) {
@@ -1572,12 +1602,12 @@ public  final class ServerReflectionRequest extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
diff --git a/services/src/generated/main/java/io/grpc/reflection/v1alpha/ServerReflectionRequestOrBuilder.java b/services/src/generated/main/java/io/grpc/reflection/v1alpha/ServerReflectionRequestOrBuilder.java
index 9aa551404..efd053800 100644
--- a/services/src/generated/main/java/io/grpc/reflection/v1alpha/ServerReflectionRequestOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/reflection/v1alpha/ServerReflectionRequestOrBuilder.java
@@ -65,6 +65,15 @@ public interface ServerReflectionRequestOrBuilder extends
    *
    * <code>.grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;</code>
    */
+  boolean hasFileContainingExtension();
+  /**
+   * <pre>
+   * Find the proto file which defines an extension extending the given
+   * message type with the given field number.
+   * </pre>
+   *
+   * <code>.grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;</code>
+   */
   io.grpc.reflection.v1alpha.ExtensionRequest getFileContainingExtension();
   /**
    * <pre>
diff --git a/services/src/generated/main/java/io/grpc/reflection/v1alpha/ServerReflectionResponse.java b/services/src/generated/main/java/io/grpc/reflection/v1alpha/ServerReflectionResponse.java
index 1215eeb30..868e1e3d6 100644
--- a/services/src/generated/main/java/io/grpc/reflection/v1alpha/ServerReflectionResponse.java
+++ b/services/src/generated/main/java/io/grpc/reflection/v1alpha/ServerReflectionResponse.java
@@ -14,6 +14,7 @@ public  final class ServerReflectionResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.reflection.v1alpha.ServerReflectionResponse)
     ServerReflectionResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use ServerReflectionResponse.newBuilder() to construct.
   private ServerReflectionResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -25,7 +26,7 @@ public  final class ServerReflectionResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private ServerReflectionResponse(
       com.google.protobuf.CodedInputStream input,
@@ -33,6 +34,8 @@ public  final class ServerReflectionResponse extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -42,7 +45,8 @@ public  final class ServerReflectionResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -130,6 +134,7 @@ public  final class ServerReflectionResponse extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -255,6 +260,21 @@ public  final class ServerReflectionResponse extends
    *
    * <code>.grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;</code>
    */
+  public boolean hasFileDescriptorResponse() {
+    return messageResponseCase_ == 4;
+  }
+  /**
+   * <pre>
+   * This message is used to answer file_by_filename, file_containing_symbol,
+   * file_containing_extension requests with transitive dependencies. As
+   * the repeated label is not allowed in oneof fields, we use a
+   * FileDescriptorResponse message to encapsulate the repeated fields.
+   * The reflection service is allowed to avoid sending FileDescriptorProtos
+   * that were previously sent in response to earlier requests in the stream.
+   * </pre>
+   *
+   * <code>.grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;</code>
+   */
   public io.grpc.reflection.v1alpha.FileDescriptorResponse getFileDescriptorResponse() {
     if (messageResponseCase_ == 4) {
        return (io.grpc.reflection.v1alpha.FileDescriptorResponse) messageResponse_;
@@ -288,6 +308,16 @@ public  final class ServerReflectionResponse extends
    *
    * <code>.grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;</code>
    */
+  public boolean hasAllExtensionNumbersResponse() {
+    return messageResponseCase_ == 5;
+  }
+  /**
+   * <pre>
+   * This message is used to answer all_extension_numbers_of_type requst.
+   * </pre>
+   *
+   * <code>.grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;</code>
+   */
   public io.grpc.reflection.v1alpha.ExtensionNumberResponse getAllExtensionNumbersResponse() {
     if (messageResponseCase_ == 5) {
        return (io.grpc.reflection.v1alpha.ExtensionNumberResponse) messageResponse_;
@@ -316,6 +346,16 @@ public  final class ServerReflectionResponse extends
    *
    * <code>.grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;</code>
    */
+  public boolean hasListServicesResponse() {
+    return messageResponseCase_ == 6;
+  }
+  /**
+   * <pre>
+   * This message is used to answer list_services request.
+   * </pre>
+   *
+   * <code>.grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;</code>
+   */
   public io.grpc.reflection.v1alpha.ListServiceResponse getListServicesResponse() {
     if (messageResponseCase_ == 6) {
        return (io.grpc.reflection.v1alpha.ListServiceResponse) messageResponse_;
@@ -344,6 +384,16 @@ public  final class ServerReflectionResponse extends
    *
    * <code>.grpc.reflection.v1alpha.ErrorResponse error_response = 7;</code>
    */
+  public boolean hasErrorResponse() {
+    return messageResponseCase_ == 7;
+  }
+  /**
+   * <pre>
+   * This message is used when an error occurs.
+   * </pre>
+   *
+   * <code>.grpc.reflection.v1alpha.ErrorResponse error_response = 7;</code>
+   */
   public io.grpc.reflection.v1alpha.ErrorResponse getErrorResponse() {
     if (messageResponseCase_ == 7) {
        return (io.grpc.reflection.v1alpha.ErrorResponse) messageResponse_;
@@ -394,6 +444,7 @@ public  final class ServerReflectionResponse extends
     if (messageResponseCase_ == 7) {
       output.writeMessage(7, (io.grpc.reflection.v1alpha.ErrorResponse) messageResponse_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -424,11 +475,11 @@ public  final class ServerReflectionResponse extends
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(7, (io.grpc.reflection.v1alpha.ErrorResponse) messageResponse_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -470,6 +521,7 @@ public  final class ServerReflectionResponse extends
       case 0:
       default:
     }
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -715,7 +767,7 @@ public  final class ServerReflectionResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -728,12 +780,12 @@ public  final class ServerReflectionResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -775,6 +827,7 @@ public  final class ServerReflectionResponse extends
           break;
         }
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1016,6 +1069,21 @@ public  final class ServerReflectionResponse extends
      *
      * <code>.grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;</code>
      */
+    public boolean hasFileDescriptorResponse() {
+      return messageResponseCase_ == 4;
+    }
+    /**
+     * <pre>
+     * This message is used to answer file_by_filename, file_containing_symbol,
+     * file_containing_extension requests with transitive dependencies. As
+     * the repeated label is not allowed in oneof fields, we use a
+     * FileDescriptorResponse message to encapsulate the repeated fields.
+     * The reflection service is allowed to avoid sending FileDescriptorProtos
+     * that were previously sent in response to earlier requests in the stream.
+     * </pre>
+     *
+     * <code>.grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;</code>
+     */
     public io.grpc.reflection.v1alpha.FileDescriptorResponse getFileDescriptorResponse() {
       if (fileDescriptorResponseBuilder_ == null) {
         if (messageResponseCase_ == 4) {
@@ -1213,6 +1281,16 @@ public  final class ServerReflectionResponse extends
      *
      * <code>.grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;</code>
      */
+    public boolean hasAllExtensionNumbersResponse() {
+      return messageResponseCase_ == 5;
+    }
+    /**
+     * <pre>
+     * This message is used to answer all_extension_numbers_of_type requst.
+     * </pre>
+     *
+     * <code>.grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;</code>
+     */
     public io.grpc.reflection.v1alpha.ExtensionNumberResponse getAllExtensionNumbersResponse() {
       if (allExtensionNumbersResponseBuilder_ == null) {
         if (messageResponseCase_ == 5) {
@@ -1375,6 +1453,16 @@ public  final class ServerReflectionResponse extends
      *
      * <code>.grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;</code>
      */
+    public boolean hasListServicesResponse() {
+      return messageResponseCase_ == 6;
+    }
+    /**
+     * <pre>
+     * This message is used to answer list_services request.
+     * </pre>
+     *
+     * <code>.grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;</code>
+     */
     public io.grpc.reflection.v1alpha.ListServiceResponse getListServicesResponse() {
       if (listServicesResponseBuilder_ == null) {
         if (messageResponseCase_ == 6) {
@@ -1537,6 +1625,16 @@ public  final class ServerReflectionResponse extends
      *
      * <code>.grpc.reflection.v1alpha.ErrorResponse error_response = 7;</code>
      */
+    public boolean hasErrorResponse() {
+      return messageResponseCase_ == 7;
+    }
+    /**
+     * <pre>
+     * This message is used when an error occurs.
+     * </pre>
+     *
+     * <code>.grpc.reflection.v1alpha.ErrorResponse error_response = 7;</code>
+     */
     public io.grpc.reflection.v1alpha.ErrorResponse getErrorResponse() {
       if (errorResponseBuilder_ == null) {
         if (messageResponseCase_ == 7) {
@@ -1691,12 +1789,12 @@ public  final class ServerReflectionResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
diff --git a/services/src/generated/main/java/io/grpc/reflection/v1alpha/ServerReflectionResponseOrBuilder.java b/services/src/generated/main/java/io/grpc/reflection/v1alpha/ServerReflectionResponseOrBuilder.java
index 6fe2129c3..0a24d9138 100644
--- a/services/src/generated/main/java/io/grpc/reflection/v1alpha/ServerReflectionResponseOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/reflection/v1alpha/ServerReflectionResponseOrBuilder.java
@@ -42,6 +42,19 @@ public interface ServerReflectionResponseOrBuilder extends
    *
    * <code>.grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;</code>
    */
+  boolean hasFileDescriptorResponse();
+  /**
+   * <pre>
+   * This message is used to answer file_by_filename, file_containing_symbol,
+   * file_containing_extension requests with transitive dependencies. As
+   * the repeated label is not allowed in oneof fields, we use a
+   * FileDescriptorResponse message to encapsulate the repeated fields.
+   * The reflection service is allowed to avoid sending FileDescriptorProtos
+   * that were previously sent in response to earlier requests in the stream.
+   * </pre>
+   *
+   * <code>.grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;</code>
+   */
   io.grpc.reflection.v1alpha.FileDescriptorResponse getFileDescriptorResponse();
   /**
    * <pre>
@@ -64,6 +77,14 @@ public interface ServerReflectionResponseOrBuilder extends
    *
    * <code>.grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;</code>
    */
+  boolean hasAllExtensionNumbersResponse();
+  /**
+   * <pre>
+   * This message is used to answer all_extension_numbers_of_type requst.
+   * </pre>
+   *
+   * <code>.grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;</code>
+   */
   io.grpc.reflection.v1alpha.ExtensionNumberResponse getAllExtensionNumbersResponse();
   /**
    * <pre>
@@ -81,6 +102,14 @@ public interface ServerReflectionResponseOrBuilder extends
    *
    * <code>.grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;</code>
    */
+  boolean hasListServicesResponse();
+  /**
+   * <pre>
+   * This message is used to answer list_services request.
+   * </pre>
+   *
+   * <code>.grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;</code>
+   */
   io.grpc.reflection.v1alpha.ListServiceResponse getListServicesResponse();
   /**
    * <pre>
@@ -98,6 +127,14 @@ public interface ServerReflectionResponseOrBuilder extends
    *
    * <code>.grpc.reflection.v1alpha.ErrorResponse error_response = 7;</code>
    */
+  boolean hasErrorResponse();
+  /**
+   * <pre>
+   * This message is used when an error occurs.
+   * </pre>
+   *
+   * <code>.grpc.reflection.v1alpha.ErrorResponse error_response = 7;</code>
+   */
   io.grpc.reflection.v1alpha.ErrorResponse getErrorResponse();
   /**
    * <pre>
diff --git a/services/src/generated/main/java/io/grpc/reflection/v1alpha/ServiceResponse.java b/services/src/generated/main/java/io/grpc/reflection/v1alpha/ServiceResponse.java
index 528faa0f1..4fa714bb9 100644
--- a/services/src/generated/main/java/io/grpc/reflection/v1alpha/ServiceResponse.java
+++ b/services/src/generated/main/java/io/grpc/reflection/v1alpha/ServiceResponse.java
@@ -15,6 +15,7 @@ public  final class ServiceResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.reflection.v1alpha.ServiceResponse)
     ServiceResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use ServiceResponse.newBuilder() to construct.
   private ServiceResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -26,7 +27,7 @@ public  final class ServiceResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private ServiceResponse(
       com.google.protobuf.CodedInputStream input,
@@ -34,6 +35,8 @@ public  final class ServiceResponse extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -43,7 +46,8 @@ public  final class ServiceResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -62,6 +66,7 @@ public  final class ServiceResponse extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -136,6 +141,7 @@ public  final class ServiceResponse extends
     if (!getNameBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -146,11 +152,11 @@ public  final class ServiceResponse extends
     if (!getNameBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -164,6 +170,7 @@ public  final class ServiceResponse extends
     boolean result = true;
     result = result && getName()
         .equals(other.getName());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -344,7 +351,7 @@ public  final class ServiceResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -357,12 +364,12 @@ public  final class ServiceResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -380,6 +387,7 @@ public  final class ServiceResponse extends
         name_ = other.name_;
         onChanged();
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -501,12 +509,12 @@ public  final class ServiceResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
diff --git a/services/src/generated/test/java/io/grpc/reflection/testing/DynamicReply.java b/services/src/generated/test/java/io/grpc/reflection/testing/DynamicReply.java
index a06094c6f..ede0e79a7 100644
--- a/services/src/generated/test/java/io/grpc/reflection/testing/DynamicReply.java
+++ b/services/src/generated/test/java/io/grpc/reflection/testing/DynamicReply.java
@@ -10,6 +10,7 @@ public  final class DynamicReply extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.reflection.testing.DynamicReply)
     DynamicReplyOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use DynamicReply.newBuilder() to construct.
   private DynamicReply(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -40,8 +41,8 @@ public  final class DynamicReply extends
             done = true;
             break;
           default: {
-            if (!parseUnknownField(input, unknownFields,
-                                   extensionRegistry, tag)) {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -150,7 +151,6 @@ public  final class DynamicReply extends
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -351,7 +351,7 @@ public  final class DynamicReply extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -364,12 +364,12 @@ public  final class DynamicReply extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
diff --git a/services/src/generated/test/java/io/grpc/reflection/testing/DynamicRequest.java b/services/src/generated/test/java/io/grpc/reflection/testing/DynamicRequest.java
index 381555608..63fe6225c 100644
--- a/services/src/generated/test/java/io/grpc/reflection/testing/DynamicRequest.java
+++ b/services/src/generated/test/java/io/grpc/reflection/testing/DynamicRequest.java
@@ -10,6 +10,7 @@ public  final class DynamicRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.reflection.testing.DynamicRequest)
     DynamicRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use DynamicRequest.newBuilder() to construct.
   private DynamicRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -40,8 +41,8 @@ public  final class DynamicRequest extends
             done = true;
             break;
           default: {
-            if (!parseUnknownField(input, unknownFields,
-                                   extensionRegistry, tag)) {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -150,7 +151,6 @@ public  final class DynamicRequest extends
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -351,7 +351,7 @@ public  final class DynamicRequest extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -364,12 +364,12 @@ public  final class DynamicRequest extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
diff --git a/services/src/generated/test/java/io/grpc/reflection/testing/EmptyMessage.java b/services/src/generated/test/java/io/grpc/reflection/testing/EmptyMessage.java
index 7caed65ea..7d24bce59 100644
--- a/services/src/generated/test/java/io/grpc/reflection/testing/EmptyMessage.java
+++ b/services/src/generated/test/java/io/grpc/reflection/testing/EmptyMessage.java
@@ -10,6 +10,7 @@ public  final class EmptyMessage extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.reflection.testing.EmptyMessage)
     EmptyMessageOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use EmptyMessage.newBuilder() to construct.
   private EmptyMessage(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -38,8 +39,8 @@ public  final class EmptyMessage extends
             done = true;
             break;
           default: {
-            if (!parseUnknownField(input, unknownFields,
-                                   extensionRegistry, tag)) {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -93,7 +94,6 @@ public  final class EmptyMessage extends
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -276,7 +276,7 @@ public  final class EmptyMessage extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -289,12 +289,12 @@ public  final class EmptyMessage extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
diff --git a/services/src/generated/test/java/io/grpc/reflection/testing/NestedTypeOuter.java b/services/src/generated/test/java/io/grpc/reflection/testing/NestedTypeOuter.java
index 8af8316ca..25b0d4cb9 100644
--- a/services/src/generated/test/java/io/grpc/reflection/testing/NestedTypeOuter.java
+++ b/services/src/generated/test/java/io/grpc/reflection/testing/NestedTypeOuter.java
@@ -10,6 +10,7 @@ public  final class NestedTypeOuter extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.reflection.testing.NestedTypeOuter)
     NestedTypeOuterOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use NestedTypeOuter.newBuilder() to construct.
   private NestedTypeOuter(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -38,8 +39,8 @@ public  final class NestedTypeOuter extends
             done = true;
             break;
           default: {
-            if (!parseUnknownField(input, unknownFields,
-                                   extensionRegistry, tag)) {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -79,6 +80,7 @@ public  final class NestedTypeOuter extends
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.reflection.testing.NestedTypeOuter.Middle)
       MiddleOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use Middle.newBuilder() to construct.
     private Middle(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -107,8 +109,8 @@ public  final class NestedTypeOuter extends
               done = true;
               break;
             default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -157,6 +159,7 @@ public  final class NestedTypeOuter extends
         com.google.protobuf.GeneratedMessageV3 implements
         // @@protoc_insertion_point(message_implements:grpc.reflection.testing.NestedTypeOuter.Middle.Inner)
         InnerOrBuilder {
+    private static final long serialVersionUID = 0L;
       // Use Inner.newBuilder() to construct.
       private Inner(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
         super(builder);
@@ -187,8 +190,8 @@ public  final class NestedTypeOuter extends
                 done = true;
                 break;
               default: {
-                if (!parseUnknownField(input, unknownFields,
-                                       extensionRegistry, tag)) {
+                if (!parseUnknownField(
+                    input, unknownFields, extensionRegistry, tag)) {
                   done = true;
                 }
                 break;
@@ -270,7 +273,6 @@ public  final class NestedTypeOuter extends
         return size;
       }
 
-      private static final long serialVersionUID = 0L;
       @java.lang.Override
       public boolean equals(final java.lang.Object obj) {
         if (obj == this) {
@@ -471,7 +473,7 @@ public  final class NestedTypeOuter extends
         }
         public Builder setField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
-            Object value) {
+            java.lang.Object value) {
           return (Builder) super.setField(field, value);
         }
         public Builder clearField(
@@ -484,12 +486,12 @@ public  final class NestedTypeOuter extends
         }
         public Builder setRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
-            int index, Object value) {
+            int index, java.lang.Object value) {
           return (Builder) super.setRepeatedField(field, index, value);
         }
         public Builder addRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
-            Object value) {
+            java.lang.Object value) {
           return (Builder) super.addRepeatedField(field, value);
         }
         public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -639,7 +641,6 @@ public  final class NestedTypeOuter extends
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -822,7 +823,7 @@ public  final class NestedTypeOuter extends
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -835,12 +836,12 @@ public  final class NestedTypeOuter extends
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -954,7 +955,6 @@ public  final class NestedTypeOuter extends
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -1137,7 +1137,7 @@ public  final class NestedTypeOuter extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -1150,12 +1150,12 @@ public  final class NestedTypeOuter extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
diff --git a/services/src/generated/test/java/io/grpc/reflection/testing/Reply.java b/services/src/generated/test/java/io/grpc/reflection/testing/Reply.java
index 3e9c35098..6c44225e7 100644
--- a/services/src/generated/test/java/io/grpc/reflection/testing/Reply.java
+++ b/services/src/generated/test/java/io/grpc/reflection/testing/Reply.java
@@ -10,6 +10,7 @@ public  final class Reply extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.reflection.testing.Reply)
     ReplyOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use Reply.newBuilder() to construct.
   private Reply(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -40,8 +41,8 @@ public  final class Reply extends
             done = true;
             break;
           default: {
-            if (!parseUnknownField(input, unknownFields,
-                                   extensionRegistry, tag)) {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -150,7 +151,6 @@ public  final class Reply extends
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -351,7 +351,7 @@ public  final class Reply extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -364,12 +364,12 @@ public  final class Reply extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
diff --git a/services/src/generated/test/java/io/grpc/reflection/testing/Request.java b/services/src/generated/test/java/io/grpc/reflection/testing/Request.java
index 6b01ca7ad..cac590639 100644
--- a/services/src/generated/test/java/io/grpc/reflection/testing/Request.java
+++ b/services/src/generated/test/java/io/grpc/reflection/testing/Request.java
@@ -10,6 +10,7 @@ public  final class Request extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.reflection.testing.Request)
     RequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use Request.newBuilder() to construct.
   private Request(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -40,8 +41,8 @@ public  final class Request extends
             done = true;
             break;
           default: {
-            if (!parseUnknownField(input, unknownFields,
-                                   extensionRegistry, tag)) {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -150,7 +151,6 @@ public  final class Request extends
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -351,7 +351,7 @@ public  final class Request extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -364,12 +364,12 @@ public  final class Request extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
diff --git a/services/src/generated/test/java/io/grpc/reflection/testing/ThirdLevelType.java b/services/src/generated/test/java/io/grpc/reflection/testing/ThirdLevelType.java
index 1003dbd60..8467e0c45 100644
--- a/services/src/generated/test/java/io/grpc/reflection/testing/ThirdLevelType.java
+++ b/services/src/generated/test/java/io/grpc/reflection/testing/ThirdLevelType.java
@@ -11,6 +11,7 @@ public  final class ThirdLevelType extends
       ThirdLevelType> implements
     // @@protoc_insertion_point(message_implements:grpc.reflection.testing.ThirdLevelType)
     ThirdLevelTypeOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use ThirdLevelType.newBuilder() to construct.
   private ThirdLevelType(com.google.protobuf.GeneratedMessageV3.ExtendableBuilder<io.grpc.reflection.testing.ThirdLevelType, ?> builder) {
     super(builder);
@@ -41,8 +42,8 @@ public  final class ThirdLevelType extends
             done = true;
             break;
           default: {
-            if (!parseUnknownField(input, unknownFields,
-                                   extensionRegistry, tag)) {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -160,7 +161,6 @@ public  final class ThirdLevelType extends
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -365,7 +365,7 @@ public  final class ThirdLevelType extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -378,12 +378,12 @@ public  final class ThirdLevelType extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public <Type> Builder setExtension(
diff --git a/services/src/generated/test/java/io/grpc/reflection/testing/TypeWithExtensions.java b/services/src/generated/test/java/io/grpc/reflection/testing/TypeWithExtensions.java
index 78c427fa4..cdad5bd12 100644
--- a/services/src/generated/test/java/io/grpc/reflection/testing/TypeWithExtensions.java
+++ b/services/src/generated/test/java/io/grpc/reflection/testing/TypeWithExtensions.java
@@ -11,6 +11,7 @@ public  final class TypeWithExtensions extends
       TypeWithExtensions> implements
     // @@protoc_insertion_point(message_implements:grpc.reflection.testing.TypeWithExtensions)
     TypeWithExtensionsOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use TypeWithExtensions.newBuilder() to construct.
   private TypeWithExtensions(com.google.protobuf.GeneratedMessageV3.ExtendableBuilder<io.grpc.reflection.testing.TypeWithExtensions, ?> builder) {
     super(builder);
@@ -41,8 +42,8 @@ public  final class TypeWithExtensions extends
             done = true;
             break;
           default: {
-            if (!parseUnknownField(input, unknownFields,
-                                   extensionRegistry, tag)) {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -160,7 +161,6 @@ public  final class TypeWithExtensions extends
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -365,7 +365,7 @@ public  final class TypeWithExtensions extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -378,12 +378,12 @@ public  final class TypeWithExtensions extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public <Type> Builder setExtension(
diff --git a/testing-proto/src/generated/main/java/io/grpc/testing/protobuf/SimpleRequest.java b/testing-proto/src/generated/main/java/io/grpc/testing/protobuf/SimpleRequest.java
index 6188cfac8..1da90edc7 100644
--- a/testing-proto/src/generated/main/java/io/grpc/testing/protobuf/SimpleRequest.java
+++ b/testing-proto/src/generated/main/java/io/grpc/testing/protobuf/SimpleRequest.java
@@ -14,6 +14,7 @@ public  final class SimpleRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.testing.SimpleRequest)
     SimpleRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use SimpleRequest.newBuilder() to construct.
   private SimpleRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -25,7 +26,7 @@ public  final class SimpleRequest extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private SimpleRequest(
       com.google.protobuf.CodedInputStream input,
@@ -33,6 +34,8 @@ public  final class SimpleRequest extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -42,7 +45,8 @@ public  final class SimpleRequest extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -61,6 +65,7 @@ public  final class SimpleRequest extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -133,6 +138,7 @@ public  final class SimpleRequest extends
     if (!getRequestMessageBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, requestMessage_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -143,11 +149,11 @@ public  final class SimpleRequest extends
     if (!getRequestMessageBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, requestMessage_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -161,6 +167,7 @@ public  final class SimpleRequest extends
     boolean result = true;
     result = result && getRequestMessage()
         .equals(other.getRequestMessage());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -340,7 +347,7 @@ public  final class SimpleRequest extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -353,12 +360,12 @@ public  final class SimpleRequest extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -376,6 +383,7 @@ public  final class SimpleRequest extends
         requestMessage_ = other.requestMessage_;
         onChanged();
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -492,12 +500,12 @@ public  final class SimpleRequest extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
diff --git a/testing-proto/src/generated/main/java/io/grpc/testing/protobuf/SimpleResponse.java b/testing-proto/src/generated/main/java/io/grpc/testing/protobuf/SimpleResponse.java
index 174ed1e05..d2725fae9 100644
--- a/testing-proto/src/generated/main/java/io/grpc/testing/protobuf/SimpleResponse.java
+++ b/testing-proto/src/generated/main/java/io/grpc/testing/protobuf/SimpleResponse.java
@@ -14,6 +14,7 @@ public  final class SimpleResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.testing.SimpleResponse)
     SimpleResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use SimpleResponse.newBuilder() to construct.
   private SimpleResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -25,7 +26,7 @@ public  final class SimpleResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private SimpleResponse(
       com.google.protobuf.CodedInputStream input,
@@ -33,6 +34,8 @@ public  final class SimpleResponse extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -42,7 +45,8 @@ public  final class SimpleResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -61,6 +65,7 @@ public  final class SimpleResponse extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -133,6 +138,7 @@ public  final class SimpleResponse extends
     if (!getResponseMessageBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, responseMessage_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -143,11 +149,11 @@ public  final class SimpleResponse extends
     if (!getResponseMessageBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, responseMessage_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -161,6 +167,7 @@ public  final class SimpleResponse extends
     boolean result = true;
     result = result && getResponseMessage()
         .equals(other.getResponseMessage());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -340,7 +347,7 @@ public  final class SimpleResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -353,12 +360,12 @@ public  final class SimpleResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -376,6 +383,7 @@ public  final class SimpleResponse extends
         responseMessage_ = other.responseMessage_;
         onChanged();
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -492,12 +500,12 @@ public  final class SimpleResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }