all: update to proto 3.5.0

5 files changed, 174 insertions, 54 deletions

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 691b438ea..2508a9597 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
@@ -432,6 +432,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -850,7 +853,7 @@ public final class Control {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new PoissonParams(input, extensionRegistry);
+        return new PoissonParams(input, extensionRegistry);
       }
     };
 
@@ -903,6 +906,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -1244,7 +1250,7 @@ public final class Control {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ClosedLoopParams(input, extensionRegistry);
+        return new ClosedLoopParams(input, extensionRegistry);
       }
     };
 
@@ -1320,6 +1326,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2133,7 +2142,7 @@ public final class Control {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new LoadParams(input, extensionRegistry);
+        return new LoadParams(input, extensionRegistry);
       }
     };
 
@@ -2202,6 +2211,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2727,7 +2739,7 @@ public final class Control {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new SecurityParams(input, extensionRegistry);
+        return new SecurityParams(input, extensionRegistry);
       }
     };
 
@@ -2803,6 +2815,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3560,7 +3575,7 @@ public final class Control {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ChannelArg(input, extensionRegistry);
+        return new ChannelArg(input, extensionRegistry);
       }
     };
 
@@ -3846,6 +3861,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -6396,7 +6414,7 @@ public final class Control {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ClientConfig(input, extensionRegistry);
+        return new ClientConfig(input, extensionRegistry);
       }
     };
 
@@ -6457,6 +6475,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -6975,7 +6996,7 @@ public final class Control {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ClientStatus(input, extensionRegistry);
+        return new ClientStatus(input, extensionRegistry);
       }
     };
 
@@ -7037,6 +7058,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -7452,7 +7476,7 @@ public final class Control {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Mark(input, extensionRegistry);
+        return new Mark(input, extensionRegistry);
       }
     };
 
@@ -7528,6 +7552,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -8341,7 +8368,7 @@ public final class Control {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ClientArgs(input, extensionRegistry);
+        return new ClientArgs(input, extensionRegistry);
       }
     };
 
@@ -8531,6 +8558,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -10045,7 +10075,7 @@ public final class Control {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ServerConfig(input, extensionRegistry);
+        return new ServerConfig(input, extensionRegistry);
       }
     };
 
@@ -10121,6 +10151,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -10934,7 +10967,7 @@ public final class Control {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ServerArgs(input, extensionRegistry);
+        return new ServerArgs(input, extensionRegistry);
       }
     };
 
@@ -11015,6 +11048,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -11679,7 +11715,7 @@ public final class Control {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ServerStatus(input, extensionRegistry);
+        return new ServerStatus(input, extensionRegistry);
       }
     };
 
@@ -11727,6 +11763,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -12063,7 +12102,7 @@ public final class Control {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new CoreRequest(input, extensionRegistry);
+        return new CoreRequest(input, extensionRegistry);
       }
     };
 
@@ -12121,6 +12160,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -12531,7 +12573,7 @@ public final class Control {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new CoreResponse(input, extensionRegistry);
+        return new CoreResponse(input, extensionRegistry);
       }
     };
 
@@ -12579,6 +12621,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -12915,7 +12960,7 @@ public final class Control {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Void(input, extensionRegistry);
+        return new Void(input, extensionRegistry);
       }
     };
 
@@ -13086,6 +13131,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -14404,7 +14452,7 @@ public final class Control {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Scenario(input, extensionRegistry);
+        return new Scenario(input, extensionRegistry);
       }
     };
 
@@ -14481,6 +14529,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -15166,7 +15217,7 @@ public final class Control {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Scenarios(input, extensionRegistry);
+        return new Scenarios(input, extensionRegistry);
       }
     };
 
@@ -15355,6 +15406,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -16817,7 +16871,7 @@ public final class Control {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ScenarioResultSummary(input, extensionRegistry);
+        return new ScenarioResultSummary(input, extensionRegistry);
       }
     };
 
@@ -17145,6 +17199,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -20026,7 +20083,7 @@ public final class Control {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ScenarioResult(input, extensionRegistry);
+        return new ScenarioResult(input, extensionRegistry);
       }
     };
 
