diff --git a/alts/src/main/proto/grpc/gcp/handshaker.proto b/alts/src/main/proto/grpc/gcp/handshaker.proto
index 1820dd26db..0248c8868c 100644
--- a/alts/src/main/proto/grpc/gcp/handshaker.proto
+++ b/alts/src/main/proto/grpc/gcp/handshaker.proto
@@ -229,6 +229,6 @@ service HandshakerService {
   // service expects to respond. Client does not have to wait for service's
   // response before sending next request.
   rpc DoHandshake(stream HandshakerReq)
-    returns (stream HandshakerResp) {
+      returns (stream HandshakerResp) {
   }
 }
diff --git a/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java b/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java
index 7150f28371..66dda20c66 100644
--- a/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java
+++ b/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java
@@ -95,6 +95,38 @@ public final class ChannelzGrpc {
      return getGetServersMethod;
   }
 
+  private static volatile io.grpc.MethodDescriptor<io.grpc.channelz.v1.GetServerRequest,
+      io.grpc.channelz.v1.GetServerResponse> getGetServerMethod;
+
+  @io.grpc.stub.annotations.RpcMethod(
+      fullMethodName = SERVICE_NAME + '/' + "GetServer",
+      requestType = io.grpc.channelz.v1.GetServerRequest.class,
+      responseType = io.grpc.channelz.v1.GetServerResponse.class,
+      methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
+  public static io.grpc.MethodDescriptor<io.grpc.channelz.v1.GetServerRequest,
+      io.grpc.channelz.v1.GetServerResponse> getGetServerMethod() {
+    io.grpc.MethodDescriptor<io.grpc.channelz.v1.GetServerRequest, io.grpc.channelz.v1.GetServerResponse> getGetServerMethod;
+    if ((getGetServerMethod = ChannelzGrpc.getGetServerMethod) == null) {
+      synchronized (ChannelzGrpc.class) {
+        if ((getGetServerMethod = ChannelzGrpc.getGetServerMethod) == null) {
+          ChannelzGrpc.getGetServerMethod = getGetServerMethod = 
+              io.grpc.MethodDescriptor.<io.grpc.channelz.v1.GetServerRequest, io.grpc.channelz.v1.GetServerResponse>newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "grpc.channelz.v1.Channelz", "GetServer"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  io.grpc.channelz.v1.GetServerRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  io.grpc.channelz.v1.GetServerResponse.getDefaultInstance()))
+                  .setSchemaDescriptor(new ChannelzMethodDescriptorSupplier("GetServer"))
+                  .build();
+          }
+        }
+     }
+     return getGetServerMethod;
+  }
+
   private static volatile io.grpc.MethodDescriptor<io.grpc.channelz.v1.GetServerSocketsRequest,
       io.grpc.channelz.v1.GetServerSocketsResponse> getGetServerSocketsMethod;
 
@@ -275,6 +307,16 @@ public final class ChannelzGrpc {
       asyncUnimplementedUnaryCall(getGetServersMethod(), responseObserver);
     }
 
