@@ -2746,15 +2746,15 @@
 PRODUCT_PACKAGES_DEBUG += $(CNE_DBG)
 PRODUCT_PACKAGES_DEBUG += $(CNESETTINGS_DBG)
 PRODUCT_PACKAGES_DEBUG += $(COMMON_DBG)
-PRODUCT_PACKAGES_DEBUG += $(DATA_DBG)
-PRODUCT_PACKAGES_DEBUG += $(DIAG_DBG)
+PRODUCT_PACKAGES += $(DATA_DBG)
+PRODUCT_PACKAGES += $(DIAG_DBG)
 PRODUCT_PACKAGES_DEBUG += $(FM_DBG)
 PRODUCT_PACKAGES_DEBUG += $(GPS_DBG)
 PRODUCT_PACKAGES_DEBUG += $(IMS_RCS_DBG)
 PRODUCT_PACKAGES_DEBUG += $(KERNEL_TEST_DBG)
 PRODUCT_PACKAGES_DEBUG += $(KS_DBG)
 PRODUCT_PACKAGES_DEBUG += $(MM_AUDIO_DBG)
-PRODUCT_PACKAGES_DEBUG += $(MM_CAMERA_DBG)
+PRODUCT_PACKAGES += $(MM_CAMERA_DBG)
 PRODUCT_PACKAGES_DEBUG += $(MM_CORE_DBG)
 PRODUCT_PACKAGES_DEBUG += $(MM_VIDEO_DBG)
 #PRODUCT_PACKAGES_DEBUG += $(NFC_DBG)