diff --git a/configs/gps/gps_psds.conf b/configs/gps/gps_psds.conf
new file mode 100644
index 0000000000000000000000000000000000000000..29436722393093c8e48f028eebd1f4384001528f
--- /dev/null
+++ b/configs/gps/gps_psds.conf
@@ -0,0 +1,5 @@
+NTP_SERVER=north-america.pool.ntp.org
+XTRA_SERVER_1=https://glltos1.glpals.com/4day/v5/latest/lto2.dat
+XTRA_SERVER_2=https://glltos2.glpals.com/4day/v5/latest/lto2.dat
+SUPL_HOST=supl.google.com
+SUPL_PORT=7275
diff --git a/device-common.mk b/device-common.mk
index fab92c63944b1a567b1f203540e97f9b2027cbba..1dd3fdd76efc200914849ffeeb4e45f681c00515 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -128,6 +128,10 @@ PRODUCT_PACKAGES += \
     android.hardware.graphics.composer@2.2-service \
     android.hardware.graphics.mapper@2.0-impl
 
+# GPS
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/configs/gps/gps_psds.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/gps_psds.conf
+
 # Health
 PRODUCT_PACKAGES += \
     android.hardware.health@2.0-impl \
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index c90e855d171ca23c96bc61cc105b024455363ef1..d8cb44ab6eb06f3c2e90ffc1f820d7ae57202148 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -247,8 +247,11 @@ Add a comment to this line
     
 <!-- Values for GPS configuration -->
     <string-array translatable="false" name="config_gpsParameters">
+        <item>SUPL_HOST=supl.google.com</item>
+        <item>SUPL_PORT=7275</item>
         <item>XTRA_SERVER_1=https://glltos1.glpals.com/4day/v5/latest/lto2.dat</item>
         <item>XTRA_SERVER_2=https://glltos2.glpals.com/4day/v5/latest/lto2.dat</item>
+        <item>NTP_SERVER=north-america.pool.ntp.org</item>
     </string-array>
 
     <!-- List of biometric sensors on the device, in decreasing strength. Consumed by AuthService
diff --git a/ramdisk/etc/init.samsungexynos8895.rc b/ramdisk/etc/init.samsungexynos8895.rc
index a694d366a4085a01ea8e5668ef0bcdf264cd482a..6cf892936c4a796d94f9b6e0ade8eadc9676458c 100644
--- a/ramdisk/etc/init.samsungexynos8895.rc
+++ b/ramdisk/etc/init.samsungexynos8895.rc
@@ -39,6 +39,8 @@ on post-fs-data
    exec u:r:vendor_toolbox:s0 -- /vendor/bin/toybox_vendor find /data/vendor -type d \
         -exec /vendor/bin/toybox_vendor setfattr -x security.sehash {} \;
    restorecon_recursive /data/vendor
+    # GnssConfiguration doesn't actually look at gps.conf, just the debug file
+    mount none /system/etc/gps.conf /system/etc/gps_debug.conf bind
 
 # setup cgroup freezer for freecess
     mkdir /dev/freezer
diff --git a/sepolicy/vendor/init.te b/sepolicy/vendor/init.te
index 3d07b86aaaa03407088eb2b78048669d91dc56d0..64b542f3df9eb531c0cc106fd963aed9a5d197ad 100644
--- a/sepolicy/vendor/init.te
+++ b/sepolicy/vendor/init.te
@@ -56,3 +56,6 @@ allow init hidl_base_hwservice:hwservice_manager add;
 allow init hwservicemanager:binder transfer;
 
 unix_socket_connect(init, property, rild)
+
+# Allow init to bind mount over system files
+allow init system_file:file mounton;