diff --git a/Android.bp b/Android.bp
index 70b3c4f..f920958 100644
--- a/Android.bp
+++ b/Android.bp
@@ -5,3 +5,34 @@
 soong_namespace {
 }
 
+android_app_import {
+	name: "MotCamera3AI",
+	owner: "motorola",
+	apk: "proprietary/product/app/MotCamera3AI/MotCamera3AI.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	product_specific: true,
+}
+
+android_app_import {
+	name: "MotCamera3",
+	owner: "motorola",
+	apk: "proprietary/product/priv-app/MotCamera3/MotCamera3.apk",
+	overrides: ["Camera2"],
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	product_specific: true,
+}
+
+dex_import {
+	name: "com.motorola.androidx.camera.extensions",
+	owner: "motorola",
+	jars: ["proprietary/system_ext/framework/com.motorola.androidx.camera.extensions.jar"],
+	system_ext_specific: true,
+}
+
diff --git a/berlin-vendor.mk b/berlin-vendor.mk
index ff95ebe..5b5facd 100644
--- a/berlin-vendor.mk
+++ b/berlin-vendor.mk
@@ -6,6 +6,67 @@ PRODUCT_SOONG_NAMESPACES += \
     vendor/motorola/berlin
 
 PRODUCT_COPY_FILES += \