@@ -20158,7 +20215,7 @@ public final class Control {
       "ad\"C\n\016SecurityParams\022\023\n\013use_test_ca\030\001 \001(" +
       "\010\022\034\n\024server_host_override\030\002 \001(\t\"M\n\nChann" +
       "elArg\022\014\n\004name\030\001 \001(\t\022\023\n\tstr_value\030\002 \001(\tH\000" +
-      "\022\023\n\tint_value\030\003 \001(\005H\000B\007\n\005value\"\275\004\n\014Clien",
+      "\022\023\n\tint_value\030\003 \001(\005H\000B\007\n\005value\"\275\004\n\014Clien" +
       "tConfig\022\026\n\016server_targets\030\001 \003(\t\022-\n\013clien" +
       "t_type\030\002 \001(\0162\030.grpc.testing.ClientType\0225" +
       "\n\017security_params\030\003 \001(\0132\034.grpc.testing.S" +
@@ -20168,7 +20225,7 @@ public final class Control {
       " \001(\0162\025.grpc.testing.RpcType\022-\n\013load_para" +
       "ms\030\n \001(\0132\030.grpc.testing.LoadParams\0223\n\016pa" +
       "yload_config\030\013 \001(\0132\033.grpc.testing.Payloa" +
-      "dConfig\0227\n\020histogram_params\030\014 \001(\0132\035.grpc",
+      "dConfig\0227\n\020histogram_params\030\014 \001(\0132\035.grpc" +
       ".testing.HistogramParams\022\021\n\tcore_list\030\r " +
       "\003(\005\022\022\n\ncore_limit\030\016 \001(\005\022\030\n\020other_client_" +
       "api\030\017 \001(\t\022.\n\014channel_args\030\020 \003(\0132\030.grpc.t" +
@@ -20178,7 +20235,7 @@ public final class Control {
       "t\030\001 \001(\010\"h\n\nClientArgs\022+\n\005setup\030\001 \001(\0132\032.g" +
       "rpc.testing.ClientConfigH\000\022\"\n\004mark\030\002 \001(\013" +
       "2\022.grpc.testing.MarkH\000B\t\n\007argtype\"\264\002\n\014Se" +
-      "rverConfig\022-\n\013server_type\030\001 \001(\0162\030.grpc.t",
+      "rverConfig\022-\n\013server_type\030\001 \001(\0162\030.grpc.t" +
       "esting.ServerType\0225\n\017security_params\030\002 \001" +
       "(\0132\034.grpc.testing.SecurityParams\022\014\n\004port" +
       "\030\004 \001(\005\022\034\n\024async_server_threads\030\007 \001(\005\022\022\n\n" +
@@ -20188,7 +20245,7 @@ public final class Control {
       "source_quota_size\030\351\007 \001(\005\"h\n\nServerArgs\022+" +
       "\n\005setup\030\001 \001(\0132\032.grpc.testing.ServerConfi" +
       "gH\000\022\"\n\004mark\030\002 \001(\0132\022.grpc.testing.MarkH\000B" +
-      "\t\n\007argtype\"U\n\014ServerStatus\022(\n\005stats\030\001 \001(",
+      "\t\n\007argtype\"U\n\014ServerStatus\022(\n\005stats\030\001 \001(" +
       "\0132\031.grpc.testing.ServerStats\022\014\n\004port\030\002 \001" +
       "(\005\022\r\n\005cores\030\003 \001(\005\"\r\n\013CoreRequest\"\035\n\014Core" +
       "Response\022\r\n\005cores\030\001 \001(\005\"\006\n\004Void\"\375\001\n\010Scen" +
@@ -20198,7 +20255,7 @@ public final class Control {
       ".testing.ServerConfig\022\023\n\013num_servers\030\005 \001" +
       "(\005\022\026\n\016warmup_seconds\030\006 \001(\005\022\031\n\021benchmark_" +
       "seconds\030\007 \001(\005\022 \n\030spawn_local_worker_coun" +
-      "t\030\010 \001(\005\"6\n\tScenarios\022)\n\tscenarios\030\001 \003(\0132",
+      "t\030\010 \001(\005\"6\n\tScenarios\022)\n\tscenarios\030\001 \003(\0132" +
       "\026.grpc.testing.Scenario\"\274\003\n\025ScenarioResu" +
       "ltSummary\022\013\n\003qps\030\001 \001(\001\022\033\n\023qps_per_server" +
       "_core\030\002 \001(\001\022\032\n\022server_system_time\030\003 \001(\001\022" +
@@ -20208,7 +20265,7 @@ public final class Control {
       "\022\n\nlatency_95\030\t \001(\001\022\022\n\nlatency_99\030\n \001(\001\022" +
       "\023\n\013latency_999\030\013 \001(\001\022\030\n\020server_cpu_usage" +
       "\030\014 \001(\001\022&\n\036successful_requests_per_second" +
-      "\030\r \001(\001\022\"\n\032failed_requests_per_second\030\016 \001",
+      "\030\r \001(\001\022\"\n\032failed_requests_per_second\030\016 \001" +
       "(\001\022 \n\030client_polls_per_request\030\017 \001(\001\022 \n\030" +
       "server_polls_per_request\030\020 \001(\001\"\203\003\n\016Scena" +
       "rioResult\022(\n\010scenario\030\001 \001(\0132\026.grpc.testi" +
@@ -20218,7 +20275,7 @@ public final class Control {
       "tats\030\004 \003(\0132\031.grpc.testing.ServerStats\022\024\n" +
       "\014server_cores\030\005 \003(\005\0224\n\007summary\030\006 \001(\0132#.g" +
       "rpc.testing.ScenarioResultSummary\022\026\n\016cli" +
-      "ent_success\030\007 \003(\010\022\026\n\016server_success\030\010 \003(",
+      "ent_success\030\007 \003(\010\022\026\n\016server_success\030\010 \003(" +
       "\010\0229\n\017request_results\030\t \003(\0132 .grpc.testin" +
       "g.RequestResultCount*A\n\nClientType\022\017\n\013SY" +
       "NC_CLIENT\020\000\022\020\n\014ASYNC_CLIENT\020\001\022\020\n\014OTHER_C" +
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 f2f026ded..34591b2bf 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
@@ -161,6 +161,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -578,7 +581,7 @@ public final class Messages {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new BoolValue(input, extensionRegistry);
+        return new BoolValue(input, extensionRegistry);
       }
     };
 
@@ -660,6 +663,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1194,7 +1200,7 @@ public final class Messages {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Payload(input, extensionRegistry);
+        return new Payload(input, extensionRegistry);
       }
     };
 
@@ -1264,6 +1270,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1789,7 +1798,7 @@ public final class Messages {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new EchoStatus(input, extensionRegistry);
+        return new EchoStatus(input, extensionRegistry);
       }
     };
 
@@ -2002,6 +2011,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3640,7 +3652,7 @@ public final class Messages {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new SimpleRequest(input, extensionRegistry);
+        return new SimpleRequest(input, extensionRegistry);
       }
     };
 
@@ -3757,6 +3769,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -4642,7 +4657,7 @@ public final class Messages {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new SimpleResponse(input, extensionRegistry);
+        return new SimpleResponse(input, extensionRegistry);
       }
     };
 
@@ -4753,6 +4768,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -5588,7 +5606,7 @@ public final class Messages {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new StreamingInputCallRequest(input, extensionRegistry);
+        return new StreamingInputCallRequest(input, extensionRegistry);
       }
     };
 
@@ -5650,6 +5668,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -6064,7 +6085,7 @@ public final class Messages {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new StreamingInputCallResponse(input, extensionRegistry);
+        return new StreamingInputCallResponse(input, extensionRegistry);
       }
     };
 