+    /**
+     * <pre>
+     * Returns a single Server, or else a NOT_FOUND code.
+     * </pre>
+     */
+    public void getServer(io.grpc.channelz.v1.GetServerRequest request,
+        io.grpc.stub.StreamObserver<io.grpc.channelz.v1.GetServerResponse> responseObserver) {
+      asyncUnimplementedUnaryCall(getGetServerMethod(), responseObserver);
+    }
+
     /**
      * <pre>
      * Gets all server sockets that exist in the process.
@@ -331,6 +373,13 @@ public final class ChannelzGrpc {
                 io.grpc.channelz.v1.GetServersRequest,
                 io.grpc.channelz.v1.GetServersResponse>(
                   this, METHODID_GET_SERVERS)))
+          .addMethod(
+            getGetServerMethod(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                io.grpc.channelz.v1.GetServerRequest,
+                io.grpc.channelz.v1.GetServerResponse>(
+                  this, METHODID_GET_SERVER)))
           .addMethod(
             getGetServerSocketsMethod(),
             asyncUnaryCall(
@@ -408,6 +457,17 @@ public final class ChannelzGrpc {
           getChannel().newCall(getGetServersMethod(), getCallOptions()), request, responseObserver);
     }
 
+    /**
+     * <pre>
+     * Returns a single Server, or else a NOT_FOUND code.
+     * </pre>
+     */
+    public void getServer(io.grpc.channelz.v1.GetServerRequest request,
+        io.grpc.stub.StreamObserver<io.grpc.channelz.v1.GetServerResponse> responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getGetServerMethod(), getCallOptions()), request, responseObserver);
+    }
+
     /**
      * <pre>
      * Gets all server sockets that exist in the process.
@@ -496,6 +556,16 @@ public final class ChannelzGrpc {
           getChannel(), getGetServersMethod(), getCallOptions(), request);
     }
 
+    /**
+     * <pre>
+     * Returns a single Server, or else a NOT_FOUND code.
+     * </pre>
+     */
+    public io.grpc.channelz.v1.GetServerResponse getServer(io.grpc.channelz.v1.GetServerRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getGetServerMethod(), getCallOptions(), request);
+    }
+
     /**
      * <pre>
      * Gets all server sockets that exist in the process.
@@ -582,6 +652,17 @@ public final class ChannelzGrpc {
           getChannel().newCall(getGetServersMethod(), getCallOptions()), request);
     }
 
+    /**
+     * <pre>
+     * Returns a single Server, or else a NOT_FOUND code.
+     * </pre>
+     */
+    public com.google.common.util.concurrent.ListenableFuture<io.grpc.channelz.v1.GetServerResponse> getServer(
+        io.grpc.channelz.v1.GetServerRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getGetServerMethod(), getCallOptions()), request);
+    }
+
     /**
      * <pre>
      * Gets all server sockets that exist in the process.
@@ -629,10 +710,11 @@ public final class ChannelzGrpc {
 
   private static final int METHODID_GET_TOP_CHANNELS = 0;
   private static final int METHODID_GET_SERVERS = 1;
-  private static final int METHODID_GET_SERVER_SOCKETS = 2;
-  private static final int METHODID_GET_CHANNEL = 3;
-  private static final int METHODID_GET_SUBCHANNEL = 4;
-  private static final int METHODID_GET_SOCKET = 5;
+  private static final int METHODID_GET_SERVER = 2;
+  private static final int METHODID_GET_SERVER_SOCKETS = 3;
+  private static final int METHODID_GET_CHANNEL = 4;
+  private static final int METHODID_GET_SUBCHANNEL = 5;
+  private static final int METHODID_GET_SOCKET = 6;
 
   private static final class MethodHandlers<Req, Resp> implements
       io.grpc.stub.ServerCalls.UnaryMethod<Req, Resp>,
@@ -659,6 +741,10 @@ public final class ChannelzGrpc {
           serviceImpl.getServers((io.grpc.channelz.v1.GetServersRequest) request,
               (io.grpc.stub.StreamObserver<io.grpc.channelz.v1.GetServersResponse>) responseObserver);
           break;
+        case METHODID_GET_SERVER:
+          serviceImpl.getServer((io.grpc.channelz.v1.GetServerRequest) request,
+              (io.grpc.stub.StreamObserver<io.grpc.channelz.v1.GetServerResponse>) responseObserver);
+          break;
         case METHODID_GET_SERVER_SOCKETS:
           serviceImpl.getServerSockets((io.grpc.channelz.v1.GetServerSocketsRequest) request,
               (io.grpc.stub.StreamObserver<io.grpc.channelz.v1.GetServerSocketsResponse>) responseObserver);
@@ -738,6 +824,7 @@ public final class ChannelzGrpc {
               .setSchemaDescriptor(new ChannelzFileDescriptorSupplier())
               .addMethod(getGetTopChannelsMethod())
               .addMethod(getGetServersMethod())
+              .addMethod(getGetServerMethod())
               .addMethod(getGetServerSocketsMethod())
               .addMethod(getGetChannelMethod())
               .addMethod(getGetSubchannelMethod())
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/ChannelzProto.java b/services/src/generated/main/java/io/grpc/channelz/v1/ChannelzProto.java
index 1c56589e59..a6a9244e7f 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/ChannelzProto.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/ChannelzProto.java
@@ -159,6 +159,16 @@ public final class ChannelzProto {
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_grpc_channelz_v1_GetServersResponse_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_grpc_channelz_v1_GetServerRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_grpc_channelz_v1_GetServerRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_grpc_channelz_v1_GetServerResponse_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_grpc_channelz_v1_GetServerResponse_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
     internal_static_grpc_channelz_v1_GetServerSocketsRequest_descriptor;
   static final 
@@ -328,43 +338,50 @@ public final class ChannelzProto {
       "_ssthresh\030\027 \001(\r\022\020\n\010tcpi_rtt\030\030 \001(\r\022\023\n\013tcp" +
       "i_rttvar\030\031 \001(\r\022\031\n\021tcpi_snd_ssthresh\030\032 \001(" +
       "\r\022\025\n\rtcpi_snd_cwnd\030\033 \001(\r\022\023\n\013tcpi_advmss\030" +
-      "\034 \001(\r\022\027\n\017tcpi_reordering\030\035 \001(\r\"1\n\025GetTop" +
+      "\034 \001(\r\022\027\n\017tcpi_reordering\030\035 \001(\r\"F\n\025GetTop" +
       "ChannelsRequest\022\030\n\020start_channel_id\030\001 \001(" +
-      "\003\"Q\n\026GetTopChannelsResponse\022*\n\007channel\030\001" +
-      " \003(\0132\031.grpc.channelz.v1.Channel\022\013\n\003end\030\002" +
-      " \001(\010\",\n\021GetServersRequest\022\027\n\017start_serve" +
-      "r_id\030\001 \001(\003\"K\n\022GetServersResponse\022(\n\006serv" +
-      "er\030\001 \003(\0132\030.grpc.channelz.v1.Server\022\013\n\003en" +
-      "d\030\002 \001(\010\"E\n\027GetServerSocketsRequest\022\021\n\tse" +
-      "rver_id\030\001 \001(\003\022\027\n\017start_socket_id\030\002 \001(\003\"X" +
-      "\n\030GetServerSocketsResponse\022/\n\nsocket_ref" +
-      "\030\001 \003(\0132\033.grpc.channelz.v1.SocketRef\022\013\n\003e" +
-      "nd\030\002 \001(\010\"\'\n\021GetChannelRequest\022\022\n\nchannel" +
-      "_id\030\001 \001(\003\"@\n\022GetChannelResponse\022*\n\007chann" +
-      "el\030\001 \001(\0132\031.grpc.channelz.v1.Channel\"-\n\024G" +
-      "etSubchannelRequest\022\025\n\rsubchannel_id\030\001 \001" +
-      "(\003\"I\n\025GetSubchannelResponse\0220\n\nsubchanne" +
-      "l\030\001 \001(\0132\034.grpc.channelz.v1.Subchannel\"%\n" +
-      "\020GetSocketRequest\022\021\n\tsocket_id\030\001 \001(\003\"=\n\021" +
-      "GetSocketResponse\022(\n\006socket\030\001 \001(\0132\030.grpc" +
-      ".channelz.v1.Socket2\304\004\n\010Channelz\022c\n\016GetT" +
-      "opChannels\022\'.grpc.channelz.v1.GetTopChan" +
-      "nelsRequest\032(.grpc.channelz.v1.GetTopCha" +
-      "nnelsResponse\022W\n\nGetServers\022#.grpc.chann" +
-      "elz.v1.GetServersRequest\032$.grpc.channelz" +
-      ".v1.GetServersResponse\022i\n\020GetServerSocke" +
-      "ts\022).grpc.channelz.v1.GetServerSocketsRe" +
-      "quest\032*.grpc.channelz.v1.GetServerSocket" +
-      "sResponse\022W\n\nGetChannel\022#.grpc.channelz." +
-      "v1.GetChannelRequest\032$.grpc.channelz.v1." +
-      "GetChannelResponse\022`\n\rGetSubchannel\022&.gr" +
-      "pc.channelz.v1.GetSubchannelRequest\032\'.gr" +
-      "pc.channelz.v1.GetSubchannelResponse\022T\n\t" +
-      "GetSocket\022\".grpc.channelz.v1.GetSocketRe" +
-      "quest\032#.grpc.channelz.v1.GetSocketRespon" +
-      "seBX\n\023io.grpc.channelz.v1B\rChannelzProto" +
-      "P\001Z0google.golang.org/grpc/channelz/grpc" +
-      "_channelz_v1b\006proto3"
+      "\003\022\023\n\013max_results\030\002 \001(\003\"Q\n\026GetTopChannels" +
+      "Response\022*\n\007channel\030\001 \003(\0132\031.grpc.channel" +
+      "z.v1.Channel\022\013\n\003end\030\002 \001(\010\"A\n\021GetServersR" +
+      "equest\022\027\n\017start_server_id\030\001 \001(\003\022\023\n\013max_r" +
+      "esults\030\002 \001(\003\"K\n\022GetServersResponse\022(\n\006se" +
+      "rver\030\001 \003(\0132\030.grpc.channelz.v1.Server\022\013\n\003" +
+      "end\030\002 \001(\010\"%\n\020GetServerRequest\022\021\n\tserver_" +
+      "id\030\001 \001(\003\"=\n\021GetServerResponse\022(\n\006server\030" +
+      "\001 \001(\0132\030.grpc.channelz.v1.Server\"Z\n\027GetSe" +
+      "rverSocketsRequest\022\021\n\tserver_id\030\001 \001(\003\022\027\n" +
+      "\017start_socket_id\030\002 \001(\003\022\023\n\013max_results\030\003 " +
+      "\001(\003\"X\n\030GetServerSocketsResponse\022/\n\nsocke" +
+      "t_ref\030\001 \003(\0132\033.grpc.channelz.v1.SocketRef" +
+      "\022\013\n\003end\030\002 \001(\010\"\'\n\021GetChannelRequest\022\022\n\nch" +
+      "annel_id\030\001 \001(\003\"@\n\022GetChannelResponse\022*\n\007" +
+      "channel\030\001 \001(\0132\031.grpc.channelz.v1.Channel" +
+      "\"-\n\024GetSubchannelRequest\022\025\n\rsubchannel_i" +
+      "d\030\001 \001(\003\"I\n\025GetSubchannelResponse\0220\n\nsubc" +
+      "hannel\030\001 \001(\0132\034.grpc.channelz.v1.Subchann" +
+      "el\"6\n\020GetSocketRequest\022\021\n\tsocket_id\030\001 \001(" +
+      "\003\022\017\n\007summary\030\002 \001(\010\"=\n\021GetSocketResponse\022" +
+      "(\n\006socket\030\001 \001(\0132\030.grpc.channelz.v1.Socke" +
+      "t2\232\005\n\010Channelz\022c\n\016GetTopChannels\022\'.grpc." +
+      "channelz.v1.GetTopChannelsRequest\032(.grpc" +
+      ".channelz.v1.GetTopChannelsResponse\022W\n\nG" +
+      "etServers\022#.grpc.channelz.v1.GetServersR" +
+      "equest\032$.grpc.channelz.v1.GetServersResp" +
+      "onse\022T\n\tGetServer\022\".grpc.channelz.v1.Get" +
+      "ServerRequest\032#.grpc.channelz.v1.GetServ" +
+      "erResponse\022i\n\020GetServerSockets\022).grpc.ch" +
+      "annelz.v1.GetServerSocketsRequest\032*.grpc" +
+      ".channelz.v1.GetServerSocketsResponse\022W\n" +
+      "\nGetChannel\022#.grpc.channelz.v1.GetChanne" +
+      "lRequest\032$.grpc.channelz.v1.GetChannelRe" +
+      "sponse\022`\n\rGetSubchannel\022&.grpc.channelz." +
+      "v1.GetSubchannelRequest\032\'.grpc.channelz." +
+      "v1.GetSubchannelResponse\022T\n\tGetSocket\022\"." +
+      "grpc.channelz.v1.GetSocketRequest\032#.grpc" +
+      ".channelz.v1.GetSocketResponseBX\n\023io.grp" +
+      "c.channelz.v1B\rChannelzProtoP\001Z0google.g" +
+      "olang.org/grpc/channelz/grpc_channelz_v1" +
+      "b\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -537,7 +554,7 @@ public final class ChannelzProto {
     internal_static_grpc_channelz_v1_GetTopChannelsRequest_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_grpc_channelz_v1_GetTopChannelsRequest_descriptor,
-        new java.lang.String[] { "StartChannelId", });
+        new java.lang.String[] { "StartChannelId", "MaxResults", });
     internal_static_grpc_channelz_v1_GetTopChannelsResponse_descriptor =
       getDescriptor().getMessageTypes().get(21);
     internal_static_grpc_channelz_v1_GetTopChannelsResponse_fieldAccessorTable = new
@@ -549,57 +566,69 @@ public final class ChannelzProto {
     internal_static_grpc_channelz_v1_GetServersRequest_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_grpc_channelz_v1_GetServersRequest_descriptor,
-        new java.lang.String[] { "StartServerId", });
+        new java.lang.String[] { "StartServerId", "MaxResults", });
     internal_static_grpc_channelz_v1_GetServersResponse_descriptor =
       getDescriptor().getMessageTypes().get(23);
     internal_static_grpc_channelz_v1_GetServersResponse_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_grpc_channelz_v1_GetServersResponse_descriptor,
         new java.lang.String[] { "Server", "End", });
-    internal_static_grpc_channelz_v1_GetServerSocketsRequest_descriptor =
+    internal_static_grpc_channelz_v1_GetServerRequest_descriptor =
       getDescriptor().getMessageTypes().get(24);
+    internal_static_grpc_channelz_v1_GetServerRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_grpc_channelz_v1_GetServerRequest_descriptor,
+        new java.lang.String[] { "ServerId", });
+    internal_static_grpc_channelz_v1_GetServerResponse_descriptor =
+      getDescriptor().getMessageTypes().get(25);
+    internal_static_grpc_channelz_v1_GetServerResponse_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_grpc_channelz_v1_GetServerResponse_descriptor,
+        new java.lang.String[] { "Server", });
+    internal_static_grpc_channelz_v1_GetServerSocketsRequest_descriptor =
+      getDescriptor().getMessageTypes().get(26);
     internal_static_grpc_channelz_v1_GetServerSocketsRequest_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_grpc_channelz_v1_GetServerSocketsRequest_descriptor,
-        new java.lang.String[] { "ServerId", "StartSocketId", });
+        new java.lang.String[] { "ServerId", "StartSocketId", "MaxResults", });
     internal_static_grpc_channelz_v1_GetServerSocketsResponse_descriptor =
-      getDescriptor().getMessageTypes().get(25);
+      getDescriptor().getMessageTypes().get(27);
     internal_static_grpc_channelz_v1_GetServerSocketsResponse_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_grpc_channelz_v1_GetServerSocketsResponse_descriptor,
         new java.lang.String[] { "SocketRef", "End", });
     internal_static_grpc_channelz_v1_GetChannelRequest_descriptor =
-      getDescriptor().getMessageTypes().get(26);
+      getDescriptor().getMessageTypes().get(28);
     internal_static_grpc_channelz_v1_GetChannelRequest_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_grpc_channelz_v1_GetChannelRequest_descriptor,
         new java.lang.String[] { "ChannelId", });
     internal_static_grpc_channelz_v1_GetChannelResponse_descriptor =
-      getDescriptor().getMessageTypes().get(27);
+      getDescriptor().getMessageTypes().get(29);
     internal_static_grpc_channelz_v1_GetChannelResponse_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_grpc_channelz_v1_GetChannelResponse_descriptor,
         new java.lang.String[] { "Channel", });
     internal_static_grpc_channelz_v1_GetSubchannelRequest_descriptor =
-      getDescriptor().getMessageTypes().get(28);
+      getDescriptor().getMessageTypes().get(30);
     internal_static_grpc_channelz_v1_GetSubchannelRequest_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_grpc_channelz_v1_GetSubchannelRequest_descriptor,
         new java.lang.String[] { "SubchannelId", });
     internal_static_grpc_channelz_v1_GetSubchannelResponse_descriptor =
-      getDescriptor().getMessageTypes().get(29);
+      getDescriptor().getMessageTypes().get(31);
     internal_static_grpc_channelz_v1_GetSubchannelResponse_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_grpc_channelz_v1_GetSubchannelResponse_descriptor,
         new java.lang.String[] { "Subchannel", });
     internal_static_grpc_channelz_v1_GetSocketRequest_descriptor =
-      getDescriptor().getMessageTypes().get(30);
+      getDescriptor().getMessageTypes().get(32);
     internal_static_grpc_channelz_v1_GetSocketRequest_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_grpc_channelz_v1_GetSocketRequest_descriptor,
-        new java.lang.String[] { "SocketId", });
+        new java.lang.String[] { "SocketId", "Summary", });
     internal_static_grpc_channelz_v1_GetSocketResponse_descriptor =
-      getDescriptor().getMessageTypes().get(31);
+      getDescriptor().getMessageTypes().get(33);
     internal_static_grpc_channelz_v1_GetSocketResponse_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_grpc_channelz_v1_GetSocketResponse_descriptor,
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetChannelRequest.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetChannelRequest.java
index 0aa4c1f2e8..ec7a10b42c 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetChannelRequest.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetChannelRequest.java
@@ -83,7 +83,7 @@ private static final long serialVersionUID = 0L;
   private long channelId_;
   /**
    * <pre>
-   * channel_id is the the identifier of the specific channel to get.
+   * channel_id is the identifier of the specific channel to get.
    * </pre>
    *
    * <code>int64 channel_id = 1;</code>
@@ -379,7 +379,7 @@ private static final long serialVersionUID = 0L;
     private long channelId_ ;
     /**
      * <pre>
-     * channel_id is the the identifier of the specific channel to get.
+     * channel_id is the identifier of the specific channel to get.
      * </pre>
      *
      * <code>int64 channel_id = 1;</code>
@@ -389,7 +389,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * channel_id is the the identifier of the specific channel to get.
+     * channel_id is the identifier of the specific channel to get.
      * </pre>
      *
      * <code>int64 channel_id = 1;</code>
@@ -402,7 +402,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * channel_id is the the identifier of the specific channel to get.
+     * channel_id is the identifier of the specific channel to get.
      * </pre>
      *
      * <code>int64 channel_id = 1;</code>
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetChannelRequestOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetChannelRequestOrBuilder.java
index dbb7a9c31d..55fc578609 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetChannelRequestOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetChannelRequestOrBuilder.java
@@ -9,7 +9,7 @@ public interface GetChannelRequestOrBuilder extends
 
   /**
    * <pre>
-   * channel_id is the the identifier of the specific channel to get.
+   * channel_id is the identifier of the specific channel to get.
    * </pre>
    *
    * <code>int64 channel_id = 1;</code>
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetServerRequest.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetServerRequest.java
new file mode 100644
index 0000000000..205ffac972
--- /dev/null
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetServerRequest.java
@@ -0,0 +1,464 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: grpc/channelz/v1/channelz.proto
+
+package io.grpc.channelz.v1;
+
+/**
+ * Protobuf type {@code grpc.channelz.v1.GetServerRequest}
+ */
+public  final class GetServerRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:grpc.channelz.v1.GetServerRequest)
+    GetServerRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use GetServerRequest.newBuilder() to construct.
+  private GetServerRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+    super(builder);
+  }
+  private GetServerRequest() {
+    serverId_ = 0L;
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private GetServerRequest(
+      com.google.protobuf.CodedInputStream input,
+      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();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 8: {
+
+            serverId_ = input.readInt64();
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return io.grpc.channelz.v1.ChannelzProto.internal_static_grpc_channelz_v1_GetServerRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return io.grpc.channelz.v1.ChannelzProto.internal_static_grpc_channelz_v1_GetServerRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            io.grpc.channelz.v1.GetServerRequest.class, io.grpc.channelz.v1.GetServerRequest.Builder.class);
+  }
+
+  public static final int SERVER_ID_FIELD_NUMBER = 1;
+  private long serverId_;
+  /**
+   * <pre>
+   * server_id is the identifier of the specific server to get.
+   * </pre>
+   *
+   * <code>int64 server_id = 1;</code>
+   */
+  public long getServerId() {
+    return serverId_;
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (serverId_ != 0L) {
+      output.writeInt64(1, serverId_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (serverId_ != 0L) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt64Size(1, serverId_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof io.grpc.channelz.v1.GetServerRequest)) {
+      return super.equals(obj);
+    }
+    io.grpc.channelz.v1.GetServerRequest other = (io.grpc.channelz.v1.GetServerRequest) obj;
+
+    boolean result = true;
+    result = result && (getServerId()
+        == other.getServerId());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + SERVER_ID_FIELD_NUMBER;
+    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+        getServerId());
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static io.grpc.channelz.v1.GetServerRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static io.grpc.channelz.v1.GetServerRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static io.grpc.channelz.v1.GetServerRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static io.grpc.channelz.v1.GetServerRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static io.grpc.channelz.v1.GetServerRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static io.grpc.channelz.v1.GetServerRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static io.grpc.channelz.v1.GetServerRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static io.grpc.channelz.v1.GetServerRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static io.grpc.channelz.v1.GetServerRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static io.grpc.channelz.v1.GetServerRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static io.grpc.channelz.v1.GetServerRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static io.grpc.channelz.v1.GetServerRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(io.grpc.channelz.v1.GetServerRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * Protobuf type {@code grpc.channelz.v1.GetServerRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+      // @@protoc_insertion_point(builder_implements:grpc.channelz.v1.GetServerRequest)
+      io.grpc.channelz.v1.GetServerRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return io.grpc.channelz.v1.ChannelzProto.internal_static_grpc_channelz_v1_GetServerRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return io.grpc.channelz.v1.ChannelzProto.internal_static_grpc_channelz_v1_GetServerRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              io.grpc.channelz.v1.GetServerRequest.class, io.grpc.channelz.v1.GetServerRequest.Builder.class);
+    }
+
+    // Construct using io.grpc.channelz.v1.GetServerRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      serverId_ = 0L;
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return io.grpc.channelz.v1.ChannelzProto.internal_static_grpc_channelz_v1_GetServerRequest_descriptor;
+    }
+
+    public io.grpc.channelz.v1.GetServerRequest getDefaultInstanceForType() {
+      return io.grpc.channelz.v1.GetServerRequest.getDefaultInstance();
+    }
+
+    public io.grpc.channelz.v1.GetServerRequest build() {
+      io.grpc.channelz.v1.GetServerRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public io.grpc.channelz.v1.GetServerRequest buildPartial() {
+      io.grpc.channelz.v1.GetServerRequest result = new io.grpc.channelz.v1.GetServerRequest(this);
+      result.serverId_ = serverId_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof io.grpc.channelz.v1.GetServerRequest) {
+        return mergeFrom((io.grpc.channelz.v1.GetServerRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(io.grpc.channelz.v1.GetServerRequest other) {
+      if (other == io.grpc.channelz.v1.GetServerRequest.getDefaultInstance()) return this;
+      if (other.getServerId() != 0L) {
+        setServerId(other.getServerId());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      io.grpc.channelz.v1.GetServerRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (io.grpc.channelz.v1.GetServerRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private long serverId_ ;
+    /**
+     * <pre>
+     * server_id is the identifier of the specific server to get.
+     * </pre>
+     *
+     * <code>int64 server_id = 1;</code>
+     */
+    public long getServerId() {
+      return serverId_;
+    }
+    /**
+     * <pre>
+     * server_id is the identifier of the specific server to get.
+     * </pre>
+     *
+     * <code>int64 server_id = 1;</code>
+     */
+    public Builder setServerId(long value) {
+      
+      serverId_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * server_id is the identifier of the specific server to get.
+     * </pre>
+     *
+     * <code>int64 server_id = 1;</code>
+     */
+    public Builder clearServerId() {
+      
+      serverId_ = 0L;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:grpc.channelz.v1.GetServerRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:grpc.channelz.v1.GetServerRequest)
+  private static final io.grpc.channelz.v1.GetServerRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new io.grpc.channelz.v1.GetServerRequest();
+  }
+
+  public static io.grpc.channelz.v1.GetServerRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser<GetServerRequest>
+      PARSER = new com.google.protobuf.AbstractParser<GetServerRequest>() {
+    public GetServerRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new GetServerRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser<GetServerRequest> parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser<GetServerRequest> getParserForType() {
+    return PARSER;
+  }
+
+  public io.grpc.channelz.v1.GetServerRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetServerRequestOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetServerRequestOrBuilder.java
new file mode 100644
index 0000000000..d144b5aaba
--- /dev/null
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetServerRequestOrBuilder.java
@@ -0,0 +1,18 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: grpc/channelz/v1/channelz.proto
+
+package io.grpc.channelz.v1;
+
+public interface GetServerRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:grpc.channelz.v1.GetServerRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * <pre>
+   * server_id is the identifier of the specific server to get.
+   * </pre>
+   *
+   * <code>int64 server_id = 1;</code>
+   */
+  long getServerId();
+}
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetServerResponse.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetServerResponse.java
new file mode 100644
index 0000000000..202f0b46dc
--- /dev/null
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetServerResponse.java
@@ -0,0 +1,630 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: grpc/channelz/v1/channelz.proto
+
+package io.grpc.channelz.v1;
+
+/**
+ * Protobuf type {@code grpc.channelz.v1.GetServerResponse}
+ */
+public  final class GetServerResponse extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:grpc.channelz.v1.GetServerResponse)
+    GetServerResponseOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use GetServerResponse.newBuilder() to construct.
+  private GetServerResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+    super(builder);
+  }
+  private GetServerResponse() {
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private GetServerResponse(
+      com.google.protobuf.CodedInputStream input,
+      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();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            io.grpc.channelz.v1.Server.Builder subBuilder = null;
+            if (server_ != null) {
+              subBuilder = server_.toBuilder();
+            }
+            server_ = input.readMessage(io.grpc.channelz.v1.Server.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(server_);
+              server_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return io.grpc.channelz.v1.ChannelzProto.internal_static_grpc_channelz_v1_GetServerResponse_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return io.grpc.channelz.v1.ChannelzProto.internal_static_grpc_channelz_v1_GetServerResponse_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            io.grpc.channelz.v1.GetServerResponse.class, io.grpc.channelz.v1.GetServerResponse.Builder.class);
+  }
+
+  public static final int SERVER_FIELD_NUMBER = 1;
+  private io.grpc.channelz.v1.Server server_;
+  /**
+   * <pre>
+   * The Server that corresponds to the requested server_id.  This field
+   * should be set.
+   * </pre>
+   *
+   * <code>.grpc.channelz.v1.Server server = 1;</code>
+   */
+  public boolean hasServer() {
+    return server_ != null;
+  }
+  /**
+   * <pre>
+   * The Server that corresponds to the requested server_id.  This field
+   * should be set.
+   * </pre>
+   *
+   * <code>.grpc.channelz.v1.Server server = 1;</code>
+   */
+  public io.grpc.channelz.v1.Server getServer() {
+    return server_ == null ? io.grpc.channelz.v1.Server.getDefaultInstance() : server_;
+  }
+  /**
+   * <pre>
+   * The Server that corresponds to the requested server_id.  This field
+   * should be set.
+   * </pre>
+   *
+   * <code>.grpc.channelz.v1.Server server = 1;</code>
+   */
+  public io.grpc.channelz.v1.ServerOrBuilder getServerOrBuilder() {
+    return getServer();
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (server_ != null) {
+      output.writeMessage(1, getServer());
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (server_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, getServer());
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof io.grpc.channelz.v1.GetServerResponse)) {
+      return super.equals(obj);
+    }
+    io.grpc.channelz.v1.GetServerResponse other = (io.grpc.channelz.v1.GetServerResponse) obj;
+
+    boolean result = true;
+    result = result && (hasServer() == other.hasServer());
+    if (hasServer()) {
+      result = result && getServer()
+          .equals(other.getServer());
+    }
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (hasServer()) {
+      hash = (37 * hash) + SERVER_FIELD_NUMBER;
+      hash = (53 * hash) + getServer().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static io.grpc.channelz.v1.GetServerResponse parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static io.grpc.channelz.v1.GetServerResponse parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static io.grpc.channelz.v1.GetServerResponse parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static io.grpc.channelz.v1.GetServerResponse parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static io.grpc.channelz.v1.GetServerResponse parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static io.grpc.channelz.v1.GetServerResponse parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static io.grpc.channelz.v1.GetServerResponse parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static io.grpc.channelz.v1.GetServerResponse parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static io.grpc.channelz.v1.GetServerResponse parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static io.grpc.channelz.v1.GetServerResponse parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static io.grpc.channelz.v1.GetServerResponse parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static io.grpc.channelz.v1.GetServerResponse parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(io.grpc.channelz.v1.GetServerResponse prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * Protobuf type {@code grpc.channelz.v1.GetServerResponse}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+      // @@protoc_insertion_point(builder_implements:grpc.channelz.v1.GetServerResponse)
+      io.grpc.channelz.v1.GetServerResponseOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return io.grpc.channelz.v1.ChannelzProto.internal_static_grpc_channelz_v1_GetServerResponse_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return io.grpc.channelz.v1.ChannelzProto.internal_static_grpc_channelz_v1_GetServerResponse_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              io.grpc.channelz.v1.GetServerResponse.class, io.grpc.channelz.v1.GetServerResponse.Builder.class);
+    }
+
+    // Construct using io.grpc.channelz.v1.GetServerResponse.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      if (serverBuilder_ == null) {
+        server_ = null;
+      } else {
+        server_ = null;
+        serverBuilder_ = null;
+      }
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return io.grpc.channelz.v1.ChannelzProto.internal_static_grpc_channelz_v1_GetServerResponse_descriptor;
+    }
+
+    public io.grpc.channelz.v1.GetServerResponse getDefaultInstanceForType() {
+      return io.grpc.channelz.v1.GetServerResponse.getDefaultInstance();
+    }
+
+    public io.grpc.channelz.v1.GetServerResponse build() {
+      io.grpc.channelz.v1.GetServerResponse result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public io.grpc.channelz.v1.GetServerResponse buildPartial() {
+      io.grpc.channelz.v1.GetServerResponse result = new io.grpc.channelz.v1.GetServerResponse(this);
+      if (serverBuilder_ == null) {
+        result.server_ = server_;
+      } else {
+        result.server_ = serverBuilder_.build();
+      }
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof io.grpc.channelz.v1.GetServerResponse) {
+        return mergeFrom((io.grpc.channelz.v1.GetServerResponse)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(io.grpc.channelz.v1.GetServerResponse other) {
+      if (other == io.grpc.channelz.v1.GetServerResponse.getDefaultInstance()) return this;
+      if (other.hasServer()) {
+        mergeServer(other.getServer());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      io.grpc.channelz.v1.GetServerResponse parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (io.grpc.channelz.v1.GetServerResponse) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private io.grpc.channelz.v1.Server server_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        io.grpc.channelz.v1.Server, io.grpc.channelz.v1.Server.Builder, io.grpc.channelz.v1.ServerOrBuilder> serverBuilder_;
+    /**
+     * <pre>
+     * The Server that corresponds to the requested server_id.  This field
+     * should be set.
+     * </pre>
+     *
+     * <code>.grpc.channelz.v1.Server server = 1;</code>
+     */
+    public boolean hasServer() {
+      return serverBuilder_ != null || server_ != null;
+    }
+    /**
+     * <pre>
+     * The Server that corresponds to the requested server_id.  This field
+     * should be set.
+     * </pre>
+     *
+     * <code>.grpc.channelz.v1.Server server = 1;</code>
+     */
+    public io.grpc.channelz.v1.Server getServer() {
+      if (serverBuilder_ == null) {
+        return server_ == null ? io.grpc.channelz.v1.Server.getDefaultInstance() : server_;
+      } else {
+        return serverBuilder_.getMessage();
+      }
+    }
+    /**
+     * <pre>
+     * The Server that corresponds to the requested server_id.  This field
+     * should be set.
+     * </pre>
+     *
+     * <code>.grpc.channelz.v1.Server server = 1;</code>
+     */
+    public Builder setServer(io.grpc.channelz.v1.Server value) {
+      if (serverBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        server_ = value;
+        onChanged();
+      } else {
+        serverBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * <pre>
+     * The Server that corresponds to the requested server_id.  This field
+     * should be set.
+     * </pre>
+     *
+     * <code>.grpc.channelz.v1.Server server = 1;</code>
+     */
+    public Builder setServer(
+        io.grpc.channelz.v1.Server.Builder builderForValue) {
+      if (serverBuilder_ == null) {
+        server_ = builderForValue.build();
+        onChanged();
+      } else {
+        serverBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * <pre>
+     * The Server that corresponds to the requested server_id.  This field
+     * should be set.
+     * </pre>
+     *
+     * <code>.grpc.channelz.v1.Server server = 1;</code>
+     */
+    public Builder mergeServer(io.grpc.channelz.v1.Server value) {
+      if (serverBuilder_ == null) {
+        if (server_ != null) {
+          server_ =
+            io.grpc.channelz.v1.Server.newBuilder(server_).mergeFrom(value).buildPartial();
+        } else {
+          server_ = value;
+        }
+        onChanged();
+      } else {
+        serverBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * <pre>
+     * The Server that corresponds to the requested server_id.  This field
+     * should be set.
+     * </pre>
+     *
+     * <code>.grpc.channelz.v1.Server server = 1;</code>
+     */
+    public Builder clearServer() {
+      if (serverBuilder_ == null) {
+        server_ = null;
+        onChanged();
+      } else {
+        server_ = null;
+        serverBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * <pre>
+     * The Server that corresponds to the requested server_id.  This field
+     * should be set.
+     * </pre>
+     *
+     * <code>.grpc.channelz.v1.Server server = 1;</code>
+     */
+    public io.grpc.channelz.v1.Server.Builder getServerBuilder() {
+      
+      onChanged();
+      return getServerFieldBuilder().getBuilder();
+    }
+    /**
+     * <pre>
+     * The Server that corresponds to the requested server_id.  This field
+     * should be set.
+     * </pre>
+     *
+     * <code>.grpc.channelz.v1.Server server = 1;</code>
+     */
+    public io.grpc.channelz.v1.ServerOrBuilder getServerOrBuilder() {
+      if (serverBuilder_ != null) {
+        return serverBuilder_.getMessageOrBuilder();
+      } else {
+        return server_ == null ?
+            io.grpc.channelz.v1.Server.getDefaultInstance() : server_;
+      }
+    }
+    /**
+     * <pre>
+     * The Server that corresponds to the requested server_id.  This field
+     * should be set.
+     * </pre>
+     *
+     * <code>.grpc.channelz.v1.Server server = 1;</code>
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        io.grpc.channelz.v1.Server, io.grpc.channelz.v1.Server.Builder, io.grpc.channelz.v1.ServerOrBuilder> 
+        getServerFieldBuilder() {
+      if (serverBuilder_ == null) {
+        serverBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            io.grpc.channelz.v1.Server, io.grpc.channelz.v1.Server.Builder, io.grpc.channelz.v1.ServerOrBuilder>(
+                getServer(),
+                getParentForChildren(),
+                isClean());
+        server_ = null;
+      }
+      return serverBuilder_;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:grpc.channelz.v1.GetServerResponse)
+  }
+
+  // @@protoc_insertion_point(class_scope:grpc.channelz.v1.GetServerResponse)
+  private static final io.grpc.channelz.v1.GetServerResponse DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new io.grpc.channelz.v1.GetServerResponse();
+  }
+
+  public static io.grpc.channelz.v1.GetServerResponse getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser<GetServerResponse>
+      PARSER = new com.google.protobuf.AbstractParser<GetServerResponse>() {
+    public GetServerResponse parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new GetServerResponse(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser<GetServerResponse> parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser<GetServerResponse> getParserForType() {
+    return PARSER;
+  }
+
+  public io.grpc.channelz.v1.GetServerResponse getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetServerResponseOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetServerResponseOrBuilder.java
new file mode 100644
index 0000000000..4f280a3e94
--- /dev/null
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetServerResponseOrBuilder.java
@@ -0,0 +1,37 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: grpc/channelz/v1/channelz.proto
+
+package io.grpc.channelz.v1;
+
+public interface GetServerResponseOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:grpc.channelz.v1.GetServerResponse)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * <pre>
+   * The Server that corresponds to the requested server_id.  This field
+   * should be set.
+   * </pre>
+   *
+   * <code>.grpc.channelz.v1.Server server = 1;</code>
+   */
+  boolean hasServer();
+  /**
+   * <pre>
+   * The Server that corresponds to the requested server_id.  This field
+   * should be set.
+   * </pre>
+   *
+   * <code>.grpc.channelz.v1.Server server = 1;</code>
+   */
+  io.grpc.channelz.v1.Server getServer();
+  /**
+   * <pre>
+   * The Server that corresponds to the requested server_id.  This field
+   * should be set.
+   * </pre>
+   *
+   * <code>.grpc.channelz.v1.Server server = 1;</code>
+   */
+  io.grpc.channelz.v1.ServerOrBuilder getServerOrBuilder();
+}
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetServerSocketsRequest.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetServerSocketsRequest.java
index 7707b825e2..bb353acbcd 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetServerSocketsRequest.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetServerSocketsRequest.java
@@ -18,6 +18,7 @@ private static final long serialVersionUID = 0L;
   private GetServerSocketsRequest() {
     serverId_ = 0L;
     startSocketId_ = 0L;
+    maxResults_ = 0L;
   }
 
   @java.lang.Override
@@ -61,6 +62,11 @@ private static final long serialVersionUID = 0L;
             startSocketId_ = input.readInt64();
             break;
           }
+          case 24: {
+
+            maxResults_ = input.readInt64();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -100,6 +106,9 @@ private static final long serialVersionUID = 0L;
    * <pre>
    * start_socket_id indicates that only sockets at or above this id should be
    * included in the results.
+   * To request the first page, this must be set to 0. To request
+   * subsequent pages, the client generates this value by adding 1 to
+   * the highest seen result ID.
    * </pre>
    *
    * <code>int64 start_socket_id = 2;</code>
@@ -108,6 +117,21 @@ private static final long serialVersionUID = 0L;
     return startSocketId_;
   }
 
+  public static final int MAX_RESULTS_FIELD_NUMBER = 3;
+  private long maxResults_;
+  /**
+   * <pre>
+   * If non-zero, the server will return a page of results containing
+   * at most this many items. If zero, the server will choose a
+   * reasonable page size.  Must never be negative.
+   * </pre>
+   *
+   * <code>int64 max_results = 3;</code>
+   */
+  public long getMaxResults() {
+    return maxResults_;
+  }
+
   private byte memoizedIsInitialized = -1;
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -126,6 +150,9 @@ private static final long serialVersionUID = 0L;
     if (startSocketId_ != 0L) {
       output.writeInt64(2, startSocketId_);
     }
+    if (maxResults_ != 0L) {
+      output.writeInt64(3, maxResults_);
+    }
     unknownFields.writeTo(output);
   }
 
@@ -142,6 +169,10 @@ private static final long serialVersionUID = 0L;
       size += com.google.protobuf.CodedOutputStream
         .computeInt64Size(2, startSocketId_);
     }
+    if (maxResults_ != 0L) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt64Size(3, maxResults_);
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -162,6 +193,8 @@ private static final long serialVersionUID = 0L;
         == other.getServerId());
     result = result && (getStartSocketId()
         == other.getStartSocketId());
+    result = result && (getMaxResults()
+        == other.getMaxResults());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -179,6 +212,9 @@ private static final long serialVersionUID = 0L;
     hash = (37 * hash) + START_SOCKET_ID_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
         getStartSocketId());
+    hash = (37 * hash) + MAX_RESULTS_FIELD_NUMBER;
+    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+        getMaxResults());
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -312,6 +348,8 @@ private static final long serialVersionUID = 0L;
 
       startSocketId_ = 0L;
 
+      maxResults_ = 0L;
+
       return this;
     }
 
@@ -336,6 +374,7 @@ private static final long serialVersionUID = 0L;
       io.grpc.channelz.v1.GetServerSocketsRequest result = new io.grpc.channelz.v1.GetServerSocketsRequest(this);
       result.serverId_ = serverId_;
       result.startSocketId_ = startSocketId_;
+      result.maxResults_ = maxResults_;
       onBuilt();
       return result;
     }
@@ -383,6 +422,9 @@ private static final long serialVersionUID = 0L;
       if (other.getStartSocketId() != 0L) {
         setStartSocketId(other.getStartSocketId());
       }
+      if (other.getMaxResults() != 0L) {
+        setMaxResults(other.getMaxResults());
+      }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
@@ -441,6 +483,9 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * start_socket_id indicates that only sockets at or above this id should be
      * included in the results.
+     * To request the first page, this must be set to 0. To request
+     * subsequent pages, the client generates this value by adding 1 to
+     * the highest seen result ID.
      * </pre>
      *
      * <code>int64 start_socket_id = 2;</code>
@@ -452,6 +497,9 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * start_socket_id indicates that only sockets at or above this id should be
      * included in the results.
+     * To request the first page, this must be set to 0. To request
+     * subsequent pages, the client generates this value by adding 1 to
+     * the highest seen result ID.
      * </pre>
      *
      * <code>int64 start_socket_id = 2;</code>
@@ -466,6 +514,9 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * start_socket_id indicates that only sockets at or above this id should be
      * included in the results.
+     * To request the first page, this must be set to 0. To request
+     * subsequent pages, the client generates this value by adding 1 to
+     * the highest seen result ID.
      * </pre>
      *
      * <code>int64 start_socket_id = 2;</code>
@@ -476,6 +527,50 @@ private static final long serialVersionUID = 0L;
       onChanged();
       return this;
     }
+
+    private long maxResults_ ;
+    /**
+     * <pre>
+     * If non-zero, the server will return a page of results containing
+     * at most this many items. If zero, the server will choose a
+     * reasonable page size.  Must never be negative.
+     * </pre>
+     *
+     * <code>int64 max_results = 3;</code>
+     */
+    public long getMaxResults() {
+      return maxResults_;
+    }
+    /**
+     * <pre>
+     * If non-zero, the server will return a page of results containing
+     * at most this many items. If zero, the server will choose a
+     * reasonable page size.  Must never be negative.
+     * </pre>
+     *
+     * <code>int64 max_results = 3;</code>
+     */
+    public Builder setMaxResults(long value) {
+      
+      maxResults_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * If non-zero, the server will return a page of results containing
+     * at most this many items. If zero, the server will choose a
+     * reasonable page size.  Must never be negative.
+     * </pre>
+     *
+     * <code>int64 max_results = 3;</code>
+     */
+    public Builder clearMaxResults() {
+      
+      maxResults_ = 0L;
+      onChanged();
+      return this;
+    }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetServerSocketsRequestOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetServerSocketsRequestOrBuilder.java
index 8ff1d500a5..cf39fe7930 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetServerSocketsRequestOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetServerSocketsRequestOrBuilder.java
@@ -16,9 +16,23 @@ public interface GetServerSocketsRequestOrBuilder extends
    * <pre>
    * start_socket_id indicates that only sockets at or above this id should be
    * included in the results.
+   * To request the first page, this must be set to 0. To request
+   * subsequent pages, the client generates this value by adding 1 to
+   * the highest seen result ID.
    * </pre>
    *
    * <code>int64 start_socket_id = 2;</code>
    */
   long getStartSocketId();
+
+  /**
+   * <pre>
+   * If non-zero, the server will return a page of results containing
+   * at most this many items. If zero, the server will choose a
+   * reasonable page size.  Must never be negative.
+   * </pre>
+   *
+   * <code>int64 max_results = 3;</code>
+   */
+  long getMaxResults();
 }
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetServerSocketsResponse.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetServerSocketsResponse.java
index 2f7df8ed85..3cc66dc371 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetServerSocketsResponse.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetServerSocketsResponse.java
@@ -99,6 +99,7 @@ private static final long serialVersionUID = 0L;
    * <pre>
    * list of socket refs that the connection detail service knows about.  Sorted in
    * ascending socket_id order.
+   * Must contain at least 1 result, otherwise 'end' must be true.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.SocketRef socket_ref = 1;</code>
@@ -110,6 +111,7 @@ private static final long serialVersionUID = 0L;
    * <pre>
    * list of socket refs that the connection detail service knows about.  Sorted in
    * ascending socket_id order.
+   * Must contain at least 1 result, otherwise 'end' must be true.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.SocketRef socket_ref = 1;</code>
@@ -122,6 +124,7 @@ private static final long serialVersionUID = 0L;
    * <pre>
    * list of socket refs that the connection detail service knows about.  Sorted in
    * ascending socket_id order.
+   * Must contain at least 1 result, otherwise 'end' must be true.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.SocketRef socket_ref = 1;</code>
@@ -133,6 +136,7 @@ private static final long serialVersionUID = 0L;
    * <pre>
    * list of socket refs that the connection detail service knows about.  Sorted in
    * ascending socket_id order.
+   * Must contain at least 1 result, otherwise 'end' must be true.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.SocketRef socket_ref = 1;</code>
@@ -144,6 +148,7 @@ private static final long serialVersionUID = 0L;
    * <pre>
    * list of socket refs that the connection detail service knows about.  Sorted in
    * ascending socket_id order.
+   * Must contain at least 1 result, otherwise 'end' must be true.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.SocketRef socket_ref = 1;</code>
@@ -527,6 +532,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of socket refs that the connection detail service knows about.  Sorted in
      * ascending socket_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketRef socket_ref = 1;</code>
@@ -542,6 +548,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of socket refs that the connection detail service knows about.  Sorted in
      * ascending socket_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketRef socket_ref = 1;</code>
@@ -557,6 +564,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of socket refs that the connection detail service knows about.  Sorted in
      * ascending socket_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketRef socket_ref = 1;</code>
@@ -572,6 +580,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of socket refs that the connection detail service knows about.  Sorted in
      * ascending socket_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketRef socket_ref = 1;</code>
@@ -594,6 +603,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of socket refs that the connection detail service knows about.  Sorted in
      * ascending socket_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketRef socket_ref = 1;</code>
@@ -613,6 +623,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of socket refs that the connection detail service knows about.  Sorted in
      * ascending socket_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketRef socket_ref = 1;</code>
@@ -634,6 +645,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of socket refs that the connection detail service knows about.  Sorted in
      * ascending socket_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketRef socket_ref = 1;</code>
@@ -656,6 +668,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of socket refs that the connection detail service knows about.  Sorted in
      * ascending socket_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketRef socket_ref = 1;</code>
@@ -675,6 +688,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of socket refs that the connection detail service knows about.  Sorted in
      * ascending socket_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketRef socket_ref = 1;</code>
@@ -694,6 +708,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of socket refs that the connection detail service knows about.  Sorted in
      * ascending socket_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketRef socket_ref = 1;</code>
@@ -714,6 +729,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of socket refs that the connection detail service knows about.  Sorted in
      * ascending socket_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketRef socket_ref = 1;</code>
@@ -732,6 +748,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of socket refs that the connection detail service knows about.  Sorted in
      * ascending socket_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketRef socket_ref = 1;</code>
@@ -750,6 +767,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of socket refs that the connection detail service knows about.  Sorted in
      * ascending socket_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketRef socket_ref = 1;</code>
@@ -762,6 +780,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of socket refs that the connection detail service knows about.  Sorted in
      * ascending socket_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketRef socket_ref = 1;</code>
@@ -777,6 +796,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of socket refs that the connection detail service knows about.  Sorted in
      * ascending socket_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketRef socket_ref = 1;</code>
@@ -793,6 +813,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of socket refs that the connection detail service knows about.  Sorted in
      * ascending socket_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketRef socket_ref = 1;</code>
@@ -805,6 +826,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of socket refs that the connection detail service knows about.  Sorted in
      * ascending socket_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketRef socket_ref = 1;</code>
@@ -818,6 +840,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of socket refs that the connection detail service knows about.  Sorted in
      * ascending socket_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketRef socket_ref = 1;</code>
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetServerSocketsResponseOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetServerSocketsResponseOrBuilder.java
index 8eba7d92d7..714d0182dd 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetServerSocketsResponseOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetServerSocketsResponseOrBuilder.java
@@ -11,6 +11,7 @@ public interface GetServerSocketsResponseOrBuilder extends
    * <pre>
    * list of socket refs that the connection detail service knows about.  Sorted in
    * ascending socket_id order.
+   * Must contain at least 1 result, otherwise 'end' must be true.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.SocketRef socket_ref = 1;</code>
@@ -21,6 +22,7 @@ public interface GetServerSocketsResponseOrBuilder extends
    * <pre>
    * list of socket refs that the connection detail service knows about.  Sorted in
    * ascending socket_id order.
+   * Must contain at least 1 result, otherwise 'end' must be true.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.SocketRef socket_ref = 1;</code>
@@ -30,6 +32,7 @@ public interface GetServerSocketsResponseOrBuilder extends
    * <pre>
    * list of socket refs that the connection detail service knows about.  Sorted in
    * ascending socket_id order.
+   * Must contain at least 1 result, otherwise 'end' must be true.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.SocketRef socket_ref = 1;</code>
@@ -39,6 +42,7 @@ public interface GetServerSocketsResponseOrBuilder extends
    * <pre>
    * list of socket refs that the connection detail service knows about.  Sorted in
    * ascending socket_id order.
+   * Must contain at least 1 result, otherwise 'end' must be true.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.SocketRef socket_ref = 1;</code>
@@ -49,6 +53,7 @@ public interface GetServerSocketsResponseOrBuilder extends
    * <pre>
    * list of socket refs that the connection detail service knows about.  Sorted in
    * ascending socket_id order.
+   * Must contain at least 1 result, otherwise 'end' must be true.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.SocketRef socket_ref = 1;</code>
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetServersRequest.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetServersRequest.java
index 32e70df3e1..8b4fc28f4a 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetServersRequest.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetServersRequest.java
@@ -17,6 +17,7 @@ private static final long serialVersionUID = 0L;
   }
   private GetServersRequest() {
     startServerId_ = 0L;
+    maxResults_ = 0L;
   }
 
   @java.lang.Override
@@ -55,6 +56,11 @@ private static final long serialVersionUID = 0L;
             startServerId_ = input.readInt64();
             break;
           }
+          case 16: {
+
+            maxResults_ = input.readInt64();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -85,6 +91,9 @@ private static final long serialVersionUID = 0L;
    * <pre>
    * start_server_id indicates that only servers at or above this id should be
    * included in the results.
+   * To request the first page, this must be set to 0. To request
+   * subsequent pages, the client generates this value by adding 1 to
+   * the highest seen result ID.
    * </pre>
    *
    * <code>int64 start_server_id = 1;</code>
@@ -93,6 +102,21 @@ private static final long serialVersionUID = 0L;
     return startServerId_;
   }
 
+  public static final int MAX_RESULTS_FIELD_NUMBER = 2;
+  private long maxResults_;
+  /**
+   * <pre>
+   * If non-zero, the server will return a page of results containing
+   * at most this many items. If zero, the server will choose a
+   * reasonable page size.  Must never be negative.
+   * </pre>
+   *
+   * <code>int64 max_results = 2;</code>
+   */
+  public long getMaxResults() {
+    return maxResults_;
+  }
+
   private byte memoizedIsInitialized = -1;
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -108,6 +132,9 @@ private static final long serialVersionUID = 0L;
     if (startServerId_ != 0L) {
       output.writeInt64(1, startServerId_);
     }
+    if (maxResults_ != 0L) {
+      output.writeInt64(2, maxResults_);
+    }
     unknownFields.writeTo(output);
   }
 
@@ -120,6 +147,10 @@ private static final long serialVersionUID = 0L;
       size += com.google.protobuf.CodedOutputStream
         .computeInt64Size(1, startServerId_);
     }
+    if (maxResults_ != 0L) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt64Size(2, maxResults_);
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -138,6 +169,8 @@ private static final long serialVersionUID = 0L;
     boolean result = true;
     result = result && (getStartServerId()
         == other.getStartServerId());
+    result = result && (getMaxResults()
+        == other.getMaxResults());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -152,6 +185,9 @@ private static final long serialVersionUID = 0L;
     hash = (37 * hash) + START_SERVER_ID_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
         getStartServerId());
+    hash = (37 * hash) + MAX_RESULTS_FIELD_NUMBER;
+    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+        getMaxResults());
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -283,6 +319,8 @@ private static final long serialVersionUID = 0L;
       super.clear();
       startServerId_ = 0L;
 
+      maxResults_ = 0L;
+
       return this;
     }
 
@@ -306,6 +344,7 @@ private static final long serialVersionUID = 0L;
     public io.grpc.channelz.v1.GetServersRequest buildPartial() {
       io.grpc.channelz.v1.GetServersRequest result = new io.grpc.channelz.v1.GetServersRequest(this);
       result.startServerId_ = startServerId_;
+      result.maxResults_ = maxResults_;
       onBuilt();
       return result;
     }
@@ -350,6 +389,9 @@ private static final long serialVersionUID = 0L;
       if (other.getStartServerId() != 0L) {
         setStartServerId(other.getStartServerId());
       }
+      if (other.getMaxResults() != 0L) {
+        setMaxResults(other.getMaxResults());
+      }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
@@ -382,6 +424,9 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * start_server_id indicates that only servers at or above this id should be
      * included in the results.
+     * To request the first page, this must be set to 0. To request
+     * subsequent pages, the client generates this value by adding 1 to
+     * the highest seen result ID.
      * </pre>
      *
      * <code>int64 start_server_id = 1;</code>
@@ -393,6 +438,9 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * start_server_id indicates that only servers at or above this id should be
      * included in the results.
+     * To request the first page, this must be set to 0. To request
+     * subsequent pages, the client generates this value by adding 1 to
+     * the highest seen result ID.
      * </pre>
      *
      * <code>int64 start_server_id = 1;</code>
@@ -407,6 +455,9 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * start_server_id indicates that only servers at or above this id should be
      * included in the results.
+     * To request the first page, this must be set to 0. To request
+     * subsequent pages, the client generates this value by adding 1 to
+     * the highest seen result ID.
      * </pre>
      *
      * <code>int64 start_server_id = 1;</code>
@@ -417,6 +468,50 @@ private static final long serialVersionUID = 0L;
       onChanged();
       return this;
     }