+    vendor/motorola/berlin/proprietary/vendor/etc/permissions/com.motorola.camera3.berlin.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.motorola.camera3.berlin.xml \
+    vendor/motorola/berlin/proprietary/vendor/etc/permissions/com.motorola.camera3.content.ai.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.motorola.camera3.content.ai.xml \
+    vendor/motorola/berlin/proprietary/vendor/etc/permissions/com.motorola.camera3.lens.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.motorola.camera3.lens.xml \
+    vendor/motorola/berlin/proprietary/product/etc/permissions/com.motorola.camera3.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/com.motorola.camera3.xml \
+    vendor/motorola/berlin/proprietary/vendor/etc/permissions/com.motorola.camera3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.motorola.camera3.xml \
+    vendor/motorola/berlin/proprietary/product/etc/permissions/com.motorola.moto-uirefresh.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/com.motorola.moto-uirefresh.xml \
+    vendor/motorola/berlin/proprietary/product/etc/permissions/com.motorola.motodisplay.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/com.motorola.motodisplay.xml \
+    vendor/motorola/berlin/proprietary/product/etc/permissions/deviceowner-configuration-com.motorola.camera3.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/deviceowner-configuration-com.motorola.camera3.xml \
+    vendor/motorola/berlin/proprietary/product/etc/permissions/privapp-permissions-com.motorola.camera3.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-com.motorola.camera3.xml \
+    vendor/motorola/berlin/proprietary/product/etc/permissions/privapp-permissions-com.motorola.motodisplay.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-com.motorola.motodisplay.xml \
+    vendor/motorola/berlin/proprietary/product/etc/sysconfig/hiddenapi-whitelist-com.motorola.camera3.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/hiddenapi-whitelist-com.motorola.camera3.xml \
+    vendor/motorola/berlin/proprietary/product/lib64/libFNVfbEngineHAL.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libFNVfbEngineHAL.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libSNPE.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libSNPE.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libSuperSensorCPU_v05052021.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libSuperSensorCPU_v05052021.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libSuperSensorProcessorCWrapper_v2.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libSuperSensorProcessorCWrapper_v2.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libSuperSensorProcessor_v05052021.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libSuperSensorProcessor_v05052021.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libSuperSensor_v05052021.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libSuperSensor_v05052021.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libarcsoft_dualcam_refocus.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libarcsoft_dualcam_refocus.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libarcsoft_frc.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libarcsoft_frc.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libarcsoft_hdr_scbokeh_image.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libarcsoft_hdr_scbokeh_image.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libarcsoft_high_dynamic_range.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libarcsoft_high_dynamic_range.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libarcsoft_multiframe_bokeh_image.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libarcsoft_multiframe_bokeh_image.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libarcsoft_scbokeh_Generic.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libarcsoft_scbokeh_Generic.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libarcsoft_supernight.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libarcsoft_supernight.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libarcsoft_superportrait.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libarcsoft_superportrait.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libas-super-slow-motion.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libas-super-slow-motion.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libbarhopper_v3.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libbarhopper_v3.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libbg-postproc-jni.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libbg-postproc-jni.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libc++.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libc++.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libc++_shared.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libc++_shared.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libcamerax_extension_jni.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libcamerax_extension_jni.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libdoc-util.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libdoc-util.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libdynamic_depth.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libdynamic_depth.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libfn-beauty-vfb-base.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libfn-beauty-vfb-base.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libfoundation.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libfoundation.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libgg-dynamic_depth.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libgg-dynamic_depth.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libgg-tensorflow-lite.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libgg-tensorflow-lite.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libgif.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libgif.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libjpeg.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libjpeg.so \
+    vendor/motorola/berlin/proprietary/product/lib64/liblenovo_panorama.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/liblenovo_panorama.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libmcf-base.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libmcf-base.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libmcf-jni.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libmcf-jni.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libmcf-qc-fd-offline_local.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libmcf-qc-fd-offline_local.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libmcf-stand-alone-sm.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libmcf-stand-alone-sm.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libmmcamera_faceproc2.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libmmcamera_faceproc2.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libmorpho_cinema_graph.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libmorpho_cinema_graph.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libmorpho_panorama_gp3.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libmorpho_panorama_gp3.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libmorpho_sensor_fusion.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libmorpho_sensor_fusion.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libmot-cinemagraph-engine.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libmot-cinemagraph-engine.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libmot-util.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libmot-util.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libmpbase.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libmpbase.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libqc-snpe.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libqc-snpe.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libsmart_ppt.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libsmart_ppt.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libsmudge_detect.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libsmudge_detect.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libtensorflowlite.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libtensorflowlite.so \
+    vendor/motorola/berlin/proprietary/product/lib64/libtensorflowlite_gpu_delegate.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libtensorflowlite_gpu_delegate.so \
+    vendor/motorola/berlin/proprietary/system_ext/etc/permissions/com.motorola.androidx.camera.extensions.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.motorola.androidx.camera.extensions.xml \
+    vendor/motorola/berlin/proprietary/vendor/etc/permissions/com.motorola.androidx.camera.extensions.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.motorola.androidx.camera.extensions.xml \
+    vendor/motorola/berlin/proprietary/system_ext/etc/public.libraries-motocamera.txt:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/public.libraries-motocamera.txt \
+    vendor/motorola/berlin/proprietary/system_ext/lib/libmcf_native_window_helper.motocamera.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libmcf_native_window_helper.motocamera.so \
+    vendor/motorola/berlin/proprietary/system_ext/lib64/libmcf_native_window_helper.motocamera.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmcf_native_window_helper.motocamera.so \
     vendor/motorola/berlin/proprietary/vendor/bin/STFlashTool:$(TARGET_COPY_OUT_VENDOR)/bin/STFlashTool \
     vendor/motorola/berlin/proprietary/vendor/bin/hw/motorola.hardware.camera.desktop@2.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/motorola.hardware.camera.desktop@2.0-service \
     vendor/motorola/berlin/proprietary/vendor/etc/acdbdata/Bluetooth_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/Bluetooth_cal.acdb \
@@ -366,6 +427,10 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/berlin/proprietary/vendor/lib/com.qti.settings.sdm865.so:$(TARGET_COPY_OUT_VENDOR)/lib/com.qti.settings.sdm865.so \
     vendor/motorola/berlin/proprietary/vendor/lib/com.qti.settings.sm8350.so:$(TARGET_COPY_OUT_VENDOR)/lib/com.qti.settings.sm8350.so \
     vendor/motorola/berlin/proprietary/vendor/lib/com.qti.stats.common.so:$(TARGET_COPY_OUT_VENDOR)/lib/com.qti.stats.common.so \
