diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index fb1ae52..b343f20 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -19,12 +19,10 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_ripcurrent_fullmte.mk \
     $(LOCAL_DIR)/factory_ripcurrent.mk \
     $(LOCAL_DIR)/aosp_husky.mk \
-    $(LOCAL_DIR)/aosp_husky_61_pgagnostic.mk \
     $(LOCAL_DIR)/aosp_husky_fullmte.mk \
     $(LOCAL_DIR)/aosp_husky_pgagnostic.mk \
     $(LOCAL_DIR)/factory_husky.mk \
     $(LOCAL_DIR)/aosp_shiba.mk \
-    $(LOCAL_DIR)/aosp_shiba_61_pgagnostic.mk \
     $(LOCAL_DIR)/aosp_shiba_fullmte.mk \
     $(LOCAL_DIR)/aosp_shiba_pgagnostic.mk \
     $(LOCAL_DIR)/factory_shiba.mk
diff --git a/audio/husky/config/audio_platform_configuration.xml b/audio/husky/config/audio_platform_configuration.xml
index 60f0be3..3c403c1 100644
--- a/audio/husky/config/audio_platform_configuration.xml
+++ b/audio/husky/config/audio_platform_configuration.xml
@@ -308,7 +308,7 @@
         <module libname="audio_waves_aoc.so" argu="Sink=SPK:1 ThermistorsName=VIRTUAL-SKIN-SPEAKER"/>
         <module libname="audio_cca_aoc.so" argu="UnsupportBands=48000 ExSharedBands=48000 VoIPMode=Dl"/>
         <module libname="audio_fortemedia_aoc.so" argu="MCPS_TABLE=y DL_CH=y VoIP_DLCHs=SPK:2,USB:2,BT:2 VoIP_Rate=32000 SHARED_MODULE=1130578253"/>
-        <module libname="audio_sounddose_aoc.so"/>
+        <module libname="audio_sounddose_aoc.so" argu="Blackbird,Condor=0,46.35,0.1950549451;54.6,57,0.98625"/>
         <module libname="liboffloadeffect.so"/>
         <module libname="audio_amcs_ext.so"/>
         <module libname="audio_bluenote_aoc.so"/>
diff --git a/audio/shiba/config/audio_platform_configuration.xml b/audio/shiba/config/audio_platform_configuration.xml
index 60f0be3..3c403c1 100644
--- a/audio/shiba/config/audio_platform_configuration.xml
+++ b/audio/shiba/config/audio_platform_configuration.xml
@@ -308,7 +308,7 @@
         <module libname="audio_waves_aoc.so" argu="Sink=SPK:1 ThermistorsName=VIRTUAL-SKIN-SPEAKER"/>
         <module libname="audio_cca_aoc.so" argu="UnsupportBands=48000 ExSharedBands=48000 VoIPMode=Dl"/>
         <module libname="audio_fortemedia_aoc.so" argu="MCPS_TABLE=y DL_CH=y VoIP_DLCHs=SPK:2,USB:2,BT:2 VoIP_Rate=32000 SHARED_MODULE=1130578253"/>
-        <module libname="audio_sounddose_aoc.so"/>
+        <module libname="audio_sounddose_aoc.so" argu="Blackbird,Condor=0,46.35,0.1950549451;54.6,57,0.98625"/>
         <module libname="liboffloadeffect.so"/>
         <module libname="audio_amcs_ext.so"/>
         <module libname="audio_bluenote_aoc.so"/>
diff --git a/conf/init.husky.rc b/conf/init.husky.rc
index 17b081e..ffd9bd8 100644
--- a/conf/init.husky.rc
+++ b/conf/init.husky.rc
@@ -68,6 +68,9 @@ on property:vendor.all.modules.ready=1
     chown system system /sys/bus/i2c/devices/0-0043/default/num_waves
     chown system system /sys/bus/i2c/devices/0-0043/default/f0_offset
     chown system system /sys/bus/i2c/devices/0-0043/default/owt_free_space
