diff --git a/envoy/config/core/v3/address.proto b/envoy/config/core/v3/address.proto
index bf8f84c2..8228450e 100644
--- a/envoy/config/core/v3/address.proto
+++ b/envoy/config/core/v3/address.proto
@@ -32,6 +32,7 @@ message Pipe {
 
 // [#not-implemented-hide:] The address represents an envoy internal listener.
 // TODO(lambdai): Make this address available for listener and endpoint.
+// TODO(asraa): When address available, remove workaround from test/server/server_fuzz_test.cc:30.
 message EnvoyInternalAddress {
   oneof address_name_specifier {
     option (validate.required) = true;
diff --git a/envoy/config/core/v4alpha/address.proto b/envoy/config/core/v4alpha/address.proto
index a1605946..6ae82359 100644
--- a/envoy/config/core/v4alpha/address.proto
+++ b/envoy/config/core/v4alpha/address.proto
@@ -32,6 +32,7 @@ message Pipe {
 
 // [#not-implemented-hide:] The address represents an envoy internal listener.
 // TODO(lambdai): Make this address available for listener and endpoint.
+// TODO(asraa): When address available, remove workaround from test/server/server_fuzz_test.cc:30.
 message EnvoyInternalAddress {
   option (udpa.annotations.versioning).previous_message_type =
       "envoy.config.core.v3.EnvoyInternalAddress";