diff --git a/conf/Android.bp b/conf/Android.bp
index f355e29..d9dd48b 100644
--- a/conf/Android.bp
+++ b/conf/Android.bp
@@ -71,7 +71,7 @@ genrule {
 
 prebuilt_etc {
     name: "fstab.zumapro",
-    src: ":gen_fstab.zumapro-hw-encrypt",
+    src: ":gen_fstab.zumapro-no-encrypt",
     vendor: true,
     vendor_ramdisk_available: true,
 }
diff --git a/device.mk b/device.mk
index 534d0eb..4997565 100644
--- a/device.mk
+++ b/device.mk
@@ -596,7 +596,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_ramdisk.mk)
 
 # Titan-M
 ifeq (,$(filter true, $(BOARD_WITHOUT_DTLS)))
-include device/google/gs-common/dauntless/gsc.mk
+#include device/google/gs-common/dauntless/gsc.mk
 endif
 
 PRODUCT_PACKAGES_DEBUG += \
@@ -796,9 +796,16 @@ PRODUCT_PACKAGES += \
 	libopenvx-opencl
 endif
 
+# TODO[b/279647242]: 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 += \