+    chown system system /sys/bus/i2c/devices/0-0043/default/braking_time_bank
+    chown system system /sys/bus/i2c/devices/0-0043/default/braking_time_index
+    chown system system /sys/bus/i2c/devices/0-0043/default/braking_time_ms
     chown system system /sys/bus/i2c/devices/0-0043/default/f0_comp_enable
     chown system system /sys/bus/i2c/devices/0-0043/default/redc_comp_enable
     chown system system /sys/bus/i2c/devices/0-0043/default/delay_before_stop_playback_us
diff --git a/conf/init.shiba.rc b/conf/init.shiba.rc
index 8c88141..b30f54f 100644
--- a/conf/init.shiba.rc
+++ b/conf/init.shiba.rc
@@ -62,6 +62,9 @@ on property:vendor.all.modules.ready=1
     chown system system /sys/bus/i2c/devices/0-0043/calibration/redc_stored
     chown system system /sys/bus/i2c/devices/0-0043/default/vibe_state
     chown system system /sys/bus/i2c/devices/0-0043/default/num_waves
+    chown system system /sys/bus/i2c/devices/0-0043/default/braking_time_bank
+    chown system system /sys/bus/i2c/devices/0-0043/default/braking_time_index
+    chown system system /sys/bus/i2c/devices/0-0043/default/braking_time_ms
     chown system system /sys/bus/i2c/devices/0-0043/default/f0_offset
     chown system system /sys/bus/i2c/devices/0-0043/default/owt_free_space
     chown system system /sys/bus/i2c/devices/0-0043/default/f0_comp_enable
diff --git a/device-husky.mk b/device-husky.mk
index 8e123ae..50a1582 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -31,9 +31,7 @@ ifeq ($(filter factory_husky, $(TARGET_PRODUCT)),)
     include device/google/shusky/uwb/uwb_calibration.mk
 endif
 
-DEVICE_PAGE_AGNOSTIC ?= $(if $(filter %_pgagnostic,$(TARGET_PRODUCT)),true,false)
-
-ifeq ($(DEVICE_PAGE_AGNOSTIC),true)
+ifeq ($(PRODUCT_BOOTS_16K),true)
 TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
 TARGET_KERNEL_DIR := $(RELEASE_KERNEL_HUSKY_DIR)/16kb
 TARGET_RW_FILE_SYSTEM_TYPE := ext4
@@ -304,16 +302,29 @@ include device/google/gs-common/gps/brcm/device.mk
 PRODUCT_COPY_FILES += \
        device/google/shusky/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer
 
+# Location
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+    PRODUCT_COPY_FILES += \
+        device/google/shusky/location/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
+        device/google/shusky/location/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
+    ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
+        PRODUCT_COPY_FILES += \
+            device/google/shusky/location/gps.6.1.xml.hk3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    else
         PRODUCT_COPY_FILES += \
-            device/google/shusky/location/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
-            device/google/shusky/location/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf \
             device/google/shusky/location/gps.xml.hk3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    endif
 else
+    PRODUCT_COPY_FILES += \
+        device/google/shusky/location/lhd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
+        device/google/shusky/location/scd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
+    ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
+        PRODUCT_COPY_FILES += \
+            device/google/shusky/location/gps_user.6.1.xml.hk3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    else
         PRODUCT_COPY_FILES += \
-            device/google/shusky/location/lhd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
-            device/google/shusky/location/scd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf \
             device/google/shusky/location/gps_user.xml.hk3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    endif
 endif
 
 # Set zram size
@@ -396,7 +407,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=27
+    ro.vendor.build.svn=32
 
 # WLC userdebug specific
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
diff --git a/device-shiba.mk b/device-shiba.mk
index 8da0637..f96a9a1 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -24,9 +24,7 @@ TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_SHIBA_DIR)/kernel-headers
 
 LOCAL_PATH := device/google/shusky
 
