diff --git a/aosp_husky.mk b/aosp_husky.mk
index 3ea1b08..47cf99b 100644
--- a/aosp_husky.mk
+++ b/aosp_husky.mk
@@ -20,7 +20,7 @@ USE_SWIFTSHADER := true
 BOARD_USES_SWIFTSHADER := true
 
 $(call inherit-product, device/google/zuma/aosp_common.mk)
-$(call inherit-product, device/google/shusky/device-husky.mk)
+$(call inherit-product, device/google/shusky/husky_generic.mk)
 
 PRODUCT_NAME := aosp_husky
 PRODUCT_DEVICE := husky
diff --git a/aosp_ripcurrent.mk b/aosp_ripcurrent.mk
index 83322c4..4a6c484 100644
--- a/aosp_ripcurrent.mk
+++ b/aosp_ripcurrent.mk
@@ -20,7 +20,7 @@ USE_SWIFTSHADER := true
 BOARD_USES_SWIFTSHADER := true
 
 $(call inherit-product, device/google/zuma/aosp_common.mk)
-$(call inherit-product, device/google/shusky/device-ripcurrent.mk)
+$(call inherit-product, device/google/shusky/ripcurrent_generic.mk)
 
 PRODUCT_NAME := aosp_ripcurrent
 PRODUCT_DEVICE := ripcurrent
diff --git a/aosp_shiba.mk b/aosp_shiba.mk
index 04a59a7..f9ec72f 100644
--- a/aosp_shiba.mk
+++ b/aosp_shiba.mk
@@ -20,7 +20,7 @@ USE_SWIFTSHADER := true
 BOARD_USES_SWIFTSHADER := true
 
 $(call inherit-product, device/google/zuma/aosp_common.mk)
-$(call inherit-product, device/google/shusky/device-shiba.mk)
+$(call inherit-product, device/google/shusky/shiba_generic.mk)
 
 PRODUCT_NAME := aosp_shiba
 PRODUCT_DEVICE := shiba
diff --git a/device-husky.mk b/device-husky.mk
index 74346a7..fbb5e6c 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -113,7 +113,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # Enable Bluetooth AutoOn feature
 PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.server.automatic_turn_on=false
+    bluetooth.server.automatic_turn_on=true
 
 # Bluetooth Tx power caps
 PRODUCT_COPY_FILES += \
@@ -382,7 +382,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=25
+    ro.vendor.build.svn=27
 
 # WLC userdebug specific
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
diff --git a/device-shiba.mk b/device-shiba.mk
index 683410c..e5d6fcd 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -97,7 +97,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # Enable Bluetooth AutoOn feature
 PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.server.automatic_turn_on=false
+    bluetooth.server.automatic_turn_on=true
 
 # Bluetooth Tx power caps
 PRODUCT_COPY_FILES += \
@@ -358,7 +358,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=25
+    ro.vendor.build.svn=26
 
 # P23 Devices no longer need rlsservice
 PRODUCT_VENDOR_PROPERTIES += \
diff --git a/husky_generic.mk b/husky_generic.mk
new file mode 100644
index 0000000..2bf7caf
--- /dev/null
+++ b/husky_generic.mk
@@ -0,0 +1,17 @@
+#
+# Copyright 2024 The Android Open-Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+$(call inherit-product, device/google/shusky/device-husky.mk)
diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json
index 8522bb5..4592bd7 100644
--- a/perf/powerhint-husky.json
+++ b/perf/powerhint-husky.json
@@ -3074,7 +3074,7 @@
       "HBoostOffMissedCycles": 5,
       "HBoostPidPuFactor": 0.5,
       "HBoostUclampMin": 722,
-      "JankCheckTimeFactor": 1.43,
+      "JankCheckTimeFactor": 1.2,
       "LowFrameRateThreshold": 25,
       "MaxRecordsNum": 300
     },
@@ -3109,7 +3109,7 @@
       "HBoostOffMissedCycles": 5,
       "HBoostPidPuFactor": 0.5,
       "HBoostUclampMin": 722,
