diff --git a/device.mk b/device.mk
index 267086bb..350d12cb 100644
--- a/device.mk
+++ b/device.mk
@@ -554,7 +554,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_ramdisk.mk)
 
 # Titan-M
 ifeq (,$(filter true, $(BOARD_WITHOUT_DTLS)))
-include hardware/google/pixel/dauntless/dauntless.mk
+#include hardware/google/pixel/dauntless/dauntless.mk
 endif
 
 PRODUCT_PACKAGES_DEBUG += \
@@ -750,9 +750,17 @@ PRODUCT_PACKAGES += \
 	libopenvx-opencl
 endif
 
+# TODO[b/XXXX]: Re-enable Trusty and disable this when Trusty is working
+PRODUCT_PACKAGES += \
+	android.hardware.keymaster@4.1-service \
+	android.hardware.gatekeeper@1.0-service.software
+LOCAL_KEYMASTER_PRODUCT_PACKAGE := android.hardware.keymaster@4.1-service
+LOCAL_GATEKEEPER_PRODUCT_PACKAGE := android.hardware.gatekeeper@1.0-service.software
+
 # Trusty (KM, GK, Storage)
-$(call inherit-product, system/core/trusty/trusty-storage.mk)
-$(call inherit-product, system/core/trusty/trusty-base.mk)
+#$(call inherit-product, system/core/trusty/trusty-storage.mk)
+#$(call inherit-product, system/core/trusty/trusty-base.mk)
+
 
 # Trusty unit test tool
 PRODUCT_PACKAGES_DEBUG += trusty-ut-ctrl \