-DEVICE_PAGE_AGNOSTIC ?= $(if $(filter %_pgagnostic,$(TARGET_PRODUCT)),true,false)
-
-ifeq ($(DEVICE_PAGE_AGNOSTIC),true)
+ifeq ($(PRODUCT_BOOTS_16K),true)
 TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
 TARGET_KERNEL_DIR := $(RELEASE_KERNEL_SHIBA_DIR)/16kb
 TARGET_RW_FILE_SYSTEM_TYPE := ext4
@@ -287,16 +285,29 @@ include device/google/gs-common/gps/brcm/device.mk
 PRODUCT_COPY_FILES += \
        device/google/shusky/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer
 
+# Location
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+    PRODUCT_COPY_FILES += \
+        device/google/shusky/location/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
+        device/google/shusky/location/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
+    ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
+        PRODUCT_COPY_FILES += \
+            device/google/shusky/location/gps.6.1.xml.sb3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    else
         PRODUCT_COPY_FILES += \
-            device/google/shusky/location/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
-            device/google/shusky/location/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf \
             device/google/shusky/location/gps.xml.sb3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    endif
 else
+    PRODUCT_COPY_FILES += \
+        device/google/shusky/location/lhd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
+        device/google/shusky/location/scd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
+    ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
+        PRODUCT_COPY_FILES += \
+            device/google/shusky/location/gps_user.6.1.xml.sb3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    else
         PRODUCT_COPY_FILES += \
-            device/google/shusky/location/lhd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
-            device/google/shusky/location/scd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf \
             device/google/shusky/location/gps_user.xml.sb3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    endif
 endif
 
 # Set zram size
@@ -373,7 +384,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=27
+    ro.vendor.build.svn=32
 
 # P23 Devices no longer need rlsservice
 PRODUCT_VENDOR_PROPERTIES += \
