diff --git a/core/java/android/location/Location.java b/core/java/android/location/Location.java
index fd3e5a22e969e..fea7bc9315bd7 100644
--- a/core/java/android/location/Location.java
+++ b/core/java/android/location/Location.java
@@ -28,6 +28,7 @@ import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.SystemClock;
+import android.os.SystemProperties;
 import android.util.Printer;
 import android.util.TimeUtils;
 
@@ -805,6 +806,13 @@ public class Location implements Parcelable {
      * @see LocationManager#addTestProvider
      */
     public boolean isMock() {
+        // Check if mock location override is enabled via Settings
+        boolean overrideMockDetection = SystemProperties.getBoolean(
+            "persist.sys.override_mock_location", false);
+        
+        if (overrideMockDetection) {
+            return false;
+        }
         return (mFieldsMask & HAS_MOCK_PROVIDER_MASK) != 0;
     }
 
diff --git a/services/core/java/com/android/server/OnlineConfigObserver.java b/services/core/java/com/android/server/OnlineConfigObserver.java
index db5586501a2ae..cad8c58c23746 100644
--- a/services/core/java/com/android/server/OnlineConfigObserver.java
+++ b/services/core/java/com/android/server/OnlineConfigObserver.java
@@ -44,7 +44,7 @@ public class OnlineConfigObserver {
     private static final boolean DEBUG = false;
 
     private static final String CONFIG_URL =
-            "https://raw.githubusercontent.com/Lunaris-AOSP/system_config/refs/heads/16/lunaris.json";
+            "https://raw.githubusercontent.com/Mist-OS-Staging/system_config/refs/heads/4.3/mist.json";
 
     private static final long CONFIG_INTERVAL_MS = 60000;