diff --git a/BoardConfig.mk b/BoardConfig.mk
index 1eb91b2ba..16d96b611 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -149,6 +149,7 @@ BOARD_CHARGER_ENABLE_SUSPEND := true
 # Vendor Interface Manifest
 DEVICE_MANIFEST_FILE := device/google/wahoo/manifest.xml
 DEVICE_MATRIX_FILE := device/google/wahoo/compatibility_matrix.xml
+DEVICE_FRAMEWORK_MANIFEST_FILE := device/google/wahoo/framework_manifest.xml
 
 BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
 
diff --git a/framework_manifest.xml b/framework_manifest.xml
new file mode 100644
index 000000000..c82d51c8e
--- /dev/null
+++ b/framework_manifest.xml
@@ -0,0 +1,12 @@
+<manifest version="1.0" type="framework">
+    <hal format="hidl">
+        <name>vendor.qti.atcmdfwd</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IAtCmdFwd</name>
+            <instance>AtCmdFwdService</instance>
+        </interface>
+    </hal>
+</manifest>
+
diff --git a/manifest.xml b/manifest.xml
index f10c44532..ca6f6c7fb 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -465,13 +465,4 @@
             <instance>cnd</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>vendor.qti.atcmdfwd</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IAtCmdFwd</name>
-            <instance>AtCmdFwdService</instance>
-        </interface>
-    </hal>
 </manifest>