diff --git a/aosp_tangorpro.mk b/aosp_tangorpro.mk
index 684bd85..d09cd8f 100644
--- a/aosp_tangorpro.mk
+++ b/aosp_tangorpro.mk
@@ -30,5 +30,5 @@ PRODUCT_MODEL := AOSP on Tangorpro
 PRODUCT_BRAND := Android
 PRODUCT_MANUFACTURER := Google
 
-DEVICE_MANIFEST_FILE := \
+DEVICE_MANIFEST_FILE += \
 	device/google/tangorpro/manifest.xml
diff --git a/bluetooth/device_framework_matrix_product.xml b/bluetooth/device_framework_matrix_product.xml
new file mode 100644
index 0000000..965e090
--- /dev/null
+++ b/bluetooth/device_framework_matrix_product.xml
@@ -0,0 +1,35 @@
+<compatibility-matrix version="1.0" type="framework" level="7">
+    <hal format="hidl" optional="true">
+        <name>hardware.google.bluetooth.bt_channel_avoidance</name>
+        <version>1.0</version>
+        <interface>
+            <name>IBTChannelAvoidance</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
+        <name>hardware.google.bluetooth.sar</name>
+        <version>1.1</version>
+        <interface>
+            <name>IBluetoothSar</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
+        <name>hardware.google.bluetooth.ext</name>
+        <version>1.0</version>
+        <interface>
+            <name>IBluetoothExt</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
+        <name>hardware.google.bluetooth.ccc</name>
+        <transport>hwbinder</transport>
+        <version>1.1</version>
+        <interface>
+            <name>IBluetoothCcc</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</compatibility-matrix>
diff --git a/bluetooth/manifest_bluetooth.xml b/bluetooth/manifest_bluetooth.xml
index 2d055f4..71a8da2 100644
--- a/bluetooth/manifest_bluetooth.xml
+++ b/bluetooth/manifest_bluetooth.xml
@@ -35,4 +35,13 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>hardware.google.bluetooth.ext</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IBluetoothExt</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
 </manifest>
diff --git a/bluetooth/syna_default.mk b/bluetooth/syna_default.mk
index d07b47a..424ac88 100644
--- a/bluetooth/syna_default.mk
+++ b/bluetooth/syna_default.mk
@@ -17,6 +17,7 @@
 # Bluetooth HAL and Pixel extension
 DEVICE_MANIFEST_FILE += \
        device/google/tangorpro/bluetooth/manifest_bluetooth.xml
+DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/tangorpro/bluetooth/device_framework_matrix_product.xml
 BOARD_SEPOLICY_DIRS += device/google/tangorpro-sepolicy/bluetooth
 PRODUCT_PACKAGES += android.hardware.bluetooth@1.1-service.synabtlinux
 # Bluetooth SAR test tools
diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index 95aad3b..9538b2a 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -39,7 +39,6 @@ DISABLE_SENSOR_BARO_PROX_HIFI := true
 include device/google/tangorpro/audio/tangorpro/audio-tables.mk
 include device/google/gs201/device-shipping-common.mk
 
-DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/tangorpro/device_framework_matrix_product.xml
 $(call soong_config_set,lyric,tuning_product,cloudripper)
 $(call soong_config_set,google3a_config,target_device,cloudripper)
 
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
deleted file mode 100644
index c0f208c..0000000
--- a/device_framework_matrix_product.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<compatibility-matrix version="1.0" type="framework" level="7">
-    <hal format="hidl">
-        <name>hardware.google.bluetooth.ccc</name>
-        <version>1.1</version>
-        <interface>
-            <name>IBluetoothCcc</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-</compatibility-matrix>
-
diff --git a/manifest.xml b/manifest.xml
index 1f0aebe..65f48c3 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -84,15 +84,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.bluetooth</name>
-        <transport>hwbinder</transport>
-        <version>1.1</version>
-        <interface>
-            <name>IBluetoothHci</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.bluetooth.audio</name>
         <transport>hwbinder</transport>
@@ -131,33 +122,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>hardware.google.bluetooth.bt_channel_avoidance</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IBTChannelAvoidance</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>hardware.google.bluetooth.sar</name>
-        <transport>hwbinder</transport>
-        <version>1.1</version>
-        <interface>
-            <name>IBluetoothSar</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>hardware.google.bluetooth.ccc</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IBluetoothCcc</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
        <name>vendor.google.whitechapel.audio.audioext</name>
        <transport>hwbinder</transport>