diff --git a/service-t/src/com/android/server/connectivity/mdns/MdnsInterfaceAdvertiser.java b/service-t/src/com/android/server/connectivity/mdns/MdnsInterfaceAdvertiser.java
index 878fd26211..be268e3901 100644
--- a/service-t/src/com/android/server/connectivity/mdns/MdnsInterfaceAdvertiser.java
+++ b/service-t/src/com/android/server/connectivity/mdns/MdnsInterfaceAdvertiser.java
@@ -443,7 +443,7 @@ public class MdnsInterfaceAdvertiser implements MulticastPacketReader.PacketHand
         // conflicting service is still probing and won't reply either.
         final MdnsReplyInfo answers = mRecordRepository.getReply(packet, srcCopy);
         // Dump the query packet.
-        if (DBG || answers != null) {
+        if (DBG && answers != null) {
             mSharedLog.v("Parsed packet with transactionId(" + packet.transactionId + "): "
                     + packet.questions.size() + " questions, "
                     + packet.answers.size() + " answers, "
diff --git a/service-t/src/com/android/server/connectivity/mdns/MdnsReplySender.java b/service-t/src/com/android/server/connectivity/mdns/MdnsReplySender.java
index 2fff2172bc..571346f026 100644
--- a/service-t/src/com/android/server/connectivity/mdns/MdnsReplySender.java
+++ b/service-t/src/com/android/server/connectivity/mdns/MdnsReplySender.java
@@ -28,6 +28,7 @@ import android.os.Looper;
 import android.os.Message;
 import android.util.ArrayMap;
 import android.util.ArraySet;
+import android.util.Log;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.net.module.util.SharedLog;
@@ -55,6 +56,7 @@ import java.util.Set;
 public class MdnsReplySender {
     @VisibleForTesting
     static final int MSG_SEND = 1;
+    private static final String TAG = MdnsReplySender.class.getSimpleName();
     private static final int PACKET_NOT_SENT = 0;
     private static final int PACKET_SENT = 1;
 
@@ -282,7 +284,7 @@ public class MdnsReplySender {
                 return;
             }
 
-            mSharedLog.log("Sending " + replyInfo);
+            Log.i(TAG, "Sending " + replyInfo);
 
             final int flags = 0x8400; // Response, authoritative (rfc6762 18.4)
             final MdnsPacket packet = new MdnsPacket(flags,