diff --git a/device-husky.mk b/device-husky.mk
index 92f889d..7ef9b87 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -352,7 +352,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=5
+    ro.vendor.build.svn=6
 
 # WLC userdebug specific
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
diff --git a/device-shiba.mk b/device-shiba.mk
index 820c1a1..e523ae0 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -333,7 +333,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=5
+    ro.vendor.build.svn=6
 
 # P23 Devices no longer need rlsservice
 PRODUCT_VENDOR_PROPERTIES += \
diff --git a/location/gps.xml b/location/gps.xml
index 7a6ce2c..774e206 100644
--- a/location/gps.xml
+++ b/location/gps.xml
@@ -58,7 +58,7 @@
        AssertEnabled="true"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
-       CpLppHighAccuracyShapeMode="2"
+       CpLppHighAccuracyShapeMode="1"
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
diff --git a/location/gps.xml.hk3 b/location/gps.xml.hk3
index 8ad70f0..2857dcf 100644
--- a/location/gps.xml.hk3
+++ b/location/gps.xml.hk3
@@ -58,7 +58,7 @@
        AssertEnabled="true"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
-       CpLppHighAccuracyShapeMode="2"
+       CpLppHighAccuracyShapeMode="1"
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
diff --git a/location/gps.xml.sb3 b/location/gps.xml.sb3
index 1c42ca0..bceb407 100644
--- a/location/gps.xml.sb3
+++ b/location/gps.xml.sb3
@@ -58,7 +58,7 @@
        AssertEnabled="true"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
-       CpLppHighAccuracyShapeMode="2"
+       CpLppHighAccuracyShapeMode="1"
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
diff --git a/location/gps_user.xml b/location/gps_user.xml
index 9d42ff3..9f3bd02 100644
--- a/location/gps_user.xml
+++ b/location/gps_user.xml
@@ -57,7 +57,7 @@
        AssertEnabled="false"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
-       CpLppHighAccuracyShapeMode="2"
+       CpLppHighAccuracyShapeMode="1"
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
diff --git a/location/gps_user.xml.hk3 b/location/gps_user.xml.hk3
index 94f5955..8a1d2b3 100644
--- a/location/gps_user.xml.hk3
+++ b/location/gps_user.xml.hk3
@@ -57,7 +57,7 @@
        AssertEnabled="false"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
-       CpLppHighAccuracyShapeMode="2"
+       CpLppHighAccuracyShapeMode="1"
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
diff --git a/location/gps_user.xml.sb3 b/location/gps_user.xml.sb3
index f19e50f..f74bce6 100644
--- a/location/gps_user.xml.sb3
+++ b/location/gps_user.xml.sb3
@@ -57,7 +57,7 @@
        AssertEnabled="false"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
-       CpLppHighAccuracyShapeMode="2"
+       CpLppHighAccuracyShapeMode="1"
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"