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 336a3ecccf..8fc83ef1f5 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
@@ -344,9 +344,10 @@ public final class ChannelzProto {
       "nelz.v1.GetSubchannelRequest\032\'.grpc.chan" +
       "nelz.v1.GetSubchannelResponse\022T\n\tGetSock" +
       "et\022\".grpc.channelz.v1.GetSocketRequest\032#" +
-      ".grpc.channelz.v1.GetSocketResponseB0\n\023i" +
-      "o.grpc.channelz.v1B\rChannelzProtoP\001Z\010cha" +
-      "nnelzb\006proto3"
+      ".grpc.channelz.v1.GetSocketResponseBX\n\023i" +
+      "o.grpc.channelz.v1B\rChannelzProtoP\001Z0goo" +
+      "gle.golang.org/grpc/channelz/grpc_channe" +
+      "lz_v1b\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
diff --git a/services/src/main/proto/grpc/channelz/v1/channelz.proto b/services/src/main/proto/grpc/channelz/v1/channelz.proto
index 6c0175c473..62acffcaae 100644
--- a/services/src/main/proto/grpc/channelz/v1/channelz.proto
+++ b/services/src/main/proto/grpc/channelz/v1/channelz.proto
@@ -28,7 +28,7 @@ import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/wrappers.proto";
 
-option go_package = "channelz";
+option go_package = "google.golang.org/grpc/channelz/grpc_channelz_v1";
 option java_multiple_files = true;
 option java_package = "io.grpc.channelz.v1";
 option java_outer_classname = "ChannelzProto";