diff --git a/location/gps.6.1.xml.hk3 b/location/gps.6.1.xml.hk3
new file mode 100644
index 0000000..beba2bb
--- /dev/null
+++ b/location/gps.6.1.xml.hk3
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
+  <hal
+       PortName="/dev/ttyBCM"
+       BaudRate="921600"
+       GpioNStdbyPath="/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby"
+       CustGpioDelayMs="250"
+       LogEnabled="true"
+       Log="JAVA"
+       SecondaryConfigPath="/data/vendor/gps/overlay/gps_overlay.xml"
+       LogDirectory="/sdcard/gps/broadcom/storage/"
+       CtrlPipe="/data/vendor/gps/glgpsctrl"
+       NmeaOutName="/data/vendor/gps/nmea_out"
+
+       acSuplServer="supl.google.com"
+       SuplPort="7275"
+       SuplLogEnable="true"
+       SuplLogFullName="/data/vendor/gps/suplflow.txt"
+       tlsEnable="true"
+
+       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplEnable="true"
+       SuplUseApn="false"
+       SuplUseApnNI="true"
+       SuplUseFwCellInfo="false"
+       SuplDummyCellInfo ="true"
+       SuplTlsCertDirPath="/etc/security/cacerts"
+       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
+       SuplUT1Seconds="20"
+       SuplUT2Seconds="20"
+       SuplUT3Seconds="20"
+       TcpConnectionTimeout="20"
+       SuplLppCapable="true"
+       SuplEcidCapable="true"
+       SuplVersion="2"
+       SuplMinorVersion="0"
+       SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
+       SuplGlonassCapable = "true"
+       SuplGalileoCapable = "true"
+       SuplBdsCapable = "true"
+       SuplMgpsCapable = "true"
+
+       RtoEnable="true"
+       RtiEnable="true"
+       HttpSyncLto="true"
+       LtoFileName="lto2.dat"
+       LtoDir="/data/vendor/gps/"
+       LtoSyncThresholdDays="1"
+
+       GnssYearOfHardware="2020"
+       CpGuardTimeSec="2"
+       CpLppGuardTimeSec="2"
+       IgnoreInjectedSystemTime="true"
+
+       AttributionAppPkgName="com.google.android.carrierlocation"
+
+       AssertEnabled="true"
+       CpLppeCancelDbhOnAgnssProvideLoc="true"
+       CpLppeUseAgnssLocForEmptyDbh="true"
+       CpLppHighAccuracyShapeMode="1"
+       ReAidingOnHotStart="false"
+       ReAidingIntervalSec="3600"
+       RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/devices/platform/bbd_pps/pps_assert"
+       MaxThreadNum="13"
+       SensorsMask="0x244"
+  />
+
+  <gll
+       PpsEnable="true"
+       LogPriMask="LOG_INFO"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+       FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
+       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
+       MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
+       RfType="GL_RF_4776_BRCM"
+       ExtL5Bias="10.5"
+
+       WarmStandbyTimeout1Seconds="10"
+       WarmStandbyTimeout2Seconds="15"
+
+       EnableGnssPropagateInStandby="true"
+
+       RfPathLossDb_Ap="3.51"
+       RfPathLossDb_Cp="3.51"
+       RfPathLossDb_Ap_L5="4.01"
+       RfPathLossDb_Cp_L5="4.01"
+       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
+
+       EnableOnChipStopNotification="2"
+       PowerMode="3"
+       MinGpsWeekNumber="2216"
+       OnChipAccMask="50"
+
+       EnableB1C="false"
+       EnableCoex="true"
+
+       RTICacheTimeoutSec="3600"
+  />
+
+  <gll_features
+       EnableNicAutoSwitch="true"
+       EnableNavic="true"
+  />
+
+</glgps>
+
diff --git a/location/gps.6.1.xml.sb3 b/location/gps.6.1.xml.sb3
new file mode 100644
index 0000000..fe5065b
--- /dev/null
+++ b/location/gps.6.1.xml.sb3
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
+  <hal
+       PortName="/dev/ttyBCM"
+       BaudRate="921600"
+       GpioNStdbyPath="/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby"
+       CustGpioDelayMs="250"
+       LogEnabled="true"
+       Log="JAVA"
+       SecondaryConfigPath="/data/vendor/gps/overlay/gps_overlay.xml"
+       LogDirectory="/sdcard/gps/broadcom/storage/"
+       CtrlPipe="/data/vendor/gps/glgpsctrl"
+       NmeaOutName="/data/vendor/gps/nmea_out"
+
+       acSuplServer="supl.google.com"
+       SuplPort="7275"
+       SuplLogEnable="true"
+       SuplLogFullName="/data/vendor/gps/suplflow.txt"
+       tlsEnable="true"
+
+       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplEnable="true"
+       SuplUseApn="false"
+       SuplUseApnNI="true"
+       SuplUseFwCellInfo="false"
+       SuplDummyCellInfo ="true"
+       SuplTlsCertDirPath="/etc/security/cacerts"
+       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
+       SuplUT1Seconds="20"
+       SuplUT2Seconds="20"
+       SuplUT3Seconds="20"
+       TcpConnectionTimeout="20"
+       SuplLppCapable="true"
+       SuplEcidCapable="true"
+       SuplVersion="2"
+       SuplMinorVersion="0"
+       SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
+       SuplGlonassCapable = "true"
+       SuplGalileoCapable = "true"
+       SuplBdsCapable = "true"
+       SuplMgpsCapable = "true"
+
+       RtoEnable="true"
+       RtiEnable="true"
+       HttpSyncLto="true"
+       LtoFileName="lto2.dat"
+       LtoDir="/data/vendor/gps/"
+       LtoSyncThresholdDays="1"
+
+       GnssYearOfHardware="2020"
+       CpGuardTimeSec="2"
+       CpLppGuardTimeSec="2"
+       IgnoreInjectedSystemTime="true"
+
+       AttributionAppPkgName="com.google.android.carrierlocation"
+
+       AssertEnabled="true"
+       CpLppeCancelDbhOnAgnssProvideLoc="true"
+       CpLppeUseAgnssLocForEmptyDbh="true"
+       CpLppHighAccuracyShapeMode="1"
+       ReAidingOnHotStart="false"
+       ReAidingIntervalSec="3600"
+       RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/devices/platform/bbd_pps/pps_assert"
+       MaxThreadNum="13"
+       SensorsMask="0x244"
+  />
+
+  <gll
+       PpsEnable="true"
+       LogPriMask="LOG_INFO"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+       FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
+       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
+       MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
+       RfType="GL_RF_4776_BRCM"
+       ExtL5Bias="11.3"
+
+       WarmStandbyTimeout1Seconds="10"
+       WarmStandbyTimeout2Seconds="15"
+
+       EnableGnssPropagateInStandby="true"
+
+       RfPathLossDb_Ap="3.4"
+       RfPathLossDb_Cp="3.4"
+       RfPathLossDb_Ap_L5="4"
+       RfPathLossDb_Cp_L5="4"
+       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
+
+       EnableOnChipStopNotification="2"
+       PowerMode="3"
+       MinGpsWeekNumber="2216"
+       OnChipAccMask="50"
+
+       EnableB1C="false"
+       EnableCoex="true"
+
+       RTICacheTimeoutSec="3600"
+  />
+
+  <gll_features
+       EnableNicAutoSwitch="true"
+       EnableNavic="true"
+  />
+
+</glgps>
+
diff --git a/location/gps_user.6.1.xml.hk3 b/location/gps_user.6.1.xml.hk3
new file mode 100644
index 0000000..a6ddbce
--- /dev/null
+++ b/location/gps_user.6.1.xml.hk3
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
+  <hal
+       PortName="/dev/ttyBCM"
+       BaudRate="921600"
+       GpioNStdbyPath="/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby"
+       CustGpioDelayMs="250"
+       LogEnabled="false"
+       Log="JAVA"
+       LogDirectory="/sdcard/gps/broadcom/storage/"
+       CtrlPipe="/data/vendor/gps/glgpsctrl"
+       NmeaOutName="/data/vendor/gps/nmea_out"
+
+       acSuplServer="supl.google.com"
+       SuplPort="7275"
+       SuplLogEnable="false"
+       SuplLogFullName="/data/vendor/gps/suplflow.txt"
+       tlsEnable="true"
+
+       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplEnable="true"
+       SuplUseApn="false"
+       SuplUseApnNI="true"
+       SuplUseFwCellInfo="false"
+       SuplDummyCellInfo ="true"
+       SuplTlsCertDirPath="/etc/security/cacerts"
+       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
+       SuplUT1Seconds="20"
+       SuplUT2Seconds="20"
+       SuplUT3Seconds="20"
+       TcpConnectionTimeout="20"
+       SuplLppCapable="true"
+       SuplEcidCapable="true"
+       SuplVersion="2"
+       SuplMinorVersion="0"
+       SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
+       SuplGlonassCapable = "true"
+       SuplGalileoCapable = "true"
+       SuplBdsCapable = "true"
+       SuplMgpsCapable = "true"
+
+       RtoEnable="true"
+       RtiEnable="true"
+       HttpSyncLto="true"
+       LtoFileName="lto2.dat"
+       LtoDir="/data/vendor/gps/"
+       LtoSyncThresholdDays="1"
+
+       GnssYearOfHardware="2020"
+       CpGuardTimeSec="2"
+       CpLppGuardTimeSec="2"
+       IgnoreInjectedSystemTime="true"
+
+       AttributionAppPkgName="com.google.android.carrierlocation"
+
+       AssertEnabled="false"
+       CpLppeCancelDbhOnAgnssProvideLoc="true"
+       CpLppeUseAgnssLocForEmptyDbh="true"
+       CpLppHighAccuracyShapeMode="1"
+       ReAidingOnHotStart="false"
+       ReAidingIntervalSec="3600"
+       RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/devices/platform/bbd_pps/pps_assert"
+       MaxThreadNum="13"
+       SensorsMask="0x244"
+  />
+
+  <gll
+       PpsEnable="true"
+       LogPriMask="LOG_INFO"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+       FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
+       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
+       MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
+       RfType="GL_RF_4776_BRCM"
+       ExtL5Bias="10.5"
+
+       WarmStandbyTimeout1Seconds="10"
+       WarmStandbyTimeout2Seconds="15"
+
+       EnableGnssPropagateInStandby="true"
+
+       RfPathLossDb_Ap="3.51"
+       RfPathLossDb_Cp="3.51"
+       RfPathLossDb_Ap_L5="4.01"
+       RfPathLossDb_Cp_L5="4.01"
+       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
+
+       EnableOnChipStopNotification="0"
+       PowerMode="3"
+       MinGpsWeekNumber="2216"
+       OnChipAccMask="50"
+
+       EnableB1C="false"
+       EnableCoex="true"
+
+       RTICacheTimeoutSec="3600"
+  />
+
+  <gll_features
+       EnableNicAutoSwitch="true"
+       EnableNavic="true"
+  />
+
+</glgps>
+
diff --git a/location/gps_user.6.1.xml.sb3 b/location/gps_user.6.1.xml.sb3
new file mode 100644
index 0000000..4248a7b
--- /dev/null
+++ b/location/gps_user.6.1.xml.sb3
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
+  <hal
+       PortName="/dev/ttyBCM"
+       BaudRate="921600"
+       GpioNStdbyPath="/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby"
+       CustGpioDelayMs="250"
+       LogEnabled="false"
+       Log="JAVA"
+       LogDirectory="/sdcard/gps/broadcom/storage/"
+       CtrlPipe="/data/vendor/gps/glgpsctrl"
+       NmeaOutName="/data/vendor/gps/nmea_out"
+
+       acSuplServer="supl.google.com"
+       SuplPort="7275"
+       SuplLogEnable="false"
+       SuplLogFullName="/data/vendor/gps/suplflow.txt"
+       tlsEnable="true"
+
+       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplEnable="true"
+       SuplUseApn="false"
+       SuplUseApnNI="true"
+       SuplUseFwCellInfo="false"
+       SuplDummyCellInfo ="true"
+       SuplTlsCertDirPath="/etc/security/cacerts"
+       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
+       SuplUT1Seconds="20"
+       SuplUT2Seconds="20"
+       SuplUT3Seconds="20"
+       TcpConnectionTimeout="20"
+       SuplLppCapable="true"
+       SuplEcidCapable="true"
+       SuplVersion="2"
+       SuplMinorVersion="0"
+       SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
+       SuplGlonassCapable = "true"
+       SuplGalileoCapable = "true"
+       SuplBdsCapable = "true"
+       SuplMgpsCapable = "true"
+
+       RtoEnable="true"
+       RtiEnable="true"
+       HttpSyncLto="true"
+       LtoFileName="lto2.dat"
+       LtoDir="/data/vendor/gps/"
+       LtoSyncThresholdDays="1"
+
+       GnssYearOfHardware="2020"
+       CpGuardTimeSec="2"
+       CpLppGuardTimeSec="2"
+       IgnoreInjectedSystemTime="true"
+
+       AttributionAppPkgName="com.google.android.carrierlocation"
+
+       AssertEnabled="false"
+       CpLppeCancelDbhOnAgnssProvideLoc="true"
+       CpLppeUseAgnssLocForEmptyDbh="true"
+       CpLppHighAccuracyShapeMode="1"
+       ReAidingOnHotStart="false"
+       ReAidingIntervalSec="3600"
+       RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/devices/platform/bbd_pps/pps_assert"
+       MaxThreadNum="13"
+       SensorsMask="0x244"
+  />
+
+  <gll
+       PpsEnable="true"
+       LogPriMask="LOG_INFO"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+       FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
+       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
+       MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
+       RfType="GL_RF_4776_BRCM"
+       ExtL5Bias="11.3"
+
+       WarmStandbyTimeout1Seconds="10"
+       WarmStandbyTimeout2Seconds="15"
+
+       EnableGnssPropagateInStandby="true"
+
+       RfPathLossDb_Ap="3.4"
+       RfPathLossDb_Cp="3.4"
+       RfPathLossDb_Ap_L5="4"
+       RfPathLossDb_Cp_L5="4"
+       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
+
+       EnableOnChipStopNotification="0"
+       PowerMode="3"
+       MinGpsWeekNumber="2216"
+       OnChipAccMask="50"
+
+       EnableB1C="false"
+       EnableCoex="true"
+
+       RTICacheTimeoutSec="3600"
+  />
+
+  <gll_features
+       EnableNicAutoSwitch="true"
+       EnableNavic="true"
+  />
+
+</glgps>
+
diff --git a/location/lhd.conf b/location/lhd.conf
index c430b93..a0183a4 100644
--- a/location/lhd.conf
+++ b/location/lhd.conf
@@ -31,3 +31,4 @@ SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf
 
 SkipSensorWakeLock=true
 LoggerWakeLockEnable=false
