diff --git a/conf/init.cheetah.rc b/conf/init.cheetah.rc
index 9ee3b38..48454c7 100644
--- a/conf/init.cheetah.rc
+++ b/conf/init.cheetah.rc
@@ -2,6 +2,10 @@
 import /vendor/etc/init/hw/init.gs201.rc
 import /vendor/etc/init/hw/init.pantah.rc
 
+on property:vendor.device.modules.ready=1
+    # Start the twoshay touch service
+    start twoshay
+
 on property:ro.boot.cdt_hwid=0x00030303000100010001000000000000
     setprop persist.vendor.nfc.config_file_name libnfc-hal-st-proto1.conf
 
diff --git a/conf/init.panther.rc b/conf/init.panther.rc
index 7aaa2b5..4ba6117 100644
--- a/conf/init.panther.rc
+++ b/conf/init.panther.rc
@@ -2,6 +2,10 @@
 import /vendor/etc/init/hw/init.gs201.rc
 import /vendor/etc/init/hw/init.pantah.rc
 
+on property:vendor.device.modules.ready=1
+    # Start the twoshay touch service
+    start twoshay
+
 # Toggle glove_mode according to touch_sensitivity_mode
 on property:persist.vendor.touch_sensitivity_mode=0 && property:sys.boot_completed=1
     write /proc/focaltech_touch/high_sensitivity 0
diff --git a/location/gps.xml b/location/gps.xml
index a7f09e8..d0fcfdb 100644
--- a/location/gps.xml
+++ b/location/gps.xml
@@ -20,7 +20,10 @@
 
        SuplSslMethod="SSLv23_NO_TLSv1_2"
        SuplEnable="true"
-       SuplUseApn="true"
+       SuplUseApn="false"
+       SuplUseApnNI="true"
+       SuplUseFwCellInfo="false"
+       SuplDummyCellInfo ="true"
        SuplTlsCertDirPath="/etc/security/cacerts"
        SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
        SuplUT1Seconds="20"
@@ -54,6 +57,8 @@
        AssertEnabled="true"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
+       ReAidingOnHotStart="false"
+       ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
   />
 
diff --git a/location/gps.xml.c10 b/location/gps.xml.c10
index 60b75d9..4d73818 100644
--- a/location/gps.xml.c10
+++ b/location/gps.xml.c10
@@ -20,7 +20,10 @@
 
        SuplSslMethod="SSLv23_NO_TLSv1_2"
        SuplEnable="true"
-       SuplUseApn="true"
+       SuplUseApn="false"
+       SuplUseApnNI="true"
+       SuplUseFwCellInfo="false"
+       SuplDummyCellInfo ="true"
        SuplTlsCertDirPath="/etc/security/cacerts"
        SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
        SuplUT1Seconds="20"
@@ -54,6 +57,8 @@
        AssertEnabled="true"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
+       ReAidingOnHotStart="false"
+       ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
   />
 
diff --git a/location/gps.xml.p10 b/location/gps.xml.p10
index 8088bb4..634e21d 100644
--- a/location/gps.xml.p10
+++ b/location/gps.xml.p10
@@ -20,7 +20,10 @@
 
        SuplSslMethod="SSLv23_NO_TLSv1_2"
        SuplEnable="true"
-       SuplUseApn="true"
+       SuplUseApn="false"
+       SuplUseApnNI="true"
+       SuplUseFwCellInfo="false"
+       SuplDummyCellInfo ="true"
        SuplTlsCertDirPath="/etc/security/cacerts"
        SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
        SuplUT1Seconds="20"
@@ -54,6 +57,8 @@
        AssertEnabled="true"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
+       ReAidingOnHotStart="false"
+       ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
   />
 
diff --git a/location/gps_user.xml b/location/gps_user.xml
index adb3ad7..266b53b 100644
--- a/location/gps_user.xml
+++ b/location/gps_user.xml
@@ -19,7 +19,10 @@
 
        SuplSslMethod="SSLv23_NO_TLSv1_2"
        SuplEnable="true"
-       SuplUseApn="true"
+       SuplUseApn="false"
+       SuplUseApnNI="true"
+       SuplUseFwCellInfo="false"
+       SuplDummyCellInfo ="true"
        SuplTlsCertDirPath="/etc/security/cacerts"
        SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
        SuplUT1Seconds="20"
@@ -53,6 +56,8 @@
        AssertEnabled="false"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
+       ReAidingOnHotStart="false"
+       ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
   />
 
diff --git a/location/gps_user.xml.c10 b/location/gps_user.xml.c10
index af5c307..7a60567 100644
--- a/location/gps_user.xml.c10
+++ b/location/gps_user.xml.c10
@@ -19,7 +19,10 @@
 
        SuplSslMethod="SSLv23_NO_TLSv1_2"
        SuplEnable="true"
-       SuplUseApn="true"
+       SuplUseApn="false"
+       SuplUseApnNI="true"
+       SuplUseFwCellInfo="false"
+       SuplDummyCellInfo ="true"
        SuplTlsCertDirPath="/etc/security/cacerts"
        SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
        SuplUT1Seconds="20"
@@ -53,6 +56,8 @@
        AssertEnabled="false"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
+       ReAidingOnHotStart="false"
+       ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
   />
 
diff --git a/location/gps_user.xml.p10 b/location/gps_user.xml.p10
index e7f8146..92526b5 100644
--- a/location/gps_user.xml.p10
+++ b/location/gps_user.xml.p10
@@ -19,7 +19,10 @@
 
        SuplSslMethod="SSLv23_NO_TLSv1_2"
        SuplEnable="true"
-       SuplUseApn="true"
+       SuplUseApn="false"
+       SuplUseApnNI="true"
+       SuplUseFwCellInfo="false"
+       SuplDummyCellInfo ="true"
        SuplTlsCertDirPath="/etc/security/cacerts"
        SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
        SuplUT1Seconds="20"
@@ -53,6 +56,8 @@
        AssertEnabled="false"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
+       ReAidingOnHotStart="false"
+       ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
   />