+
+    private long maxResults_ ;
+    /**
+     * <pre>
+     * If non-zero, the server will return a page of results containing
+     * at most this many items. If zero, the server will choose a
+     * reasonable page size.  Must never be negative.
+     * </pre>
+     *
+     * <code>int64 max_results = 2;</code>
+     */
+    public long getMaxResults() {
+      return maxResults_;
+    }
+    /**
+     * <pre>
+     * If non-zero, the server will return a page of results containing
+     * at most this many items. If zero, the server will choose a
+     * reasonable page size.  Must never be negative.
+     * </pre>
+     *
+     * <code>int64 max_results = 2;</code>
+     */
+    public Builder setMaxResults(long value) {
+      
+      maxResults_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * If non-zero, the server will return a page of results containing
+     * at most this many items. If zero, the server will choose a
+     * reasonable page size.  Must never be negative.
+     * </pre>
+     *
+     * <code>int64 max_results = 2;</code>
+     */
+    public Builder clearMaxResults() {
+      
+      maxResults_ = 0L;
+      onChanged();
+      return this;
+    }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetServersRequestOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetServersRequestOrBuilder.java
index c2157622a2..23ef847bc3 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetServersRequestOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetServersRequestOrBuilder.java
@@ -11,9 +11,23 @@ public interface GetServersRequestOrBuilder extends
    * <pre>
    * start_server_id indicates that only servers at or above this id should be
    * included in the results.
+   * To request the first page, this must be set to 0. To request
+   * subsequent pages, the client generates this value by adding 1 to
+   * the highest seen result ID.
    * </pre>
    *
    * <code>int64 start_server_id = 1;</code>
    */
   long getStartServerId();
+
+  /**
+   * <pre>
+   * If non-zero, the server will return a page of results containing
+   * at most this many items. If zero, the server will choose a
+   * reasonable page size.  Must never be negative.
+   * </pre>
+   *
+   * <code>int64 max_results = 2;</code>
+   */
+  long getMaxResults();
 }
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetServersResponse.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetServersResponse.java
index dde0f1628a..d37f02e46c 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetServersResponse.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetServersResponse.java
@@ -99,6 +99,7 @@ private static final long serialVersionUID = 0L;
    * <pre>
    * list of servers that the connection detail service knows about.  Sorted in
    * ascending server_id order.
