diff --git a/config/common.mk b/config/common.mk
index c94f1031f..801042a65 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -119,7 +119,6 @@ PRODUCT_PACKAGES += \
 
 # PixelSetupWizard overlay
 PRODUCT_PACKAGES += \
-    PixelSetupWizardOverlay \
     PixelSetupWizardAodOverlay
 
 # Dex preopt
diff --git a/packages/overlays/PixelSetupWizardAodOverlay/Android.mk b/packages/overlays/PixelSetupWizardAodOverlay/Android.mk
deleted file mode 100644
index 97eda8cd3..000000000
--- a/packages/overlays/PixelSetupWizardAodOverlay/Android.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := PixelSetupWizardAodOverlay
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-LOCAL_PRODUCT_MODULE := true
-include $(BUILD_PACKAGE)
diff --git a/packages/overlays/PixelSetupWizardAodOverlay/res/values/bools.xml b/packages/overlays/PixelSetupWizardAodOverlay/res/values/bools.xml
deleted file mode 100644
index 1586e0f2b..000000000
--- a/packages/overlays/PixelSetupWizardAodOverlay/res/values/bools.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <bool name="show_always_on_display_opt_in">false</bool>
-</resources>
diff --git a/packages/overlays/PixelSetupWizardOverlay/Android.mk b/packages/overlays/PixelSetupWizardOverlay/Android.mk
deleted file mode 100644
index 652657aad..000000000
--- a/packages/overlays/PixelSetupWizardOverlay/Android.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := PixelSetupWizardOverlay
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-LOCAL_PRODUCT_MODULE := true
-include $(BUILD_PACKAGE)
diff --git a/packages/overlays/PixelSetupWizardOverlay/AndroidManifest.xml b/packages/overlays/PixelSetupWizardOverlay/AndroidManifest.xml
deleted file mode 100644
index 598d7740c..000000000
--- a/packages/overlays/PixelSetupWizardOverlay/AndroidManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.pixel.setupwizard.overlay"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <overlay android:targetPackage="com.google.android.pixel.setupwizard" android:priority="1" android:isStatic="true" />
-
-    <application android:label="Setup wizard" android:hasCode="false"/>
-</manifest>
diff --git a/rro_overlays/PixelSetupWizardAodOverlay/Android.bp b/rro_overlays/PixelSetupWizardAodOverlay/Android.bp
new file mode 100644
index 000000000..71410ed88
--- /dev/null
+++ b/rro_overlays/PixelSetupWizardAodOverlay/Android.bp
@@ -0,0 +1,6 @@
+runtime_resource_overlay {
+    name: "PixelSetupWizardAodOverlay",
+    certificate: "platform",
+    sdk_version: "current",
+    product_specific: true
+}
\ No newline at end of file
diff --git a/packages/overlays/PixelSetupWizardAodOverlay/AndroidManifest.xml b/rro_overlays/PixelSetupWizardAodOverlay/AndroidManifest.xml
similarity index 100%
rename from packages/overlays/PixelSetupWizardAodOverlay/AndroidManifest.xml
rename to rro_overlays/PixelSetupWizardAodOverlay/AndroidManifest.xml
diff --git a/packages/overlays/PixelSetupWizardOverlay/res/values/bools.xml b/rro_overlays/PixelSetupWizardAodOverlay/res/values/bools.xml
similarity index 66%
rename from packages/overlays/PixelSetupWizardOverlay/res/values/bools.xml
rename to rro_overlays/PixelSetupWizardAodOverlay/res/values/bools.xml
index 1a64a7ecb..4020208d4 100644
--- a/packages/overlays/PixelSetupWizardOverlay/res/values/bools.xml
+++ b/rro_overlays/PixelSetupWizardAodOverlay/res/values/bools.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <bool name="show_air_gestures_opt_in">false</bool>
+    <bool name="show_always_on_display_opt_in">true</bool>
 </resources>