+PpsEnable=true
diff --git a/location/lhd_user.conf b/location/lhd_user.conf
index 73e03bc..d861fec 100644
--- a/location/lhd_user.conf
+++ b/location/lhd_user.conf
@@ -29,3 +29,4 @@ TrafficLogEnabled=false
 
 SkipSensorWakeLock=true
 LoggerWakeLockEnable=false
+PpsEnable=true
diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json
index b944c9c..1c29123 100644
--- a/perf/powerhint-husky.json
+++ b/perf/powerhint-husky.json
@@ -718,7 +718,7 @@
       "Values": [
         "50",
         "30",
-        "20",
+        "23",
         "18"
       ],
       "DefaultIndex": 0
@@ -1891,7 +1891,7 @@
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PMU_MID_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "20"
+      "Value": "23"
     },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json
index f5f1ca1..48af0bb 100644
--- a/perf/powerhint-ripcurrent.json
+++ b/perf/powerhint-ripcurrent.json
@@ -764,7 +764,7 @@
       "Values": [
         "50",
         "30",
-        "20",
+        "23",
         "18"
       ],
       "DefaultIndex": 0
@@ -1740,7 +1740,7 @@
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PMU_MID_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "20"
+      "Value": "23"
     },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json
index c9ca7d2..fb000e1 100644
--- a/perf/powerhint-shiba.json
+++ b/perf/powerhint-shiba.json
@@ -718,7 +718,7 @@
       "Values": [
         "50",
         "30",
-        "20",
+        "23",
         "18"
       ],
       "DefaultIndex": 0