+    vendor/motorola/berlin/proprietary/vendor/lib/com.qualcomm.mcx.distortionmapper.so:$(TARGET_COPY_OUT_VENDOR)/lib/com.qualcomm.mcx.distortionmapper.so \
+    vendor/motorola/berlin/proprietary/vendor/lib/com.qualcomm.mcx.linearmapper.so:$(TARGET_COPY_OUT_VENDOR)/lib/com.qualcomm.mcx.linearmapper.so \
+    vendor/motorola/berlin/proprietary/vendor/lib/com.qualcomm.mcx.policy.mfl.so:$(TARGET_COPY_OUT_VENDOR)/lib/com.qualcomm.mcx.policy.mfl.so \
+    vendor/motorola/berlin/proprietary/vendor/lib/com.qualcomm.qti.mcx.usecase.extension.so:$(TARGET_COPY_OUT_VENDOR)/lib/com.qualcomm.qti.mcx.usecase.extension.so \
     vendor/motorola/berlin/proprietary/vendor/lib/hw/camera.qcom.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/camera.qcom.so \
     vendor/motorola/berlin/proprietary/vendor/lib/hw/com.qti.chi.override.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/com.qti.chi.override.so \
     vendor/motorola/berlin/proprietary/vendor/lib/libAndroidAlgSys.so:$(TARGET_COPY_OUT_VENDOR)/lib/libAndroidAlgSys.so \
@@ -542,6 +607,10 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/berlin/proprietary/vendor/lib64/com.qti.settings.sdm865.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qti.settings.sdm865.so \
     vendor/motorola/berlin/proprietary/vendor/lib64/com.qti.settings.sm8350.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qti.settings.sm8350.so \
     vendor/motorola/berlin/proprietary/vendor/lib64/com.qti.stats.common.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qti.stats.common.so \
+    vendor/motorola/berlin/proprietary/vendor/lib64/com.qualcomm.mcx.distortionmapper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.mcx.distortionmapper.so \
+    vendor/motorola/berlin/proprietary/vendor/lib64/com.qualcomm.mcx.linearmapper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.mcx.linearmapper.so \
+    vendor/motorola/berlin/proprietary/vendor/lib64/com.qualcomm.mcx.policy.mfl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.mcx.policy.mfl.so \
+    vendor/motorola/berlin/proprietary/vendor/lib64/com.qualcomm.qti.mcx.usecase.extension.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.mcx.usecase.extension.so \
     vendor/motorola/berlin/proprietary/vendor/lib64/hw/camera.qcom.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/camera.qcom.so \
     vendor/motorola/berlin/proprietary/vendor/lib64/hw/com.qti.chi.override.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/com.qti.chi.override.so \
     vendor/motorola/berlin/proprietary/vendor/lib64/hw/fingerprint.goodix.default.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/fingerprint.goodix.default.so \
@@ -611,3 +680,8 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/berlin/proprietary/vendor/lib64/sensors.ssc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/sensors.ssc.so \
     vendor/motorola/berlin/proprietary/vendor/lib64/vendor.goodix.hardware.biometrics.fingerprint@3.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.goodix.hardware.biometrics.fingerprint@3.0.so \
     vendor/motorola/berlin/proprietary/vendor/lib64/vendor.qti.hardware.camera.postproc@1.0-service-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.camera.postproc@1.0-service-impl.so