+   * Must contain at least 1 result, otherwise 'end' must be true.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.Server server = 1;</code>
@@ -110,6 +111,7 @@ private static final long serialVersionUID = 0L;
    * <pre>
    * list of servers that the connection detail service knows about.  Sorted in
    * ascending server_id order.
+   * Must contain at least 1 result, otherwise 'end' must be true.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.Server server = 1;</code>
@@ -122,6 +124,7 @@ private static final long serialVersionUID = 0L;
    * <pre>
    * list of servers that the connection detail service knows about.  Sorted in
    * ascending server_id order.
+   * Must contain at least 1 result, otherwise 'end' must be true.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.Server server = 1;</code>
@@ -133,6 +136,7 @@ private static final long serialVersionUID = 0L;
    * <pre>
    * list of servers that the connection detail service knows about.  Sorted in
    * ascending server_id order.
+   * Must contain at least 1 result, otherwise 'end' must be true.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.Server server = 1;</code>
@@ -144,6 +148,7 @@ private static final long serialVersionUID = 0L;
    * <pre>
    * list of servers that the connection detail service knows about.  Sorted in
    * ascending server_id order.
+   * Must contain at least 1 result, otherwise 'end' must be true.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.Server server = 1;</code>
@@ -527,6 +532,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of servers that the connection detail service knows about.  Sorted in
      * ascending server_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Server server = 1;</code>
