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/device-husky.mk b/device-husky.mk
index 62608e8..aad692e 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -396,7 +396,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)))
@@ -472,3 +472,4 @@ $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modu
 endif
 
 PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
+PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true
diff --git a/device-shiba.mk b/device-shiba.mk
index f3b7e91..4965a07 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -373,7 +373,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=26
+    ro.vendor.build.svn=32
 
 # P23 Devices no longer need rlsservice
 PRODUCT_VENDOR_PROPERTIES += \
@@ -441,3 +441,4 @@ $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modu
 endif
 
 PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
+PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := 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,