@@ -1795,7 +1795,7 @@
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PMU_MID_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "20"
+      "Value": "23"
     },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json
index b08761a..d25340f 100644
--- a/thermal/thermal_info_config_husky.json
+++ b/thermal/thermal_info_config_husky.json
@@ -327,10 +327,6 @@
             "PollingDelay":300000,
             "PassiveDelay":7000,
             "BindedCdevInfo": [
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 2, 3, 4, 5, 5, 5]
-                },
                 {
                     "CdevRequest": "gxp-cooling",
                     "LimitInfo": [0, 0, 0, 0, 0, 6, 6]
@@ -603,7 +599,7 @@
             ]
         },
         {
-            "Name":"VIRTUAL-SKIN-CPU-GPU",
+            "Name":"VIRTUAL-SKIN-SOC",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
@@ -623,7 +619,7 @@
                 "K_D":["NaN", "NaN", "NaN", 0, "NaN", "NaN", "NaN"],
                 "I_Max":["NaN", "NaN", "NaN", 2600, "NaN", "NaN", "NaN"],
                 "S_Power":["NaN", "NaN", "NaN", 800, "NaN", "NaN", "NaN"],
-                "MinAllocPower":["NaN", "NaN", "NaN", 0, "NaN", "NaN", "NaN"],
+                "MinAllocPower":["NaN", "NaN", "NaN", 800, "NaN", "NaN", "NaN"],
                 "MaxAllocPower":["NaN", "NaN", "NaN", 3900, "NaN", "NaN", "NaN"],
                 "I_Cutoff":["NaN", "NaN", "NaN", 8, "NaN", "NaN", "NaN"]
             },
