diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk
index 3ef75b3039..a5813242da 100644
--- a/target/product/gsi_release.mk
+++ b/target/product/gsi_release.mk
@@ -91,4 +91,11 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Window Extensions
 ifneq ($(PRODUCT_IS_ATV),true)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
-endif
\ No newline at end of file
+endif
+
+# A GSI is to be mixed with different boot images. That means we can't determine
+# the kernel version when building a GSI.
+# Assume the device supports UFFD. If it doesn't, the ART runtime will fall back
+# to CC, and odrefresh will regenerate core dexopt artifacts on the first boot,
+# so this is okay.
+PRODUCT_ENABLE_UFFD_GC := true