diff --git a/sdm660.mk b/sdm660.mk
index bd8b1736..0686af08 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -8,6 +8,8 @@
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
 $(call inherit-product-if-exists, build/target/product/embedded.mk)
+# Disable deprecated sdcardfs, enable casefold, projid
+$(call inherit-product, $(SRC_TARGET_DIR)/product/emulated_storage.mk)
 
 # Enable updating of APEXes
 ifeq ($(ENABLE_APEX), true)