@@ -663,6 +659,15 @@
                     "BindedPowerRail": "S2S_VDD_G3D",
                     "CdevCeiling": [0, 8, 8, 8, 9, 11, 11],
                     "LimitInfo": [0, 0, 0, 0, 0, 11, 11]
+                },
+                {
+                    "CdevRequest": "tpu_cooling",
+                    "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
+                    "MaxReleaseStep": 1,
+                    "MaxThrottleStep": 1,
+                    "BindedPowerRail": "S7M_VDD_TPU",
+                    "CdevCeiling": [0, 7, 7, 7, 7, 7, 7],
+                    "LimitInfo": [0, 0, 0, 0, 0, 7, 7]
                 }
             ]
         },
@@ -1138,6 +1143,11 @@
             "PowerSampleDelay":7000,
             "PowerSampleCount":1
         },
+        {
+            "Name":"S7M_VDD_TPU",
+            "PowerSampleDelay":7000,
+            "PowerSampleCount":1
+        },
         {
             "Name":"PARTIAL_SYSTEM_POWER",
             "VirtualRails":true,
diff --git a/thermal/thermal_info_config_shiba.json b/thermal/thermal_info_config_shiba.json
index bc6bdf1..a46f42e 100644
--- a/thermal/thermal_info_config_shiba.json
+++ b/thermal/thermal_info_config_shiba.json
@@ -295,10 +295,6 @@
             "PollingDelay":300000,
             "PassiveDelay":7000,
             "BindedCdevInfo": [
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 2, 3, 4, 5, 5, 5]
-                },
                 {
                     "CdevRequest": "gxp-cooling",
                     "LimitInfo": [0, 0, 0, 0, 0, 6, 6]
@@ -571,7 +567,7 @@
             ]
         },
         {
-            "Name":"VIRTUAL-SKIN-CPU-GPU",
+            "Name":"VIRTUAL-SKIN-SOC",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
@@ -591,7 +587,7 @@
                 "K_D":["NaN", "NaN", "NaN", 0, "NaN", "NaN", "NaN"],
                 "I_Max":["NaN", "NaN", "NaN", 2600, "NaN", "NaN", "NaN"],
                 "S_Power":["NaN", "NaN", "NaN", 800, "NaN", "NaN", "NaN"],
-                "MinAllocPower":["NaN", "NaN", "NaN", 0, "NaN", "NaN", "NaN"],
+                "MinAllocPower":["NaN", "NaN", "NaN", 800, "NaN", "NaN", "NaN"],
                 "MaxAllocPower":["NaN", "NaN", "NaN", 3900, "NaN", "NaN", "NaN"],
                 "I_Cutoff":["NaN", "NaN", "NaN", 8, "NaN", "NaN", "NaN"]
             },
@@ -631,6 +627,15 @@
                     "BindedPowerRail": "S2S_VDD_G3D",
                     "CdevCeiling": [0, 9, 9, 9, 9, 11, 11],
                     "LimitInfo": [0, 0, 0, 0, 0, 11, 11]
+                },
+                {
+                    "CdevRequest": "tpu_cooling",
+                    "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
+                    "MaxReleaseStep": 1,
+                    "MaxThrottleStep": 1,
+                    "BindedPowerRail": "S7M_VDD_TPU",
+                    "CdevCeiling": [0, 7, 7, 7, 7, 7, 7],
+                    "LimitInfo": [0, 0, 0, 0, 0, 7, 7]
                 }
             ]
         },
@@ -1171,6 +1176,11 @@
             "PowerSampleDelay":7000,
             "PowerSampleCount":1
         },
+        {
+            "Name":"S7M_VDD_TPU",
+            "PowerSampleDelay":7000,
+            "PowerSampleCount":1
+        },
         {
             "Name":"PARTIAL_SYSTEM_POWER",
             "VirtualRails":true,