diff --git a/caiman/BoardConfig.mk b/caiman/BoardConfig.mk
index 034b3e71..73089b85 100644
--- a/caiman/BoardConfig.mk
+++ b/caiman/BoardConfig.mk
@@ -16,7 +16,13 @@
 
 TARGET_BOARD_INFO_FILE := device/google/caimito/board-info.txt
 TARGET_BOOTLOADER_BOARD_NAME := caiman
-TARGET_SCREEN_DENSITY := 480
+
+ifdef PHONE_CAR_BOARD_PRODUCT
+    include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
+else
+    TARGET_SCREEN_DENSITY := 480
+endif
+
 BOARD_USES_GENERIC_AUDIO := true
 USES_DEVICE_GOOGLE_CAIMITO := true
 
diff --git a/device-caiman.mk b/device-caiman.mk
index 3cea0154..40e5e5f4 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -403,12 +403,12 @@ PRODUCT_VENDOR_PROPERTIES += \
 # Bluetooth LE Audio
 # Unicast
 PRODUCT_PRODUCT_PROPERTIES += \
-	bluetooth.profile.bap.unicast.client.enabled=true \
-	bluetooth.profile.csip.set_coordinator.enabled=true \
-	bluetooth.profile.hap.client.enabled=true \
-	bluetooth.profile.mcp.server.enabled=true \
-	bluetooth.profile.ccp.server.enabled=true \
-	bluetooth.profile.vcp.controller.enabled=true
+	bluetooth.profile.bap.unicast.client.enabled?=true \
+	bluetooth.profile.csip.set_coordinator.enabled?=true \
+	bluetooth.profile.hap.client.enabled?=true \
+	bluetooth.profile.mcp.server.enabled?=true \
+	bluetooth.profile.ccp.server.enabled?=true \
+	bluetooth.profile.vcp.controller.enabled?=true
 
 # Set support one-handed mode
 PRODUCT_PRODUCT_PROPERTIES += \
@@ -416,8 +416,8 @@ PRODUCT_PRODUCT_PROPERTIES += \
 
 # Bluetooth LE Audio Broadcast
 PRODUCT_PRODUCT_PROPERTIES += \
-	bluetooth.profile.bap.broadcast.assist.enabled=true \
-	bluetooth.profile.bap.broadcast.source.enabled=true
+	bluetooth.profile.bap.broadcast.assist.enabled?=true \
+	bluetooth.profile.bap.broadcast.source.enabled?=true
 
 # LE Audio switcher in developer options
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/device-komodo.mk b/device-komodo.mk
index 1bea4b8e..365b80cc 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -404,17 +404,17 @@ PRODUCT_VENDOR_PROPERTIES += \
 # Bluetooth LE Audio
 # Unicast
 PRODUCT_PRODUCT_PROPERTIES += \
-	bluetooth.profile.bap.unicast.client.enabled=true \
-	bluetooth.profile.csip.set_coordinator.enabled=true \
-	bluetooth.profile.hap.client.enabled=true \
-	bluetooth.profile.mcp.server.enabled=true \
-	bluetooth.profile.ccp.server.enabled=true \
-	bluetooth.profile.vcp.controller.enabled=true
+	bluetooth.profile.bap.unicast.client.enabled?=true \
+	bluetooth.profile.csip.set_coordinator.enabled?=true \
+	bluetooth.profile.hap.client.enabled?=true \
+	bluetooth.profile.mcp.server.enabled?=true \
+	bluetooth.profile.ccp.server.enabled?=true \
+	bluetooth.profile.vcp.controller.enabled?=true
 
 # Bluetooth LE Audio Broadcast
 PRODUCT_PRODUCT_PROPERTIES += \
-	bluetooth.profile.bap.broadcast.assist.enabled=true \
-	bluetooth.profile.bap.broadcast.source.enabled=true
+	bluetooth.profile.bap.broadcast.assist.enabled?=true \
+	bluetooth.profile.bap.broadcast.source.enabled?=true
 
 # LE Audio switcher in developer options
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/device-tokay.mk b/device-tokay.mk
index 019eef5d..f1377845 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -369,12 +369,12 @@ PRODUCT_VENDOR_PROPERTIES += \
 # Bluetooth LE Audio
 # Unicast
 PRODUCT_PRODUCT_PROPERTIES += \
-	bluetooth.profile.bap.unicast.client.enabled=true \
-	bluetooth.profile.csip.set_coordinator.enabled=true \
-	bluetooth.profile.hap.client.enabled=true \
-	bluetooth.profile.mcp.server.enabled=true \
-	bluetooth.profile.ccp.server.enabled=true \
-	bluetooth.profile.vcp.controller.enabled=true
+	bluetooth.profile.bap.unicast.client.enabled?=true \
+	bluetooth.profile.csip.set_coordinator.enabled?=true \
+	bluetooth.profile.hap.client.enabled?=true \
+	bluetooth.profile.mcp.server.enabled?=true \
+	bluetooth.profile.ccp.server.enabled?=true \
+	bluetooth.profile.vcp.controller.enabled?=true
 
 # Set support one-handed mode
 PRODUCT_PRODUCT_PROPERTIES += \
@@ -382,8 +382,8 @@ PRODUCT_PRODUCT_PROPERTIES += \
 
 # Bluetooth LE Audio Broadcast
 PRODUCT_PRODUCT_PROPERTIES += \
-	bluetooth.profile.bap.broadcast.assist.enabled=true \
-	bluetooth.profile.bap.broadcast.source.enabled=true
+	bluetooth.profile.bap.broadcast.assist.enabled?=true \
+	bluetooth.profile.bap.broadcast.source.enabled?=true
 
 # LE Audio switcher in developer options
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/tokay/BoardConfig.mk b/tokay/BoardConfig.mk
index 608b533f..90df65c9 100644
--- a/tokay/BoardConfig.mk
+++ b/tokay/BoardConfig.mk
@@ -16,7 +16,13 @@
 
 TARGET_BOARD_INFO_FILE := device/google/caimito/board-info.txt
 TARGET_BOOTLOADER_BOARD_NAME := tokay
-TARGET_SCREEN_DENSITY := 420
+
+ifdef PHONE_CAR_BOARD_PRODUCT
+    include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
+else
+    TARGET_SCREEN_DENSITY := 420
+endif
+
 BOARD_USES_GENERIC_AUDIO := true
 USES_DEVICE_GOOGLE_CAIMITO := true