diff --git a/audio/caiman/tuning/spatializer/base b/audio/caiman/tuning/spatializer/base
index 85771ce2..38cc646e 100644
Binary files a/audio/caiman/tuning/spatializer/base and b/audio/caiman/tuning/spatializer/base differ
diff --git a/audio/caiman/tuning/spatializer/mode_2_ch b/audio/caiman/tuning/spatializer/mode_2_ch
index 42b89999..470c56cf 100644
Binary files a/audio/caiman/tuning/spatializer/mode_2_ch and b/audio/caiman/tuning/spatializer/mode_2_ch differ
diff --git a/audio/caiman/tuning/spatializer/mode_6_ch b/audio/caiman/tuning/spatializer/mode_6_ch
index b9e8240f..94ec6356 100644
Binary files a/audio/caiman/tuning/spatializer/mode_6_ch and b/audio/caiman/tuning/spatializer/mode_6_ch differ
diff --git a/audio/komodo/tuning/spatializer/base b/audio/komodo/tuning/spatializer/base
index 85771ce2..38cc646e 100644
Binary files a/audio/komodo/tuning/spatializer/base and b/audio/komodo/tuning/spatializer/base differ
diff --git a/audio/komodo/tuning/spatializer/mode_2_ch b/audio/komodo/tuning/spatializer/mode_2_ch
index 42b89999..470c56cf 100644
Binary files a/audio/komodo/tuning/spatializer/mode_2_ch and b/audio/komodo/tuning/spatializer/mode_2_ch differ
diff --git a/audio/komodo/tuning/spatializer/mode_6_ch b/audio/komodo/tuning/spatializer/mode_6_ch
index b9e8240f..94ec6356 100644
Binary files a/audio/komodo/tuning/spatializer/mode_6_ch and b/audio/komodo/tuning/spatializer/mode_6_ch differ
diff --git a/audio/tokay/tuning/spatializer/base b/audio/tokay/tuning/spatializer/base
index 85771ce2..38cc646e 100644
Binary files a/audio/tokay/tuning/spatializer/base and b/audio/tokay/tuning/spatializer/base differ
diff --git a/audio/tokay/tuning/spatializer/mode_2_ch b/audio/tokay/tuning/spatializer/mode_2_ch
index 42b89999..470c56cf 100644
Binary files a/audio/tokay/tuning/spatializer/mode_2_ch and b/audio/tokay/tuning/spatializer/mode_2_ch differ
diff --git a/audio/tokay/tuning/spatializer/mode_6_ch b/audio/tokay/tuning/spatializer/mode_6_ch
index b9e8240f..94ec6356 100644
Binary files a/audio/tokay/tuning/spatializer/mode_6_ch and b/audio/tokay/tuning/spatializer/mode_6_ch differ
diff --git a/bluetooth/bt_vendor_overlay_caiman.conf b/bluetooth/bt_vendor_overlay_caiman.conf
index 34134e68..1f5eb93c 100644
--- a/bluetooth/bt_vendor_overlay_caiman.conf
+++ b/bluetooth/bt_vendor_overlay_caiman.conf
@@ -20,7 +20,7 @@ BtOffloadTrunkGroup = 24P_AOC
 SarBackOffHighResolution = true
 
 # Update BQR Event Mask property value
-BqrEventMaskValueUpdate = 295006
+BqrEventMaskValueUpdate = 295262
 
 # Update BQR Event Mask property value
 BqrEnergyReportLogging = true
@@ -33,7 +33,7 @@ AccelBtDisable = false
 
 BtHalRecoveryByRestart = true
 
-BtHalBqrEnable = true
+BtHalBqrEnable = false
 
 # <string> The hardware stage with old chip revision is no longer
 # supported by BT firmware.
diff --git a/bluetooth/bt_vendor_overlay_komodo.conf b/bluetooth/bt_vendor_overlay_komodo.conf
index 34134e68..1f5eb93c 100644
--- a/bluetooth/bt_vendor_overlay_komodo.conf
+++ b/bluetooth/bt_vendor_overlay_komodo.conf
@@ -20,7 +20,7 @@ BtOffloadTrunkGroup = 24P_AOC
 SarBackOffHighResolution = true
 
 # Update BQR Event Mask property value
-BqrEventMaskValueUpdate = 295006
+BqrEventMaskValueUpdate = 295262
 
 # Update BQR Event Mask property value
 BqrEnergyReportLogging = true
@@ -33,7 +33,7 @@ AccelBtDisable = false
 
 BtHalRecoveryByRestart = true
 
-BtHalBqrEnable = true
+BtHalBqrEnable = false
 
 # <string> The hardware stage with old chip revision is no longer
 # supported by BT firmware.
diff --git a/bluetooth/bt_vendor_overlay_tokay.conf b/bluetooth/bt_vendor_overlay_tokay.conf
index 34134e68..1f5eb93c 100644
--- a/bluetooth/bt_vendor_overlay_tokay.conf
+++ b/bluetooth/bt_vendor_overlay_tokay.conf
@@ -20,7 +20,7 @@ BtOffloadTrunkGroup = 24P_AOC
 SarBackOffHighResolution = true
 
 # Update BQR Event Mask property value
-BqrEventMaskValueUpdate = 295006
+BqrEventMaskValueUpdate = 295262
 
 # Update BQR Event Mask property value
 BqrEnergyReportLogging = true
@@ -33,7 +33,7 @@ AccelBtDisable = false
 
 BtHalRecoveryByRestart = true
 
-BtHalBqrEnable = true
+BtHalBqrEnable = false
 
 # <string> The hardware stage with old chip revision is no longer
 # supported by BT firmware.
diff --git a/fingerprint/ultrasonic_udfps.mk b/fingerprint/ultrasonic_udfps.mk
index df84688a..1e9d8a3f 100644
--- a/fingerprint/ultrasonic_udfps.mk
+++ b/fingerprint/ultrasonic_udfps.mk
@@ -17,12 +17,10 @@
 PRODUCT_SOONG_NAMESPACES += \
 	vendor/qcom/fingerprint/qfp-service \
 	vendor/qcom/fingerprint/QFingerprintService \
-	vendor/qcom/fingerprint/QFPCalibration \
 
 PRODUCT_PACKAGES += \
 	qfp-daemon \
-	QFingerprintService \
-	QFPCalibration \
+	QFingerprintService
 
 PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml
@@ -36,6 +34,11 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.qfp.enable_setprop=0 \
 	log.tag.QFP=3
 
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_SOONG_NAMESPACES += \
+	vendor/qcom/fingerprint/QFPCalibration
+endif
+
 ifneq (,$(findstring factory, $(TARGET_PRODUCT)))
 PRODUCT_PACKAGES += QfsFactoryTest
 endif