diff --git a/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringConfigurationTest.java b/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringConfigurationTest.java
index c4c7c9cca7..f0b7db60c8 100644
--- a/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringConfigurationTest.java
+++ b/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringConfigurationTest.java
@@ -767,23 +767,17 @@ public class TetheringConfigurationTest {
                 mMockContext, mLog, INVALID_SUBSCRIPTION_ID, mDeps).readEnableSyncSM(mMockContext);
     }
 
-    private void assertEnableSyncSM(boolean value) {
-        assertEquals(value, TetheringConfiguration.USE_SYNC_SM);
-    }
-
     @Test
     public void testEnableSyncSMFlag() throws Exception {
         // Test default enabled
         setTetherEnableSyncSMFlagEnabled(null);
-        assertEnableSyncSM(true);
+        assertEquals(true, TetheringConfiguration.USE_SYNC_SM);
 
         setTetherEnableSyncSMFlagEnabled(true);
-        assertEnableSyncSM(true);
+        assertEquals(true, TetheringConfiguration.USE_SYNC_SM);
 
-        // Feature is enabled by default after 25Q2 release.
-        if (!SdkUtil.isAtLeast25Q2()) {
-            setTetherEnableSyncSMFlagEnabled(false);
-            assertEnableSyncSM(false);
-        }
+        // Feature is enabled forcefully after 25Q2 release.
+        setTetherEnableSyncSMFlagEnabled(false);
+        assertEquals(SdkUtil.isAtLeast25Q2(), TetheringConfiguration.USE_SYNC_SM);
     }
 }
diff --git a/staticlibs/framework/com/android/net/module/util/SdkUtil.java b/staticlibs/framework/com/android/net/module/util/SdkUtil.java
index 63558dd18c..1acb156c54 100644
--- a/staticlibs/framework/com/android/net/module/util/SdkUtil.java
+++ b/staticlibs/framework/com/android/net/module/util/SdkUtil.java
@@ -52,6 +52,6 @@ public class SdkUtil {
 
     /** Checks if the device is running on a release version of Android Baklava or newer */
     public static boolean isAtLeast25Q2() {
-        return SDK_INT >= 36  || (SDK_INT == 35 && "Baklava".equals(Build.VERSION.CODENAME));
+        return SDK_INT >= 36 || (SDK_INT == 35 && "Baklava".equals(Build.VERSION.CODENAME));
     }
 }