diff --git a/shared/auto/device.mk b/shared/auto/device.mk
index 406e0d5..47ad1a2 100644
--- a/shared/auto/device.mk
+++ b/shared/auto/device.mk
@@ -17,11 +17,12 @@
 ################################################
 # Begin GCE specific configurations
 
+DEVICE_MANIFEST_FILE += device/google/cuttlefish/shared/config/manifest.xml
+DEVICE_MANIFEST_FILE += device/google/cuttlefish/shared/auto/manifest-extra.xml
+
 $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
 $(call inherit-product, device/google/cuttlefish/shared/device.mk)
 
-DEVICE_MANIFEST_FILE += device/google/cuttlefish/shared/auto/manifest-extra.xml
-
 ################################################
 # Begin general Android Auto Embedded configurations
 
diff --git a/shared/auto/manifest-extra.xml b/shared/auto/manifest-extra.xml
index fa5b698..47e8b99 100644
--- a/shared/auto/manifest-extra.xml
+++ b/shared/auto/manifest-extra.xml
@@ -9,7 +9,7 @@
 */
 -->
 <!-- Android Auto Embedded specific HALs-->
-<manifest version="1.0" type="device" target-level="1">
+<manifest version="1.0" type="device">
     <hal format="hidl">
         <name>android.hardware.automotive.audiocontrol</name>
         <transport>hwbinder</transport>
diff --git a/shared/device.mk b/shared/device.mk
index 01313ef..12d42c0 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -14,8 +14,6 @@
 # limitations under the License.
 #
 
-DEVICE_MANIFEST_FILE += device/google/cuttlefish/shared/config/manifest.xml
-
 PRODUCT_COPY_FILES += device/google/cuttlefish_kernel/4.4-x86_64/kernel:kernel
 
 PRODUCT_SHIPPING_API_LEVEL := 26
diff --git a/shared/phone/device.mk b/shared/phone/device.mk
index 8653a85..a4c4813 100644
--- a/shared/phone/device.mk
+++ b/shared/phone/device.mk
@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+DEVICE_MANIFEST_FILE += device/google/cuttlefish/shared/config/manifest.xml
+
 $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
 $(call inherit-product, frameworks/native/build/phone-xhdpi-2048-dalvik-heap.mk)
 $(call inherit-product, device/google/cuttlefish/shared/device.mk)
diff --git a/shared/tablet/device.mk b/shared/tablet/device.mk
index 1a99394..6038275 100644
--- a/shared/tablet/device.mk
+++ b/shared/tablet/device.mk
@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+DEVICE_MANIFEST_FILE += device/google/cuttlefish/shared/config/manifest.xml
+
 $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
 $(call inherit-product, frameworks/native/build/tablet-7in-xhdpi-2048-dalvik-heap.mk)
 $(call inherit-product, device/google/cuttlefish/shared/device.mk)
diff --git a/shared/tablet_3g/device.mk b/shared/tablet_3g/device.mk
index 917945c..b60dc0a 100644
--- a/shared/tablet_3g/device.mk
+++ b/shared/tablet_3g/device.mk
@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+DEVICE_MANIFEST_FILE += device/google/cuttlefish/shared/config/manifest.xml
+
 $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
 $(call inherit-product, frameworks/native/build/phone-xhdpi-2048-dalvik-heap.mk)
 $(call inherit-product, device/google/cuttlefish/shared/device.mk)
diff --git a/shared/tv/device.mk b/shared/tv/device.mk
index 2154125..bc30379 100644
--- a/shared/tv/device.mk
+++ b/shared/tv/device.mk
@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+DEVICE_MANIFEST_FILE += device/google/cuttlefish/shared/config/manifest.xml
+
 $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_no_telephony.mk)
 $(call inherit-product, device/google/cuttlefish/shared/device.mk)
 
diff --git a/shared/wear/device.mk b/shared/wear/device.mk
index 2154125..bc30379 100644
--- a/shared/wear/device.mk
+++ b/shared/wear/device.mk
@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+DEVICE_MANIFEST_FILE += device/google/cuttlefish/shared/config/manifest.xml
+
 $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_no_telephony.mk)
 $(call inherit-product, device/google/cuttlefish/shared/device.mk)