@@ -542,6 +548,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of servers that the connection detail service knows about.  Sorted in
      * ascending server_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Server server = 1;</code>
@@ -557,6 +564,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of servers that the connection detail service knows about.  Sorted in
      * ascending server_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Server server = 1;</code>
@@ -572,6 +580,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of servers that the connection detail service knows about.  Sorted in
      * ascending server_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Server server = 1;</code>
@@ -594,6 +603,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of servers that the connection detail service knows about.  Sorted in
      * ascending server_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Server server = 1;</code>
@@ -613,6 +623,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of servers that the connection detail service knows about.  Sorted in
      * ascending server_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Server server = 1;</code>
@@ -634,6 +645,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of servers that the connection detail service knows about.  Sorted in
      * ascending server_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Server server = 1;</code>
@@ -656,6 +668,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of servers that the connection detail service knows about.  Sorted in
      * ascending server_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Server server = 1;</code>
@@ -675,6 +688,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of servers that the connection detail service knows about.  Sorted in
      * ascending server_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Server server = 1;</code>
@@ -694,6 +708,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of servers that the connection detail service knows about.  Sorted in
      * ascending server_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Server server = 1;</code>
@@ -714,6 +729,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of servers that the connection detail service knows about.  Sorted in
      * ascending server_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Server server = 1;</code>
