diff --git a/akita_generic.mk b/akita_generic.mk
index 76f32fc..bb260cd 100644
--- a/akita_generic.mk
+++ b/akita_generic.mk
@@ -15,3 +15,6 @@
 #
 
 $(call inherit-product, device/google/akita/device-akita.mk)
+
+# preloaded_nanoapps.json
+PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p23_common
diff --git a/device-akita.mk b/device-akita.mk
index dd44c91..5a18be3 100644
--- a/device-akita.mk
+++ b/device-akita.mk
@@ -238,6 +238,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.leaudio.allow_list=SM-R510
 
+# Support LE & Classic concurrent encryption (b/330704060)
+PRODUCT_PRODUCT_PROPERTIES += \
+    bluetooth.ble.allow_enc_with_bredr=true
+
 # Enable one-handed mode
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.support_one_handed_mode=true
diff --git a/factory_akita.mk b/factory_akita.mk
index b834d1e..aae1617 100644
--- a/factory_akita.mk
+++ b/factory_akita.mk
@@ -32,3 +32,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # Factory binaries of camera
 PRODUCT_PACKAGES += fatp_ak3_wide_hat_tool
+
+# preloaded_nanoapps.json
+PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory