diff --git a/device-oriole.mk b/device-oriole.mk
index f8ac167..298b1d9 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -273,5 +273,9 @@ else
 		device/google/raviole/location/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
 endif
 
+# Setup Wizard device-specific settings
+PRODUCT_PRODUCT_PROPERTIES += \
+    setupwizard.feature.enable_quick_start_flow_for_debug=true \
+
 # Window Extensions
 $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
diff --git a/device-raven.mk b/device-raven.mk
index 62a5e2d..4550a0b 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -292,5 +292,9 @@ else
 		device/google/raviole/location/gps_user.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
 endif
 
+# Setup Wizard device-specific settings
+PRODUCT_PRODUCT_PROPERTIES += \
+    setupwizard.feature.enable_quick_start_flow_for_debug=true \
+
 # Window Extensions
 $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)