diff --git a/android/app/src/com/android/bluetooth/a2dp/A2dpService.java b/android/app/src/com/android/bluetooth/a2dp/A2dpService.java
index 57ff97bae3dd77b6b438cd9496216df16b3b92c1..061f96ee144351c6d8e366f5e788e1b9c3b073f2 100644
--- a/android/app/src/com/android/bluetooth/a2dp/A2dpService.java
+++ b/android/app/src/com/android/bluetooth/a2dp/A2dpService.java
@@ -148,7 +148,7 @@ public class A2dpService extends ProfileService {
             throw new IllegalStateException("start() called twice");
         }
 
-        // Step 1: Get AdapterService, A2dpNativeInterface, DatabaseManager, AudioManager.
+        // Step 1: Get AdapterService, DatabaseManager, AudioManager.
         // None of them can be null.
         mAdapterService =
                 requireNonNull(
diff --git a/android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerNativeInterface.java b/android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerNativeInterface.java
index de4959aa8ccba2d6091fd8a5bacc128e0fec1aaa..0fb1ea7b070e320bfcdfca2dcdda3b07e2b54ad4 100644
--- a/android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerNativeInterface.java
+++ b/android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerNativeInterface.java
@@ -29,7 +29,7 @@ import java.util.UUID;
 
 /** Provides Bluetooth AVRCP Controller native interface for the AVRCP Controller service */
 public class AvrcpControllerNativeInterface {
-    static final String TAG = AvrcpControllerNativeInterface.class.getSimpleName().substring(0, 23);
+    static final String TAG = AvrcpControllerNativeInterface.class.getSimpleName();
     static final boolean DBG = Log.isLoggable(TAG, Log.DEBUG);
     static final boolean VDBG = Log.isLoggable(TAG, Log.VERBOSE);
 
diff --git a/android/app/src/com/android/bluetooth/hap/HapClientNativeInterface.java b/android/app/src/com/android/bluetooth/hap/HapClientNativeInterface.java
index fd00ad7200f15eaa3147f76fe435bb8c6aea2376..263a8076f901fe4841499de6b6602b581e12679e 100644
--- a/android/app/src/com/android/bluetooth/hap/HapClientNativeInterface.java
+++ b/android/app/src/com/android/bluetooth/hap/HapClientNativeInterface.java
@@ -29,12 +29,9 @@ import com.android.internal.annotations.VisibleForTesting;
 import java.util.ArrayList;
 import java.util.Arrays;
 
-/**
- * Hearing Access Profile Client Native Interface to/from JNI.
- */
+/** Hearing Access Profile Client Native Interface to/from JNI. */
 public class HapClientNativeInterface {
-    private static final String TAG =
-            HapClientNativeInterface.class.getSimpleName().substring(0, 23);
+    private static final String TAG = HapClientNativeInterface.class.getSimpleName();
     private static final boolean DBG = Log.isLoggable(TAG, Log.DEBUG);
 
     private final BluetoothAdapter mAdapter;