@@ -732,6 +748,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of servers that the connection detail service knows about.  Sorted in
      * ascending server_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Server server = 1;</code>
@@ -750,6 +767,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of servers that the connection detail service knows about.  Sorted in
      * ascending server_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Server server = 1;</code>
@@ -762,6 +780,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of servers that the connection detail service knows about.  Sorted in
      * ascending server_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Server server = 1;</code>
@@ -777,6 +796,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of servers that the connection detail service knows about.  Sorted in
      * ascending server_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Server server = 1;</code>
@@ -793,6 +813,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of servers that the connection detail service knows about.  Sorted in
      * ascending server_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Server server = 1;</code>
@@ -805,6 +826,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of servers that the connection detail service knows about.  Sorted in
      * ascending server_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Server server = 1;</code>
@@ -818,6 +840,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of servers that the connection detail service knows about.  Sorted in
      * ascending server_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Server server = 1;</code>
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetServersResponseOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetServersResponseOrBuilder.java
index 7aeb36c974..11580b3beb 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetServersResponseOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetServersResponseOrBuilder.java
@@ -11,6 +11,7 @@ public interface GetServersResponseOrBuilder extends
    * <pre>
    * list of servers that the connection detail service knows about.  Sorted in
    * ascending server_id order.
+   * Must contain at least 1 result, otherwise 'end' must be true.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.Server server = 1;</code>
@@ -21,6 +22,7 @@ public interface GetServersResponseOrBuilder extends
    * <pre>
    * list of servers that the connection detail service knows about.  Sorted in
    * ascending server_id order.
+   * Must contain at least 1 result, otherwise 'end' must be true.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.Server server = 1;</code>
@@ -30,6 +32,7 @@ public interface GetServersResponseOrBuilder extends
    * <pre>
    * list of servers that the connection detail service knows about.  Sorted in
    * ascending server_id order.
+   * Must contain at least 1 result, otherwise 'end' must be true.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.Server server = 1;</code>
@@ -39,6 +42,7 @@ public interface GetServersResponseOrBuilder extends
    * <pre>
    * list of servers that the connection detail service knows about.  Sorted in
    * ascending server_id order.
+   * Must contain at least 1 result, otherwise 'end' must be true.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.Server server = 1;</code>
@@ -49,6 +53,7 @@ public interface GetServersResponseOrBuilder extends
    * <pre>
    * list of servers that the connection detail service knows about.  Sorted in
    * ascending server_id order.
+   * Must contain at least 1 result, otherwise 'end' must be true.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.Server server = 1;</code>
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetSocketRequest.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetSocketRequest.java
index b370a45e89..e7874478ef 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetSocketRequest.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetSocketRequest.java
@@ -17,6 +17,7 @@ private static final long serialVersionUID = 0L;
   }
   private GetSocketRequest() {
     socketId_ = 0L;
+    summary_ = false;
   }
 
   @java.lang.Override
@@ -55,6 +56,11 @@ private static final long serialVersionUID = 0L;
             socketId_ = input.readInt64();
             break;
           }
+          case 16: {
+
+            summary_ = input.readBool();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +89,7 @@ private static final long serialVersionUID = 0L;
   private long socketId_;
   /**
    * <pre>
-   * socket_id is the the identifier of the specific socket to get.
+   * socket_id is the identifier of the specific socket to get.
    * </pre>
    *
    * <code>int64 socket_id = 1;</code>
@@ -92,6 +98,21 @@ private static final long serialVersionUID = 0L;
     return socketId_;
   }
 
+  public static final int SUMMARY_FIELD_NUMBER = 2;
+  private boolean summary_;
+  /**
+   * <pre>
+   * If true, the response will contain only high level information
+   * that is inexpensive to obtain. Fields thay may be omitted are
+   * documented.
+   * </pre>
+   *
+   * <code>bool summary = 2;</code>
+   */
+  public boolean getSummary() {
+    return summary_;
+  }
+
   private byte memoizedIsInitialized = -1;
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -107,6 +128,9 @@ private static final long serialVersionUID = 0L;
     if (socketId_ != 0L) {
       output.writeInt64(1, socketId_);
     }
+    if (summary_ != false) {
+      output.writeBool(2, summary_);
+    }
     unknownFields.writeTo(output);
   }
 
@@ -119,6 +143,10 @@ private static final long serialVersionUID = 0L;
       size += com.google.protobuf.CodedOutputStream
         .computeInt64Size(1, socketId_);
     }
+    if (summary_ != false) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeBoolSize(2, summary_);
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -137,6 +165,8 @@ private static final long serialVersionUID = 0L;
     boolean result = true;
     result = result && (getSocketId()
         == other.getSocketId());
+    result = result && (getSummary()
+        == other.getSummary());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -151,6 +181,9 @@ private static final long serialVersionUID = 0L;
     hash = (37 * hash) + SOCKET_ID_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
         getSocketId());
+    hash = (37 * hash) + SUMMARY_FIELD_NUMBER;
+    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+        getSummary());
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -282,6 +315,8 @@ private static final long serialVersionUID = 0L;
       super.clear();
       socketId_ = 0L;
 
+      summary_ = false;
+
       return this;
     }
 
@@ -305,6 +340,7 @@ private static final long serialVersionUID = 0L;
     public io.grpc.channelz.v1.GetSocketRequest buildPartial() {
       io.grpc.channelz.v1.GetSocketRequest result = new io.grpc.channelz.v1.GetSocketRequest(this);
       result.socketId_ = socketId_;
+      result.summary_ = summary_;
       onBuilt();
       return result;
     }
@@ -349,6 +385,9 @@ private static final long serialVersionUID = 0L;
       if (other.getSocketId() != 0L) {
         setSocketId(other.getSocketId());
       }
+      if (other.getSummary() != false) {
+        setSummary(other.getSummary());
+      }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
@@ -379,7 +418,7 @@ private static final long serialVersionUID = 0L;
     private long socketId_ ;
     /**
      * <pre>
-     * socket_id is the the identifier of the specific socket to get.
+     * socket_id is the identifier of the specific socket to get.
      * </pre>
      *
      * <code>int64 socket_id = 1;</code>
@@ -389,7 +428,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * socket_id is the the identifier of the specific socket to get.
+     * socket_id is the identifier of the specific socket to get.
      * </pre>
      *
      * <code>int64 socket_id = 1;</code>
@@ -402,7 +441,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * socket_id is the the identifier of the specific socket to get.
+     * socket_id is the identifier of the specific socket to get.
      * </pre>
      *
      * <code>int64 socket_id = 1;</code>
@@ -413,6 +452,50 @@ private static final long serialVersionUID = 0L;
       onChanged();
       return this;
     }
+
+    private boolean summary_ ;
+    /**
+     * <pre>
+     * If true, the response will contain only high level information
+     * that is inexpensive to obtain. Fields thay may be omitted are
+     * documented.
+     * </pre>
+     *
+     * <code>bool summary = 2;</code>
+     */
+    public boolean getSummary() {
+      return summary_;
+    }
+    /**
+     * <pre>
+     * If true, the response will contain only high level information
+     * that is inexpensive to obtain. Fields thay may be omitted are
+     * documented.
+     * </pre>
+     *
+     * <code>bool summary = 2;</code>
+     */
+    public Builder setSummary(boolean value) {
+      
+      summary_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * If true, the response will contain only high level information
+     * that is inexpensive to obtain. Fields thay may be omitted are
+     * documented.
+     * </pre>
+     *
+     * <code>bool summary = 2;</code>
+     */
+    public Builder clearSummary() {
+      
+      summary_ = false;
+      onChanged();
+      return this;
+    }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetSocketRequestOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetSocketRequestOrBuilder.java
index ea5deb9ebd..12406093af 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetSocketRequestOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetSocketRequestOrBuilder.java
@@ -9,10 +9,21 @@ public interface GetSocketRequestOrBuilder extends
 
   /**
    * <pre>
-   * socket_id is the the identifier of the specific socket to get.
+   * socket_id is the identifier of the specific socket to get.
    * </pre>
    *
    * <code>int64 socket_id = 1;</code>
    */
   long getSocketId();
+
+  /**
+   * <pre>
+   * If true, the response will contain only high level information
+   * that is inexpensive to obtain. Fields thay may be omitted are
+   * documented.
+   * </pre>
+   *
+   * <code>bool summary = 2;</code>
+   */
+  boolean getSummary();
 }
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetSubchannelRequest.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetSubchannelRequest.java
index fdaa0ec565..517d6b63b9 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetSubchannelRequest.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetSubchannelRequest.java
@@ -83,7 +83,7 @@ private static final long serialVersionUID = 0L;
   private long subchannelId_;
   /**
    * <pre>
-   * subchannel_id is the the identifier of the specific subchannel to get.
+   * subchannel_id is the identifier of the specific subchannel to get.
    * </pre>
    *
    * <code>int64 subchannel_id = 1;</code>
@@ -379,7 +379,7 @@ private static final long serialVersionUID = 0L;
     private long subchannelId_ ;
     /**
      * <pre>
-     * subchannel_id is the the identifier of the specific subchannel to get.
+     * subchannel_id is the identifier of the specific subchannel to get.
      * </pre>
      *
      * <code>int64 subchannel_id = 1;</code>
@@ -389,7 +389,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * subchannel_id is the the identifier of the specific subchannel to get.
+     * subchannel_id is the identifier of the specific subchannel to get.
      * </pre>
      *
      * <code>int64 subchannel_id = 1;</code>
@@ -402,7 +402,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * subchannel_id is the the identifier of the specific subchannel to get.
+     * subchannel_id is the identifier of the specific subchannel to get.
      * </pre>
      *
      * <code>int64 subchannel_id = 1;</code>
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetSubchannelRequestOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetSubchannelRequestOrBuilder.java
index 64e2fccecf..23fda23578 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetSubchannelRequestOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetSubchannelRequestOrBuilder.java
@@ -9,7 +9,7 @@ public interface GetSubchannelRequestOrBuilder extends
 
   /**
    * <pre>
-   * subchannel_id is the the identifier of the specific subchannel to get.
+   * subchannel_id is the identifier of the specific subchannel to get.
    * </pre>
    *
    * <code>int64 subchannel_id = 1;</code>
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetTopChannelsRequest.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetTopChannelsRequest.java
index 699b9d4598..c6c4e5b148 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetTopChannelsRequest.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetTopChannelsRequest.java
@@ -17,6 +17,7 @@ private static final long serialVersionUID = 0L;
   }
   private GetTopChannelsRequest() {
     startChannelId_ = 0L;
+    maxResults_ = 0L;
   }
 
   @java.lang.Override
@@ -55,6 +56,11 @@ private static final long serialVersionUID = 0L;
             startChannelId_ = input.readInt64();
             break;
           }
+          case 16: {
+
+            maxResults_ = input.readInt64();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -85,6 +91,9 @@ private static final long serialVersionUID = 0L;
    * <pre>
    * start_channel_id indicates that only channels at or above this id should be
    * included in the results.
+   * To request the first page, this should be set to 0. To request
+   * subsequent pages, the client generates this value by adding 1 to
+   * the highest seen result ID.
    * </pre>
    *
    * <code>int64 start_channel_id = 1;</code>
@@ -93,6 +102,21 @@ private static final long serialVersionUID = 0L;
     return startChannelId_;
   }
 
+  public static final int MAX_RESULTS_FIELD_NUMBER = 2;
+  private long maxResults_;
+  /**
+   * <pre>
+   * If non-zero, the server will return a page of results containing
+   * at most this many items. If zero, the server will choose a
+   * reasonable page size.  Must never be negative.
+   * </pre>
+   *
+   * <code>int64 max_results = 2;</code>
+   */
+  public long getMaxResults() {
+    return maxResults_;
+  }
+
   private byte memoizedIsInitialized = -1;
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -108,6 +132,9 @@ private static final long serialVersionUID = 0L;
     if (startChannelId_ != 0L) {
       output.writeInt64(1, startChannelId_);
     }
+    if (maxResults_ != 0L) {
+      output.writeInt64(2, maxResults_);
+    }
     unknownFields.writeTo(output);
   }
 
@@ -120,6 +147,10 @@ private static final long serialVersionUID = 0L;
       size += com.google.protobuf.CodedOutputStream
         .computeInt64Size(1, startChannelId_);
     }
+    if (maxResults_ != 0L) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt64Size(2, maxResults_);
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -138,6 +169,8 @@ private static final long serialVersionUID = 0L;
     boolean result = true;
     result = result && (getStartChannelId()
         == other.getStartChannelId());
