diff --git a/compatibility_matrix.xml b/compatibility_matrix.xml
index 24b2761c..120671f6 100644
--- a/compatibility_matrix.xml
+++ b/compatibility_matrix.xml
@@ -68,4 +68,12 @@
         -->
         <version>1.0</version>
     </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.qti.atcmdfwd</name>
+        <version>1.0</version>
+        <interface>
+            <name>IAtCmdFwd</name>
+            <instance>AtCmdFwdService</instance>
+        </interface>
+    </hal>
 </compatibility-matrix>
diff --git a/device_framework_matrix.xml b/device_framework_matrix.xml
index 917ae5c9..921545bf 100644
--- a/device_framework_matrix.xml
+++ b/device_framework_matrix.xml
@@ -1,12 +1,4 @@
 <compatibility-matrix version="1.0" type="framework">
-    <hal format="hidl" optional="true">
-        <name>vendor.qti.atcmdfwd</name>
-        <version>1.0</version>
-        <interface>
-            <name>IAtCmdFwd</name>
-            <instance>AtCmdFwdService</instance>
-        </interface>
-    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.qcril.am</name>
         <version>1.0</version>