diff --git a/device-oriole.mk b/device-oriole.mk
index d3800b1..d9dff81 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -193,6 +193,10 @@ PRODUCT_PACKAGES += \
     NoCutoutOverlay \
     AvoidAppsInCutoutOverlay
 
+# Android DeviceAsWebcam specific overlay
+PRODUCT_PACKAGES += \
+    DeviceAsWebcamOriole
+
 # SKU specific RROs
 PRODUCT_PACKAGES += \
     SettingsOverlayGR1YH \
diff --git a/device-raven.mk b/device-raven.mk
index cf5bb71..2afddb6 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -205,6 +205,10 @@ PRODUCT_PACKAGES += \
     NoCutoutOverlay \
     AvoidAppsInCutoutOverlay
 
+# Android DeviceAsWebcam specific overlay
+PRODUCT_PACKAGES += \
+    DeviceAsWebcamRaven
+
 # Fingerprint antispoof property
 PRODUCT_PRODUCT_PROPERTIES +=\
     persist.vendor.fingerprint.disable.fake.override=none
diff --git a/oriole/overlay_packages/DeviceAsWebcamOriole/Android.bp b/oriole/overlay_packages/DeviceAsWebcamOriole/Android.bp
new file mode 100644
index 0000000..158e2b8
--- /dev/null
+++ b/oriole/overlay_packages/DeviceAsWebcamOriole/Android.bp
@@ -0,0 +1,10 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "DeviceAsWebcamOriole",
+    certificate: "platform",
+    product_specific: true,
+    sdk_version: "current",
+}
diff --git a/oriole/overlay_packages/DeviceAsWebcamOriole/AndroidManifest.xml b/oriole/overlay_packages/DeviceAsWebcamOriole/AndroidManifest.xml
new file mode 100644
index 0000000..cc7d3ba
--- /dev/null
+++ b/oriole/overlay_packages/DeviceAsWebcamOriole/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.google.android.overlay.DeviceAsWebcam"
+          android:versionCode="1"
+          android:versionName="1.0" >
+    <application android:hasCode="false" />
+    <overlay
+        android:targetPackage="com.android.DeviceAsWebcam"
+        android:isStatic="true"
+        android:priority="1"/>
+</manifest>
\ No newline at end of file
diff --git a/oriole/overlay_packages/DeviceAsWebcamOriole/OWNERS b/oriole/overlay_packages/DeviceAsWebcamOriole/OWNERS
new file mode 100644
index 0000000..d22af85
--- /dev/null
+++ b/oriole/overlay_packages/DeviceAsWebcamOriole/OWNERS
@@ -0,0 +1 @@
+include platform/frameworks/av:/camera/OWNERS
\ No newline at end of file
diff --git a/oriole/overlay_packages/DeviceAsWebcamOriole/res/raw/physical_camera_mapping.json b/oriole/overlay_packages/DeviceAsWebcamOriole/res/raw/physical_camera_mapping.json
new file mode 100644
index 0000000..4dd9988
--- /dev/null
+++ b/oriole/overlay_packages/DeviceAsWebcamOriole/res/raw/physical_camera_mapping.json
@@ -0,0 +1 @@
+{"0": {"3" : "UW"}}
\ No newline at end of file
diff --git a/raven/overlay_packages/DeviceAsWebcamRaven/Android.bp b/raven/overlay_packages/DeviceAsWebcamRaven/Android.bp
new file mode 100644
index 0000000..9a0527d
--- /dev/null
+++ b/raven/overlay_packages/DeviceAsWebcamRaven/Android.bp
@@ -0,0 +1,10 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "DeviceAsWebcamRaven",
+    certificate: "platform",
+    product_specific: true,
+    sdk_version: "current",
+}
diff --git a/raven/overlay_packages/DeviceAsWebcamRaven/AndroidManifest.xml b/raven/overlay_packages/DeviceAsWebcamRaven/AndroidManifest.xml
new file mode 100644
index 0000000..cc7d3ba
--- /dev/null
+++ b/raven/overlay_packages/DeviceAsWebcamRaven/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.google.android.overlay.DeviceAsWebcam"
+          android:versionCode="1"
+          android:versionName="1.0" >
+    <application android:hasCode="false" />
+    <overlay
+        android:targetPackage="com.android.DeviceAsWebcam"
+        android:isStatic="true"
+        android:priority="1"/>
+</manifest>
\ No newline at end of file
diff --git a/raven/overlay_packages/DeviceAsWebcamRaven/OWNERS b/raven/overlay_packages/DeviceAsWebcamRaven/OWNERS
new file mode 100644
index 0000000..d22af85
--- /dev/null
+++ b/raven/overlay_packages/DeviceAsWebcamRaven/OWNERS
@@ -0,0 +1 @@
+include platform/frameworks/av:/camera/OWNERS
\ No newline at end of file
diff --git a/raven/overlay_packages/DeviceAsWebcamRaven/res/raw/physical_camera_mapping.json b/raven/overlay_packages/DeviceAsWebcamRaven/res/raw/physical_camera_mapping.json
new file mode 100644
index 0000000..4dd9988
--- /dev/null
+++ b/raven/overlay_packages/DeviceAsWebcamRaven/res/raw/physical_camera_mapping.json
@@ -0,0 +1 @@
+{"0": {"3" : "UW"}}
\ No newline at end of file