@@ -6171,6 +6192,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -6927,7 +6951,7 @@ public final class Messages {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ResponseParameters(input, extensionRegistry);
+        return new ResponseParameters(input, extensionRegistry);
       }
     };
 
@@ -7100,6 +7124,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -8476,7 +8503,7 @@ public final class Messages {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new StreamingOutputCallRequest(input, extensionRegistry);
+        return new StreamingOutputCallRequest(input, extensionRegistry);
       }
     };
 
@@ -8553,6 +8580,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -9123,7 +9153,7 @@ public final class Messages {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new StreamingOutputCallResponse(input, extensionRegistry);
+        return new StreamingOutputCallResponse(input, extensionRegistry);
       }
     };
 
@@ -9182,6 +9212,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -9581,7 +9614,7 @@ public final class Messages {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ReconnectParams(input, extensionRegistry);
+        return new ReconnectParams(input, extensionRegistry);
       }
     };
 
@@ -9655,6 +9688,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -10219,7 +10255,7 @@ public final class Messages {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ReconnectInfo(input, extensionRegistry);
+        return new ReconnectInfo(input, extensionRegistry);
       }
     };
 
@@ -10316,7 +10352,7 @@ public final class Messages {
       "\rresponse_size\030\002 \001(\005\022&\n\007payload\030\003 \001(\0132\025." +
       "grpc.testing.Payload\022\025\n\rfill_username\030\004 " +
       "\001(\010\022\030\n\020fill_oauth_scope\030\005 \001(\010\0224\n\023respons" +
-      "e_compressed\030\006 \001(\0132\027.grpc.testing.BoolVa",
+      "e_compressed\030\006 \001(\0132\027.grpc.testing.BoolVa" +
       "lue\0221\n\017response_status\030\007 \001(\0132\030.grpc.test" +
       "ing.EchoStatus\0222\n\021expect_compressed\030\010 \001(" +
       "\0132\027.grpc.testing.BoolValue\"_\n\016SimpleResp" +
@@ -10326,7 +10362,7 @@ public final class Messages {
       "oad\030\001 \001(\0132\025.grpc.testing.Payload\0222\n\021expe" +
       "ct_compressed\030\002 \001(\0132\027.grpc.testing.BoolV" +
       "alue\"=\n\032StreamingInputCallResponse\022\037\n\027ag" +
-      "gregated_payload_size\030\001 \001(\005\"d\n\022ResponseP",
+      "gregated_payload_size\030\001 \001(\005\"d\n\022ResponseP" +
       "arameters\022\014\n\004size\030\001 \001(\005\022\023\n\013interval_us\030\002" +
       " \001(\005\022+\n\ncompressed\030\003 \001(\0132\027.grpc.testing." +
       "BoolValue\"\350\001\n\032StreamingOutputCallRequest" +
@@ -10336,7 +10372,7 @@ public final class Messages {
       "load\030\003 \001(\0132\025.grpc.testing.Payload\0221\n\017res" +
       "ponse_status\030\007 \001(\0132\030.grpc.testing.EchoSt" +
       "atus\"E\n\033StreamingOutputCallResponse\022&\n\007p" +
-      "ayload\030\001 \001(\0132\025.grpc.testing.Payload\"3\n\017R",
+      "ayload\030\001 \001(\0132\025.grpc.testing.Payload\"3\n\017R" +
       "econnectParams\022 \n\030max_reconnect_backoff_" +
       "ms\030\001 \001(\005\"3\n\rReconnectInfo\022\016\n\006passed\030\001 \001(" +
       "\010\022\022\n\nbackoff_ms\030\002 \003(\005*\037\n\013PayloadType\022\020\n\014" +
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 02e3def63..7c7f7ad59 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
@@ -55,6 +55,9 @@ public final class Payloads {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -506,7 +509,7 @@ public final class Payloads {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ByteBufferParams(input, extensionRegistry);
+        return new ByteBufferParams(input, extensionRegistry);
       }
     };
 
@@ -566,6 +569,9 @@ public final class Payloads {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1017,7 +1023,7 @@ public final class Payloads {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new SimpleProtoParams(input, extensionRegistry);
+        return new SimpleProtoParams(input, extensionRegistry);
       }
     };
 
@@ -1070,6 +1076,9 @@ public final class Payloads {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -1411,7 +1420,7 @@ public final class Payloads {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ComplexProtoParams(input, extensionRegistry);
+        return new ComplexProtoParams(input, extensionRegistry);
       }
     };
 
@@ -1500,6 +1509,9 @@ public final class Payloads {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2517,7 +2529,7 @@ public final class Payloads {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new PayloadConfig(input, extensionRegistry);
+        return new PayloadConfig(input, extensionRegistry);
       }
     };
 
@@ -2574,7 +2586,7 @@ public final class Payloads {
       "sH\000\0228\n\rsimple_params\030\002 \001(\0132\037.grpc.testin" +
       "g.SimpleProtoParamsH\000\022:\n\016complex_params\030" +
       "\003 \001(\0132 .grpc.testing.ComplexProtoParamsH" +
-      "\000B\t\n\007payloadB$\n\030io.grpc.benchmarks.proto",
+      "\000B\t\n\007payloadB$\n\030io.grpc.benchmarks.proto" +
       "B\010Payloadsb\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
diff --git a/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Services.java b/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Services.java
index 36bf486d5..0e2e15d31 100644
--- a/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Services.java
+++ b/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Services.java
@@ -32,7 +32,7 @@ public final class Services {
       "nse(\0010\001\022R\n\023StreamingFromClient\022\033.grpc.te" +
       "sting.SimpleRequest\032\034.grpc.testing.Simpl" +
       "eResponse(\001\022R\n\023StreamingFromServer\022\033.grp" +
-      "c.testing.SimpleRequest\032\034.grpc.testing.S",
+      "c.testing.SimpleRequest\032\034.grpc.testing.S" +
       "impleResponse0\001\022R\n\021StreamingBothWays\022\033.g" +
       "rpc.testing.SimpleRequest\032\034.grpc.testing" +
       ".SimpleResponse(\0010\0012\227\002\n\rWorkerService\022E\n" +
@@ -42,7 +42,7 @@ public final class Services {
       "ng.ClientStatus(\0010\001\022B\n\tCoreCount\022\031.grpc." +
       "testing.CoreRequest\032\032.grpc.testing.CoreR" +
       "esponse\0224\n\nQuitWorker\022\022.grpc.testing.Voi" +
-      "d\032\022.grpc.testing.Void2^\n\030ReportQpsScenar",
+      "d\032\022.grpc.testing.Void2^\n\030ReportQpsScenar" +
       "ioService\022B\n\016ReportScenario\022\034.grpc.testi" +
       "ng.ScenarioResult\032\022.grpc.testing.VoidB$\n" +
       "\030io.grpc.benchmarks.protoB\010Servicesb\006pro" +
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 6e8719382..8337a3364 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
@@ -104,6 +104,9 @@ public final class Stats {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -895,7 +898,7 @@ public final class Stats {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ServerStats(input, extensionRegistry);
+        return new ServerStats(input, extensionRegistry);
       }
     };
 
@@ -967,6 +970,9 @@ public final class Stats {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1460,7 +1466,7 @@ public final class Stats {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new HistogramParams(input, extensionRegistry);
+        return new HistogramParams(input, extensionRegistry);
       }
     };
 
@@ -1556,6 +1562,9 @@ public final class Stats {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2360,7 +2369,7 @@ public final class Stats {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new HistogramData(input, extensionRegistry);
+        return new HistogramData(input, extensionRegistry);
       }
     };
 
@@ -2420,6 +2429,9 @@ public final class Stats {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2872,7 +2884,7 @@ public final class Stats {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new RequestResultCount(input, extensionRegistry);
+        return new RequestResultCount(input, extensionRegistry);
       }
     };
 
@@ -3022,6 +3034,9 @@ public final class Stats {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -4297,7 +4312,7 @@ public final class Stats {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ClientStats(input, extensionRegistry);
+        return new ClientStats(input, extensionRegistry);
       }
     };
 
@@ -4359,7 +4374,7 @@ public final class Stats {
       "HistogramData\022\016\n\006bucket\030\001 \003(\r\022\020\n\010min_see" +
       "n\030\002 \001(\001\022\020\n\010max_seen\030\003 \001(\001\022\013\n\003sum\030\004 \001(\001\022\026" +
       "\n\016sum_of_squares\030\005 \001(\001\022\r\n\005count\030\006 \001(\001\"8\n" +
-      "\022RequestResultCount\022\023\n\013status_code\030\001 \001(\005",
+      "\022RequestResultCount\022\023\n\013status_code\030\001 \001(\005" +
       "\022\r\n\005count\030\002 \001(\003\"\315\001\n\013ClientStats\022.\n\tlaten" +
       "cies\030\001 \001(\0132\033.grpc.testing.HistogramData\022" +
       "\024\n\014time_elapsed\030\002 \001(\001\022\021\n\ttime_user\030\003 \001(\001" +