diff --git a/device-husky.mk b/device-husky.mk
index c5c9057..40e1216 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -519,8 +519,9 @@ PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
 PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true
 
 # Bluetooth device id
+# Husky: 0x410D
 PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.device_id.product_id=20493
+    bluetooth.device_id.product_id=16653
 
 # Set support for LEA multicodec
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/device-shiba.mk b/device-shiba.mk
index 8d8d142..206e4a6 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -488,8 +488,9 @@ PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
 PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true
 
 # Bluetooth device id
+# Shiba: 0x410E
 PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.device_id.product_id=20492
+    bluetooth.device_id.product_id=16654
 
 # Set support for LEA multicodec
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk
index 63ef483..9240a13 100644
--- a/husky/BoardConfig.mk
+++ b/husky/BoardConfig.mk
@@ -45,6 +45,7 @@ include device/google/shusky/device-shusky-common.mk
 
 include device/google/zuma/BoardConfig-common.mk
 -include vendor/google_devices/zuma/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 -include vendor/google_devices/husky/proprietary/BoardConfigVendor.mk
 include device/google/shusky-sepolicy/husky-sepolicy.mk
 include device/google/shusky/wifi/BoardConfig-wifi.mk
diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json
index f5ca2ae..64fa155 100644
--- a/perf/powerhint-husky.json
+++ b/perf/powerhint-husky.json
@@ -219,7 +219,6 @@
         "0",
         "1"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -427,7 +426,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -473,7 +471,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json
index 41e06e7..7a34efb 100644
--- a/perf/powerhint-ripcurrent.json
+++ b/perf/powerhint-ripcurrent.json
@@ -214,7 +214,6 @@
         "0",
         "1"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -422,7 +421,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -468,7 +466,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json
index 158f6fc..bccce89 100644
--- a/perf/powerhint-shiba.json
+++ b/perf/powerhint-shiba.json
@@ -210,7 +210,6 @@
         "0",
         "1"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -428,7 +427,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -474,7 +472,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
diff --git a/ripcurrent/BoardConfig.mk b/ripcurrent/BoardConfig.mk
index a84d4b0..142e21a 100644
--- a/ripcurrent/BoardConfig.mk
+++ b/ripcurrent/BoardConfig.mk
@@ -31,5 +31,6 @@ include device/google/shusky/device-shusky-common.mk
 
 include device/google/zuma/BoardConfig-common.mk
 -include vendor/google_devices/zuma/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 include device/google/shusky-sepolicy/ripcurrent-sepolicy.mk
 include device/google/shusky/wifi/BoardConfig-wifi.mk
diff --git a/shiba/BoardConfig.mk b/shiba/BoardConfig.mk
index 30d204e..847a288 100644
--- a/shiba/BoardConfig.mk
+++ b/shiba/BoardConfig.mk
@@ -41,6 +41,7 @@ include device/google/shusky/device-shusky-common.mk
 
 include device/google/zuma/BoardConfig-common.mk
 -include vendor/google_devices/zuma/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 -include vendor/google_devices/shiba/proprietary/BoardConfigVendor.mk
 include device/google/shusky-sepolicy/shiba-sepolicy.mk
 include device/google/shusky/wifi/BoardConfig-wifi.mk