diff --git a/shared/phone/device.mk b/shared/phone/device.mk
index c60423e..3063000 100644
--- a/shared/phone/device.mk
+++ b/shared/phone/device.mk
@@ -41,4 +41,5 @@
     frameworks/native/data/etc/android.hardware.telephony.gsm.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.gsm.xml
 
 # These flags are important for the GSI, but break auto
+PRODUCT_ENFORCE_RRO_TARGETS := framework-res
 PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS := device/google/cuttlefish/shared/overlay
diff --git a/shared/phone/device_vendor.mk b/shared/phone/device_vendor.mk
index 1a2d326..0df1f4a 100644
--- a/shared/phone/device_vendor.mk
+++ b/shared/phone/device_vendor.mk
@@ -48,4 +48,5 @@
 
 # TODO: below should be moved to vendor
 # These flags are important for the GSI, but break auto
+PRODUCT_ENFORCE_RRO_TARGETS := framework-res
 PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS := device/google/cuttlefish/shared/overlay