+    result = result && (getMaxResults()
+        == other.getMaxResults());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -152,6 +185,9 @@ private static final long serialVersionUID = 0L;
     hash = (37 * hash) + START_CHANNEL_ID_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
         getStartChannelId());
+    hash = (37 * hash) + MAX_RESULTS_FIELD_NUMBER;
+    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+        getMaxResults());
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -283,6 +319,8 @@ private static final long serialVersionUID = 0L;
       super.clear();
       startChannelId_ = 0L;
 
+      maxResults_ = 0L;
+
       return this;
     }
 
@@ -306,6 +344,7 @@ private static final long serialVersionUID = 0L;
     public io.grpc.channelz.v1.GetTopChannelsRequest buildPartial() {
       io.grpc.channelz.v1.GetTopChannelsRequest result = new io.grpc.channelz.v1.GetTopChannelsRequest(this);
       result.startChannelId_ = startChannelId_;
+      result.maxResults_ = maxResults_;
       onBuilt();
       return result;
     }
@@ -350,6 +389,9 @@ private static final long serialVersionUID = 0L;
       if (other.getStartChannelId() != 0L) {
         setStartChannelId(other.getStartChannelId());
       }
+      if (other.getMaxResults() != 0L) {
+        setMaxResults(other.getMaxResults());
+      }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
@@ -382,6 +424,9 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * start_channel_id indicates that only channels at or above this id should be
      * included in the results.
+     * To request the first page, this should be set to 0. To request
+     * subsequent pages, the client generates this value by adding 1 to
+     * the highest seen result ID.
      * </pre>
      *
      * <code>int64 start_channel_id = 1;</code>
@@ -393,6 +438,9 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * start_channel_id indicates that only channels at or above this id should be
      * included in the results.
+     * To request the first page, this should be set to 0. To request
+     * subsequent pages, the client generates this value by adding 1 to
+     * the highest seen result ID.
      * </pre>
      *
      * <code>int64 start_channel_id = 1;</code>
@@ -407,6 +455,9 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * start_channel_id indicates that only channels at or above this id should be
      * included in the results.
+     * To request the first page, this should be set to 0. To request
+     * subsequent pages, the client generates this value by adding 1 to
+     * the highest seen result ID.
      * </pre>
      *
      * <code>int64 start_channel_id = 1;</code>
@@ -417,6 +468,50 @@ private static final long serialVersionUID = 0L;
       onChanged();
       return this;
     }
+
+    private long maxResults_ ;
+    /**
+     * <pre>
+     * If non-zero, the server will return a page of results containing
+     * at most this many items. If zero, the server will choose a
+     * reasonable page size.  Must never be negative.
+     * </pre>
+     *
+     * <code>int64 max_results = 2;</code>
+     */
+    public long getMaxResults() {
+      return maxResults_;
+    }
+    /**
+     * <pre>
+     * If non-zero, the server will return a page of results containing
+     * at most this many items. If zero, the server will choose a
+     * reasonable page size.  Must never be negative.
+     * </pre>
+     *
+     * <code>int64 max_results = 2;</code>
+     */
+    public Builder setMaxResults(long value) {
+      
+      maxResults_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * If non-zero, the server will return a page of results containing
+     * at most this many items. If zero, the server will choose a
+     * reasonable page size.  Must never be negative.
+     * </pre>
+     *
+     * <code>int64 max_results = 2;</code>
+     */
+    public Builder clearMaxResults() {
+      
+      maxResults_ = 0L;
+      onChanged();
+      return this;
+    }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetTopChannelsRequestOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetTopChannelsRequestOrBuilder.java
index bc03cf3db6..fd6bd02af4 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetTopChannelsRequestOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetTopChannelsRequestOrBuilder.java
@@ -11,9 +11,23 @@ public interface GetTopChannelsRequestOrBuilder extends
    * <pre>
    * start_channel_id indicates that only channels at or above this id should be
    * included in the results.
+   * To request the first page, this should be set to 0. To request
+   * subsequent pages, the client generates this value by adding 1 to
+   * the highest seen result ID.
    * </pre>
    *
    * <code>int64 start_channel_id = 1;</code>
    */
   long getStartChannelId();
+
+  /**
+   * <pre>
+   * If non-zero, the server will return a page of results containing
+   * at most this many items. If zero, the server will choose a
+   * reasonable page size.  Must never be negative.
+   * </pre>
+   *
+   * <code>int64 max_results = 2;</code>
+   */
+  long getMaxResults();
 }
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetTopChannelsResponse.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetTopChannelsResponse.java
index c0ef291706..2877ff919d 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetTopChannelsResponse.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetTopChannelsResponse.java
@@ -99,6 +99,7 @@ private static final long serialVersionUID = 0L;
    * <pre>
    * list of channels that the connection detail service knows about.  Sorted in
    * ascending channel_id order.
+   * Must contain at least 1 result, otherwise 'end' must be true.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.Channel channel = 1;</code>
@@ -110,6 +111,7 @@ private static final long serialVersionUID = 0L;
    * <pre>
    * list of channels that the connection detail service knows about.  Sorted in
    * ascending channel_id order.
+   * Must contain at least 1 result, otherwise 'end' must be true.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.Channel channel = 1;</code>
@@ -122,6 +124,7 @@ private static final long serialVersionUID = 0L;
    * <pre>
    * list of channels that the connection detail service knows about.  Sorted in
    * ascending channel_id order.
+   * Must contain at least 1 result, otherwise 'end' must be true.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.Channel channel = 1;</code>
@@ -133,6 +136,7 @@ private static final long serialVersionUID = 0L;
    * <pre>
    * list of channels that the connection detail service knows about.  Sorted in
    * ascending channel_id order.
+   * Must contain at least 1 result, otherwise 'end' must be true.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.Channel channel = 1;</code>
@@ -144,6 +148,7 @@ private static final long serialVersionUID = 0L;
    * <pre>
    * list of channels that the connection detail service knows about.  Sorted in
    * ascending channel_id order.
+   * Must contain at least 1 result, otherwise 'end' must be true.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.Channel channel = 1;</code>
@@ -527,6 +532,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of channels that the connection detail service knows about.  Sorted in
      * ascending channel_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Channel channel = 1;</code>
@@ -542,6 +548,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of channels that the connection detail service knows about.  Sorted in
      * ascending channel_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Channel channel = 1;</code>
@@ -557,6 +564,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of channels that the connection detail service knows about.  Sorted in
      * ascending channel_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Channel channel = 1;</code>
@@ -572,6 +580,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of channels that the connection detail service knows about.  Sorted in
      * ascending channel_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Channel channel = 1;</code>
@@ -594,6 +603,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of channels that the connection detail service knows about.  Sorted in
      * ascending channel_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Channel channel = 1;</code>
@@ -613,6 +623,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of channels that the connection detail service knows about.  Sorted in
      * ascending channel_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Channel channel = 1;</code>
@@ -634,6 +645,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of channels that the connection detail service knows about.  Sorted in
      * ascending channel_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Channel channel = 1;</code>
@@ -656,6 +668,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of channels that the connection detail service knows about.  Sorted in
      * ascending channel_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Channel channel = 1;</code>
@@ -675,6 +688,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of channels that the connection detail service knows about.  Sorted in
      * ascending channel_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Channel channel = 1;</code>
@@ -694,6 +708,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of channels that the connection detail service knows about.  Sorted in
      * ascending channel_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Channel channel = 1;</code>
@@ -714,6 +729,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of channels that the connection detail service knows about.  Sorted in
      * ascending channel_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Channel channel = 1;</code>
@@ -732,6 +748,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of channels that the connection detail service knows about.  Sorted in
      * ascending channel_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Channel channel = 1;</code>
@@ -750,6 +767,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of channels that the connection detail service knows about.  Sorted in
      * ascending channel_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Channel channel = 1;</code>
@@ -762,6 +780,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of channels that the connection detail service knows about.  Sorted in
      * ascending channel_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Channel channel = 1;</code>
@@ -777,6 +796,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of channels that the connection detail service knows about.  Sorted in
      * ascending channel_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Channel channel = 1;</code>
@@ -793,6 +813,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of channels that the connection detail service knows about.  Sorted in
      * ascending channel_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Channel channel = 1;</code>
@@ -805,6 +826,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of channels that the connection detail service knows about.  Sorted in
      * ascending channel_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Channel channel = 1;</code>
@@ -818,6 +840,7 @@ private static final long serialVersionUID = 0L;
      * <pre>
      * list of channels that the connection detail service knows about.  Sorted in
      * ascending channel_id order.
+     * Must contain at least 1 result, otherwise 'end' must be true.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.Channel channel = 1;</code>
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetTopChannelsResponseOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetTopChannelsResponseOrBuilder.java
index bbbe3defa7..f250546686 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetTopChannelsResponseOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetTopChannelsResponseOrBuilder.java
@@ -11,6 +11,7 @@ public interface GetTopChannelsResponseOrBuilder extends
    * <pre>
    * list of channels that the connection detail service knows about.  Sorted in
    * ascending channel_id order.
+   * Must contain at least 1 result, otherwise 'end' must be true.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.Channel channel = 1;</code>
@@ -21,6 +22,7 @@ public interface GetTopChannelsResponseOrBuilder extends
    * <pre>
    * list of channels that the connection detail service knows about.  Sorted in
    * ascending channel_id order.
+   * Must contain at least 1 result, otherwise 'end' must be true.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.Channel channel = 1;</code>
@@ -30,6 +32,7 @@ public interface GetTopChannelsResponseOrBuilder extends
    * <pre>
    * list of channels that the connection detail service knows about.  Sorted in
    * ascending channel_id order.
+   * Must contain at least 1 result, otherwise 'end' must be true.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.Channel channel = 1;</code>
@@ -39,6 +42,7 @@ public interface GetTopChannelsResponseOrBuilder extends
    * <pre>
    * list of channels that the connection detail service knows about.  Sorted in
    * ascending channel_id order.
+   * Must contain at least 1 result, otherwise 'end' must be true.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.Channel channel = 1;</code>
@@ -49,6 +53,7 @@ public interface GetTopChannelsResponseOrBuilder extends
    * <pre>
    * list of channels that the connection detail service knows about.  Sorted in
    * ascending channel_id order.
