diff --git a/framework-t/api/system-current.txt b/framework-t/api/system-current.txt
index ce18d8e929..6613ee6b30 100644
--- a/framework-t/api/system-current.txt
+++ b/framework-t/api/system-current.txt
@@ -59,9 +59,7 @@ package android.nearby {
   }
 
   public class NearbyManager {
-    method public static boolean isFastPairScanEnabled(@NonNull android.content.Context);
     method public void queryOffloadCapability(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.nearby.OffloadCapability>);
-    method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public static void setFastPairScanEnabled(@NonNull android.content.Context, boolean);
     method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_ADVERTISE, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void startBroadcast(@NonNull android.nearby.BroadcastRequest, @NonNull java.util.concurrent.Executor, @NonNull android.nearby.BroadcastCallback);
     method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_SCAN, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int startScan(@NonNull android.nearby.ScanRequest, @NonNull java.util.concurrent.Executor, @NonNull android.nearby.ScanCallback);
     method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_ADVERTISE, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void stopBroadcast(@NonNull android.nearby.BroadcastCallback);
diff --git a/nearby/framework/java/android/nearby/NearbyManager.java b/nearby/framework/java/android/nearby/NearbyManager.java
index b2ea044a4c..b5dcd548c7 100644
--- a/nearby/framework/java/android/nearby/NearbyManager.java
+++ b/nearby/framework/java/android/nearby/NearbyManager.java
@@ -290,27 +290,25 @@ public class NearbyManager {
     /**
      * Read from {@link Settings} whether Fast Pair scan is enabled.
      *
-     * @param context either activity or application context for caller to query the setting
-     * @return whether the Fast Pair scan is enabled
-     * @throws NullPointerException if {@code context} is {@code null}
+     * @param context the {@link Context} to query the setting
+     * @return whether the Fast Pair is enabled
+     * @hide
      */
-    public static boolean isFastPairScanEnabled(@NonNull Context context) {
-        Objects.requireNonNull(context);
+    public static boolean getFastPairScanEnabled(@NonNull Context context) {
         final int enabled = Settings.Secure.getInt(
                 context.getContentResolver(), FAST_PAIR_SCAN_ENABLED, 0);
         return enabled != 0;
     }
 
     /**
-     * Write into {@link Settings} whether Fast Pair scan is enabled.
+     * Write into {@link Settings} whether Fast Pair scan is enabled
      *
-     * @param context either activity or application context, for caller to set the setting
+     * @param context the {@link Context} to set the setting
      * @param enable whether the Fast Pair scan should be enabled
-     * @throws NullPointerException if {@code context} is {@code null}
+     * @hide
      */
     @RequiresPermission(Manifest.permission.WRITE_SECURE_SETTINGS)
     public static void setFastPairScanEnabled(@NonNull Context context, boolean enable) {
-        Objects.requireNonNull(context);
         Settings.Secure.putInt(
                 context.getContentResolver(), FAST_PAIR_SCAN_ENABLED, enable ? 1 : 0);
         Log.v(TAG, String.format(
diff --git a/nearby/service/java/com/android/server/nearby/fastpair/FastPairManager.java b/nearby/service/java/com/android/server/nearby/fastpair/FastPairManager.java
index 1ef98e50b8..c00f22da0d 100644
--- a/nearby/service/java/com/android/server/nearby/fastpair/FastPairManager.java
+++ b/nearby/service/java/com/android/server/nearby/fastpair/FastPairManager.java
@@ -231,7 +231,7 @@ public class FastPairManager {
                 mIntentFilter, Context.RECEIVER_EXPORTED);
 
         // Default false for now.
-        mScanEnabled = NearbyManager.isFastPairScanEnabled(mLocatorContextWrapper.getContext());
+        mScanEnabled = NearbyManager.getFastPairScanEnabled(mLocatorContextWrapper.getContext());
         registerFastPairScanChangeContentObserver(mLocatorContextWrapper.getContentResolver());
     }
 
@@ -435,15 +435,12 @@ public class FastPairManager {
     }
 
     private void registerFastPairScanChangeContentObserver(ContentResolver resolver) {
-        if (mFastPairScanChangeContentObserver != null) {
-            unregisterFastPairScanChangeContentObserver(resolver);
-        }
         mFastPairScanChangeContentObserver = new ContentObserver(ForegroundThread.getHandler()) {
             @Override
             public void onChange(boolean selfChange, Uri uri) {
                 super.onChange(selfChange, uri);
                 setScanEnabled(
-                        NearbyManager.isFastPairScanEnabled(mLocatorContextWrapper.getContext()));
+                        NearbyManager.getFastPairScanEnabled(mLocatorContextWrapper.getContext()));
             }
         };
         try {
@@ -456,15 +453,6 @@ public class FastPairManager {
         }
     }
 
-    private void unregisterFastPairScanChangeContentObserver(ContentResolver resolver) {
-        try {
-            resolver.unregisterContentObserver(mFastPairScanChangeContentObserver);
-            mFastPairScanChangeContentObserver = null;
-        } catch (SecurityException | NullPointerException | IllegalArgumentException e) {
-            Log.w(TAG, "Failed to unregister FastPairScanChange content observer.", e);
-        }
-    }
-
     /**
      * Processed task in a background thread
      */
diff --git a/nearby/tests/cts/fastpair/src/android/nearby/cts/NearbyManagerTest.java b/nearby/tests/cts/fastpair/src/android/nearby/cts/NearbyManagerTest.java
index 90a721e647..9ed1e8309a 100644
--- a/nearby/tests/cts/fastpair/src/android/nearby/cts/NearbyManagerTest.java
+++ b/nearby/tests/cts/fastpair/src/android/nearby/cts/NearbyManagerTest.java
@@ -169,9 +169,9 @@ public class NearbyManagerTest {
     @SdkSuppress(minSdkVersion = 32, codeName = "T")
     public void setFastPairScanEnabled() {
         mNearbyManager.setFastPairScanEnabled(mContext, true);
-        assertThat(mNearbyManager.isFastPairScanEnabled(mContext)).isTrue();
+        assertThat(mNearbyManager.getFastPairScanEnabled(mContext)).isTrue();
         mNearbyManager.setFastPairScanEnabled(mContext, false);
-        assertThat(mNearbyManager.isFastPairScanEnabled(mContext)).isFalse();
+        assertThat(mNearbyManager.getFastPairScanEnabled(mContext)).isFalse();
     }
 
     @Test