-      "JankCheckTimeFactor": 1.43,
+      "JankCheckTimeFactor": 1.2,
       "LowFrameRateThreshold": 25,
       "MaxRecordsNum": 300
     },
@@ -3144,7 +3144,7 @@
       "HBoostOffMissedCycles": 5,
       "HBoostPidPuFactor": 0.5,
       "HBoostUclampMin": 722,
-      "JankCheckTimeFactor": 1.43,
+      "JankCheckTimeFactor": 1.2,
       "LowFrameRateThreshold": 25,
       "MaxRecordsNum": 300
     },
diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json
index 0d6715a..f7ef01a 100644
--- a/perf/powerhint-ripcurrent.json
+++ b/perf/powerhint-ripcurrent.json
@@ -2854,7 +2854,7 @@
       "HBoostOffMissedCycles": 5,
       "HBoostPidPuFactor": 0.5,
       "HBoostUclampMin": 722,
-      "JankCheckTimeFactor": 1.43,
+      "JankCheckTimeFactor": 1.2,
       "LowFrameRateThreshold": 25,
       "MaxRecordsNum": 300
     },
@@ -2887,7 +2887,7 @@
       "HBoostOffMissedCycles": 5,
       "HBoostPidPuFactor": 0.5,
       "HBoostUclampMin": 722,
-      "JankCheckTimeFactor": 1.43,
+      "JankCheckTimeFactor": 1.2,
       "LowFrameRateThreshold": 25,
       "MaxRecordsNum": 300
     },
@@ -2920,7 +2920,7 @@
       "HBoostOffMissedCycles": 5,
       "HBoostPidPuFactor": 0.5,
       "HBoostUclampMin": 722,
-      "JankCheckTimeFactor": 1.43,
+      "JankCheckTimeFactor": 1.2,
       "LowFrameRateThreshold": 25,
       "MaxRecordsNum": 300
     },
diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json
index da77adc..4e1e732 100644
--- a/perf/powerhint-shiba.json
+++ b/perf/powerhint-shiba.json
@@ -2978,7 +2978,7 @@
       "HBoostOffMissedCycles": 5,
       "HBoostPidPuFactor": 0.5,
       "HBoostUclampMin": 722,
-      "JankCheckTimeFactor": 1.43,
+      "JankCheckTimeFactor": 1.2,
       "LowFrameRateThreshold": 25,
       "MaxRecordsNum": 300
     },
@@ -3013,7 +3013,7 @@
       "HBoostOffMissedCycles": 5,
       "HBoostPidPuFactor": 0.5,
       "HBoostUclampMin": 722,
-      "JankCheckTimeFactor": 1.43,
+      "JankCheckTimeFactor": 1.2,
       "LowFrameRateThreshold": 25,
       "MaxRecordsNum": 300
     },
@@ -3048,7 +3048,7 @@
       "HBoostOffMissedCycles": 5,
       "HBoostPidPuFactor": 0.5,
       "HBoostUclampMin": 722,
-      "JankCheckTimeFactor": 1.43,
+      "JankCheckTimeFactor": 1.2,
       "LowFrameRateThreshold": 25,
       "MaxRecordsNum": 300
     },
diff --git a/ripcurrent_generic.mk b/ripcurrent_generic.mk
new file mode 100644
index 0000000..bb1afb3
--- /dev/null
+++ b/ripcurrent_generic.mk
@@ -0,0 +1,17 @@
+#
+# Copyright 2024 The Android Open-Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+$(call inherit-product, device/google/shusky/device-ripcurrent.mk)
diff --git a/shiba_generic.mk b/shiba_generic.mk
new file mode 100644
index 0000000..064301e
--- /dev/null
+++ b/shiba_generic.mk
@@ -0,0 +1,17 @@
+#
+# Copyright 2024 The Android Open-Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+$(call inherit-product, device/google/shusky/device-shiba.mk)