diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..b78bd08
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+proprietary/product/priv-app/MotCamera4/MotCamera4.apk filter=lfs diff=lfs merge=lfs -text
diff --git a/Android.bp b/Android.bp
index 1a2fde3..005723a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -8,6 +8,17 @@ soong_namespace {
 	],
 }
 
+android_app_import {
+	name: "MotoSignatureApp",
+	owner: "motorola",
+	apk: "proprietary/system/app/MotoSignatureApp/MotoSignatureApp.apk",
+	preprocessed: true,
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+}
+
 android_app_import {
 	name: "EuiccPartnerApp",
 	owner: "motorola",
@@ -19,6 +30,18 @@ android_app_import {
 	product_specific: true,
 }
 
+android_app_import {
+	name: "MotCamera3AI",
+	owner: "motorola",
+	apk: "proprietary/product/app/MotCamera3AI/MotCamera3AI.apk",
+	preprocessed: true,
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	product_specific: true,
+}
+
 android_app_import {
 	name: "EuiccGoogle",
 	owner: "motorola",
@@ -55,6 +78,49 @@ android_app_import {
 	product_specific: true,
 }
 
+android_app_import {
+	name: "MotCamera4",
+	owner: "motorola",
+	apk: "proprietary/product/priv-app/MotCamera4/MotCamera4.apk",
+	preprocessed: true,
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	product_specific: true,
+}
+
+android_app_import {
+	name: "MotorolaSettingsProvider",
+	owner: "motorola",
+	apk: "proprietary/system_ext/priv-app/MotorolaSettingsProvider/MotorolaSettingsProvider.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "com.motorola.motosignature",
+	owner: "motorola",
+	jars: ["proprietary/system/framework/com.motorola.motosignature.jar"],
+}
+
+dex_import {
+	name: "moto-core_services",
+	owner: "motorola",
+	jars: ["proprietary/system/framework/moto-core_services.jar"],
+}
+
+dex_import {
+	name: "moto-settings",
+	owner: "motorola",
+	jars: ["proprietary/system/framework/moto-settings.jar"],
+}
+
 dex_import {
 	name: "com.android.hotwordenrollment.common.util",
 	owner: "motorola",
diff --git a/fogos-vendor.mk b/fogos-vendor.mk
index fbedd6c..a021416 100644
--- a/fogos-vendor.mk
+++ b/fogos-vendor.mk
@@ -6,7 +6,20 @@ PRODUCT_SOONG_NAMESPACES += \
     vendor/motorola/fogos
 
 PRODUCT_COPY_FILES += \
+    vendor/motorola/fogos/proprietary/vendor/etc/permissions/com.motorola.camera3.content.ai.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.motorola.camera3.content.ai.xml \
+    vendor/motorola/fogos/proprietary/vendor/etc/permissions/com.motorola.camera3.fogos.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.motorola.camera3.fogos.xml \
+    vendor/motorola/fogos/proprietary/vendor/etc/permissions/com.motorola.camera3.lens.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.motorola.camera3.lens.xml \
+    vendor/motorola/fogos/proprietary/product/etc/permissions/com.motorola.camera3.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/com.motorola.camera3.xml \
+    vendor/motorola/fogos/proprietary/vendor/etc/permissions/com.motorola.camera3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.motorola.camera3.xml \
+    vendor/motorola/fogos/proprietary/product/etc/permissions/com.motorola.moto-uirefresh.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/com.motorola.moto-uirefresh.xml \
+    vendor/motorola/fogos/proprietary/product/etc/permissions/deviceowner-configuration-com.motorola.camera3.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/deviceowner-configuration-com.motorola.camera3.xml \
     vendor/motorola/fogos/proprietary/product/etc/permissions/privapp-permissions-com.google.android.euicc.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-com.google.android.euicc.xml \
+    vendor/motorola/fogos/proprietary/product/etc/permissions/privapp-permissions-com.motorola.camera3.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-com.motorola.camera3.xml \
+    vendor/motorola/fogos/proprietary/product/etc/sysconfig/hiddenapi-whitelist-com.motorola.camera3.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/hiddenapi-whitelist-com.motorola.camera3.xml \
+    vendor/motorola/fogos/proprietary/system/etc/permissions/com.motorola.motosignature.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/com.motorola.motosignature.xml \
+    vendor/motorola/fogos/proprietary/system/etc/permissions/moto-core_services.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/moto-core_services.xml \
+    vendor/motorola/fogos/proprietary/system/etc/permissions/moto-settings.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/moto-settings.xml \
+    vendor/motorola/fogos/proprietary/system_ext/bin/motsettings:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/motsettings \
     vendor/motorola/fogos/proprietary/system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.android.hotwordenrollment.common.util.xml \
     vendor/motorola/fogos/proprietary/vendor/bin/capsense_reset:$(TARGET_COPY_OUT_VENDOR)/bin/capsense_reset \
     vendor/motorola/fogos/proprietary/vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-goodixservice:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.biometrics.fingerprint@2.1-goodixservice \
@@ -389,8 +402,15 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/vendor/lib64/vendor.qti.hardware.scve.panorama@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.scve.panorama@1.0.so
 
 PRODUCT_PACKAGES += \
+    MotoSignatureApp \
     EuiccPartnerApp \
+    MotCamera3AI \
     EuiccGoogle \
     HotwordEnrollmentOKGoogleHEXAGON_WIDEBAND \
     HotwordEnrollmentXGoogleHEXAGON_WIDEBAND \
+    MotCamera4 \
+    MotorolaSettingsProvider \
+    com.motorola.motosignature \
+    moto-core_services \
+    moto-settings \
     com.android.hotwordenrollment.common.util
diff --git a/proprietary/product/app/MotCamera3AI/MotCamera3AI.apk b/proprietary/product/app/MotCamera3AI/MotCamera3AI.apk
new file mode 100644
index 0000000..1346029
Binary files /dev/null and b/proprietary/product/app/MotCamera3AI/MotCamera3AI.apk differ
diff --git a/proprietary/product/etc/permissions/com.motorola.camera3.xml b/proprietary/product/etc/permissions/com.motorola.camera3.xml
new file mode 100644
index 0000000..72eb259
--- /dev/null
+++ b/proprietary/product/etc/permissions/com.motorola.camera3.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+  ~ Copyright (C) 2013-2020 Motorola Mobility LLC,
+  ~ All Rights Reserved.
+  ~ Motorola Mobility Confidential Restricted.
+  -->
+
+<permissions>
+    <feature name="com.motorola.camera3" />
+</permissions>
diff --git a/proprietary/product/etc/permissions/com.motorola.moto-uirefresh.xml b/proprietary/product/etc/permissions/com.motorola.moto-uirefresh.xml
new file mode 100644
index 0000000..6019a40
--- /dev/null
+++ b/proprietary/product/etc/permissions/com.motorola.moto-uirefresh.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<permissions>
+    <feature name="com.motorola.moto" />
+    <feature name="com.motorola.moto.uirefresh" />
+    <disallowed-managed-profile package="com.motorola.moto"/>
+</permissions>
diff --git a/proprietary/product/etc/permissions/deviceowner-configuration-com.motorola.camera3.xml b/proprietary/product/etc/permissions/deviceowner-configuration-com.motorola.camera3.xml
new file mode 100644
index 0000000..7dc9fd8
--- /dev/null
+++ b/proprietary/product/etc/permissions/deviceowner-configuration-com.motorola.camera3.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<config>
+    <required-managed-device package="com.motorola.camera3"/>
+    <required-managed-user package="com.motorola.camera3"/>
+</config>
diff --git a/proprietary/product/etc/permissions/privapp-permissions-com.motorola.camera3.xml b/proprietary/product/etc/permissions/privapp-permissions-com.motorola.camera3.xml
new file mode 100644
index 0000000..bf8cc53
--- /dev/null
+++ b/proprietary/product/etc/permissions/privapp-permissions-com.motorola.camera3.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<permissions>
+    <privapp-permissions package="com.motorola.camera3">
+
+        <!-- System defined permissions -->
+        <permission name="android.permission.STOP_APP_SWITCHES"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
+
+    </privapp-permissions>
+</permissions>
diff --git a/proprietary/product/etc/sysconfig/hiddenapi-whitelist-com.motorola.camera3.xml b/proprietary/product/etc/sysconfig/hiddenapi-whitelist-com.motorola.camera3.xml
new file mode 100644
index 0000000..ded0f65
--- /dev/null
+++ b/proprietary/product/etc/sysconfig/hiddenapi-whitelist-com.motorola.camera3.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+   <hidden-api-whitelisted-app package="com.motorola.camera3" />
+</config>
diff --git a/proprietary/product/priv-app/MotCamera4/MotCamera4.apk b/proprietary/product/priv-app/MotCamera4/MotCamera4.apk
new file mode 100644
index 0000000..8eb4eb6
--- /dev/null
+++ b/proprietary/product/priv-app/MotCamera4/MotCamera4.apk
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ff0541a8b175eabb6998ddcd64173731cea351de494e9a387256ca99c0b7d5e5
+size 230860128
diff --git a/proprietary/system/app/MotoSignatureApp/MotoSignatureApp.apk b/proprietary/system/app/MotoSignatureApp/MotoSignatureApp.apk
new file mode 100644
index 0000000..12357f3
Binary files /dev/null and b/proprietary/system/app/MotoSignatureApp/MotoSignatureApp.apk differ
diff --git a/proprietary/system/etc/permissions/com.motorola.motosignature.xml b/proprietary/system/etc/permissions/com.motorola.motosignature.xml
new file mode 100644
index 0000000..67236fc
--- /dev/null
+++ b/proprietary/system/etc/permissions/com.motorola.motosignature.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<permissions>
+    <library name="com.motorola.motosignature"
+             file="/system/framework/com.motorola.motosignature.jar"/>
+</permissions>
diff --git a/proprietary/system/etc/permissions/moto-core_services.xml b/proprietary/system/etc/permissions/moto-core_services.xml
new file mode 100644
index 0000000..a1875e8
--- /dev/null
+++ b/proprietary/system/etc/permissions/moto-core_services.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 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.
+-->
+<permissions>
+    <library
+        name="moto-core_services"
+        file="/system/framework/moto-core_services.jar"
+    />
+</permissions>
+
diff --git a/proprietary/system/etc/permissions/moto-settings.xml b/proprietary/system/etc/permissions/moto-settings.xml
new file mode 100644
index 0000000..6f1da92
--- /dev/null
+++ b/proprietary/system/etc/permissions/moto-settings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 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.
+-->
+<permissions>
+    <library
+        name="moto-settings"
+        file="/system/framework/moto-settings.jar"
+    />
+</permissions>
+
diff --git a/proprietary/system/framework/com.motorola.motosignature.jar b/proprietary/system/framework/com.motorola.motosignature.jar
new file mode 100644
index 0000000..51def14
Binary files /dev/null and b/proprietary/system/framework/com.motorola.motosignature.jar differ
diff --git a/proprietary/system/framework/moto-core_services.jar b/proprietary/system/framework/moto-core_services.jar
new file mode 100644
index 0000000..1ec8b49
Binary files /dev/null and b/proprietary/system/framework/moto-core_services.jar differ
diff --git a/proprietary/system/framework/moto-settings.jar b/proprietary/system/framework/moto-settings.jar
new file mode 100644
index 0000000..8548051
Binary files /dev/null and b/proprietary/system/framework/moto-settings.jar differ
diff --git a/proprietary/system_ext/bin/motsettings b/proprietary/system_ext/bin/motsettings
new file mode 100755
index 0000000..898e923
--- /dev/null
+++ b/proprietary/system_ext/bin/motsettings
@@ -0,0 +1,2 @@
+#!/system/bin/sh
+cmd motsettings "$@"
diff --git a/proprietary/system_ext/priv-app/MotorolaSettingsProvider/MotorolaSettingsProvider.apk b/proprietary/system_ext/priv-app/MotorolaSettingsProvider/MotorolaSettingsProvider.apk
new file mode 100644
index 0000000..6aebb4a
Binary files /dev/null and b/proprietary/system_ext/priv-app/MotorolaSettingsProvider/MotorolaSettingsProvider.apk differ
diff --git a/proprietary/vendor/etc/permissions/com.motorola.camera3.content.ai.xml b/proprietary/vendor/etc/permissions/com.motorola.camera3.content.ai.xml
new file mode 100644
index 0000000..5b2d21b
--- /dev/null
+++ b/proprietary/vendor/etc/permissions/com.motorola.camera3.content.ai.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+  ~ Copyright (C) 2019 Motorola Mobility LLC,
+  ~ All Rights Reserved.
+  ~ Motorola Mobility Confidential Restricted.
+  -->
+<permissions>
+    <feature name="com.motorola.camera3.content.ai" />
+</permissions>
diff --git a/proprietary/vendor/etc/permissions/com.motorola.camera3.fogos.xml b/proprietary/vendor/etc/permissions/com.motorola.camera3.fogos.xml
new file mode 100644
index 0000000..a8d16df
--- /dev/null
+++ b/proprietary/vendor/etc/permissions/com.motorola.camera3.fogos.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+  ~ Copyright (C) 2023 Motorola Mobility LLC,
+  ~ All Rights Reserved.
+  ~ Motorola Mobility Confidential Restricted.
+  -->
+
+<permissions>
+    <feature name="com.motorola.camera3.fogos" />
+</permissions>
diff --git a/proprietary/vendor/etc/permissions/com.motorola.camera3.lens.xml b/proprietary/vendor/etc/permissions/com.motorola.camera3.lens.xml
new file mode 100644
index 0000000..a1b691f
--- /dev/null
+++ b/proprietary/vendor/etc/permissions/com.motorola.camera3.lens.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+  ~ Copyright (C) 2013-2020 Motorola Mobility LLC,
+  ~ All Rights Reserved.
+  ~ Motorola Mobility Confidential Restricted.
+  -->
+
+<permissions>
+    <feature name="com.google.lens.feature.CAMERA_INTEGRATION" />
+</permissions>
diff --git a/proprietary/vendor/etc/permissions/com.motorola.camera3.xml b/proprietary/vendor/etc/permissions/com.motorola.camera3.xml
new file mode 100644
index 0000000..72eb259
--- /dev/null
+++ b/proprietary/vendor/etc/permissions/com.motorola.camera3.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+  ~ Copyright (C) 2013-2020 Motorola Mobility LLC,
+  ~ All Rights Reserved.
+  ~ Motorola Mobility Confidential Restricted.
+  -->
+
+<permissions>
+    <feature name="com.motorola.camera3" />
+</permissions>