diff --git a/xds/src/main/java/io/grpc/xds/EnvoyProtoData.java b/xds/src/main/java/io/grpc/xds/EnvoyProtoData.java
index ad78a6967c5e..a93f9db54a03 100644
--- a/xds/src/main/java/io/grpc/xds/EnvoyProtoData.java
+++ b/xds/src/main/java/io/grpc/xds/EnvoyProtoData.java
@@ -226,6 +226,7 @@ static final class Builder {
       private Map<String, ?> metadata;
       @Nullable
       private Locality locality;
+      // TODO(sanjaypujare): eliminate usage of listening_addresses field.
       private final List<Address> listeningAddresses = new ArrayList<>();
       private String buildVersion = "";
       private String userAgentName = "";
diff --git a/xds/src/main/java/io/grpc/xds/XdsClientImpl.java b/xds/src/main/java/io/grpc/xds/XdsClientImpl.java
index 829e87117955..b427cdd7c90b 100644
--- a/xds/src/main/java/io/grpc/xds/XdsClientImpl.java
+++ b/xds/src/main/java/io/grpc/xds/XdsClientImpl.java
@@ -462,6 +462,7 @@ private void updateNodeMetadataForListenerRequest(int port) {
       newMetadata.putAll(node.getMetadata());
     }
     newMetadata.put("TRAFFICDIRECTOR_PROXYLESS", "1");
+    // TODO(sanjaypujare): eliminate usage of listening_addresses.
     EnvoyProtoData.Address listeningAddress =
         new EnvoyProtoData.Address("0.0.0.0", port);
     node =
diff --git a/xds/src/test/java/io/grpc/xds/EnvoyProtoDataTest.java b/xds/src/test/java/io/grpc/xds/EnvoyProtoDataTest.java
index 2e307d6c7eb9..5ffabdf36427 100644
--- a/xds/src/test/java/io/grpc/xds/EnvoyProtoDataTest.java
+++ b/xds/src/test/java/io/grpc/xds/EnvoyProtoDataTest.java
@@ -96,6 +96,7 @@ public void locality_equal() {
         .testEquals();
   }
 
+  @SuppressWarnings("deprecation")
   @Test
   public void convertNode() {
     Node node = Node.newBuilder()