diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index 45e52ff1..1a9859c6 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -83,10 +83,6 @@ on init
     write /sys/block/zram0/comp_algorithm lz77eh
     write /proc/sys/vm/page-cluster 0
 
-    # Page Pinner dumping at bugreport
-    chown system system /sys/kernel/debug/page_pinner/longterm_pinner
-    chown system system /sys/kernel/debug/page_pinner/alloc_contig_failed
-
     # Some user code relies on ro.boot.hardware.revision
     setprop ro.boot.hardware.revision ${ro.revision}
 
diff --git a/device.mk b/device.mk
index cef5b0c8..1a30d960 100644
--- a/device.mk
+++ b/device.mk
@@ -831,6 +831,10 @@ PRODUCT_USE_DYNAMIC_PARTITIONS := true
 PRODUCT_PRODUCT_PROPERTIES += \
 	persist.sys.fuse.passthrough.enable=true
 
+# Force disable of FUSE BPF
+PRODUCT_PRODUCT_PROPERTIES += \
+	persist.sys.fuse.bpf.enable=false
+
 # Use /product/etc/fstab.postinstall to mount system_other
 PRODUCT_PRODUCT_PROPERTIES += \
 	ro.postinstall.fstab.prefix=/product
diff --git a/gnss/47765/config/gps.xml b/gnss/47765/config/gps.xml
index 0cb80edf..2c5657cf 100644
--- a/gnss/47765/config/gps.xml
+++ b/gnss/47765/config/gps.xml
@@ -54,6 +54,8 @@
        AssertEnabled="true"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
+       ReAidingOnHotStart="false"
+       ReAidingIntervalSec="1200"
   />
 
   <gll
diff --git a/gnss/47765/config/gps.xml.oriole b/gnss/47765/config/gps.xml.oriole
index 0fec87dc..117f52a4 100644
--- a/gnss/47765/config/gps.xml.oriole
+++ b/gnss/47765/config/gps.xml.oriole
@@ -54,6 +54,8 @@
        AssertEnabled="true"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
+       ReAidingOnHotStart="false"
+       ReAidingIntervalSec="1200"
   />
 
   <gll
diff --git a/gnss/47765/config/gps.xml.raven b/gnss/47765/config/gps.xml.raven
index 25ea8590..2a37eb86 100644
--- a/gnss/47765/config/gps.xml.raven
+++ b/gnss/47765/config/gps.xml.raven
@@ -54,6 +54,8 @@
        AssertEnabled="true"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
+       ReAidingOnHotStart="false"
+       ReAidingIntervalSec="1200"
   />
 
   <gll
diff --git a/gnss/47765/config/gps_user.xml b/gnss/47765/config/gps_user.xml
index f435fd79..d884819c 100644
--- a/gnss/47765/config/gps_user.xml
+++ b/gnss/47765/config/gps_user.xml
@@ -53,6 +53,8 @@
        AssertEnabled="false"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
+       ReAidingOnHotStart="false"
+       ReAidingIntervalSec="1200"
   />
 
   <gll
diff --git a/gnss/47765/config/gps_user.xml.oriole b/gnss/47765/config/gps_user.xml.oriole
index f701c005..cbcf337d 100644
--- a/gnss/47765/config/gps_user.xml.oriole
+++ b/gnss/47765/config/gps_user.xml.oriole
@@ -53,6 +53,8 @@
        AssertEnabled="false"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
+       ReAidingOnHotStart="false"
+       ReAidingIntervalSec="1200"
   />
 
   <gll
diff --git a/gnss/47765/config/gps_user.xml.raven b/gnss/47765/config/gps_user.xml.raven
index e5800db6..e12cb91b 100644
--- a/gnss/47765/config/gps_user.xml.raven
+++ b/gnss/47765/config/gps_user.xml.raven
@@ -53,6 +53,8 @@
        AssertEnabled="false"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
+       ReAidingOnHotStart="false"
+       ReAidingIntervalSec="1200"
   />
 
   <gll
diff --git a/radio/config/default.nprf b/radio/config/default.nprf
index 834613fe..e9b3199a 100644
Binary files a/radio/config/default.nprf and b/radio/config/default.nprf differ