+   * Must contain at least 1 result, otherwise 'end' must be true.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.Channel channel = 1;</code>
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/SocketData.java b/services/src/generated/main/java/io/grpc/channelz/v1/SocketData.java
index 33f3b7d41f..fe02da8009 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/SocketData.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/SocketData.java
@@ -510,7 +510,8 @@ private static final long serialVersionUID = 0L;
   private java.util.List<io.grpc.channelz.v1.SocketOption> option_;
   /**
    * <pre>
-   * Socket options set on this socket.  May be absent.
+   * Socket options set on this socket.  May be absent if 'summary' is set
+   * on GetSocketRequest.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.SocketOption option = 13;</code>
@@ -520,7 +521,8 @@ private static final long serialVersionUID = 0L;
   }
   /**
    * <pre>
-   * Socket options set on this socket.  May be absent.
+   * Socket options set on this socket.  May be absent if 'summary' is set
+   * on GetSocketRequest.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.SocketOption option = 13;</code>
@@ -531,7 +533,8 @@ private static final long serialVersionUID = 0L;
   }
   /**
    * <pre>
-   * Socket options set on this socket.  May be absent.
+   * Socket options set on this socket.  May be absent if 'summary' is set
+   * on GetSocketRequest.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.SocketOption option = 13;</code>
@@ -541,7 +544,8 @@ private static final long serialVersionUID = 0L;
   }
   /**
    * <pre>
-   * Socket options set on this socket.  May be absent.
+   * Socket options set on this socket.  May be absent if 'summary' is set
+   * on GetSocketRequest.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.SocketOption option = 13;</code>
@@ -551,7 +555,8 @@ private static final long serialVersionUID = 0L;
   }
   /**
    * <pre>
-   * Socket options set on this socket.  May be absent.
+   * Socket options set on this socket.  May be absent if 'summary' is set
+   * on GetSocketRequest.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.SocketOption option = 13;</code>
@@ -2409,7 +2414,8 @@ private static final long serialVersionUID = 0L;
 
     /**
      * <pre>
-     * Socket options set on this socket.  May be absent.
+     * Socket options set on this socket.  May be absent if 'summary' is set
+     * on GetSocketRequest.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketOption option = 13;</code>
@@ -2423,7 +2429,8 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Socket options set on this socket.  May be absent.
+     * Socket options set on this socket.  May be absent if 'summary' is set
+     * on GetSocketRequest.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketOption option = 13;</code>
@@ -2437,7 +2444,8 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Socket options set on this socket.  May be absent.
+     * Socket options set on this socket.  May be absent if 'summary' is set
+     * on GetSocketRequest.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketOption option = 13;</code>
@@ -2451,7 +2459,8 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Socket options set on this socket.  May be absent.
+     * Socket options set on this socket.  May be absent if 'summary' is set
+     * on GetSocketRequest.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketOption option = 13;</code>
@@ -2472,7 +2481,8 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Socket options set on this socket.  May be absent.
+     * Socket options set on this socket.  May be absent if 'summary' is set
+     * on GetSocketRequest.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketOption option = 13;</code>
@@ -2490,7 +2500,8 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Socket options set on this socket.  May be absent.
+     * Socket options set on this socket.  May be absent if 'summary' is set
+     * on GetSocketRequest.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketOption option = 13;</code>
@@ -2510,7 +2521,8 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Socket options set on this socket.  May be absent.
+     * Socket options set on this socket.  May be absent if 'summary' is set
+     * on GetSocketRequest.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketOption option = 13;</code>
@@ -2531,7 +2543,8 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Socket options set on this socket.  May be absent.
+     * Socket options set on this socket.  May be absent if 'summary' is set
+     * on GetSocketRequest.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketOption option = 13;</code>
@@ -2549,7 +2562,8 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Socket options set on this socket.  May be absent.
+     * Socket options set on this socket.  May be absent if 'summary' is set
+     * on GetSocketRequest.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketOption option = 13;</code>
@@ -2567,7 +2581,8 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Socket options set on this socket.  May be absent.
+     * Socket options set on this socket.  May be absent if 'summary' is set
+     * on GetSocketRequest.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketOption option = 13;</code>
@@ -2586,7 +2601,8 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Socket options set on this socket.  May be absent.
+     * Socket options set on this socket.  May be absent if 'summary' is set
+     * on GetSocketRequest.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketOption option = 13;</code>
@@ -2603,7 +2619,8 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Socket options set on this socket.  May be absent.
+     * Socket options set on this socket.  May be absent if 'summary' is set
+     * on GetSocketRequest.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketOption option = 13;</code>
@@ -2620,7 +2637,8 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Socket options set on this socket.  May be absent.
+     * Socket options set on this socket.  May be absent if 'summary' is set
+     * on GetSocketRequest.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketOption option = 13;</code>
@@ -2631,7 +2649,8 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Socket options set on this socket.  May be absent.
+     * Socket options set on this socket.  May be absent if 'summary' is set
+     * on GetSocketRequest.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketOption option = 13;</code>
@@ -2645,7 +2664,8 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Socket options set on this socket.  May be absent.
+     * Socket options set on this socket.  May be absent if 'summary' is set
+     * on GetSocketRequest.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketOption option = 13;</code>
@@ -2660,7 +2680,8 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Socket options set on this socket.  May be absent.
+     * Socket options set on this socket.  May be absent if 'summary' is set
+     * on GetSocketRequest.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketOption option = 13;</code>
@@ -2671,7 +2692,8 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Socket options set on this socket.  May be absent.
+     * Socket options set on this socket.  May be absent if 'summary' is set
+     * on GetSocketRequest.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketOption option = 13;</code>
@@ -2683,7 +2705,8 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Socket options set on this socket.  May be absent.
+     * Socket options set on this socket.  May be absent if 'summary' is set
+     * on GetSocketRequest.
      * </pre>
      *
      * <code>repeated .grpc.channelz.v1.SocketOption option = 13;</code>
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/SocketDataOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/SocketDataOrBuilder.java
index 57403833ca..eb65c0e535 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/SocketDataOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/SocketDataOrBuilder.java
@@ -236,7 +236,8 @@ public interface SocketDataOrBuilder extends
 
   /**
    * <pre>
-   * Socket options set on this socket.  May be absent.
+   * Socket options set on this socket.  May be absent if 'summary' is set
+   * on GetSocketRequest.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.SocketOption option = 13;</code>
@@ -245,7 +246,8 @@ public interface SocketDataOrBuilder extends
       getOptionList();
   /**
    * <pre>
-   * Socket options set on this socket.  May be absent.
+   * Socket options set on this socket.  May be absent if 'summary' is set
+   * on GetSocketRequest.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.SocketOption option = 13;</code>
@@ -253,7 +255,8 @@ public interface SocketDataOrBuilder extends
   io.grpc.channelz.v1.SocketOption getOption(int index);
   /**
    * <pre>
-   * Socket options set on this socket.  May be absent.
+   * Socket options set on this socket.  May be absent if 'summary' is set
+   * on GetSocketRequest.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.SocketOption option = 13;</code>
@@ -261,7 +264,8 @@ public interface SocketDataOrBuilder extends
   int getOptionCount();
   /**
    * <pre>
-   * Socket options set on this socket.  May be absent.
+   * Socket options set on this socket.  May be absent if 'summary' is set
+   * on GetSocketRequest.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.SocketOption option = 13;</code>
@@ -270,7 +274,8 @@ public interface SocketDataOrBuilder extends
       getOptionOrBuilderList();
   /**
    * <pre>
-   * Socket options set on this socket.  May be absent.
+   * Socket options set on this socket.  May be absent if 'summary' is set
+   * on GetSocketRequest.
    * </pre>
    *
    * <code>repeated .grpc.channelz.v1.SocketOption option = 13;</code>
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/SocketRef.java b/services/src/generated/main/java/io/grpc/channelz/v1/SocketRef.java
index 089c3749c1..14fa40bfc5 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/SocketRef.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/SocketRef.java
@@ -93,6 +93,10 @@ private static final long serialVersionUID = 0L;
   public static final int SOCKET_ID_FIELD_NUMBER = 3;
   private long socketId_;
   /**
+   * <pre>
+   * The globally unique id for this socket.  Must be a positive number.
+   * </pre>
+   *
    * <code>int64 socket_id = 3;</code>
    */
   public long getSocketId() {
@@ -448,12 +452,20 @@ private static final long serialVersionUID = 0L;
 
     private long socketId_ ;
     /**
+     * <pre>
+     * The globally unique id for this socket.  Must be a positive number.
+     * </pre>
+     *
      * <code>int64 socket_id = 3;</code>
      */
     public long getSocketId() {
       return socketId_;
     }
     /**
+     * <pre>
+     * The globally unique id for this socket.  Must be a positive number.
+     * </pre>
+     *
      * <code>int64 socket_id = 3;</code>
      */
     public Builder setSocketId(long value) {
@@ -463,6 +475,10 @@ private static final long serialVersionUID = 0L;
       return this;
     }
     /**
+     * <pre>
+     * The globally unique id for this socket.  Must be a positive number.
+     * </pre>
+     *
      * <code>int64 socket_id = 3;</code>
      */
     public Builder clearSocketId() {
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/SocketRefOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/SocketRefOrBuilder.java
index 3767016335..28198be20c 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/SocketRefOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/SocketRefOrBuilder.java
@@ -8,6 +8,10 @@ public interface SocketRefOrBuilder extends
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   * <pre>
+   * The globally unique id for this socket.  Must be a positive number.
+   * </pre>
+   *
    * <code>int64 socket_id = 3;</code>
    */
   long getSocketId();
diff --git a/services/src/main/proto/grpc/channelz/v1/channelz.proto b/services/src/main/proto/grpc/channelz/v1/channelz.proto
index f0611657f2..20de23f7fa 100644
--- a/services/src/main/proto/grpc/channelz/v1/channelz.proto
+++ b/services/src/main/proto/grpc/channelz/v1/channelz.proto
@@ -177,6 +177,7 @@ message SubchannelRef {
 
 // SocketRef is a reference to a Socket.
 message SocketRef {
+  // The globally unique id for this socket.  Must be a positive number.
   int64 socket_id = 3;
   // An optional name associated with the socket.
   string name = 4;
@@ -288,7 +289,8 @@ message SocketData {
   // include stream level or TCP level flow control info.
   google.protobuf.Int64Value  remote_flow_control_window = 12;
 
-  // Socket options set on this socket.  May be absent.
+  // Socket options set on this socket.  May be absent if 'summary' is set
+  // on GetSocketRequest.
   repeated SocketOption option = 13;
 }
 
@@ -424,6 +426,8 @@ service Channelz {
   rpc GetTopChannels(GetTopChannelsRequest) returns (GetTopChannelsResponse);
   // Gets all servers that exist in the process.
   rpc GetServers(GetServersRequest) returns (GetServersResponse);
+  // Returns a single Server, or else a NOT_FOUND code.
+  rpc GetServer(GetServerRequest) returns (GetServerResponse);
   // Gets all server sockets that exist in the process.
   rpc GetServerSockets(GetServerSocketsRequest) returns (GetServerSocketsResponse);
   // Returns a single Channel, or else a NOT_FOUND code.
@@ -437,12 +441,21 @@ service Channelz {
 message GetTopChannelsRequest {
   // start_channel_id indicates that only channels at or above this id should be
   // included in the results.
+  // To request the first page, this should be set to 0. To request
+  // subsequent pages, the client generates this value by adding 1 to
+  // the highest seen result ID.
   int64 start_channel_id = 1;
+
+  // If non-zero, the server will return a page of results containing
+  // at most this many items. If zero, the server will choose a
+  // reasonable page size.  Must never be negative.
+  int64 max_results = 2;
 }
 
 message GetTopChannelsResponse {
   // list of channels that the connection detail service knows about.  Sorted in
   // ascending channel_id order.
+  // Must contain at least 1 result, otherwise 'end' must be true.
   repeated Channel channel = 1;
   // If set, indicates that the list of channels is the final list.  Requesting
   // more channels can only return more if they are created after this RPC
@@ -453,12 +466,21 @@ message GetTopChannelsResponse {
 message GetServersRequest {
   // start_server_id indicates that only servers at or above this id should be
   // included in the results.
+  // To request the first page, this must be set to 0. To request
+  // subsequent pages, the client generates this value by adding 1 to
+  // the highest seen result ID.
   int64 start_server_id = 1;
+
+  // If non-zero, the server will return a page of results containing
+  // at most this many items. If zero, the server will choose a
+  // reasonable page size.  Must never be negative.
+  int64 max_results = 2;
 }
 
 message GetServersResponse {
   // list of servers that the connection detail service knows about.  Sorted in
   // ascending server_id order.
+  // Must contain at least 1 result, otherwise 'end' must be true.
   repeated Server server = 1;
   // If set, indicates that the list of servers is the final list.  Requesting
   // more servers will only return more if they are created after this RPC
@@ -466,16 +488,36 @@ message GetServersResponse {
   bool end = 2;
 }
 
+message GetServerRequest {
+  // server_id is the identifier of the specific server to get.
+  int64 server_id = 1;
+}
+
+message GetServerResponse {
+  // The Server that corresponds to the requested server_id.  This field
+  // should be set.
+  Server server = 1;
+}
+
 message GetServerSocketsRequest {
   int64 server_id = 1;
   // start_socket_id indicates that only sockets at or above this id should be
   // included in the results.
+  // To request the first page, this must be set to 0. To request
+  // subsequent pages, the client generates this value by adding 1 to
+  // the highest seen result ID.
   int64 start_socket_id = 2;
+
+  // If non-zero, the server will return a page of results containing
+  // at most this many items. If zero, the server will choose a
+  // reasonable page size.  Must never be negative.
+  int64 max_results = 3;
 }
 
 message GetServerSocketsResponse {
   // list of socket refs that the connection detail service knows about.  Sorted in
   // ascending socket_id order.
+  // Must contain at least 1 result, otherwise 'end' must be true.
   repeated SocketRef socket_ref = 1;
   // If set, indicates that the list of sockets is the final list.  Requesting
   // more sockets will only return more if they are created after this RPC
@@ -484,7 +526,7 @@ message GetServerSocketsResponse {
 }
 
 message GetChannelRequest {
-  // channel_id is the the identifier of the specific channel to get.
+  // channel_id is the identifier of the specific channel to get.
   int64 channel_id = 1;
 }
 
@@ -495,7 +537,7 @@ message GetChannelResponse {
 }
 
 message GetSubchannelRequest {
-  // subchannel_id is the the identifier of the specific subchannel to get.
+  // subchannel_id is the identifier of the specific subchannel to get.
   int64 subchannel_id = 1;
 }
 
@@ -506,8 +548,13 @@ message GetSubchannelResponse {
 }
 
 message GetSocketRequest {
-  // socket_id is the the identifier of the specific socket to get.
+  // socket_id is the identifier of the specific socket to get.
   int64 socket_id = 1;
+
+  // If true, the response will contain only high level information
+  // that is inexpensive to obtain. Fields thay may be omitted are
+  // documented.
+  bool summary = 2;
 }
 
 message GetSocketResponse {