diff --git a/device-lynx.mk b/device-lynx.mk
index 5e9a850..0aad3b8 100644
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -223,6 +223,10 @@ PRODUCT_PACKAGES += \
     NoCutoutOverlay \
     AvoidAppsInCutoutOverlay
 
+# Android DeviceAsWebcam specific overlay
+PRODUCT_PACKAGES += \
+    DeviceAsWebcamLynx
+
 # MIPI Coex Configs
 PRODUCT_COPY_FILES += \
     device/google/lynx/lynx/radio/lynx_display_primary_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/display_primary_mipi_coex_table.csv
@@ -279,3 +283,7 @@ PRODUCT_PACKAGES += \
     SettingsOverlayG0DZQ \
     SettingsOverlayGHL1X \
     SettingsOverlayGWKK3
+
+# Enable DeviceAsWebcam support
+PRODUCT_VENDOR_PROPERTIES += \
+    ro.usb.uvc.enabled=true
diff --git a/manifest.xml b/manifest.xml
index 982c345..38a4af5 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -89,16 +89,6 @@
         <transport>hwbinder</transport>
         <fqname>@1.2::IBootControl/default</fqname>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.neuralnetworks</name>
-        <transport>hwbinder</transport>
-        <version>1.2</version>
-        <interface>
-            <name>IDevice</name>
-            <instance>armnn</instance>
-        </interface>
-        <fqname>@1.2::IDevice/armnn</fqname>
-    </hal>
     <hal format="hidl">
        <name>android.hardware.neuralnetworks</name>
        <transport>hwbinder</transport>
diff --git a/rro_overlays/DeviceAsWebcamOverlay/Android.bp b/rro_overlays/DeviceAsWebcamOverlay/Android.bp
new file mode 100644
index 0000000..697b4ef
--- /dev/null
+++ b/rro_overlays/DeviceAsWebcamOverlay/Android.bp
@@ -0,0 +1,10 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "DeviceAsWebcamLynx",
+    certificate: "platform",
+    product_specific: true,
+    sdk_version: "current",
+}
diff --git a/rro_overlays/DeviceAsWebcamOverlay/AndroidManifest.xml b/rro_overlays/DeviceAsWebcamOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..0b3260c
--- /dev/null
+++ b/rro_overlays/DeviceAsWebcamOverlay/AndroidManifest.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<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>
diff --git a/rro_overlays/DeviceAsWebcamOverlay/OWNERS b/rro_overlays/DeviceAsWebcamOverlay/OWNERS
new file mode 100644
index 0000000..f48a95c
--- /dev/null
+++ b/rro_overlays/DeviceAsWebcamOverlay/OWNERS
@@ -0,0 +1 @@
+include platform/frameworks/av:/camera/OWNERS
diff --git a/rro_overlays/DeviceAsWebcamOverlay/res/raw/physical_camera_mapping.json b/rro_overlays/DeviceAsWebcamOverlay/res/raw/physical_camera_mapping.json
new file mode 100644
index 0000000..d847e25
--- /dev/null
+++ b/rro_overlays/DeviceAsWebcamOverlay/res/raw/physical_camera_mapping.json
@@ -0,0 +1 @@
+{"0": {"3" : "UW"}}