diff --git a/device-oriole.mk b/device-oriole.mk
index 09cd1ac..b62d4a8 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -275,3 +275,7 @@ endif
 PRODUCT_PACKAGES_DEBUG += \
     android.hardware.biometrics.fingerprint-service.example
 
+# Setup Wizard device-specific settings
+PRODUCT_PRODUCT_PROPERTIES += \
+    setupwizard.feature.enable_quick_start_flow_for_debug=true \
+
diff --git a/device-raven.mk b/device-raven.mk
index 6e51fd1..797a0ac 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -292,3 +292,7 @@ endif
 PRODUCT_PACKAGES_DEBUG += \
     android.hardware.biometrics.fingerprint-service.example
 
+# Setup Wizard device-specific settings
+PRODUCT_PRODUCT_PROPERTIES += \
+    setupwizard.feature.enable_quick_start_flow_for_debug=true \
+