+
+PRODUCT_PACKAGES += \
+    MotCamera3AI \
+    MotCamera3 \
+    com.motorola.androidx.camera.extensions
diff --git a/proprietary/product/app/MotCamera3AI/MotCamera3AI.apk b/proprietary/product/app/MotCamera3AI/MotCamera3AI.apk
new file mode 100644
index 0000000..ed54703
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/com.motorola.motodisplay.xml b/proprietary/product/etc/permissions/com.motorola.motodisplay.xml
new file mode 100644
index 0000000..2077552
--- /dev/null
+++ b/proprietary/product/etc/permissions/com.motorola.motodisplay.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<permissions>
+    <!-- Uses the Doze architecture of MotoDisplay. -->
+    <feature name="com.motorola.motodisplay.doze.glimpse"/>
+
+    <!-- Feature for 2017 products. -->
+    <feature name="com.motorola.motodisplay.6.0"/>
+
+    <!-- Add restriction to not reinstall MotoDisplay for work profile-->
+    <disallowed-managed-profile package="com.motorola.motodisplay"/>
+</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..ab2ade1
--- /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/permissions/privapp-permissions-com.motorola.motodisplay.xml b/proprietary/product/etc/permissions/privapp-permissions-com.motorola.motodisplay.xml
new file mode 100644
index 0000000..0da44a0
--- /dev/null
+++ b/proprietary/product/etc/permissions/privapp-permissions-com.motorola.motodisplay.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<permissions>
+    <privapp-permissions package="com.motorola.motodisplay">
+        <!-- System defined permissions -->
+        <permission name="android.permission.MEDIA_CONTENT_CONTROL"/>
+        <permission name="android.permission.MANAGE_USERS"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+        <permission name="android.permission.MODIFY_PHONE_STATE"/>
+        <permission name="android.permission.READ_WALLPAPER_INTERNAL"/>
+        <permission name="com.motorola.audiomonitor.permission.LOCAL"/>
+        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME" />
+        <permission name="android.permission.STOP_APP_SWITCHES" />
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
+        <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/lib64/libFNVfbEngineHAL.so b/proprietary/product/lib64/libFNVfbEngineHAL.so
new file mode 100644
index 0000000..ebd9694
Binary files /dev/null and b/proprietary/product/lib64/libFNVfbEngineHAL.so differ
diff --git a/proprietary/product/lib64/libSNPE.so b/proprietary/product/lib64/libSNPE.so
new file mode 100644
index 0000000..65f4ce4
Binary files /dev/null and b/proprietary/product/lib64/libSNPE.so differ
diff --git a/proprietary/product/lib64/libSuperSensorCPU_v05052021.so b/proprietary/product/lib64/libSuperSensorCPU_v05052021.so
new file mode 100644
index 0000000..aaf93ad
Binary files /dev/null and b/proprietary/product/lib64/libSuperSensorCPU_v05052021.so differ
diff --git a/proprietary/product/lib64/libSuperSensorProcessorCWrapper_v2.so b/proprietary/product/lib64/libSuperSensorProcessorCWrapper_v2.so
new file mode 100644
index 0000000..c26a777
Binary files /dev/null and b/proprietary/product/lib64/libSuperSensorProcessorCWrapper_v2.so differ
diff --git a/proprietary/product/lib64/libSuperSensorProcessor_v05052021.so b/proprietary/product/lib64/libSuperSensorProcessor_v05052021.so
new file mode 100644
index 0000000..d72b0d1
Binary files /dev/null and b/proprietary/product/lib64/libSuperSensorProcessor_v05052021.so differ
diff --git a/proprietary/product/lib64/libSuperSensor_v05052021.so b/proprietary/product/lib64/libSuperSensor_v05052021.so
new file mode 100644
index 0000000..6ae7f5f
Binary files /dev/null and b/proprietary/product/lib64/libSuperSensor_v05052021.so differ
diff --git a/proprietary/product/lib64/libarcsoft_dualcam_refocus.so b/proprietary/product/lib64/libarcsoft_dualcam_refocus.so
new file mode 100644
index 0000000..8d5a28f
Binary files /dev/null and b/proprietary/product/lib64/libarcsoft_dualcam_refocus.so differ
diff --git a/proprietary/product/lib64/libarcsoft_frc.so b/proprietary/product/lib64/libarcsoft_frc.so
new file mode 100644
index 0000000..60dc92d
Binary files /dev/null and b/proprietary/product/lib64/libarcsoft_frc.so differ
diff --git a/proprietary/product/lib64/libarcsoft_hdr_scbokeh_image.so b/proprietary/product/lib64/libarcsoft_hdr_scbokeh_image.so
new file mode 100644
index 0000000..5119b1c
Binary files /dev/null and b/proprietary/product/lib64/libarcsoft_hdr_scbokeh_image.so differ
diff --git a/proprietary/product/lib64/libarcsoft_high_dynamic_range.so b/proprietary/product/lib64/libarcsoft_high_dynamic_range.so
new file mode 100644
index 0000000..671552c
Binary files /dev/null and b/proprietary/product/lib64/libarcsoft_high_dynamic_range.so differ
diff --git a/proprietary/product/lib64/libarcsoft_multiframe_bokeh_image.so b/proprietary/product/lib64/libarcsoft_multiframe_bokeh_image.so
new file mode 100644
index 0000000..54c8958
Binary files /dev/null and b/proprietary/product/lib64/libarcsoft_multiframe_bokeh_image.so differ
diff --git a/proprietary/product/lib64/libarcsoft_scbokeh_Generic.so b/proprietary/product/lib64/libarcsoft_scbokeh_Generic.so
new file mode 100644
index 0000000..2e9101e
Binary files /dev/null and b/proprietary/product/lib64/libarcsoft_scbokeh_Generic.so differ
diff --git a/proprietary/product/lib64/libarcsoft_supernight.so b/proprietary/product/lib64/libarcsoft_supernight.so
new file mode 100644
index 0000000..c477642
Binary files /dev/null and b/proprietary/product/lib64/libarcsoft_supernight.so differ
diff --git a/proprietary/product/lib64/libarcsoft_superportrait.so b/proprietary/product/lib64/libarcsoft_superportrait.so
new file mode 100644
index 0000000..1a6a806
Binary files /dev/null and b/proprietary/product/lib64/libarcsoft_superportrait.so differ
diff --git a/proprietary/product/lib64/libas-super-slow-motion.so b/proprietary/product/lib64/libas-super-slow-motion.so
new file mode 100644
index 0000000..f8e7b85
Binary files /dev/null and b/proprietary/product/lib64/libas-super-slow-motion.so differ
diff --git a/proprietary/product/lib64/libbarhopper_v3.so b/proprietary/product/lib64/libbarhopper_v3.so
new file mode 100644
index 0000000..aea8eb8
Binary files /dev/null and b/proprietary/product/lib64/libbarhopper_v3.so differ
diff --git a/proprietary/product/lib64/libbg-postproc-jni.so b/proprietary/product/lib64/libbg-postproc-jni.so
new file mode 100644
index 0000000..a846baf
Binary files /dev/null and b/proprietary/product/lib64/libbg-postproc-jni.so differ
diff --git a/proprietary/product/lib64/libc++.so b/proprietary/product/lib64/libc++.so
new file mode 100644
index 0000000..11c969f
Binary files /dev/null and b/proprietary/product/lib64/libc++.so differ
diff --git a/proprietary/product/lib64/libc++_shared.so b/proprietary/product/lib64/libc++_shared.so
new file mode 100644
index 0000000..bb308af
Binary files /dev/null and b/proprietary/product/lib64/libc++_shared.so differ
diff --git a/proprietary/product/lib64/libcamerax_extension_jni.so b/proprietary/product/lib64/libcamerax_extension_jni.so
new file mode 100644
index 0000000..09f40c0
Binary files /dev/null and b/proprietary/product/lib64/libcamerax_extension_jni.so differ
diff --git a/proprietary/product/lib64/libdoc-util.so b/proprietary/product/lib64/libdoc-util.so
new file mode 100644
index 0000000..00b23d2
Binary files /dev/null and b/proprietary/product/lib64/libdoc-util.so differ
diff --git a/proprietary/product/lib64/libdynamic_depth.so b/proprietary/product/lib64/libdynamic_depth.so
new file mode 100644
index 0000000..19b5396
Binary files /dev/null and b/proprietary/product/lib64/libdynamic_depth.so differ
diff --git a/proprietary/product/lib64/libfn-beauty-vfb-base.so b/proprietary/product/lib64/libfn-beauty-vfb-base.so
new file mode 100644
index 0000000..8fcf6c5
Binary files /dev/null and b/proprietary/product/lib64/libfn-beauty-vfb-base.so differ
diff --git a/proprietary/product/lib64/libfoundation.so b/proprietary/product/lib64/libfoundation.so
new file mode 100644
index 0000000..3d46851
Binary files /dev/null and b/proprietary/product/lib64/libfoundation.so differ
diff --git a/proprietary/product/lib64/libgg-dynamic_depth.so b/proprietary/product/lib64/libgg-dynamic_depth.so
new file mode 100644
index 0000000..1df616d
Binary files /dev/null and b/proprietary/product/lib64/libgg-dynamic_depth.so differ
diff --git a/proprietary/product/lib64/libgg-tensorflow-lite.so b/proprietary/product/lib64/libgg-tensorflow-lite.so
new file mode 100644
index 0000000..df86cbc
Binary files /dev/null and b/proprietary/product/lib64/libgg-tensorflow-lite.so differ
diff --git a/proprietary/product/lib64/libgif.so b/proprietary/product/lib64/libgif.so
new file mode 100644
index 0000000..92a087f
Binary files /dev/null and b/proprietary/product/lib64/libgif.so differ
diff --git a/proprietary/product/lib64/libjpeg.so b/proprietary/product/lib64/libjpeg.so
new file mode 100644
index 0000000..71621a3
Binary files /dev/null and b/proprietary/product/lib64/libjpeg.so differ
diff --git a/proprietary/product/lib64/liblenovo_panorama.so b/proprietary/product/lib64/liblenovo_panorama.so
new file mode 100644
index 0000000..ade3a49
Binary files /dev/null and b/proprietary/product/lib64/liblenovo_panorama.so differ
diff --git a/proprietary/product/lib64/libmcf-base.so b/proprietary/product/lib64/libmcf-base.so
new file mode 100644
index 0000000..789bc78
Binary files /dev/null and b/proprietary/product/lib64/libmcf-base.so differ
diff --git a/proprietary/product/lib64/libmcf-jni.so b/proprietary/product/lib64/libmcf-jni.so
new file mode 100644
index 0000000..5a8fc95
Binary files /dev/null and b/proprietary/product/lib64/libmcf-jni.so differ
diff --git a/proprietary/product/lib64/libmcf-qc-fd-offline_local.so b/proprietary/product/lib64/libmcf-qc-fd-offline_local.so
new file mode 100644
index 0000000..6d5bb77
Binary files /dev/null and b/proprietary/product/lib64/libmcf-qc-fd-offline_local.so differ
diff --git a/proprietary/product/lib64/libmcf-stand-alone-sm.so b/proprietary/product/lib64/libmcf-stand-alone-sm.so
new file mode 100644
index 0000000..c2ac50b
Binary files /dev/null and b/proprietary/product/lib64/libmcf-stand-alone-sm.so differ
diff --git a/proprietary/product/lib64/libmmcamera_faceproc2.so b/proprietary/product/lib64/libmmcamera_faceproc2.so
new file mode 100644
index 0000000..47c76f3
Binary files /dev/null and b/proprietary/product/lib64/libmmcamera_faceproc2.so differ
diff --git a/proprietary/product/lib64/libmorpho_cinema_graph.so b/proprietary/product/lib64/libmorpho_cinema_graph.so
new file mode 100644
index 0000000..5113525
Binary files /dev/null and b/proprietary/product/lib64/libmorpho_cinema_graph.so differ
diff --git a/proprietary/product/lib64/libmorpho_panorama_gp3.so b/proprietary/product/lib64/libmorpho_panorama_gp3.so
new file mode 100644
index 0000000..19680e0
Binary files /dev/null and b/proprietary/product/lib64/libmorpho_panorama_gp3.so differ
diff --git a/proprietary/product/lib64/libmorpho_sensor_fusion.so b/proprietary/product/lib64/libmorpho_sensor_fusion.so
new file mode 100644
index 0000000..2bbcf51
Binary files /dev/null and b/proprietary/product/lib64/libmorpho_sensor_fusion.so differ
diff --git a/proprietary/product/lib64/libmot-cinemagraph-engine.so b/proprietary/product/lib64/libmot-cinemagraph-engine.so
new file mode 100644
index 0000000..dc12bed
Binary files /dev/null and b/proprietary/product/lib64/libmot-cinemagraph-engine.so differ
diff --git a/proprietary/product/lib64/libmot-util.so b/proprietary/product/lib64/libmot-util.so
new file mode 100644
index 0000000..85c9dc2
Binary files /dev/null and b/proprietary/product/lib64/libmot-util.so differ
diff --git a/proprietary/product/lib64/libmpbase.so b/proprietary/product/lib64/libmpbase.so
new file mode 100644
index 0000000..81e9281
Binary files /dev/null and b/proprietary/product/lib64/libmpbase.so differ
diff --git a/proprietary/product/lib64/libqc-snpe.so b/proprietary/product/lib64/libqc-snpe.so
new file mode 100644
index 0000000..74e82cc
Binary files /dev/null and b/proprietary/product/lib64/libqc-snpe.so differ
diff --git a/proprietary/product/lib64/libsmart_ppt.so b/proprietary/product/lib64/libsmart_ppt.so
new file mode 100644
index 0000000..06f74f3
Binary files /dev/null and b/proprietary/product/lib64/libsmart_ppt.so differ
diff --git a/proprietary/product/lib64/libsmudge_detect.so b/proprietary/product/lib64/libsmudge_detect.so
new file mode 100644
index 0000000..71aa62c
Binary files /dev/null and b/proprietary/product/lib64/libsmudge_detect.so differ
diff --git a/proprietary/product/lib64/libtensorflowlite.so b/proprietary/product/lib64/libtensorflowlite.so
new file mode 100644
index 0000000..f68ec44
Binary files /dev/null and b/proprietary/product/lib64/libtensorflowlite.so differ
diff --git a/proprietary/product/lib64/libtensorflowlite_gpu_delegate.so b/proprietary/product/lib64/libtensorflowlite_gpu_delegate.so
new file mode 100644
index 0000000..966bf60
Binary files /dev/null and b/proprietary/product/lib64/libtensorflowlite_gpu_delegate.so differ
diff --git a/proprietary/product/priv-app/MotCamera3/MotCamera3.apk b/proprietary/product/priv-app/MotCamera3/MotCamera3.apk
new file mode 100644
index 0000000..8e388d5
Binary files /dev/null and b/proprietary/product/priv-app/MotCamera3/MotCamera3.apk differ
diff --git a/proprietary/system_ext/etc/permissions/com.motorola.androidx.camera.extensions.xml b/proprietary/system_ext/etc/permissions/com.motorola.androidx.camera.extensions.xml
new file mode 100644
index 0000000..a156397
--- /dev/null
+++ b/proprietary/system_ext/etc/permissions/com.motorola.androidx.camera.extensions.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<permissions>
+    <library name="androidx.camera.extensions.impl"
+             file="/system_ext/framework/com.motorola.androidx.camera.extensions.jar" />
+</permissions>
diff --git a/proprietary/system_ext/etc/public.libraries-motocamera.txt b/proprietary/system_ext/etc/public.libraries-motocamera.txt
new file mode 100644
index 0000000..b9fdb56
--- /dev/null
+++ b/proprietary/system_ext/etc/public.libraries-motocamera.txt
@@ -0,0 +1 @@
+libmcf_native_window_helper.motocamera.so
diff --git a/proprietary/system_ext/framework/com.motorola.androidx.camera.extensions.jar b/proprietary/system_ext/framework/com.motorola.androidx.camera.extensions.jar
new file mode 100644
index 0000000..8e0c823
Binary files /dev/null and b/proprietary/system_ext/framework/com.motorola.androidx.camera.extensions.jar differ
diff --git a/proprietary/system_ext/lib/libmcf_native_window_helper.motocamera.so b/proprietary/system_ext/lib/libmcf_native_window_helper.motocamera.so
new file mode 100644
index 0000000..3a22d6a
Binary files /dev/null and b/proprietary/system_ext/lib/libmcf_native_window_helper.motocamera.so differ
diff --git a/proprietary/system_ext/lib64/libmcf_native_window_helper.motocamera.so b/proprietary/system_ext/lib64/libmcf_native_window_helper.motocamera.so
new file mode 100644
index 0000000..a8fc192
Binary files /dev/null and b/proprietary/system_ext/lib64/libmcf_native_window_helper.motocamera.so differ
diff --git a/proprietary/vendor/etc/permissions/com.motorola.androidx.camera.extensions.xml b/proprietary/vendor/etc/permissions/com.motorola.androidx.camera.extensions.xml
new file mode 100644
index 0000000..a156397
--- /dev/null
+++ b/proprietary/vendor/etc/permissions/com.motorola.androidx.camera.extensions.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<permissions>
+    <library name="androidx.camera.extensions.impl"
+             file="/system_ext/framework/com.motorola.androidx.camera.extensions.jar" />
+</permissions>
diff --git a/proprietary/vendor/etc/permissions/com.motorola.camera3.berlin.xml b/proprietary/vendor/etc/permissions/com.motorola.camera3.berlin.xml
new file mode 100644
index 0000000..2cdeb53
--- /dev/null
+++ b/proprietary/vendor/etc/permissions/com.motorola.camera3.berlin.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+  ~ Copyright (C) 2021 Motorola Mobility LLC,
+  ~ All Rights Reserved.
+  ~ Motorola Mobility Confidential Restricted.
+  -->
+
+<permissions>
+    <feature name="com.motorola.camera3.berlin" />
+</permissions>
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.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>
diff --git a/proprietary/vendor/lib/com.qualcomm.mcx.distortionmapper.so b/proprietary/vendor/lib/com.qualcomm.mcx.distortionmapper.so
new file mode 100644
index 0000000..07f10f3
Binary files /dev/null and b/proprietary/vendor/lib/com.qualcomm.mcx.distortionmapper.so differ
diff --git a/proprietary/vendor/lib/com.qualcomm.mcx.linearmapper.so b/proprietary/vendor/lib/com.qualcomm.mcx.linearmapper.so
new file mode 100644
index 0000000..f78e555
Binary files /dev/null and b/proprietary/vendor/lib/com.qualcomm.mcx.linearmapper.so differ
diff --git a/proprietary/vendor/lib/com.qualcomm.mcx.policy.mfl.so b/proprietary/vendor/lib/com.qualcomm.mcx.policy.mfl.so
new file mode 100644
index 0000000..e61bd5d
Binary files /dev/null and b/proprietary/vendor/lib/com.qualcomm.mcx.policy.mfl.so differ
diff --git a/proprietary/vendor/lib/com.qualcomm.qti.mcx.usecase.extension.so b/proprietary/vendor/lib/com.qualcomm.qti.mcx.usecase.extension.so
new file mode 100644
index 0000000..eaff3c4
Binary files /dev/null and b/proprietary/vendor/lib/com.qualcomm.qti.mcx.usecase.extension.so differ
diff --git a/proprietary/vendor/lib/hw/com.qti.chi.override.so b/proprietary/vendor/lib/hw/com.qti.chi.override.so
index 41569fe..fa298f6 100644
Binary files a/proprietary/vendor/lib/hw/com.qti.chi.override.so and b/proprietary/vendor/lib/hw/com.qti.chi.override.so differ
diff --git a/proprietary/vendor/lib64/camera/components/com.arcsoft.node.smooth_transition.so b/proprietary/vendor/lib64/camera/components/com.arcsoft.node.smooth_transition.so
index 56f61cf..5690b9f 100644
Binary files a/proprietary/vendor/lib64/camera/components/com.arcsoft.node.smooth_transition.so and b/proprietary/vendor/lib64/camera/components/com.arcsoft.node.smooth_transition.so differ
diff --git a/proprietary/vendor/lib64/com.qualcomm.mcx.distortionmapper.so b/proprietary/vendor/lib64/com.qualcomm.mcx.distortionmapper.so
new file mode 100644
index 0000000..5f600db
Binary files /dev/null and b/proprietary/vendor/lib64/com.qualcomm.mcx.distortionmapper.so differ
diff --git a/proprietary/vendor/lib64/com.qualcomm.mcx.linearmapper.so b/proprietary/vendor/lib64/com.qualcomm.mcx.linearmapper.so
new file mode 100644
index 0000000..aa83882
Binary files /dev/null and b/proprietary/vendor/lib64/com.qualcomm.mcx.linearmapper.so differ
diff --git a/proprietary/vendor/lib64/com.qualcomm.mcx.policy.mfl.so b/proprietary/vendor/lib64/com.qualcomm.mcx.policy.mfl.so
new file mode 100644
index 0000000..9d874d9
Binary files /dev/null and b/proprietary/vendor/lib64/com.qualcomm.mcx.policy.mfl.so differ
diff --git a/proprietary/vendor/lib64/com.qualcomm.qti.mcx.usecase.extension.so b/proprietary/vendor/lib64/com.qualcomm.qti.mcx.usecase.extension.so
new file mode 100644
index 0000000..5b88688
Binary files /dev/null and b/proprietary/vendor/lib64/com.qualcomm.qti.mcx.usecase.extension.so differ
diff --git a/proprietary/vendor/lib64/hw/com.qti.chi.override.so b/proprietary/vendor/lib64/hw/com.qti.chi.override.so
index 3f58d28..b5bcc9b 100644
Binary files a/proprietary/vendor/lib64/hw/com.qti.chi.override.so and b/proprietary/vendor/lib64/hw/com.qti.chi.override.so differ
diff --git a/proprietary/vendor/lib64/libgf_hal.so b/proprietary/vendor/lib64/libgf_hal.so
index 38f1f04..1424a98 100644
Binary files a/proprietary/vendor/lib64/libgf_hal.so and b/proprietary/vendor/lib64/libgf_hal.so differ