diff --git a/caiman_generic.mk b/caiman_generic.mk
index 6b8acb18..3efc4de4 100644
--- a/caiman_generic.mk
+++ b/caiman_generic.mk
@@ -15,3 +15,6 @@
 #
 
 $(call inherit-product, device/google/caimito/device-caiman.mk)
+
+# preloaded_nanoapps.json
+PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p24_common
diff --git a/factory_caiman.mk b/factory_caiman.mk
index dc4cd3ce..5919c0d7 100644
--- a/factory_caiman.mk
+++ b/factory_caiman.mk
@@ -59,3 +59,6 @@ SOONG_CONFIG_gpssdk_gpsconf := factory
 PRODUCT_PACKAGES += fatp_km4cm4tk4_wide_hat_tool fatp_km4cm4_tele_hat_tool fatp_km4cm4tk4_ultrawide_hat_tool fatp_km4cm4_front_hat_tool factory_lwis_client_test
 
 PRODUCT_WITHOUT_TTS_VOICE_PACKS := true
+
+# preloaded_nanoapps.json
+PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory
diff --git a/factory_komodo.mk b/factory_komodo.mk
index 6d1cf6b7..b480957c 100644
--- a/factory_komodo.mk
+++ b/factory_komodo.mk
@@ -59,3 +59,6 @@ SOONG_CONFIG_gpssdk_gpsconf := factory
 PRODUCT_PACKAGES += fatp_km4cm4tk4_wide_hat_tool fatp_km4cm4_tele_hat_tool fatp_km4cm4tk4_ultrawide_hat_tool fatp_km4cm4_front_hat_tool factory_lwis_client_test
 
 PRODUCT_WITHOUT_TTS_VOICE_PACKS := true
+
+# preloaded_nanoapps.json
+PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory
diff --git a/factory_ripcurrentpro.mk b/factory_ripcurrentpro.mk
index 3038e8b4..bbaf425e 100644
--- a/factory_ripcurrentpro.mk
+++ b/factory_ripcurrentpro.mk
@@ -57,3 +57,6 @@ SOONG_CONFIG_gpssdk_gpsconf := factory
 
 # Factory binaries of camera
 PRODUCT_PACKAGES += fatp_km4cm4tk4_wide_hat_tool fatp_km4cm4_tele_hat_tool fatp_km4cm4tk4_ultrawide_hat_tool fatp_km4cm4_front_hat_tool fatp_tk4_front_hat_tool
+
+# preloaded_nanoapps.json
+PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory
diff --git a/factory_tokay.mk b/factory_tokay.mk
index 6574b5b9..accf50c8 100644
--- a/factory_tokay.mk
+++ b/factory_tokay.mk
@@ -59,3 +59,6 @@ SOONG_CONFIG_gpssdk_gpsconf := factory
 PRODUCT_PACKAGES += fatp_km4cm4tk4_wide_hat_tool fatp_km4cm4tk4_ultrawide_hat_tool fatp_tk4_front_hat_tool factory_lwis_client_test
 
 PRODUCT_WITHOUT_TTS_VOICE_PACKS := true
+
+# preloaded_nanoapps.json
+PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory
diff --git a/komodo_generic.mk b/komodo_generic.mk
index 686ba6c7..5d89593e 100644
--- a/komodo_generic.mk
+++ b/komodo_generic.mk
@@ -15,3 +15,6 @@
 #
 
 $(call inherit-product, device/google/caimito/device-komodo.mk)
+
+# preloaded_nanoapps.json
+PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p24_common
diff --git a/ripcurrentpro_generic.mk b/ripcurrentpro_generic.mk
index d92fc54c..4d3bdd75 100644
--- a/ripcurrentpro_generic.mk
+++ b/ripcurrentpro_generic.mk
@@ -15,3 +15,6 @@
 #
 
 $(call inherit-product, device/google/caimito/device-ripcurrentpro.mk)
+
+# preloaded_nanoapps.json
+PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p24_common
diff --git a/tokay_generic.mk b/tokay_generic.mk
index 0b1cd22f..a8870261 100644
--- a/tokay_generic.mk
+++ b/tokay_generic.mk
@@ -15,3 +15,6 @@
 #
 
 $(call inherit-product, device/google/caimito/device-tokay.mk)
+
+# preloaded_nanoapps.json
+PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p24_common