diff --git a/Android.bp b/Android.bp
index 601f093..d9a01db 100644
--- a/Android.bp
+++ b/Android.bp
@@ -122,6 +122,17 @@ android_app_import {
 	system_ext_specific: true,
 }
 
+android_app_import {
+	name: "QtiTelephony",
+	owner: "motorola",
+	apk: "proprietary/system_ext/app/QtiTelephony/QtiTelephony.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	system_ext_specific: true,
+}
+
 android_app_import {
 	name: "QtiTelephonyService",
 	owner: "motorola",
@@ -145,6 +156,18 @@ android_app_import {
 	system_ext_specific: true,
 }
 
+android_app_import {
+	name: "dpmserviceapp",
+	owner: "motorola",
+	apk: "proprietary/system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	system_ext_specific: true,
+}
+
 android_app_import {
 	name: "ims",
 	owner: "motorola",
@@ -195,6 +218,13 @@ dex_import {
 	product_specific: true,
 }
 
+dex_import {
+	name: "uimservicelibrary",
+	owner: "motorola",
+	jars: ["proprietary/product/framework/uimservicelibrary.jar"],
+	product_specific: true,
+}
+
 dex_import {
 	name: "moto-telephony",
 	owner: "motorola",
@@ -230,6 +260,20 @@ dex_import {
 	system_ext_specific: true,
 }
 
+dex_import {
+	name: "vendor.qti.ims.configservice-V1.0-java",
+	owner: "motorola",
+	jars: ["proprietary/system_ext/framework/vendor.qti.ims.configservice-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.ims.configservice-V1.1-java",
+	owner: "motorola",
+	jars: ["proprietary/system_ext/framework/vendor.qti.ims.configservice-V1.1-java.jar"],
+	system_ext_specific: true,
+}
+
 dex_import {
 	name: "vendor.qti.ims.connection-V1.0-java",
 	owner: "motorola",
@@ -237,6 +281,13 @@ dex_import {
 	system_ext_specific: true,
 }
 
+dex_import {
+	name: "vendor.qti.ims.factory-V1.1-java",
+	owner: "motorola",
+	jars: ["proprietary/system_ext/framework/vendor.qti.ims.factory-V1.1-java.jar"],
+	system_ext_specific: true,
+}
+
 dex_import {
 	name: "vendor.qti.ims.factory-V2.0-java",
 	owner: "motorola",
@@ -244,6 +295,20 @@ dex_import {
 	system_ext_specific: true,
 }
 
+dex_import {
+	name: "vendor.qti.ims.factory-V2.1-java",
+	owner: "motorola",
+	jars: ["proprietary/system_ext/framework/vendor.qti.ims.factory-V2.1-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.ims.factory-V2.2-java",
+	owner: "motorola",
+	jars: ["proprietary/system_ext/framework/vendor.qti.ims.factory-V2.2-java.jar"],
+	system_ext_specific: true,
+}
+
 dex_import {
 	name: "vendor.qti.ims.rcssip-V1.0-java",
 	owner: "motorola",
@@ -251,6 +316,20 @@ dex_import {
 	system_ext_specific: true,
 }
 
+dex_import {
+	name: "vendor.qti.ims.rcssip-V1.1-java",
+	owner: "motorola",
+	jars: ["proprietary/system_ext/framework/vendor.qti.ims.rcssip-V1.1-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.ims.rcssip-V1.2-java",
+	owner: "motorola",
+	jars: ["proprietary/system_ext/framework/vendor.qti.ims.rcssip-V1.2-java.jar"],
+	system_ext_specific: true,
+}
+
 dex_import {
 	name: "vendor.qti.ims.rcsuce-V1.0-java",
 	owner: "motorola",
@@ -258,13 +337,18 @@ dex_import {
 	system_ext_specific: true,
 }
 
-prebuilt_etc_xml {
-	name: "android.hardware.neuralnetworks@1.3-service-qti",
+dex_import {
+	name: "vendor.qti.ims.rcsuce-V1.1-java",
 	owner: "motorola",
-	src: "proprietary/vendor/etc/vintf/manifest/android.hardware.neuralnetworks@1.3-service-qti.xml",
-	filename_from_src: true,
-	sub_dir: "vintf/manifest",
-	soc_specific: true,
+	jars: ["proprietary/system_ext/framework/vendor.qti.ims.rcsuce-V1.1-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.ims.rcsuce-V1.2-java",
+	owner: "motorola",
+	jars: ["proprietary/system_ext/framework/vendor.qti.ims.rcsuce-V1.2-java.jar"],
+	system_ext_specific: true,
 }
 
 prebuilt_etc_xml {
diff --git a/proprietary/product/app/uimgbaservice/uimgbaservice.apk b/proprietary/product/app/uimgbaservice/uimgbaservice.apk
index fd3a296..098ab46 100644
Binary files a/proprietary/product/app/uimgbaservice/uimgbaservice.apk and b/proprietary/product/app/uimgbaservice/uimgbaservice.apk differ
diff --git a/proprietary/product/etc/permissions/UimService.xml b/proprietary/product/etc/permissions/UimService.xml
new file mode 100644
index 0000000..0028367
--- /dev/null
+++ b/proprietary/product/etc/permissions/UimService.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (c) 2017, 2019 Qualcomm Technologies, Inc.
+  All Rights Reserved.
+  Confidential and Proprietary - Qualcomm Technologies, Inc.
+-->
+
+<permissions>
+ <library name="com.qualcomm.qti.uim.uimservicelibrary"
+          file="/product/framework/uimservicelibrary.jar"
+          dependency="qti-telephony-hidl-wrapper-prd"/>
+</permissions>
diff --git a/proprietary/product/framework/uimgbalibrary.jar b/proprietary/product/framework/uimgbalibrary.jar
index 5e334cb..7b61719 100644
Binary files a/proprietary/product/framework/uimgbalibrary.jar and b/proprietary/product/framework/uimgbalibrary.jar differ
diff --git a/proprietary/product/framework/uimgbamanagerlibrary.jar b/proprietary/product/framework/uimgbamanagerlibrary.jar
index 2996fd0..a56d88e 100644
Binary files a/proprietary/product/framework/uimgbamanagerlibrary.jar and b/proprietary/product/framework/uimgbamanagerlibrary.jar differ
diff --git a/proprietary/product/framework/uimservicelibrary.jar b/proprietary/product/framework/uimservicelibrary.jar
new file mode 100644
index 0000000..b151a75
Binary files /dev/null and b/proprietary/product/framework/uimservicelibrary.jar differ
diff --git a/proprietary/system/etc/sysconfig/qti_whitelist.xml b/proprietary/system/etc/sysconfig/qti_whitelist.xml
index 0d0d83d..baf43cd 100644
--- a/proprietary/system/etc/sysconfig/qti_whitelist.xml
+++ b/proprietary/system/etc/sysconfig/qti_whitelist.xml
@@ -106,7 +106,6 @@
     <hidden-api-whitelisted-app package="com.android.bluetooth" />
     <hidden-api-whitelisted-app package="org.codeaurora.bluetooth" />
     <hidden-api-whitelisted-app package="com.qualcomm.qti.qmmi" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.perfdump" />
     <hidden-api-whitelisted-app package="com.qualcomm.wfd.client" />
     <hidden-api-whitelisted-app package="com.qualcomm.wfd.service" />
     <hidden-api-whitelisted-app package="com.qualcomm.qti.server.wigigapp" />
diff --git a/proprietary/system/framework/WfdCommon.jar b/proprietary/system/framework/WfdCommon.jar
index 9f6df3c..4010598 100644
Binary files a/proprietary/system/framework/WfdCommon.jar and b/proprietary/system/framework/WfdCommon.jar differ
diff --git a/proprietary/system/framework/tcmclient.jar b/proprietary/system/framework/tcmclient.jar
index be6e996..af33f3b 100644
Binary files a/proprietary/system/framework/tcmclient.jar and b/proprietary/system/framework/tcmclient.jar differ
diff --git a/proprietary/system_ext/app/ImsRcsService/ImsRcsService.apk b/proprietary/system_ext/app/ImsRcsService/ImsRcsService.apk
index 1a6944f..3ce492a 100644
Binary files a/proprietary/system_ext/app/ImsRcsService/ImsRcsService.apk and b/proprietary/system_ext/app/ImsRcsService/ImsRcsService.apk differ
diff --git a/proprietary/system_ext/app/QtiTelephony/QtiTelephony.apk b/proprietary/system_ext/app/QtiTelephony/QtiTelephony.apk
new file mode 100644
index 0000000..c7526b7
Binary files /dev/null and b/proprietary/system_ext/app/QtiTelephony/QtiTelephony.apk differ
diff --git a/proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk b/proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk
index deb0592..4c989d9 100644
Binary files a/proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk and b/proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk differ
diff --git a/proprietary/system_ext/bin/dpmd b/proprietary/system_ext/bin/dpmd
index 7cb9fa0..0556b22 100755
Binary files a/proprietary/system_ext/bin/dpmd and b/proprietary/system_ext/bin/dpmd differ
diff --git a/proprietary/system_ext/bin/qccsyshal@1.1-service b/proprietary/system_ext/bin/qccsyshal@1.1-service
deleted file mode 100755
index 90109c1..0000000
Binary files a/proprietary/system_ext/bin/qccsyshal@1.1-service and /dev/null differ
diff --git a/proprietary/system_ext/bin/qccsyshal@1.2-service b/proprietary/system_ext/bin/qccsyshal@1.2-service
new file mode 100755
index 0000000..902f419
Binary files /dev/null and b/proprietary/system_ext/bin/qccsyshal@1.2-service differ
diff --git a/proprietary/system_ext/bin/qspmsvc b/proprietary/system_ext/bin/qspmsvc
index c9a04ac..e0f16ba 100755
Binary files a/proprietary/system_ext/bin/qspmsvc and b/proprietary/system_ext/bin/qspmsvc differ
diff --git a/proprietary/system_ext/bin/wfdservice b/proprietary/system_ext/bin/wfdservice
index ed9def1..187ba1f 100755
Binary files a/proprietary/system_ext/bin/wfdservice and b/proprietary/system_ext/bin/wfdservice differ
diff --git a/proprietary/system_ext/etc/init/vendor.qti.hardware.qccsyshal@1.1-service.rc b/proprietary/system_ext/etc/init/vendor.qti.hardware.qccsyshal@1.1-service.rc
deleted file mode 100644
index 79c77f7..0000000
--- a/proprietary/system_ext/etc/init/vendor.qti.hardware.qccsyshal@1.1-service.rc
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright (c) 2021 Qualcomm Technologies, Inc.
-# All Rights Reserved.
-# Confidential and Proprietary - Qualcomm Technologies, Inc.
-#
-
-on post-fs-data
-    mkdir /data/misc/qdma 0770 system system
-    mkdir /dev/socket/qdma_app 0777 system system
-    chmod 2777 /dev/socket/qdma_app
-    mkdir /data/misc/qdma/conf 0770 system system
-
-on property:vendor.qti.qdma.oper.mode=1
-    write /data/misc/qdma/conf/qdma.conf "OperationMode:1"
-    chown system system /data/misc/qdma/conf/qdma.conf
-
-on property:vendor.qti.qdma.oper.mode=2
-    write /data/misc/qdma/conf/qdma.conf "OperationMode:2"
-    chown system system /data/misc/qdma/conf/qdma.conf
-
-on property:vendor.qti.qdma.oper.mode=3
-    write /data/misc/qdma/conf/qdma.conf "OperationMode:3"
-    chown system system /data/misc/qdma/conf/qdma.conf
-
-service qccsyshal@1.1-service /system/system_ext/bin/qccsyshal@1.1-service
-    class hal
-    user system
-    group system inet
diff --git a/proprietary/system_ext/etc/init/vendor.qti.hardware.qccsyshal@1.2-service.rc b/proprietary/system_ext/etc/init/vendor.qti.hardware.qccsyshal@1.2-service.rc
new file mode 100644
index 0000000..63f02aa
--- /dev/null
+++ b/proprietary/system_ext/etc/init/vendor.qti.hardware.qccsyshal@1.2-service.rc
@@ -0,0 +1,37 @@
+#
+# Copyright (c) 2021-2022 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc.
+#
+
+on post-fs-data
+    mkdir /dev/socket/qcc_app 0770 system vendor_qtr
+    chmod 2770 /dev/socket/qcc_app
+
+    mkdir /data/misc/qcc 0770 system vendor_qtr
+    mkdir /data/misc/qcc/up 0770 system vendor_qtr
+    mkdir /data/misc/qcc/down 0770 system vendor_qtr
+    mkdir /data/misc/qcc/conf 0770 system vendor_qtr
+    mkdir /data/misc/qcc/shared 0770 system vendor_qtr
+    mkdir /data/misc/qcc/down/200 0770 system vendor_qtr
+
+on property:vendor.qti.qcc.oper.mode=1
+    write /data/misc/qcc/conf/qcc.conf "OperationMode:1"
+    chown system vendor_qtr /data/misc/qcc/conf/qcc.conf
+
+on property:vendor.qti.qcc.oper.mode=2
+    write /data/misc/qcc/conf/qcc.conf "OperationMode:2"
+    chown system vendor_qtr /data/misc/qcc/conf/qcc.conf
+
+on property:vendor.qti.qcc.oper.mode=3
+    write /data/misc/qcc/conf/qcc.conf "OperationMode:3"
+    chown system vendor_qtr /data/misc/qcc/conf/qcc.conf
+
+on property:vendor.qti.qcc.oper.mode=4
+    write /data/misc/qcc/conf/qcc.conf "OperationMode:4"
+    chown system vendor_qtr /data/misc/qcc/conf/qcc.conf
+
+service qccsyshal@1.2-service /system/system_ext/bin/qccsyshal@1.2-service
+    class hal
+    user system
+    group vendor_qtr system
diff --git a/proprietary/system_ext/etc/permissions/moto-telephony.xml b/proprietary/system_ext/etc/permissions/moto-telephony.xml
index be8f8e8..68761bb 100644
--- a/proprietary/system_ext/etc/permissions/moto-telephony.xml
+++ b/proprietary/system_ext/etc/permissions/moto-telephony.xml
@@ -14,6 +14,9 @@
     limitations under the License.
 -->
 <permissions>
-    <library name="moto-telephony" file="/system_ext/framework/moto-telephony.jar"/>
+    <library
+        name="moto-telephony"
+        file="/system_ext/framework/moto-telephony.jar"
+    />
 </permissions>
 
diff --git a/proprietary/system_ext/etc/permissions/vendor.qti.ims.rcsservice.xml b/proprietary/system_ext/etc/permissions/vendor.qti.ims.rcsservice.xml
index b495b5d..17a6390 100644
--- a/proprietary/system_ext/etc/permissions/vendor.qti.ims.rcsservice.xml
+++ b/proprietary/system_ext/etc/permissions/vendor.qti.ims.rcsservice.xml
@@ -1,6 +1,6 @@
 <!--
 /*********************************************************************
- Copyright (c) 2021 Qualcomm Technologies, Inc.
+ Copyright (c) 2021-2022 Qualcomm Technologies, Inc.
  All Rights Reserved.
  Confidential and Proprietary - Qualcomm Technologies, Inc.
 **********************************************************************/
@@ -14,4 +14,16 @@
         file="/system_ext/framework/vendor.qti.ims.rcsuce-V1.0-java.jar"/>
     <library name="vendor.qti.ims.rcssip-V1.0-java"
         file="/system_ext/framework/vendor.qti.ims.rcssip-V1.0-java.jar"/>
+    <library name="vendor.qti.ims.factory-V2.1-java"
+        file="/system_ext/framework/vendor.qti.ims.factory-V2.1-java.jar"/>
+    <library name="vendor.qti.ims.rcsuce-V1.1-java"
+        file="/system_ext/framework/vendor.qti.ims.rcsuce-V1.1-java.jar"/>
+    <library name="vendor.qti.ims.rcssip-V1.1-java"
+        file="/system_ext/framework/vendor.qti.ims.rcssip-V1.1-java.jar"/>
+    <library name="vendor.qti.ims.factory-V2.2-java"
+        file="/system_ext/framework/vendor.qti.ims.factory-V2.2-java.jar"/>
+    <library name="vendor.qti.ims.rcsuce-V1.2-java"
+        file="/system_ext/framework/vendor.qti.ims.rcsuce-V1.2-java.jar"/>
+    <library name="vendor.qti.ims.rcssip-V1.2-java"
+        file="/system_ext/framework/vendor.qti.ims.rcssip-V1.2-java.jar"/>
 </permissions>
diff --git a/proprietary/system_ext/etc/seccomp_policy/wfdservice.policy b/proprietary/system_ext/etc/seccomp_policy/wfdservice.policy
index 09d5a83..675254c 100644
--- a/proprietary/system_ext/etc/seccomp_policy/wfdservice.policy
+++ b/proprietary/system_ext/etc/seccomp_policy/wfdservice.policy
@@ -76,3 +76,4 @@ getdents64: 1
 dup: 1
 lseek: 1
 tgkill: 1
+process_vm_readv: 1
diff --git a/proprietary/system_ext/framework/com.qti.dpmframework.jar b/proprietary/system_ext/framework/com.qti.dpmframework.jar
index 36021cd..a289bde 100644
Binary files a/proprietary/system_ext/framework/com.qti.dpmframework.jar and b/proprietary/system_ext/framework/com.qti.dpmframework.jar differ
diff --git a/proprietary/system_ext/framework/dpmapi.jar b/proprietary/system_ext/framework/dpmapi.jar
index ecb15d8..4fa7eae 100644
Binary files a/proprietary/system_ext/framework/dpmapi.jar and b/proprietary/system_ext/framework/dpmapi.jar differ
diff --git a/proprietary/system_ext/framework/moto-telephony.jar b/proprietary/system_ext/framework/moto-telephony.jar
index a9f6f38..59efa02 100644
Binary files a/proprietary/system_ext/framework/moto-telephony.jar and b/proprietary/system_ext/framework/moto-telephony.jar differ
diff --git a/proprietary/system_ext/framework/qcrilhook.jar b/proprietary/system_ext/framework/qcrilhook.jar
index 96d6b07..ce64fd2 100644
Binary files a/proprietary/system_ext/framework/qcrilhook.jar and b/proprietary/system_ext/framework/qcrilhook.jar differ
diff --git a/proprietary/system_ext/framework/vendor.qti.hardware.alarm-V1.0-java.jar b/proprietary/system_ext/framework/vendor.qti.hardware.alarm-V1.0-java.jar
index 17bf2c1..a93afe6 100644
Binary files a/proprietary/system_ext/framework/vendor.qti.hardware.alarm-V1.0-java.jar and b/proprietary/system_ext/framework/vendor.qti.hardware.alarm-V1.0-java.jar differ
diff --git a/proprietary/system_ext/framework/vendor.qti.ims.configservice-V1.0-java.jar b/proprietary/system_ext/framework/vendor.qti.ims.configservice-V1.0-java.jar
new file mode 100644
index 0000000..c58a412
Binary files /dev/null and b/proprietary/system_ext/framework/vendor.qti.ims.configservice-V1.0-java.jar differ
diff --git a/proprietary/system_ext/framework/vendor.qti.ims.configservice-V1.1-java.jar b/proprietary/system_ext/framework/vendor.qti.ims.configservice-V1.1-java.jar
new file mode 100644
index 0000000..33cfee8
Binary files /dev/null and b/proprietary/system_ext/framework/vendor.qti.ims.configservice-V1.1-java.jar differ
diff --git a/proprietary/system_ext/framework/vendor.qti.ims.connection-V1.0-java.jar b/proprietary/system_ext/framework/vendor.qti.ims.connection-V1.0-java.jar
index 5fa1afc..ec82e48 100644
Binary files a/proprietary/system_ext/framework/vendor.qti.ims.connection-V1.0-java.jar and b/proprietary/system_ext/framework/vendor.qti.ims.connection-V1.0-java.jar differ
diff --git a/proprietary/system_ext/framework/vendor.qti.ims.factory-V1.1-java.jar b/proprietary/system_ext/framework/vendor.qti.ims.factory-V1.1-java.jar
new file mode 100644
index 0000000..5cce99a
Binary files /dev/null and b/proprietary/system_ext/framework/vendor.qti.ims.factory-V1.1-java.jar differ
diff --git a/proprietary/system_ext/framework/vendor.qti.ims.factory-V2.0-java.jar b/proprietary/system_ext/framework/vendor.qti.ims.factory-V2.0-java.jar
index 15a3e43..7dca503 100644
Binary files a/proprietary/system_ext/framework/vendor.qti.ims.factory-V2.0-java.jar and b/proprietary/system_ext/framework/vendor.qti.ims.factory-V2.0-java.jar differ
diff --git a/proprietary/system_ext/framework/vendor.qti.ims.factory-V2.1-java.jar b/proprietary/system_ext/framework/vendor.qti.ims.factory-V2.1-java.jar
new file mode 100644
index 0000000..d244877
Binary files /dev/null and b/proprietary/system_ext/framework/vendor.qti.ims.factory-V2.1-java.jar differ
diff --git a/proprietary/system_ext/framework/vendor.qti.ims.factory-V2.2-java.jar b/proprietary/system_ext/framework/vendor.qti.ims.factory-V2.2-java.jar
new file mode 100644
index 0000000..bb7a518
Binary files /dev/null and b/proprietary/system_ext/framework/vendor.qti.ims.factory-V2.2-java.jar differ
diff --git a/proprietary/system_ext/framework/vendor.qti.ims.rcssip-V1.0-java.jar b/proprietary/system_ext/framework/vendor.qti.ims.rcssip-V1.0-java.jar
index f1cf721..bef571f 100644
Binary files a/proprietary/system_ext/framework/vendor.qti.ims.rcssip-V1.0-java.jar and b/proprietary/system_ext/framework/vendor.qti.ims.rcssip-V1.0-java.jar differ
diff --git a/proprietary/system_ext/framework/vendor.qti.ims.rcssip-V1.1-java.jar b/proprietary/system_ext/framework/vendor.qti.ims.rcssip-V1.1-java.jar
new file mode 100644
index 0000000..c84ae1c
Binary files /dev/null and b/proprietary/system_ext/framework/vendor.qti.ims.rcssip-V1.1-java.jar differ
diff --git a/proprietary/system_ext/framework/vendor.qti.ims.rcssip-V1.2-java.jar b/proprietary/system_ext/framework/vendor.qti.ims.rcssip-V1.2-java.jar
new file mode 100644
index 0000000..7317d8a
Binary files /dev/null and b/proprietary/system_ext/framework/vendor.qti.ims.rcssip-V1.2-java.jar differ
diff --git a/proprietary/system_ext/framework/vendor.qti.ims.rcsuce-V1.0-java.jar b/proprietary/system_ext/framework/vendor.qti.ims.rcsuce-V1.0-java.jar
index a1c4841..24ec8c9 100644
Binary files a/proprietary/system_ext/framework/vendor.qti.ims.rcsuce-V1.0-java.jar and b/proprietary/system_ext/framework/vendor.qti.ims.rcsuce-V1.0-java.jar differ
diff --git a/proprietary/system_ext/framework/vendor.qti.ims.rcsuce-V1.1-java.jar b/proprietary/system_ext/framework/vendor.qti.ims.rcsuce-V1.1-java.jar
new file mode 100644
index 0000000..5ccf637
Binary files /dev/null and b/proprietary/system_ext/framework/vendor.qti.ims.rcsuce-V1.1-java.jar differ
diff --git a/proprietary/system_ext/framework/vendor.qti.ims.rcsuce-V1.2-java.jar b/proprietary/system_ext/framework/vendor.qti.ims.rcsuce-V1.2-java.jar
new file mode 100644
index 0000000..8717b55
Binary files /dev/null and b/proprietary/system_ext/framework/vendor.qti.ims.rcsuce-V1.2-java.jar differ
diff --git a/proprietary/system_ext/lib/com.qualcomm.qti.ant@1.0.so b/proprietary/system_ext/lib/com.qualcomm.qti.ant@1.0.so
index c908496..bd46338 100644
Binary files a/proprietary/system_ext/lib/com.qualcomm.qti.ant@1.0.so and b/proprietary/system_ext/lib/com.qualcomm.qti.ant@1.0.so differ
diff --git a/proprietary/system_ext/lib/com.qualcomm.qti.dpm.api@1.0.so b/proprietary/system_ext/lib/com.qualcomm.qti.dpm.api@1.0.so
deleted file mode 100644
index 8f8813c..0000000
Binary files a/proprietary/system_ext/lib/com.qualcomm.qti.dpm.api@1.0.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/hw/vendor.qti.hardware.qccsyshal@1.0-impl.so b/proprietary/system_ext/lib/hw/vendor.qti.hardware.qccsyshal@1.0-impl.so
deleted file mode 100644
index 1b892bd..0000000
Binary files a/proprietary/system_ext/lib/hw/vendor.qti.hardware.qccsyshal@1.0-impl.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/hw/vendor.qti.hardware.qccsyshal@1.1-impl.so b/proprietary/system_ext/lib/hw/vendor.qti.hardware.qccsyshal@1.1-impl.so
deleted file mode 100644
index bcf6c6d..0000000
Binary files a/proprietary/system_ext/lib/hw/vendor.qti.hardware.qccsyshal@1.1-impl.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libdpmctmgr.so b/proprietary/system_ext/lib/libdpmctmgr.so
deleted file mode 100644
index 4fca6b0..0000000
Binary files a/proprietary/system_ext/lib/libdpmctmgr.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libdpmfdmgr.so b/proprietary/system_ext/lib/libdpmfdmgr.so
deleted file mode 100644
index a2bf5ce..0000000
Binary files a/proprietary/system_ext/lib/libdpmfdmgr.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libdpmframework.so b/proprietary/system_ext/lib/libdpmframework.so
deleted file mode 100644
index 7bcd9e9..0000000
Binary files a/proprietary/system_ext/lib/libdpmframework.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libdpmtcm.so b/proprietary/system_ext/lib/libdpmtcm.so
deleted file mode 100644
index 48ede80..0000000
Binary files a/proprietary/system_ext/lib/libdpmtcm.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libmmosal.so b/proprietary/system_ext/lib/libmmosal.so
index 7592b97..d9f8f31 100644
Binary files a/proprietary/system_ext/lib/libmmosal.so and b/proprietary/system_ext/lib/libmmosal.so differ
diff --git a/proprietary/system_ext/lib/libmmparser_lite.so b/proprietary/system_ext/lib/libmmparser_lite.so
index 56fc299..effe441 100644
Binary files a/proprietary/system_ext/lib/libmmparser_lite.so and b/proprietary/system_ext/lib/libmmparser_lite.so differ
diff --git a/proprietary/system_ext/lib/libmmrtpdecoder.so b/proprietary/system_ext/lib/libmmrtpdecoder.so
index 6d2cf5c..d640407 100644
Binary files a/proprietary/system_ext/lib/libmmrtpdecoder.so and b/proprietary/system_ext/lib/libmmrtpdecoder.so differ
diff --git a/proprietary/system_ext/lib/libmmrtpencoder.so b/proprietary/system_ext/lib/libmmrtpencoder.so
index 07b3f72..2a4421e 100644
Binary files a/proprietary/system_ext/lib/libmmrtpencoder.so and b/proprietary/system_ext/lib/libmmrtpencoder.so differ
diff --git a/proprietary/system_ext/lib/libqcc_file_agent_sys.so b/proprietary/system_ext/lib/libqcc_file_agent_sys.so
index 9a16a28..b9d7922 100644
Binary files a/proprietary/system_ext/lib/libqcc_file_agent_sys.so and b/proprietary/system_ext/lib/libqcc_file_agent_sys.so differ
diff --git a/proprietary/system_ext/lib/libwfdavenhancements.so b/proprietary/system_ext/lib/libwfdavenhancements.so
index f18a7f7..583faac 100644
Binary files a/proprietary/system_ext/lib/libwfdavenhancements.so and b/proprietary/system_ext/lib/libwfdavenhancements.so differ
diff --git a/proprietary/system_ext/lib/libwfdclient.so b/proprietary/system_ext/lib/libwfdclient.so
index 035467f..7722eb7 100644
Binary files a/proprietary/system_ext/lib/libwfdclient.so and b/proprietary/system_ext/lib/libwfdclient.so differ
diff --git a/proprietary/system_ext/lib/libwfdcommonutils.so b/proprietary/system_ext/lib/libwfdcommonutils.so
index 2a815f1..c1db203 100644
Binary files a/proprietary/system_ext/lib/libwfdcommonutils.so and b/proprietary/system_ext/lib/libwfdcommonutils.so differ
diff --git a/proprietary/system_ext/lib/libwfdconfigutils.so b/proprietary/system_ext/lib/libwfdconfigutils.so
index cbb7d60..88954d2 100644
Binary files a/proprietary/system_ext/lib/libwfdconfigutils.so and b/proprietary/system_ext/lib/libwfdconfigutils.so differ
diff --git a/proprietary/system_ext/lib/libwfddisplayconfig.so b/proprietary/system_ext/lib/libwfddisplayconfig.so
index bdd6ad8..6cf67fd 100644
Binary files a/proprietary/system_ext/lib/libwfddisplayconfig.so and b/proprietary/system_ext/lib/libwfddisplayconfig.so differ
diff --git a/proprietary/system_ext/lib/libwfdmminterface.so b/proprietary/system_ext/lib/libwfdmminterface.so
index c65b930..75aef22 100644
Binary files a/proprietary/system_ext/lib/libwfdmminterface.so and b/proprietary/system_ext/lib/libwfdmminterface.so differ
diff --git a/proprietary/system_ext/lib/libwfdmmsink.so b/proprietary/system_ext/lib/libwfdmmsink.so
index 00d6213..ac0661b 100644
Binary files a/proprietary/system_ext/lib/libwfdmmsink.so and b/proprietary/system_ext/lib/libwfdmmsink.so differ
diff --git a/proprietary/system_ext/lib/libwfdmmsrc_system.so b/proprietary/system_ext/lib/libwfdmmsrc_system.so
index ad6bb4a..65bbd26 100644
Binary files a/proprietary/system_ext/lib/libwfdmmsrc_system.so and b/proprietary/system_ext/lib/libwfdmmsrc_system.so differ
diff --git a/proprietary/system_ext/lib/libwfdrtsp.so b/proprietary/system_ext/lib/libwfdrtsp.so
index 88c0c2d..16e787a 100644
Binary files a/proprietary/system_ext/lib/libwfdrtsp.so and b/proprietary/system_ext/lib/libwfdrtsp.so differ
diff --git a/proprietary/system_ext/lib/libwfdservice.so b/proprietary/system_ext/lib/libwfdservice.so
index dcc1033..625768a 100644
Binary files a/proprietary/system_ext/lib/libwfdservice.so and b/proprietary/system_ext/lib/libwfdservice.so differ
diff --git a/proprietary/system_ext/lib/libwfdsinksm.so b/proprietary/system_ext/lib/libwfdsinksm.so
index a400947..35cc6b7 100644
Binary files a/proprietary/system_ext/lib/libwfdsinksm.so and b/proprietary/system_ext/lib/libwfdsinksm.so differ
diff --git a/proprietary/system_ext/lib/libwfduibcinterface.so b/proprietary/system_ext/lib/libwfduibcinterface.so
index 52985c0..92699f4 100644
Binary files a/proprietary/system_ext/lib/libwfduibcinterface.so and b/proprietary/system_ext/lib/libwfduibcinterface.so differ
diff --git a/proprietary/system_ext/lib/libwfduibcsink.so b/proprietary/system_ext/lib/libwfduibcsink.so
index 80630e1..5898d12 100644
Binary files a/proprietary/system_ext/lib/libwfduibcsink.so and b/proprietary/system_ext/lib/libwfduibcsink.so differ
diff --git a/proprietary/system_ext/lib/libwfduibcsinkinterface.so b/proprietary/system_ext/lib/libwfduibcsinkinterface.so
index df1d0cf..f82d8af 100644
Binary files a/proprietary/system_ext/lib/libwfduibcsinkinterface.so and b/proprietary/system_ext/lib/libwfduibcsinkinterface.so differ
diff --git a/proprietary/system_ext/lib/libwfduibcsrc.so b/proprietary/system_ext/lib/libwfduibcsrc.so
index f8087d6..9651d85 100644
Binary files a/proprietary/system_ext/lib/libwfduibcsrc.so and b/proprietary/system_ext/lib/libwfduibcsrc.so differ
diff --git a/proprietary/system_ext/lib/libwfduibcsrcinterface.so b/proprietary/system_ext/lib/libwfduibcsrcinterface.so
index b1740f8..f90ffdb 100644
Binary files a/proprietary/system_ext/lib/libwfduibcsrcinterface.so and b/proprietary/system_ext/lib/libwfduibcsrcinterface.so differ
diff --git a/proprietary/system_ext/lib/vendor.qti.diaghal@1.0.so b/proprietary/system_ext/lib/vendor.qti.diaghal@1.0.so
index 961de80..702b853 100644
Binary files a/proprietary/system_ext/lib/vendor.qti.diaghal@1.0.so and b/proprietary/system_ext/lib/vendor.qti.diaghal@1.0.so differ
diff --git a/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.0-halimpl.so b/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.0-halimpl.so
deleted file mode 100644
index 87170b4..0000000
Binary files a/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.0-halimpl.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.0.so b/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.0.so
index c4155df..08e6311 100644
Binary files a/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.0.so and b/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.0.so differ
diff --git a/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.1-halimpl.so b/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.1-halimpl.so
deleted file mode 100644
index de240ca..0000000
Binary files a/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.1-halimpl.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.1.so b/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.1.so
index b1b6a94..efebb90 100644
Binary files a/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.1.so and b/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.1.so differ
diff --git a/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.2-halimpl.so b/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.2-halimpl.so
new file mode 100644
index 0000000..27057ba
Binary files /dev/null and b/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.2-halimpl.so differ
diff --git a/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.2.so b/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.2.so
new file mode 100644
index 0000000..f504609
Binary files /dev/null and b/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.2.so differ
diff --git a/proprietary/system_ext/lib/vendor.qti.hardware.wifidisplaysession@1.0.so b/proprietary/system_ext/lib/vendor.qti.hardware.wifidisplaysession@1.0.so
index 94a87d1..1d0a28a 100644
Binary files a/proprietary/system_ext/lib/vendor.qti.hardware.wifidisplaysession@1.0.so and b/proprietary/system_ext/lib/vendor.qti.hardware.wifidisplaysession@1.0.so differ
diff --git a/proprietary/system_ext/lib64/com.qualcomm.qti.ant@1.0.so b/proprietary/system_ext/lib64/com.qualcomm.qti.ant@1.0.so
index 1eaa37f..1f3b346 100644
Binary files a/proprietary/system_ext/lib64/com.qualcomm.qti.ant@1.0.so and b/proprietary/system_ext/lib64/com.qualcomm.qti.ant@1.0.so differ
diff --git a/proprietary/system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so b/proprietary/system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so
index cf54da7..8a6d2e4 100644
Binary files a/proprietary/system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so and b/proprietary/system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so differ
diff --git a/proprietary/system_ext/lib64/hw/vendor.qti.hardware.qccsyshal@1.0-impl.so b/proprietary/system_ext/lib64/hw/vendor.qti.hardware.qccsyshal@1.0-impl.so
deleted file mode 100644
index 063b6ef..0000000
Binary files a/proprietary/system_ext/lib64/hw/vendor.qti.hardware.qccsyshal@1.0-impl.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/hw/vendor.qti.hardware.qccsyshal@1.1-impl.so b/proprietary/system_ext/lib64/hw/vendor.qti.hardware.qccsyshal@1.1-impl.so
deleted file mode 100644
index 5aa9253..0000000
Binary files a/proprietary/system_ext/lib64/hw/vendor.qti.hardware.qccsyshal@1.1-impl.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/lib-imsvideocodec.so b/proprietary/system_ext/lib64/lib-imsvideocodec.so
index d77d263..3222a68 100644
Binary files a/proprietary/system_ext/lib64/lib-imsvideocodec.so and b/proprietary/system_ext/lib64/lib-imsvideocodec.so differ
diff --git a/proprietary/system_ext/lib64/lib-imsvt.so b/proprietary/system_ext/lib64/lib-imsvt.so
index f3dfa67..a367047 100644
Binary files a/proprietary/system_ext/lib64/lib-imsvt.so and b/proprietary/system_ext/lib64/lib-imsvt.so differ
diff --git a/proprietary/system_ext/lib64/lib-imsvtextutils.so b/proprietary/system_ext/lib64/lib-imsvtextutils.so
index d9a42f1..0a870b2 100644
Binary files a/proprietary/system_ext/lib64/lib-imsvtextutils.so and b/proprietary/system_ext/lib64/lib-imsvtextutils.so differ
diff --git a/proprietary/system_ext/lib64/lib-imsvtutils.so b/proprietary/system_ext/lib64/lib-imsvtutils.so
index b24d842..0612aef 100644
Binary files a/proprietary/system_ext/lib64/lib-imsvtutils.so and b/proprietary/system_ext/lib64/lib-imsvtutils.so differ
diff --git a/proprietary/system_ext/lib64/libdiag_system.so b/proprietary/system_ext/lib64/libdiag_system.so
index a527243..2a77893 100644
Binary files a/proprietary/system_ext/lib64/libdiag_system.so and b/proprietary/system_ext/lib64/libdiag_system.so differ
diff --git a/proprietary/system_ext/lib64/libdpmctmgr.so b/proprietary/system_ext/lib64/libdpmctmgr.so
index 6cdb2e0..681a7fb 100644
Binary files a/proprietary/system_ext/lib64/libdpmctmgr.so and b/proprietary/system_ext/lib64/libdpmctmgr.so differ
diff --git a/proprietary/system_ext/lib64/libdpmfdmgr.so b/proprietary/system_ext/lib64/libdpmfdmgr.so
index fd13462..8eb6c9e 100644
Binary files a/proprietary/system_ext/lib64/libdpmfdmgr.so and b/proprietary/system_ext/lib64/libdpmfdmgr.so differ
diff --git a/proprietary/system_ext/lib64/libdpmframework.so b/proprietary/system_ext/lib64/libdpmframework.so
index b437b5c..54c5456 100644
Binary files a/proprietary/system_ext/lib64/libdpmframework.so and b/proprietary/system_ext/lib64/libdpmframework.so differ
diff --git a/proprietary/system_ext/lib64/libdpmtcm.so b/proprietary/system_ext/lib64/libdpmtcm.so
index 73b8a90..7303d36 100644
Binary files a/proprietary/system_ext/lib64/libdpmtcm.so and b/proprietary/system_ext/lib64/libdpmtcm.so differ
diff --git a/proprietary/system_ext/lib64/libimscamera_jni.so b/proprietary/system_ext/lib64/libimscamera_jni.so
index 1faac5b..4a3a664 100644
Binary files a/proprietary/system_ext/lib64/libimscamera_jni.so and b/proprietary/system_ext/lib64/libimscamera_jni.so differ
diff --git a/proprietary/system_ext/lib64/libimsmedia_jni.so b/proprietary/system_ext/lib64/libimsmedia_jni.so
index e6a0bfb..fdfb8c7 100644
Binary files a/proprietary/system_ext/lib64/libimsmedia_jni.so and b/proprietary/system_ext/lib64/libimsmedia_jni.so differ
diff --git a/proprietary/system_ext/lib64/libmmosal.so b/proprietary/system_ext/lib64/libmmosal.so
index e1e56f2..8717b71 100644
Binary files a/proprietary/system_ext/lib64/libmmosal.so and b/proprietary/system_ext/lib64/libmmosal.so differ
diff --git a/proprietary/system_ext/lib64/libmmparser_lite.so b/proprietary/system_ext/lib64/libmmparser_lite.so
index 54bc965..c324e2e 100644
Binary files a/proprietary/system_ext/lib64/libmmparser_lite.so and b/proprietary/system_ext/lib64/libmmparser_lite.so differ
diff --git a/proprietary/system_ext/lib64/libmmrtpdecoder.so b/proprietary/system_ext/lib64/libmmrtpdecoder.so
index daa3643..0c15051 100644
Binary files a/proprietary/system_ext/lib64/libmmrtpdecoder.so and b/proprietary/system_ext/lib64/libmmrtpdecoder.so differ
diff --git a/proprietary/system_ext/lib64/libmmrtpencoder.so b/proprietary/system_ext/lib64/libmmrtpencoder.so
index 9bee6f1..7cfcb40 100644
Binary files a/proprietary/system_ext/lib64/libmmrtpencoder.so and b/proprietary/system_ext/lib64/libmmrtpencoder.so differ
diff --git a/proprietary/system_ext/lib64/libqcc_file_agent_sys.so b/proprietary/system_ext/lib64/libqcc_file_agent_sys.so
index 32b6bf8..ad370f6 100644
Binary files a/proprietary/system_ext/lib64/libqcc_file_agent_sys.so and b/proprietary/system_ext/lib64/libqcc_file_agent_sys.so differ
diff --git a/proprietary/system_ext/lib64/libqspmsvc.so b/proprietary/system_ext/lib64/libqspmsvc.so
index fc90b94..56dee06 100644
Binary files a/proprietary/system_ext/lib64/libqspmsvc.so and b/proprietary/system_ext/lib64/libqspmsvc.so differ
diff --git a/proprietary/system_ext/lib64/libwfdclient.so b/proprietary/system_ext/lib64/libwfdclient.so
index eeaaa53..aaaefd7 100644
Binary files a/proprietary/system_ext/lib64/libwfdclient.so and b/proprietary/system_ext/lib64/libwfdclient.so differ
diff --git a/proprietary/system_ext/lib64/libwfdcommonutils.so b/proprietary/system_ext/lib64/libwfdcommonutils.so
index d0c0b50..e7bf117 100644
Binary files a/proprietary/system_ext/lib64/libwfdcommonutils.so and b/proprietary/system_ext/lib64/libwfdcommonutils.so differ
diff --git a/proprietary/system_ext/lib64/libwfdconfigutils.so b/proprietary/system_ext/lib64/libwfdconfigutils.so
index f2aabd6..fc5153a 100644
Binary files a/proprietary/system_ext/lib64/libwfdconfigutils.so and b/proprietary/system_ext/lib64/libwfdconfigutils.so differ
diff --git a/proprietary/system_ext/lib64/libwfddisplayconfig.so b/proprietary/system_ext/lib64/libwfddisplayconfig.so
index a36f9a0..d587503 100644
Binary files a/proprietary/system_ext/lib64/libwfddisplayconfig.so and b/proprietary/system_ext/lib64/libwfddisplayconfig.so differ
diff --git a/proprietary/system_ext/lib64/libwfdmminterface.so b/proprietary/system_ext/lib64/libwfdmminterface.so
index 7434caa..b713325 100644
Binary files a/proprietary/system_ext/lib64/libwfdmminterface.so and b/proprietary/system_ext/lib64/libwfdmminterface.so differ
diff --git a/proprietary/system_ext/lib64/libwfdmmsink.so b/proprietary/system_ext/lib64/libwfdmmsink.so
index 2e0b835..d2c52db 100644
Binary files a/proprietary/system_ext/lib64/libwfdmmsink.so and b/proprietary/system_ext/lib64/libwfdmmsink.so differ
diff --git a/proprietary/system_ext/lib64/libwfdnative.so b/proprietary/system_ext/lib64/libwfdnative.so
index c6d2706..d3740e2 100644
Binary files a/proprietary/system_ext/lib64/libwfdnative.so and b/proprietary/system_ext/lib64/libwfdnative.so differ
diff --git a/proprietary/system_ext/lib64/libwfdrtsp.so b/proprietary/system_ext/lib64/libwfdrtsp.so
index 5b66f11..151fc6e 100644
Binary files a/proprietary/system_ext/lib64/libwfdrtsp.so and b/proprietary/system_ext/lib64/libwfdrtsp.so differ
diff --git a/proprietary/system_ext/lib64/libwfdsinksm.so b/proprietary/system_ext/lib64/libwfdsinksm.so
index 25f47cc..ec6d4e9 100644
Binary files a/proprietary/system_ext/lib64/libwfdsinksm.so and b/proprietary/system_ext/lib64/libwfdsinksm.so differ
diff --git a/proprietary/system_ext/lib64/libwfduibcinterface.so b/proprietary/system_ext/lib64/libwfduibcinterface.so
index f78e6d1..8fc7422 100644
Binary files a/proprietary/system_ext/lib64/libwfduibcinterface.so and b/proprietary/system_ext/lib64/libwfduibcinterface.so differ
diff --git a/proprietary/system_ext/lib64/libwfduibcsink.so b/proprietary/system_ext/lib64/libwfduibcsink.so
index 0773262..301b04f 100644
Binary files a/proprietary/system_ext/lib64/libwfduibcsink.so and b/proprietary/system_ext/lib64/libwfduibcsink.so differ
diff --git a/proprietary/system_ext/lib64/libwfduibcsinkinterface.so b/proprietary/system_ext/lib64/libwfduibcsinkinterface.so
index 51b1a5d..bbfad73 100644
Binary files a/proprietary/system_ext/lib64/libwfduibcsinkinterface.so and b/proprietary/system_ext/lib64/libwfduibcsinkinterface.so differ
diff --git a/proprietary/system_ext/lib64/libwfduibcsrc.so b/proprietary/system_ext/lib64/libwfduibcsrc.so
index 89a15b5..f2d0ad2 100644
Binary files a/proprietary/system_ext/lib64/libwfduibcsrc.so and b/proprietary/system_ext/lib64/libwfduibcsrc.so differ
diff --git a/proprietary/system_ext/lib64/libwfduibcsrcinterface.so b/proprietary/system_ext/lib64/libwfduibcsrcinterface.so
index 1156d0d..a3509d7 100644
Binary files a/proprietary/system_ext/lib64/libwfduibcsrcinterface.so and b/proprietary/system_ext/lib64/libwfduibcsrcinterface.so differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.diaghal@1.0.so b/proprietary/system_ext/lib64/vendor.qti.diaghal@1.0.so
index 423bb4f..9e79901 100644
Binary files a/proprietary/system_ext/lib64/vendor.qti.diaghal@1.0.so and b/proprietary/system_ext/lib64/vendor.qti.diaghal@1.0.so differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.dpmservice@1.0.so b/proprietary/system_ext/lib64/vendor.qti.hardware.dpmservice@1.0.so
new file mode 100644
index 0000000..604663b
Binary files /dev/null and b/proprietary/system_ext/lib64/vendor.qti.hardware.dpmservice@1.0.so differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.0-halimpl.so b/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.0-halimpl.so
deleted file mode 100644
index e95d850..0000000
Binary files a/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.0-halimpl.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.0.so b/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.0.so
index 1d76cdb..6b03043 100644
Binary files a/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.0.so and b/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.0.so differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.1-halimpl.so b/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.1-halimpl.so
deleted file mode 100644
index 471acf6..0000000
Binary files a/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.1-halimpl.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.1.so b/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.1.so
index eb7c574..a513a91 100644
Binary files a/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.1.so and b/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.1.so differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.2-halimpl.so b/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.2-halimpl.so
new file mode 100644
index 0000000..7021d3b
Binary files /dev/null and b/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.2-halimpl.so differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.2.so b/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.2.so
new file mode 100644
index 0000000..d0deb82
Binary files /dev/null and b/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.2.so differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.0.so b/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.0.so
index 4159948..a7b19d1 100644
Binary files a/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.0.so and b/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.0.so differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.1.so b/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.1.so
new file mode 100644
index 0000000..c6e6055
Binary files /dev/null and b/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.1.so differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.qspmhal@1.0.so b/proprietary/system_ext/lib64/vendor.qti.qspmhal@1.0.so
index a555409..bcbc2cf 100644
Binary files a/proprietary/system_ext/lib64/vendor.qti.qspmhal@1.0.so and b/proprietary/system_ext/lib64/vendor.qti.qspmhal@1.0.so differ
diff --git a/proprietary/system_ext/priv-app/WfdService/WfdService.apk b/proprietary/system_ext/priv-app/WfdService/WfdService.apk
index a95bf24..0290ed7 100644
Binary files a/proprietary/system_ext/priv-app/WfdService/WfdService.apk and b/proprietary/system_ext/priv-app/WfdService/WfdService.apk differ
diff --git a/proprietary/system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk b/proprietary/system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk
new file mode 100644
index 0000000..cca07a3
Binary files /dev/null and b/proprietary/system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk differ
diff --git a/proprietary/system_ext/priv-app/ims/ims.apk b/proprietary/system_ext/priv-app/ims/ims.apk
index 408081c..e979ed2 100644
Binary files a/proprietary/system_ext/priv-app/ims/ims.apk and b/proprietary/system_ext/priv-app/ims/ims.apk differ
diff --git a/proprietary/system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk b/proprietary/system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
index 3e0e9a4..57989d3 100644
Binary files a/proprietary/system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk and b/proprietary/system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk differ
diff --git a/proprietary/vendor/app/CACertService/CACertService.apk b/proprietary/vendor/app/CACertService/CACertService.apk
index eef49ac..31bfb0a 100644
Binary files a/proprietary/vendor/app/CACertService/CACertService.apk and b/proprietary/vendor/app/CACertService/CACertService.apk differ
diff --git a/proprietary/vendor/app/CneApp/CneApp.apk b/proprietary/vendor/app/CneApp/CneApp.apk
index fdd68dc..a1ab482 100644
Binary files a/proprietary/vendor/app/CneApp/CneApp.apk and b/proprietary/vendor/app/CneApp/CneApp.apk differ
diff --git a/proprietary/vendor/app/IWlanService/IWlanService.apk b/proprietary/vendor/app/IWlanService/IWlanService.apk
index ccbd85f..54d0976 100644
Binary files a/proprietary/vendor/app/IWlanService/IWlanService.apk and b/proprietary/vendor/app/IWlanService/IWlanService.apk differ
diff --git a/proprietary/vendor/app/TimeService/TimeService.apk b/proprietary/vendor/app/TimeService/TimeService.apk
index d4d5e61..254398b 100644
Binary files a/proprietary/vendor/app/TimeService/TimeService.apk and b/proprietary/vendor/app/TimeService/TimeService.apk differ
diff --git a/proprietary/vendor/bin/adpl b/proprietary/vendor/bin/adpl
index 137b719..cc0daaa 100755
Binary files a/proprietary/vendor/bin/adpl and b/proprietary/vendor/bin/adpl differ
diff --git a/proprietary/vendor/bin/charge_only_mode b/proprietary/vendor/bin/charge_only_mode
index fa2ce41..9a9e361 100755
Binary files a/proprietary/vendor/bin/charge_only_mode and b/proprietary/vendor/bin/charge_only_mode differ
diff --git a/proprietary/vendor/bin/cnd b/proprietary/vendor/bin/cnd
index 3b38959..091d7de 100755
Binary files a/proprietary/vendor/bin/cnd and b/proprietary/vendor/bin/cnd differ
diff --git a/proprietary/vendor/bin/cnss-daemon b/proprietary/vendor/bin/cnss-daemon
index f92b7fe..a5c33b7 100755
Binary files a/proprietary/vendor/bin/cnss-daemon and b/proprietary/vendor/bin/cnss-daemon differ
diff --git a/proprietary/vendor/bin/diag-router b/proprietary/vendor/bin/diag-router
index 4345197..d9ddb41 100755
Binary files a/proprietary/vendor/bin/diag-router and b/proprietary/vendor/bin/diag-router differ
diff --git a/proprietary/vendor/bin/hvdcp_opti b/proprietary/vendor/bin/hvdcp_opti
index e4dabf0..ebc0401 100755
Binary files a/proprietary/vendor/bin/hvdcp_opti and b/proprietary/vendor/bin/hvdcp_opti differ
diff --git a/proprietary/vendor/bin/hw/android.hardware.authsecret@1.0-service-qti b/proprietary/vendor/bin/hw/android.hardware.authsecret@1.0-service-qti
index ea2c7bf..5a68b40 100644
Binary files a/proprietary/vendor/bin/hw/android.hardware.authsecret@1.0-service-qti and b/proprietary/vendor/bin/hw/android.hardware.authsecret@1.0-service-qti differ
diff --git a/proprietary/vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-qti b/proprietary/vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-qti
deleted file mode 100644
index b9bb76b..0000000
Binary files a/proprietary/vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-qti and /dev/null differ
diff --git a/proprietary/vendor/bin/hw/vendor.qti.hardware.iop@2.0-service b/proprietary/vendor/bin/hw/vendor.qti.hardware.iop@2.0-service
index 2249c6c..00baa9b 100644
Binary files a/proprietary/vendor/bin/hw/vendor.qti.hardware.iop@2.0-service and b/proprietary/vendor/bin/hw/vendor.qti.hardware.iop@2.0-service differ
diff --git a/proprietary/vendor/bin/hw/vendor.qti.hardware.perf@2.2-service b/proprietary/vendor/bin/hw/vendor.qti.hardware.perf@2.2-service
index 369798b..f4b0886 100644
Binary files a/proprietary/vendor/bin/hw/vendor.qti.hardware.perf@2.2-service and b/proprietary/vendor/bin/hw/vendor.qti.hardware.perf@2.2-service differ
diff --git a/proprietary/vendor/bin/ims_rtp_daemon b/proprietary/vendor/bin/ims_rtp_daemon
index 9efc665..f88f7c0 100755
Binary files a/proprietary/vendor/bin/ims_rtp_daemon and b/proprietary/vendor/bin/ims_rtp_daemon differ
diff --git a/proprietary/vendor/bin/imsdaemon b/proprietary/vendor/bin/imsdaemon
index b54a7fc..13faeaf 100755
Binary files a/proprietary/vendor/bin/imsdaemon and b/proprietary/vendor/bin/imsdaemon differ
diff --git a/proprietary/vendor/bin/init.qti.media.sh b/proprietary/vendor/bin/init.qti.media.sh
index 07ba372..fa98e6c 100755
--- a/proprietary/vendor/bin/init.qti.media.sh
+++ b/proprietary/vendor/bin/init.qti.media.sh
@@ -2,7 +2,7 @@
 #==============================================================================
 #       init.qti.media.sh
 #
-# Copyright (c) 2020-2021, Qualcomm Technologies, Inc.
+# Copyright (c) 2020-2022, Qualcomm Technologies, Inc.
 # All Rights Reserved.
 # Confidential and Proprietary - Qualcomm Technologies, Inc.
 #
@@ -50,7 +50,7 @@ case "$target" in
         case "$soc_hwid" in
             475|515)
                 setprop vendor.media.target_variant "_yupik_v0"
-                if [ $build_codename -le "12" ]; then
+                if [ $build_codename -le "13" ]; then
                     setprop vendor.netflix.bsp_rev "Q7325-SPY-33758-1"
                 fi
                 sku_ver=`cat /sys/devices/platform/soc/aa00000.qcom,vidc/sku_version` 2> /dev/null
@@ -60,7 +60,7 @@ case "$target" in
                 ;;
             450)
                 setprop vendor.media.target_variant "_shima_v3"
-                if [ $build_codename -le "12" ]; then
+                if [ $build_codename -le "13" ]; then
                     setprop vendor.netflix.bsp_rev "Q875-32774-1"
                 fi
                 sku_ver=`cat /sys/devices/platform/soc/aa00000.qcom,vidc/sku_version` 2> /dev/null
@@ -70,7 +70,7 @@ case "$target" in
                     setprop vendor.media.target_variant "_shima_v2"
                 fi
                 ;;
-            497|498)
+            497|498|575|576)
                     setprop vendor.media.target_variant "_yupik_iot"
                 ;;
             *)
@@ -79,7 +79,7 @@ case "$target" in
                 else
                     setprop vendor.media.target_variant "_lahaina"
                 fi
-                if [ $build_codename -le "12" ]; then
+                if [ $build_codename -le "13" ]; then
                     setprop vendor.netflix.bsp_rev "Q875-32408-1"
                 fi
                 ;;
@@ -87,15 +87,18 @@ case "$target" in
         ;;
     "holi")
         case "$soc_hwid" in
-            507)
+            507|565)
                 setprop vendor.media.target_variant "_blair"
-                if [ $build_codename -le "12" ]; then
+                if [ $build_codename -le "13" ]; then
                     setprop vendor.netflix.bsp_rev "Q4350-32962-1"
                 fi
                 ;;
+            578)
+                setprop vendor.media.target_variant "_blair_lite"
+                ;;
             454|472)
                 setprop vendor.media.target_variant "_holi"
-                if [ $build_codename -le "12" ]; then
+                if [ $build_codename -le "13" ]; then
                     setprop vendor.netflix.bsp_rev "Q4350-32962-1"
                 fi
                 ;;
@@ -103,7 +106,7 @@ case "$target" in
         ;;
     "msmnile")
         setprop vendor.media.target_variant "_msmnile"
-        if [ $product == "msmnile_gvmq" ]; then
+        if [ $product == "msmnile_gvmq" ] || [ $product == "msmnile_gvmgh" ]; then
             case "$soc_hwid" in
                 460)
                     setprop vendor.media.target_variant "_direwolf"
diff --git a/proprietary/vendor/bin/loadalgo b/proprietary/vendor/bin/loadalgo
index fa5dd7d..aa72754 100755
Binary files a/proprietary/vendor/bin/loadalgo and b/proprietary/vendor/bin/loadalgo differ
diff --git a/proprietary/vendor/bin/lowi-server b/proprietary/vendor/bin/lowi-server
index 6b60e62..c22aca9 100755
Binary files a/proprietary/vendor/bin/lowi-server and b/proprietary/vendor/bin/lowi-server differ
diff --git a/proprietary/vendor/bin/netmgrd b/proprietary/vendor/bin/netmgrd
index 570d0f8..e16ae49 100755
Binary files a/proprietary/vendor/bin/netmgrd and b/proprietary/vendor/bin/netmgrd differ
diff --git a/proprietary/vendor/bin/port-bridge b/proprietary/vendor/bin/port-bridge
index 3d65c1b..6b16d03 100755
Binary files a/proprietary/vendor/bin/port-bridge and b/proprietary/vendor/bin/port-bridge differ
diff --git a/proprietary/vendor/bin/qcom-system-daemon b/proprietary/vendor/bin/qcom-system-daemon
index 76ec6f2..0a54e20 100755
Binary files a/proprietary/vendor/bin/qcom-system-daemon and b/proprietary/vendor/bin/qcom-system-daemon differ
diff --git a/proprietary/vendor/bin/qmi_motext_hook b/proprietary/vendor/bin/qmi_motext_hook
index fee4725..0486191 100755
Binary files a/proprietary/vendor/bin/qmi_motext_hook and b/proprietary/vendor/bin/qmi_motext_hook differ
diff --git a/proprietary/vendor/bin/qseecomd b/proprietary/vendor/bin/qseecomd
index 8298d45..c76c051 100755
Binary files a/proprietary/vendor/bin/qseecomd and b/proprietary/vendor/bin/qseecomd differ
diff --git a/proprietary/vendor/bin/qti b/proprietary/vendor/bin/qti
index 226eb14..7ebab1b 100755
Binary files a/proprietary/vendor/bin/qti and b/proprietary/vendor/bin/qti differ
diff --git a/proprietary/vendor/bin/qtigetprop b/proprietary/vendor/bin/qtigetprop
new file mode 100755
index 0000000..b0527f8
--- /dev/null
+++ b/proprietary/vendor/bin/qtigetprop
@@ -0,0 +1,54 @@
+#!/bin/sh --
+
+# Copyright (c) 2019-2020 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc.
+
+ril_db="/data/vendor/radio/qcrilNr.db"
+
+help() {
+    echo "Syntax error! Example: qtigetprop [config_name]"
+}
+
+if [ $# -gt 1 ]; then
+    help
+    exit 1
+elif [ $# -eq 1 ]; then
+    prop_name=$1
+fi
+
+# Disable exit on non 0
+set +e
+
+if [[ ! -f $ril_db ]]; then
+    getprop "$@"
+else
+    if [ ! -z "$prop_name" ]; then
+        query_result=`echo "SELECT 1 FROM qcril_properties_table WHERE property='$prop_name';" | sqlite3 $ril_db`
+        if [[ $query_result == "1" ]]; then
+            result=`echo "SELECT value FROM qcril_properties_table WHERE property='$1';" | sqlite3 $ril_db`
+            if [ "$result" == "" ]; then
+                echo "SELECT def_val FROM qcril_properties_table WHERE property='$1';" | sqlite3 $ril_db
+            else
+                echo $result
+            fi
+        else
+            getprop $prop_name
+        fi
+    else
+        # print RIL configs
+        all_props=`echo "SELECT * FROM qcril_properties_table;" | sqlite3 $ril_db`
+        for each_prop in $all_props; do
+            IFS='|' read -ra values <<< "$each_prop"
+            prop_name="${values[0]}"
+            def_val="${values[1]}"
+            val="${values[2]}"
+            if [[ $val == "" ]]; then
+                val=$def_val
+            fi
+            echo "$prop_name=$val"
+        done
+        # print Android properties
+        getprop
+    fi
+fi
diff --git a/proprietary/vendor/bin/qtisetprop b/proprietary/vendor/bin/qtisetprop
new file mode 100755
index 0000000..d86419e
--- /dev/null
+++ b/proprietary/vendor/bin/qtisetprop
@@ -0,0 +1,31 @@
+#!/bin/sh --
+
+# Copyright (c) 2019-2020 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc.
+
+ril_db="/data/vendor/radio/qcrilNr.db"
+
+help() {
+    echo "Syntax error!  Example: qtisetprop config_name config_val"
+}
+
+if [ $# -ne 2 ]; then
+    help
+    exit 1
+fi
+
+# Disable exit on non 0
+set +e
+
+query_result="0"
+if [[ -f $ril_db ]]; then
+    query_result=`echo "SELECT 1 FROM qcril_properties_table WHERE property='$1';" | sqlite3 $ril_db`
+fi
+
+if [[ $query_result == "1" ]]; then
+    echo "INSERT OR REPLACE INTO qcril_properties_table(property, value) VALUES('$1', '$2');" | sqlite3 $ril_db
+else
+    setprop $1 $2
+fi
+
diff --git a/proprietary/vendor/bin/rmt_storage b/proprietary/vendor/bin/rmt_storage
index df9ca97..cdfa896 100755
Binary files a/proprietary/vendor/bin/rmt_storage and b/proprietary/vendor/bin/rmt_storage differ
diff --git a/proprietary/vendor/bin/sensors.qti b/proprietary/vendor/bin/sensors.qti
index 229f5cb..45a3155 100755
Binary files a/proprietary/vendor/bin/sensors.qti and b/proprietary/vendor/bin/sensors.qti differ
diff --git a/proprietary/vendor/bin/shsusrd b/proprietary/vendor/bin/shsusrd
new file mode 100755
index 0000000..c0565f9
Binary files /dev/null and b/proprietary/vendor/bin/shsusrd differ
diff --git a/proprietary/vendor/bin/tftp_server b/proprietary/vendor/bin/tftp_server
index bb267c2..6a0eb00 100755
Binary files a/proprietary/vendor/bin/tftp_server and b/proprietary/vendor/bin/tftp_server differ
diff --git a/proprietary/vendor/bin/thermal-engine b/proprietary/vendor/bin/thermal-engine
index 1d92d90..d029b42 100755
Binary files a/proprietary/vendor/bin/thermal-engine and b/proprietary/vendor/bin/thermal-engine differ
diff --git a/proprietary/vendor/bin/wifidisplayhalservice b/proprietary/vendor/bin/wifidisplayhalservice
index 2cb372a..d8d467c 100755
Binary files a/proprietary/vendor/bin/wifidisplayhalservice and b/proprietary/vendor/bin/wifidisplayhalservice differ
diff --git a/proprietary/vendor/bin/xtra-daemon b/proprietary/vendor/bin/xtra-daemon
index 7e2b378..70ff3fb 100755
Binary files a/proprietary/vendor/bin/xtra-daemon and b/proprietary/vendor/bin/xtra-daemon differ
diff --git a/proprietary/vendor/etc/data/netmgr_config.xml b/proprietary/vendor/etc/data/netmgr_config.xml
index aee2d05..0ae7134 100644
--- a/proprietary/vendor/etc/data/netmgr_config.xml
+++ b/proprietary/vendor/etc/data/netmgr_config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
      Netmgr Module configuration XML file
-     Copyright (c) 2013, 2016-2021 Qualcomm Technologies, Inc.
+     Copyright (c) 2013, 2016-2022 Qualcomm Technologies, Inc.
      All Rights Reserved.
      Confidential and Proprietary - Qualcomm Technologies, Inc.
 -->
@@ -2803,6 +2803,7 @@
       <data name="kfc_mode" type="int"> 4 </data>
       <data name="kfc_qmap" type="int"> 1 </data>
       <data name="qmi_pc" type="int"> 1 </data>
+      <data name="dfc_ps_ext" type="int"> 0 </data>
       <data name="tcp_ack_prio" type="int"> 1 </data>
 
       <data name="single_qmux_ch_enabled" type="int"> 1 </data>
@@ -3384,6 +3385,11 @@
       <data name="single_qmux_ch_enabled" type="int"> 1 </data>
       <data name="single_qmux_ch_conn_id_str" type="string"> rmnet0 </data>
       <data name="single_qmux_ch_name" type="string"> DATA5_CNTL </data>
+
+      <data name="tc_ul_baserate" type="int"> 155000000 </data>
+      <data name="dynamic_tc_ul_baserate" type="int"> 1 </data>
+      <data name="tc_ul_burst" type="int"> 25000 </data>
+
       <data name="rmnet_data_enabled" type="int"> 1 </data>
       <data name="dataformat_agg_dl_pkt" type="int"> 10 </data>
       <data name="dataformat_agg_dl_size" type="int"> 8192 </data>
@@ -3405,6 +3411,7 @@
       <data name="iwlan_concurrency" type="int"> 1 </data>
       <data name="nl_xfrm" type="int"> 1 </data>
       <data name="netdev_max_backlog" type="int"> 10000 </data>
+      <data name="rtnetlink_tc_enabled" type="int"> 1 </data>
       <data name="debug_netdev_max_backlog" type="int"> 1500 </data>
 
       <data name="disable_tcp_hystart_detect" type="int"> 1 </data>
@@ -3414,6 +3421,7 @@
       <data name="pnd_rps_mask" type="int"> 2 </data>
       <data name="vnd_rps_mask" type="int"> 12 </data>
       <data name="qos_via_idl" type="int"> 1 </data>
+      <data name="skip_buffered_qos_modify" type="int"> 1 </data>
       <data name="max_mtu" type="int"> 9216 </data>
       <data name="netmgr_recovery_enabled" type="int"> 1 </data>
       <data name="num_modems" type="int"> 2 </data>
diff --git a/proprietary/vendor/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc b/proprietary/vendor/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc
index 47091e6..f919a5e 100644
--- a/proprietary/vendor/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc
+++ b/proprietary/vendor/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc
@@ -1,3 +1,9 @@
+on property:vendor.keymaster.quickboot=true
+     stop gatekeeper-1-0
+     start gatekeeper-1-0
+     stop gatekeeperd
+     start gatekeeperd
+
 service gatekeeper-1-0 /vendor/bin/hw/android.hardware.gatekeeper@1.0-service-qti
     class early_hal
     user system
diff --git a/proprietary/vendor/etc/init/android.hardware.keymaster@4.1-service-qti.rc b/proprietary/vendor/etc/init/android.hardware.keymaster@4.1-service-qti.rc
index 5cd13dc..811ebfd 100644
--- a/proprietary/vendor/etc/init/android.hardware.keymaster@4.1-service-qti.rc
+++ b/proprietary/vendor/etc/init/android.hardware.keymaster@4.1-service-qti.rc
@@ -1,6 +1,13 @@
 on init
     start vendor.keymaster-4-1
 
+on property:vendor.keymaster.quickboot=true
+   stop vendor.keymaster-4-1
+   start vendor.keymaster-4-1
+   stop keystore
+   start keystore
+   start wait_for_keymaster
+
 service vendor.keymaster-4-1 /vendor/bin/hw/android.hardware.keymaster@4.1-service-qti
     class early_hal
     user system
diff --git a/proprietary/vendor/etc/init/android.hardware.neuralnetworks@1.3-service-qti.rc b/proprietary/vendor/etc/init/android.hardware.neuralnetworks@1.3-service-qti.rc
deleted file mode 100644
index 1d6c390..0000000
--- a/proprietary/vendor/etc/init/android.hardware.neuralnetworks@1.3-service-qti.rc
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) 2019-2020 Qualcomm Technologies, Inc.
-# All Rights Reserved.
-# Confidential and Proprietary - Qualcomm Technologies, Inc.
-#
-
-service neuralnetworks_hal_service /vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-qti
-    class hal
-    user system
-    group system
-    writepid /dev/stune/nnapi-hal/tasks
-
-#Below changes moved from init.target.rc as part of go/FR53051
-on post-fs-data
-    mkdir /data/vendor/nnhal 0700 system system
diff --git a/proprietary/vendor/etc/init/shsusrd.rc b/proprietary/vendor/etc/init/shsusrd.rc
new file mode 100644
index 0000000..0242b65
--- /dev/null
+++ b/proprietary/vendor/etc/init/shsusrd.rc
@@ -0,0 +1,40 @@
+# Copyright (c) 2019-2021 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc.
+#
+
+on boot
+    write /data/vendor/shsusr/shsusr_log.txt ""
+    chown radio radio /data/vendor/shsusr/shsusr_log.txt
+
+# msm specific files that need to be created on /data
+on post-fs-data
+    #Create SHSUSR daemon log dir
+    mkdir /data/vendor/shsusr 0770 radio radio
+    chmod 0770 /data/vendor/shsusr
+
+service vendor.shsusrd /system/vendor/bin/shsusrd 0x002819000
+    class main
+    user radio
+    group radio
+    capabilities NET_ADMIN
+    disabled
+
+on property:persist.vendor.data.shsusr_load=1
+    start vendor.shsusrd
+
+on property:persist.vendor.data.shsusr_load=0
+    stop vendor.shsusrd
+
+on property:persist.vendor.data.shsusr_ipa=02
+    write /sys/class/net/rmnet_ipa0/queues/rx-0/rps_cpus "02"
+
+on property:persist.vendor.data.shsusr_ipa=10
+    write /sys/class/net/rmnet_ipa0/queues/rx-0/rps_cpus "10"
+
+on property:persist.vendor.data.shsusr_ipa=20
+    write /sys/class/net/rmnet_ipa0/queues/rx-0/rps_cpus "20"
+
+on property:persist.vendor.data.shsusr_ipa=40
+    write /sys/class/net/rmnet_ipa0/queues/rx-0/rps_cpus "40"
+
diff --git a/proprietary/vendor/etc/lm/GameOptimizationFeature.xml b/proprietary/vendor/etc/lm/GameOptimizationFeature.xml
index c437a0a..563296d 100644
--- a/proprietary/vendor/etc/lm/GameOptimizationFeature.xml
+++ b/proprietary/vendor/etc/lm/GameOptimizationFeature.xml
@@ -21,7 +21,7 @@
     <Name>GameOptimization</Name>
     <Libname>libgameoptfeature.so</Libname>
     <Configs target="lahaina">
-        <Enable>1</Enable>
+        <Enable>0</Enable>
         <STATIC_L0>1</STATIC_L0>
         <AGPE>1</AGPE>
         <GFAR>1</GFAR>
diff --git a/proprietary/vendor/etc/perf/perfboostsconfig.xml b/proprietary/vendor/etc/perf/perfboostsconfig.xml
index baa9bd5..bfffea1 100644
--- a/proprietary/vendor/etc/perf/perfboostsconfig.xml
+++ b/proprietary/vendor/etc/perf/perfboostsconfig.xml
@@ -33,11 +33,8 @@
 
         <!-- Type="1", main launch boost of 2sec -->
         <Config
-            Id="0x00001081" Type="1" Enable="true" Timeout="2000" Target="lahaina"
-            Resources="0x40C00000, 0x1, 0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40804200, 0xFFF,
-                       0x40800000, 0xFFF, 0x40800100, 0xFFF, 0x40800200, 0xFFF, 0x43018000, 0xFF,
-                       0x43010000, 0xFF, 0x40400000, 0x1, 0x42C10000, 0x1, 0x43430100, 0x28C5,
-                       0x43400000, 0xFFFF, 0x4281C000, 2000" />
+            Id="0x00001081" Type="1" Enable="true" Timeout="1000" Target="lahaina"
+            Resources="0x40C00000, 0x1" />
 
         <!-- SCHEDBOOST resource opcode, value-->
         <!-- CPUBOOST_MAX_FREQ BIG Core resource opcode, value-->
@@ -54,9 +51,8 @@
                       0x40800000, 1497, 0x40800100, 1516, 0x40800200, 1766" />
 
        <Config
-           Id="0x00001081" Type="1" Enable="true" Timeout="2000" Target="yupik"
-           Resources="0x40C00000, 0x1, 0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40804200, 0xFFF,
-                      0x40800000, 1516, 0x40800100, 1516, 0x40800200, 1766" />
+           Id="0x00001081" Type="1" Enable="true" Timeout="3000" Target="yupik"
+           Resources="0x40400000, 1, 0x40C00000, 0x1, 0x40C20000, 0x28, 0x40C1C000, 0x3C, 0x40C20200, 0x28, 0x40C1C200, 0x32, 0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40804200, 0xFFF, 0x40800000, 0x673, 0x40800100, 0xFFF, 0x40800200, 0x6E6, 0x43010000, 0x3B, 0x41828000, 0x8e" />
 
     <!--app lauch boost (disabling packing)-->
 
@@ -96,10 +92,9 @@
 
         <!-- Type="3", FA launch boost of 15sec -->
         <Config
-            Id="0x00001081" Type="3" Enable="true" Timeout="15000" Target="lahaina"
-            Resources="0x40C00000, 0x3, 0x40C58000, 0x2D, 0x40C54000, 0x41,
-                      0x40C74000, 0xF0, 0x40408000, 0x63, 0x40C20000, 0x28,
-                      0x40C1C000, 0x3C, 0x40C20200, 0x28, 0x40C1C200, 0x3C" />
+            Id="0x00001081" Type="3" Enable="false" Timeout="15000" Target="lahaina"
+            Resources="0x40C00000, 0x3,
+                      0x40C74000, 0xF0, 0x40408000, 0x63" />
 
         <!-- SCHEDBOOST resource opcode, value-->
         <!-- SCHED GROUP DOWNMIGRATE resource opcode, value-->
@@ -150,7 +145,6 @@
         <!-- CPUBOOST_MIN_FREQ PRIME Core resource opcode, value-->
         <!-- CPUBOOST_MIN_FREQ BIG Core resource opcode, value-->
         <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->
-        <!-- CPUBW_MAX_FREQ resource opcode, value-->
         <!-- CPUBW_MIN_FREQ resource opcode, value-->
         <!-- LLCCBW resource opcode, value-->
         <!-- L3 resource opcode, value-->
@@ -161,9 +155,9 @@
             Resources="0x40C00000, 0x1, 0x40C58000, 0x2D, 0x40C54000, 0x41,
                        0x40C74000, 0xF0, 0x40408000, 0x63, 0x40C20000, 0x28,
                        0x40C1C000, 0x3C, 0x40C20200, 0x28, 0x40C1C200, 0x3C,
-                       0x42C10000, 0x1, 0x40800200, 0x76C, 0x40800000, 0x76C,
-                       0x40800100, 0x4B0, 0x43018000, 0xFF, 0x43010000, 0x50,
-                       0x41828000, 0x3A, 0x43400000, 0x3480" />
+                       0x40800200, 0x76C, 0x40800000, 0x76C,
+                       0x40800100, 0x4B0, 0x41800000, 0x50, 0x43000000, 0x3A,
+                       0x43400000, 0x3480" />
 
      <!-- config_enableLaunchBoost6-->
         <!-- SLB_BIG_CORE_1, val-->
@@ -497,6 +491,22 @@
                        0x41000000, 3, 0x40C78000, 0, 0x40C7C000, 0, 0x40CA8000, 4,
                        0x41000200, 1, 0x40C20200, 0xA, 0x40C1C200, 0x23" />
 
+        <Config
+            Id="0x00001080" Type="4" Enable="true" Timeout="80" Target="yupik" Fps="60"
+            Resources="0x40C00000, 0x2, 0x40C20000, 0x28, 0x40C1C000, 0x3C, 0x40C20200, 0x28, 0x40C1C200, 0x32, 0x40800000, 0x5EC, 0x40800100, 0x52C, 0x40800200, 0x5EC, 0x43010000, 0x26" />
+
+        <Config
+            Id="0x00001080" Type="4" Enable="true" Timeout="80" Target="yupik" Fps="90"
+            Resources="0x40C00000, 0x2, 0x40C20000, 0x28, 0x40C1C000, 0x3C, 0x40C20200, 0x28, 0x40C1C200, 0x32, 0x40800000, 0x5EC, 0x40800100, 0x52C, 0x40800200, 0x5EC, 0x43010000, 0x26" />
+
+        <Config
+            Id="0x00001080" Type="4" Enable="true" Timeout="80" Target="yupik" Fps="120"
+            Resources="0x40C00000, 0x2, 0x40C20000, 0x28, 0x40C1C000, 0x3C, 0x40C20200, 0x28, 0x40C1C200, 0x32, 0x40800000, 0x5EC, 0x40800100, 0x52C, 0x40800200, 0x5EC, 0x43010000, 0x26" />
+
+        <Config
+            Id="0x00001080" Type="4" Enable="true" Timeout="80" Target="yupik" Fps="144"
+            Resources="0x40C00000, 0x2, 0x40C20000, 0x28, 0x40C1C000, 0x3C, 0x40C20200, 0x28, 0x40C1C200, 0x32, 0x40800000, 0x5EC, 0x40800100, 0x52C, 0x40800200, 0x5EC, 0x43010000, 0x26" />
+
         <!-- CPUBW_MIN_FREQ resource opcode, value-->
         <!-- CPUBOOST_MIN_FREQ BIG CORE resource opcode, value -->
         <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value -->
@@ -792,7 +802,7 @@
     <!--Display on Resource -->
         <!-- Display on resource opcode, value -->
         <Config
-                Id="0x00001041" Enable="true" Timeout="0" Target="lahaina"
+                Id="0x00001041" Enable="false" Timeout="0" Target="lahaina"
                 Resources="0x40000000, 1" />
 
         <Config
@@ -806,7 +816,7 @@
     <!--Display off Resource -->
         <!-- Display on resource opcode, value -->
         <Config
-                Id="0x00001040" Enable="true" Timeout="0" Target="lahaina"
+                Id="0x00001040" Enable="false" Timeout="0" Target="lahaina"
                 Resources="0x40000000, 0x0" />
 
         <Config
@@ -836,7 +846,7 @@
         <!-- 60fps -->
         <Config
             Id="0x00001094" Type="60" Enable="true" Target="lahaina" Timeout="0"
-            Resources="0x40CA4000, 4" />
+            Resources="0x41444000, 0, 0x41444100, 0, 0x41444200, 0, 0x40CA4000, 5" />
         <!-- 90fps -->
         <Config
             Id="0x00001094" Type="90" Enable="true" Target="lahaina" Timeout="0"
@@ -879,7 +889,7 @@
         <!-- 60fps -->
         <Config
             Id="0x0000109B" Type="60" Enable="true" Target="lahaina" Timeout="0"
-            Resources="0x40CA4000, 4" />
+            Resources="0x41444000, 0, 0x41444100, 0, 0x41444200, 0, 0x40CA4000, 5" />
         <!-- 90fps -->
         <Config
             Id="0x0000109B" Type="90" Enable="true" Target="lahaina" Timeout="0"
@@ -1099,11 +1109,11 @@
         <!-- PID Affine opcode,value -->
         <Config
                 Id="0x00001097" Type="0" Enable="true" Timeout="9" Target="lahaina" Fps="120"
-                Resources="0x40800000, 1500, 0x42804000, 0, 0x42C20000, 1" />
+                Resources="0x40800000, 1500, 0x42C20000, 1" />
 
         <Config
                 Id="0x00001097" Type="0" Enable="true" Timeout="7" Target="lahaina" Fps="144"
-                Resources="0x40800000, 1500, 0x42804000, 0, 0x42C20000, 1" />
+                Resources="0x40800000, 1500, 0x42C20000, 1" />
 
     </PerfBoost>
 </BoostConfigs>
diff --git a/proprietary/vendor/etc/perf/perfconfigstore.xml b/proprietary/vendor/etc/perf/perfconfigstore.xml
index 3d1e637..866f0da 100644
--- a/proprietary/vendor/etc/perf/perfconfigstore.xml
+++ b/proprietary/vendor/etc/perf/perfconfigstore.xml
@@ -55,6 +55,7 @@ ________________________________________________________________________________
                 <Prop Name="ro.vendor.perf.wlc.heavygame" Value="false" Target="yupik" />
                 <Prop Name="ro.vendor.perf.splh" Value="hw" Target="yupik" />
                 <Prop Name="ro.vendor.perf.gplaf" Value="true" Target="yupik" />
+                <Prop Name="vendor.debug.enable.memperfd" Value="true" Target="katmai" />
                 <Prop Name="ro.vendor.perf.enable.prekill" Value="false" />
                 <Prop Name="ro.vendor.perf.splh" Value="none" Target="lahaina" />
                 <Prop Name="ro.vendor.perf.gplaf" Value="false" Target="lahaina" />
@@ -73,6 +74,7 @@ ________________________________________________________________________________
                 <Prop Name="ro.vendor.qti.sys.fw.bg_apps_limit" Value="96" />
                 <Prop Name="ro.vendor.qti.sys.fw.bg_apps_limit" Value="60" Target="shima" />
                 <Prop Name="ro.vendor.qti.sys.fw.bg_apps_limit" Value="60" Target="yupik" />
+                <Prop Name="ro.vendor.qti.sys.fw.bg_apps_limit" Value="60" Target="katmai" />
                 <Prop Name="ro.vendor.at_library" Value="libqti-at.so" />
                 <Prop Name="vendor.perf.performancemode.support" Value="true" Target="lahaina" />
                 <Prop Name="ro.lmk.enable_preferred_apps" Value="true" />
@@ -90,25 +92,36 @@ ________________________________________________________________________________
                 <Prop Name="vendor.perf.topAppRenderThreadBoost.enable" Value="false" Target="lahaina" />
                 <Prop Name="ro.vendor.qti.sys.fw.bservice_age" Value="300000" Target="shima" />
                 <Prop Name="ro.vendor.qti.sys.fw.bservice_age" Value="300000" Target="yupik" />
+                <Prop Name="ro.vendor.qti.sys.fw.bservice_age" Value="300000" Target="katmai" />
                 <Prop Name="ro.vendor.qti.sys.fw.bservice_limit" Value="15" Target="shima" />
                 <Prop Name="ro.vendor.qti.sys.fw.bservice_limit" Value="15" Target="yupik" />
+                <Prop Name="ro.vendor.qti.sys.fw.bservice_limit" Value="15" Target="katmai" />
                 <Prop Name="ro.vendor.qti.sys.fw.bservice_enable" Value="true" Target="shima" />
                 <Prop Name="ro.vendor.qti.sys.fw.bservice_enable" Value="true" Target="yupik" />
+                <Prop Name="ro.vendor.qti.sys.fw.bservice_enable" Value="true" Target="katmai" />
                 <Prop Name="ro.vendor.qti.sys.fw.use_trim_settings" Value="true" Target="shima" />
                 <Prop Name="ro.vendor.qti.sys.fw.use_trim_settings" Value="true" Target="yupik" />
+                <Prop Name="ro.vendor.qti.sys.fw.use_trim_settings" Value="true" Target="katmai" />
                 <Prop Name="ro.vendor.qti.sys.fw.empty_app_percent" Value="50" Target="shima" />
                 <Prop Name="ro.vendor.qti.sys.fw.empty_app_percent" Value="50" Target="yupik" />
+                <Prop Name="ro.vendor.qti.sys.fw.empty_app_percent" Value="50" Target="katmai" />
                 <Prop Name="ro.vendor.qti.sys.fw.trim_empty_percent" Value="100" Target="shima" />
                 <Prop Name="ro.vendor.qti.sys.fw.trim_empty_percent" Value="100" Target="yupik" />
+                <Prop Name="ro.vendor.qti.sys.fw.trim_empty_percent" Value="100" Target="katmai" />
                 <Prop Name="ro.vendor.qti.sys.fw.trim_cache_percent" Value="100" Target="shima" />
                 <Prop Name="ro.vendor.qti.sys.fw.trim_cache_percent" Value="100" Target="yupik" />
+                <Prop Name="ro.vendor.qti.sys.fw.trim_cache_percent" Value="100" Target="katmai" />
                 <Prop Name="ro.vendor.qti.sys.fw.trim_enable_memory" Value="4294967296" Target="shima" />
                 <Prop Name="ro.vendor.qti.sys.fw.trim_enable_memory" Value="4294967296" Target="yupik" />
+                <Prop Name="ro.vendor.qti.sys.fw.trim_enable_memory" Value="4294967296" Target="katmai" />
                 <Prop Name="ro.vendor.qti.am.reschedule_service" Value="true" Target="shima" />
                 <Prop Name="ro.vendor.qti.am.reschedule_service" Value="true" Target="yupik" />
+                <Prop Name="ro.vendor.qti.am.reschedule_service" Value="true" Target="katmai" />
                 <Prop Name="ro.vendor.iocgrp.config" Value="1" Target="shima" />
                 <Prop Name="ro.vendor.qti.sys.fw.bservice_age" Value="300000" Target="yupik" />
+                <Prop Name="ro.vendor.qti.sys.fw.bservice_age" Value="300000" Target="katmai" />
                 <Prop Name="ro.vendor.qti.sys.fw.bservice_limit" Value="15" Target="yupik" />
+                <Prop Name="ro.vendor.qti.sys.fw.bservice_limit" Value="15" Target="katmai" />
                 <Prop Name="ro.vendor.qti.sys.fw.bservice_enable" Value="true" Target="yupik" />
                 <Prop Name="ro.vendor.qti.sys.fw.use_trim_settings" Value="true" Target="yupik" />
                 <Prop Name="ro.vendor.qti.sys.fw.empty_app_percent" Value="50" Target="yupik" />
@@ -117,6 +130,14 @@ ________________________________________________________________________________
                 <Prop Name="ro.vendor.qti.sys.fw.trim_enable_memory" Value="4294967296" Target="yupik" />
                 <Prop Name="ro.vendor.qti.am.reschedule_service" Value="true" Target="yupik" />
                 <Prop Name="ro.vendor.iocgrp.config" Value="1" Target="yupik" />
+                <Prop Name="ro.vendor.qti.sys.fw.bservice_enable" Value="true" Target="katmai" />
+                <Prop Name="ro.vendor.qti.sys.fw.use_trim_settings" Value="true" Target="katmai" />
+                <Prop Name="ro.vendor.qti.sys.fw.empty_app_percent" Value="50" Target="katmai" />
+                <Prop Name="ro.vendor.qti.sys.fw.trim_empty_percent" Value="100" Target="katmai" />
+                <Prop Name="ro.vendor.qti.sys.fw.trim_cache_percent" Value="100" Target="katmai" />
+                <Prop Name="ro.vendor.qti.sys.fw.trim_enable_memory" Value="4294967296" Target="katmai" />
+                <Prop Name="ro.vendor.qti.am.reschedule_service" Value="true" Target="katmai" />
+                <Prop Name="ro.vendor.iocgrp.config" Value="1" Target="katmai" />
                 <Prop Name="ro.lmk.enable_userspace_lmk" Value="true" />
                 <Prop Name="vendor.perf.phr.enable" Value="1" Target="lahaina"/>
                 <Prop Name="vendor.perf.phr.hr_min_rate" Value="0.5" Target="lahaina"/>
diff --git a/proprietary/vendor/etc/perf/targetconfig.xml b/proprietary/vendor/etc/perf/targetconfig.xml
index 5e5d27e..f041dec 100644
--- a/proprietary/vendor/etc/perf/targetconfig.xml
+++ b/proprietary/vendor/etc/perf/targetconfig.xml
@@ -94,4 +94,21 @@
 
     </Config3>
 
+    <Config4>
+         <TargetInfo
+             Target="katmai"
+             NumClusters="2"
+             TotalNumCores="8"
+             SocIds="575,576"
+             SynCore="1"
+             CoreCtlCpu="4"
+             MinCoreOnline="0"
+             CpufreqGov="1"
+             MinFpsForTuning="60" />
+
+         <ClustersInfo Id="0" NumCores="4" Type="little" />
+         <ClustersInfo Id="1" NumCores="4" Type="big" />
+
+    </Config4>
+
 </TargetConfig>
diff --git a/proprietary/vendor/etc/powerhint.xml b/proprietary/vendor/etc/powerhint.xml
index 963be09..0e1e9ce 100644
--- a/proprietary/vendor/etc/powerhint.xml
+++ b/proprietary/vendor/etc/powerhint.xml
@@ -327,8 +327,9 @@
 
         <!--video encode HFR fps-->
         <!--MPCTLV3_ALL_CPUS_PWR_CLPS_DIS, 0x1-->
-        <!--MPCTLV3_MIN_FREQ_CLUSTER_LITTLE_CORE_0, CPU_SILVER_LEVEL_15 (1036800 kHz)-->
-        <!--MPCTLV3_MIN_FREQ_CLUSTER_BIG_CORE_0, CPU_GOLD_LEVEL_12 (1228800 kHz)-->
+	<!-- Prime CPU - Cluster min freq 2264000 kHz -->
+        <!--MPCTLV3_MIN_FREQ_CLUSTER_LITTLE_CORE_0, CPU_SILVER_LEVEL_15 (1689000 kHz) -->
+        <!--MPCTLV3_MIN_FREQ_CLUSTER_BIG_CORE_0, CPU_GOLD_LEVEL_12 (2264000 kHz) -->
         <!--MPCTLV3_SCHED_DOWNMIGRATE, 0x14-->
         <!--MPCTLV3_SCHED_UPMIGRATE, 0x1E-->
         <!--CPU-LLC BWMON - Set sample_ms 10 -->
@@ -338,7 +339,7 @@
         <!--Set sched_boost to 2 -->
         <Config
             Id="0x00001333" Enable="true" Timeout="0" Target="lahaina"
-            Resources="0x40400000, 0x1, 0x40800100, 0x40C, 0x40800000, 0x4CC, 0x40C20000, 0x14, 0x40C1C000, 0x1E, 0x41820000, 0x0A, 0x41808000, 0x50, 0x4180C000, 0, 0x40CA8000, 0x2, 0x40C00000, 0x2"/>
+            Resources="0x40400000, 0x1, 0x40800200, 0x8D8, 0x40800100, 0x699, 0x40800000, 0x8D8, 0x40C20000, 0x14, 0x40C1C000, 0x1E, 0x41820000, 0x0A, 0x41808000, 0x50, 0x4180C000, 0, 0x40CA8000, 0x2, 0x40C00000, 0x2"/>
 
         <!--video encode HFR 480 fps-->
         <!--MPCTLV3_ALL_CPUS_PWR_CLPS_DIS, 0x1-->
diff --git a/proprietary/vendor/etc/pwr/PowerFeatureConfig.xml b/proprietary/vendor/etc/pwr/PowerFeatureConfig.xml
new file mode 100644
index 0000000..d9c526d
--- /dev/null
+++ b/proprietary/vendor/etc/pwr/PowerFeatureConfig.xml
@@ -0,0 +1,21 @@
+<!--
+/******************************************************************************
+  @file    PowerFeatureConfig.xml
+  @brief   Power Optimization feature config xml
+
+  DESCRIPTION
+      This is to enable power features for optimization
+
+  ===========================================================================
+  Copyright (c) 2020 Qualcomm Technologies, Inc.
+  All Rights Reserved.
+  Confidential and Proprietary - Qualcomm Technologies, Inc.
+  ===========================================================================
+******************************************************************************/
+-->
+<PowerFeature>
+    <Feature>
+        <Name>VideoPowerOptFeature</Name>
+        <Enable>1</Enable>
+    </Feature>
+</PowerFeature>
diff --git a/proprietary/vendor/etc/pwr/VideoPowerOptFeature.xml b/proprietary/vendor/etc/pwr/VideoPowerOptFeature.xml
new file mode 100644
index 0000000..8f4f0be
--- /dev/null
+++ b/proprietary/vendor/etc/pwr/VideoPowerOptFeature.xml
@@ -0,0 +1,39 @@
+<!--
+/******************************************************************************
+  @file    VideoOptimizationFeature.xml
+  @brief   Video Optimization feature xml
+
+  DESCRIPTION
+      Each feature has an xml file to define the feature components
+
+  ===========================================================================
+  Copyright (c) 2020-21 Qualcomm Technologies, Inc.
+  All Rights Reserved.
+  Confidential and Proprietary - Qualcomm Technologies, Inc.
+  ===========================================================================
+******************************************************************************/
+-->
+<Feature>
+   <Name>VideoPowerOptFeature</Name>
+   <Libname>libvideooptfeature.so</Libname>
+   <Configs>
+        <MAX_CONTENT_FPS>30</MAX_CONTENT_FPS>
+        <MAX_PANEL_FPS>120</MAX_PANEL_FPS>
+    </Configs>
+    <Profiles>
+        <Profile>
+            <!-- PREDECITIVE_LOAD BIG CORE resource opcode -->
+            <!-- PREDECITIVE_LOAD LITTLE Core resource opcode -->
+            <!-- CPU CORE 4 SCHED LOAD BOOST -->
+            <!-- CPU CORE 5 SCHED LOAD BOOST -->
+            <!-- CPU CORE 6 SCHED LOAD BOOST -->
+            <!-- Disable Colocation  -->
+            <DEFAULT>0x41444000, 0, 0x41444100, 0, 0x40C68140, 0xFFFFFFF6, 0x40C68150, 0xFFFFFFF6, 0x40C68160, 0xFFFFFFF6, 0x40C54000, 999999, 0x40C58000, 999990</DEFAULT>
+        </Profile>
+    </Profiles>
+    <IgnoredApps>
+        <App>com.google.android.gms</App>
+        <App>com.android.vending</App>
+        <App>com.google.android.projection.gearhead</App>
+    </IgnoredApps>
+</Feature>
diff --git a/proprietary/vendor/etc/qcril_database/qcrilNr.db b/proprietary/vendor/etc/qcril_database/qcrilNr.db
index e14ca13..3428164 100644
Binary files a/proprietary/vendor/etc/qcril_database/qcrilNr.db and b/proprietary/vendor/etc/qcril_database/qcrilNr.db differ
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/config/12.0_config.sql b/proprietary/vendor/etc/qcril_database/upgrade/config/12.0_config.sql
new file mode 100644
index 0000000..225ca98
--- /dev/null
+++ b/proprietary/vendor/etc/qcril_database/upgrade/config/12.0_config.sql
@@ -0,0 +1,8 @@
+/*
+  Copyright (c) 2022 Qualcomm Technologies, Inc.
+  All Rights Reserved.
+  Confidential and Proprietary - Qualcomm Technologies, Inc.
+*/
+
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT PRIMARY KEY NOT NULL, def_val TEXT, value TEXT);
+UPDATE qcril_properties_table set def_val='12' where property='qcrildb_version';
\ No newline at end of file
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/config/9.0_config.sql b/proprietary/vendor/etc/qcril_database/upgrade/config/9.0_config.sql
index fa959e0..b82c276 100644
--- a/proprietary/vendor/etc/qcril_database/upgrade/config/9.0_config.sql
+++ b/proprietary/vendor/etc/qcril_database/upgrade/config/9.0_config.sql
@@ -1,6 +1,5 @@
-
 /*
-  Copyright (c) 2021 Qualcomm Technologies, Inc.
+  Copyright (c) 2022 Qualcomm Technologies, Inc.
   All Rights Reserved.
   Confidential and Proprietary - Qualcomm Technologies, Inc.
 */
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/33_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/33_version_qcrildb.sql
new file mode 100644
index 0000000..a272692
--- /dev/null
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/33_version_qcrildb.sql
@@ -0,0 +1,6 @@
+
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
+
+UPDATE qcril_properties_table set value='33' where property='qcrildb_version';
+DELETE FROM qcril_emergency_source_mcc_table where MCC = '460';
+
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/36_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/36_version_qcrildb.sql
new file mode 100644
index 0000000..67dd10c
--- /dev/null
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/36_version_qcrildb.sql
@@ -0,0 +1,7 @@
+
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
+
+UPDATE qcril_properties_table set value='36' where property='qcrildb_version';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '208' AND MNC = '01';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '208' AND MNC = '01';
+
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/37_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/37_version_qcrildb.sql
new file mode 100644
index 0000000..9c4f6be
--- /dev/null
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/37_version_qcrildb.sql
@@ -0,0 +1,23 @@
+
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
+
+UPDATE qcril_properties_table set value='37' where property='qcrildb_version';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '208' AND MNC = '02';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '208' AND MNC = '02';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '208' AND MNC = '91';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '208' AND MNC = '91';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '208' AND MNC = '20';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '208' AND MNC = '20';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '208' AND MNC = '21';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '208' AND MNC = '21';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '208' AND MNC = '88';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '208' AND MNC = '88';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '208' AND MNC = '09';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '208' AND MNC = '09';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '208' AND MNC = '10';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '208' AND MNC = '10';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '208' AND MNC = '11';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '208' AND MNC = '11';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '208' AND MNC = '13';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '208' AND MNC = '13';
+
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/38_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/38_version_qcrildb.sql
new file mode 100644
index 0000000..1f5af4d
--- /dev/null
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/38_version_qcrildb.sql
@@ -0,0 +1,7 @@
+
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
+
+UPDATE qcril_properties_table set value='38' where property='qcrildb_version';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '262' AND MNC = '03' AND NUMBER = '110';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '262' AND MNC = '07' AND NUMBER = '110';
+
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/40_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/40_version_qcrildb.sql
new file mode 100644
index 0000000..a362046
--- /dev/null
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/40_version_qcrildb.sql
@@ -0,0 +1,6 @@
+
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
+
+UPDATE qcril_properties_table set value='40' where property='qcrildb_version';
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('228','01','1414','','');
+
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/41_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/41_version_qcrildb.sql
new file mode 100644
index 0000000..a585e1d
--- /dev/null
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/41_version_qcrildb.sql
@@ -0,0 +1,19 @@
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
+
+UPDATE qcril_properties_table set value='41' where property='qcrildb_version';
+
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '228' AND MNC = '01' AND NUMBER = '117';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '228' AND MNC = '01' AND NUMBER = '118';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '228' AND MNC = '01' AND NUMBER = '143';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '228' AND MNC = '01' AND NUMBER = '144';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '228' AND MNC = '01' AND NUMBER = '145';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '228' AND MNC = '01' AND NUMBER = '147';
+
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('228','01','117','','');
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('228','01','118','','');
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('228','01','143','','');
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('228','01','144','','');
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('228','01','145','','');
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('228','01','147','','');
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('228','02','1414','','');
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('228','03','1414','','');
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/42_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/42_version_qcrildb.sql
new file mode 100644
index 0000000..c8851ae
--- /dev/null
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/42_version_qcrildb.sql
@@ -0,0 +1,15 @@
+
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
+
+UPDATE qcril_properties_table set value='42' where property='qcrildb_version';
+DELETE FROM qcril_emergency_source_mcc_table where MCC = '450';
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_table" VALUES('450','112','','');
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_table" VALUES('450','911','','');
+INSERT OR REPLACE INTO "qcril_emergency_source_voice_table" VALUES('450','111','','full');
+INSERT OR REPLACE INTO "qcril_emergency_source_voice_table" VALUES('450','113','','full');
+INSERT OR REPLACE INTO "qcril_emergency_source_voice_table" VALUES('450','117','','full');
+INSERT OR REPLACE INTO "qcril_emergency_source_voice_table" VALUES('450','118','','full');
+INSERT OR REPLACE INTO "qcril_emergency_source_voice_table" VALUES('450','119','','full');
+INSERT OR REPLACE INTO "qcril_emergency_source_voice_table" VALUES('450','122','','full');
+INSERT OR REPLACE INTO "qcril_emergency_source_voice_table" VALUES('450','125','','full');
+
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/43_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/43_version_qcrildb.sql
new file mode 100644
index 0000000..d802f81
--- /dev/null
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/43_version_qcrildb.sql
@@ -0,0 +1,25 @@
+
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
+
+UPDATE qcril_properties_table set value='43' where property='qcrildb_version';
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','220','911','','');
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','221','911','','');
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','222','911','','');
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','223','911','','');
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','224','911','','');
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','225','911','','');
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','226','911','','');
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','227','911','','');
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','228','911','','');
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','229','911','','');
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','580','911','','');
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','581','911','','');
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','582','911','','');
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','583','911','','');
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','584','911','','');
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','585','911','','');
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','586','911','','');
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','587','911','','');
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','588','911','','');
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','589','911','','');
+
diff --git a/proprietary/vendor/etc/seccomp_policy/wifidisplayhalservice.policy b/proprietary/vendor/etc/seccomp_policy/wifidisplayhalservice.policy
index 9e65d00..e13898d 100644
--- a/proprietary/vendor/etc/seccomp_policy/wifidisplayhalservice.policy
+++ b/proprietary/vendor/etc/seccomp_policy/wifidisplayhalservice.policy
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Qualcomm Technologies, Inc.
+# Copyright (c) 2020, 2022 Qualcomm Technologies, Inc.
 # All Rights Reserved.
 # Confidential and Proprietary - Qualcomm Technologies, Inc
 #
@@ -92,4 +92,5 @@ tgkill: 1
 gettid: 1
 sched_yield: 1
 flock: 1
+getdents64: 1
 umask: 1
diff --git a/proprietary/vendor/etc/vintf/manifest/android.hardware.neuralnetworks@1.3-service-qti.xml b/proprietary/vendor/etc/vintf/manifest/android.hardware.neuralnetworks@1.3-service-qti.xml
deleted file mode 100644
index b49adac..0000000
--- a/proprietary/vendor/etc/vintf/manifest/android.hardware.neuralnetworks@1.3-service-qti.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<!--
-Copyright (c) 2020 Qualcomm Technologies, Inc.
-All Rights Reserved.
-Confidential and Proprietary - Qualcomm Technologies, Inc.
--->
-<manifest version="1.0" type="device">
-    <hal format="hidl">
-        <name>android.hardware.neuralnetworks</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.3::IDevice/qti-default</fqname>
-        <fqname>@1.3::IDevice/qti-dsp</fqname>
-        <fqname>@1.3::IDevice/qti-gpu</fqname>
-    </hal>
-</manifest>
diff --git a/proprietary/vendor/firmware/a615_zap.b01 b/proprietary/vendor/firmware/a615_zap.b01
index 1c78d53..5f46499 100644
Binary files a/proprietary/vendor/firmware/a615_zap.b01 and b/proprietary/vendor/firmware/a615_zap.b01 differ
diff --git a/proprietary/vendor/firmware/a615_zap.elf b/proprietary/vendor/firmware/a615_zap.elf
index df38161..a3b489e 100644
Binary files a/proprietary/vendor/firmware/a615_zap.elf and b/proprietary/vendor/firmware/a615_zap.elf differ
diff --git a/proprietary/vendor/firmware/a615_zap.mdt b/proprietary/vendor/firmware/a615_zap.mdt
index 8e5d5ee..e294ff6 100644
Binary files a/proprietary/vendor/firmware/a615_zap.mdt and b/proprietary/vendor/firmware/a615_zap.mdt differ
diff --git a/proprietary/vendor/firmware/evass.b00 b/proprietary/vendor/firmware/evass.b00
index 724a176..40d7527 100644
Binary files a/proprietary/vendor/firmware/evass.b00 and b/proprietary/vendor/firmware/evass.b00 differ
diff --git a/proprietary/vendor/firmware/evass.b01 b/proprietary/vendor/firmware/evass.b01
index aa1bc59..fbb75d7 100644
Binary files a/proprietary/vendor/firmware/evass.b01 and b/proprietary/vendor/firmware/evass.b01 differ
diff --git a/proprietary/vendor/firmware/evass.b02 b/proprietary/vendor/firmware/evass.b02
index e3eac55..1f9ccd3 100644
Binary files a/proprietary/vendor/firmware/evass.b02 and b/proprietary/vendor/firmware/evass.b02 differ
diff --git a/proprietary/vendor/firmware/evass.b03 b/proprietary/vendor/firmware/evass.b03
index b2948da..dc1ee27 100644
Binary files a/proprietary/vendor/firmware/evass.b03 and b/proprietary/vendor/firmware/evass.b03 differ
diff --git a/proprietary/vendor/firmware/evass.b04 b/proprietary/vendor/firmware/evass.b04
index a051c0c..9733a4d 100644
Binary files a/proprietary/vendor/firmware/evass.b04 and b/proprietary/vendor/firmware/evass.b04 differ
diff --git a/proprietary/vendor/firmware/evass.b05 b/proprietary/vendor/firmware/evass.b05
index 0f4001a..3d015c5 100644
Binary files a/proprietary/vendor/firmware/evass.b05 and b/proprietary/vendor/firmware/evass.b05 differ
diff --git a/proprietary/vendor/firmware/evass.b06 b/proprietary/vendor/firmware/evass.b06
index 0878295..4de9759 100644
Binary files a/proprietary/vendor/firmware/evass.b06 and b/proprietary/vendor/firmware/evass.b06 differ
diff --git a/proprietary/vendor/firmware/evass.b08 b/proprietary/vendor/firmware/evass.b08
index a051c0c..9733a4d 100644
Binary files a/proprietary/vendor/firmware/evass.b08 and b/proprietary/vendor/firmware/evass.b08 differ
diff --git a/proprietary/vendor/firmware/evass.b09 b/proprietary/vendor/firmware/evass.b09
index 249c757..933199e 100644
Binary files a/proprietary/vendor/firmware/evass.b09 and b/proprietary/vendor/firmware/evass.b09 differ
diff --git a/proprietary/vendor/firmware/evass.b10 b/proprietary/vendor/firmware/evass.b10
index 8f694bf..990bf7f 100644
Binary files a/proprietary/vendor/firmware/evass.b10 and b/proprietary/vendor/firmware/evass.b10 differ
diff --git a/proprietary/vendor/firmware/evass.mbn b/proprietary/vendor/firmware/evass.mbn
index b6f60ce..bba4979 100644
Binary files a/proprietary/vendor/firmware/evass.mbn and b/proprietary/vendor/firmware/evass.mbn differ
diff --git a/proprietary/vendor/firmware/evass.mdt b/proprietary/vendor/firmware/evass.mdt
index 687edc2..e4d8e0b 100644
Binary files a/proprietary/vendor/firmware/evass.mdt and b/proprietary/vendor/firmware/evass.mdt differ
diff --git a/proprietary/vendor/firmware/vpu20_2v.b01 b/proprietary/vendor/firmware/vpu20_2v.b01
index f993ed7..0bef0b6 100644
Binary files a/proprietary/vendor/firmware/vpu20_2v.b01 and b/proprietary/vendor/firmware/vpu20_2v.b01 differ
diff --git a/proprietary/vendor/firmware/vpu20_2v.b02 b/proprietary/vendor/firmware/vpu20_2v.b02
index 6a8a373..446e798 100644
Binary files a/proprietary/vendor/firmware/vpu20_2v.b02 and b/proprietary/vendor/firmware/vpu20_2v.b02 differ
diff --git a/proprietary/vendor/firmware/vpu20_2v.b04 b/proprietary/vendor/firmware/vpu20_2v.b04
index cad5a45..b2ac9ad 100644
Binary files a/proprietary/vendor/firmware/vpu20_2v.b04 and b/proprietary/vendor/firmware/vpu20_2v.b04 differ
diff --git a/proprietary/vendor/firmware/vpu20_2v.b09 b/proprietary/vendor/firmware/vpu20_2v.b09
index 5bb26ad..9039f77 100644
Binary files a/proprietary/vendor/firmware/vpu20_2v.b09 and b/proprietary/vendor/firmware/vpu20_2v.b09 differ
diff --git a/proprietary/vendor/firmware/vpu20_2v.b10 b/proprietary/vendor/firmware/vpu20_2v.b10
index 5634640..ebc6e5c 100644
Binary files a/proprietary/vendor/firmware/vpu20_2v.b10 and b/proprietary/vendor/firmware/vpu20_2v.b10 differ
diff --git a/proprietary/vendor/firmware/vpu20_2v.mbn b/proprietary/vendor/firmware/vpu20_2v.mbn
index f2135b5..b6089d1 100644
Binary files a/proprietary/vendor/firmware/vpu20_2v.mbn and b/proprietary/vendor/firmware/vpu20_2v.mbn differ
diff --git a/proprietary/vendor/firmware/vpu20_2v.mdt b/proprietary/vendor/firmware/vpu20_2v.mdt
index beb2f54..64e0899 100644
Binary files a/proprietary/vendor/firmware/vpu20_2v.mdt and b/proprietary/vendor/firmware/vpu20_2v.mdt differ
diff --git a/proprietary/vendor/firmware/vpu20_2v_unsigned.mbn b/proprietary/vendor/firmware/vpu20_2v_unsigned.mbn
index 3e53f1e..2ee29d0 100644
Binary files a/proprietary/vendor/firmware/vpu20_2v_unsigned.mbn and b/proprietary/vendor/firmware/vpu20_2v_unsigned.mbn differ
diff --git a/proprietary/vendor/firmware/vpu20_4v.b01 b/proprietary/vendor/firmware/vpu20_4v.b01
index f35b8e8..f398c0f 100644
Binary files a/proprietary/vendor/firmware/vpu20_4v.b01 and b/proprietary/vendor/firmware/vpu20_4v.b01 differ
diff --git a/proprietary/vendor/firmware/vpu20_4v.b02 b/proprietary/vendor/firmware/vpu20_4v.b02
index 0914140..33dc225 100644
Binary files a/proprietary/vendor/firmware/vpu20_4v.b02 and b/proprietary/vendor/firmware/vpu20_4v.b02 differ
diff --git a/proprietary/vendor/firmware/vpu20_4v.b04 b/proprietary/vendor/firmware/vpu20_4v.b04
index 6861818..42cace5 100644
Binary files a/proprietary/vendor/firmware/vpu20_4v.b04 and b/proprietary/vendor/firmware/vpu20_4v.b04 differ
diff --git a/proprietary/vendor/firmware/vpu20_4v.b09 b/proprietary/vendor/firmware/vpu20_4v.b09
index ec9eec1..78da1e9 100644
Binary files a/proprietary/vendor/firmware/vpu20_4v.b09 and b/proprietary/vendor/firmware/vpu20_4v.b09 differ
diff --git a/proprietary/vendor/firmware/vpu20_4v.b10 b/proprietary/vendor/firmware/vpu20_4v.b10
index 3e0bb36..ed58421 100644
Binary files a/proprietary/vendor/firmware/vpu20_4v.b10 and b/proprietary/vendor/firmware/vpu20_4v.b10 differ
diff --git a/proprietary/vendor/firmware/vpu20_4v.mbn b/proprietary/vendor/firmware/vpu20_4v.mbn
index 5e6734d..fc60602 100644
Binary files a/proprietary/vendor/firmware/vpu20_4v.mbn and b/proprietary/vendor/firmware/vpu20_4v.mbn differ
diff --git a/proprietary/vendor/firmware/vpu20_4v.mdt b/proprietary/vendor/firmware/vpu20_4v.mdt
index 6d9b7f6..14441ff 100644
Binary files a/proprietary/vendor/firmware/vpu20_4v.mdt and b/proprietary/vendor/firmware/vpu20_4v.mdt differ
diff --git a/proprietary/vendor/firmware/vpu20_4v_unsigned.mbn b/proprietary/vendor/firmware/vpu20_4v_unsigned.mbn
index eaba649..3455e91 100644
Binary files a/proprietary/vendor/firmware/vpu20_4v_unsigned.mbn and b/proprietary/vendor/firmware/vpu20_4v_unsigned.mbn differ
diff --git a/proprietary/vendor/lib/egl/eglSubDriverAndroid.so b/proprietary/vendor/lib/egl/eglSubDriverAndroid.so
index 8c0be44..bd0bc77 100644
Binary files a/proprietary/vendor/lib/egl/eglSubDriverAndroid.so and b/proprietary/vendor/lib/egl/eglSubDriverAndroid.so differ
diff --git a/proprietary/vendor/lib/egl/libGLESv2_adreno.so b/proprietary/vendor/lib/egl/libGLESv2_adreno.so
index 0d4c631..87611f1 100644
Binary files a/proprietary/vendor/lib/egl/libGLESv2_adreno.so and b/proprietary/vendor/lib/egl/libGLESv2_adreno.so differ
diff --git a/proprietary/vendor/lib/egl/libq3dtools_esx.so b/proprietary/vendor/lib/egl/libq3dtools_esx.so
index 9bfe72e..4dc4652 100644
Binary files a/proprietary/vendor/lib/egl/libq3dtools_esx.so and b/proprietary/vendor/lib/egl/libq3dtools_esx.so differ
diff --git a/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so b/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so
index c3b9f10..5551dd5 100644
Binary files a/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so and b/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so differ
diff --git a/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so b/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so
new file mode 100644
index 0000000..3f9ae68
Binary files /dev/null and b/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so differ
diff --git a/proprietary/vendor/lib/hw/vulkan.adreno.so b/proprietary/vendor/lib/hw/vulkan.adreno.so
index cd64568..ba831b0 100644
Binary files a/proprietary/vendor/lib/hw/vulkan.adreno.so and b/proprietary/vendor/lib/hw/vulkan.adreno.so differ
diff --git a/proprietary/vendor/lib/libCB.so b/proprietary/vendor/lib/libCB.so
index e849381..06290f9 100644
Binary files a/proprietary/vendor/lib/libCB.so and b/proprietary/vendor/lib/libCB.so differ
diff --git a/proprietary/vendor/lib/libDxHdcp.so b/proprietary/vendor/lib/libDxHdcp.so
index 7e1023f..6b970b0 100644
Binary files a/proprietary/vendor/lib/libDxHdcp.so and b/proprietary/vendor/lib/libDxHdcp.so differ
diff --git a/proprietary/vendor/lib/libOmxAacDec.so b/proprietary/vendor/lib/libOmxAacDec.so
index aecb40d..909f67a 100644
Binary files a/proprietary/vendor/lib/libOmxAacDec.so and b/proprietary/vendor/lib/libOmxAacDec.so differ
diff --git a/proprietary/vendor/lib/libOmxAlacDec.so b/proprietary/vendor/lib/libOmxAlacDec.so
index d1afe99..f0213ea 100644
Binary files a/proprietary/vendor/lib/libOmxAlacDec.so and b/proprietary/vendor/lib/libOmxAlacDec.so differ
diff --git a/proprietary/vendor/lib/libOmxAlacDecSw.so b/proprietary/vendor/lib/libOmxAlacDecSw.so
index 9146dae..e0db1a9 100644
Binary files a/proprietary/vendor/lib/libOmxAlacDecSw.so and b/proprietary/vendor/lib/libOmxAlacDecSw.so differ
diff --git a/proprietary/vendor/lib/libOmxAmrDec.so b/proprietary/vendor/lib/libOmxAmrDec.so
index 8879352..ee342c9 100644
Binary files a/proprietary/vendor/lib/libOmxAmrDec.so and b/proprietary/vendor/lib/libOmxAmrDec.so differ
diff --git a/proprietary/vendor/lib/libOmxAmrwbplusDec.so b/proprietary/vendor/lib/libOmxAmrwbplusDec.so
index 58eab31..11ae24f 100644
Binary files a/proprietary/vendor/lib/libOmxAmrwbplusDec.so and b/proprietary/vendor/lib/libOmxAmrwbplusDec.so differ
diff --git a/proprietary/vendor/lib/libOmxApeDec.so b/proprietary/vendor/lib/libOmxApeDec.so
index c2d2c20..2b8cb97 100644
Binary files a/proprietary/vendor/lib/libOmxApeDec.so and b/proprietary/vendor/lib/libOmxApeDec.so differ
diff --git a/proprietary/vendor/lib/libOmxApeDecSw.so b/proprietary/vendor/lib/libOmxApeDecSw.so
index b9acb6d..4a2975f 100644
Binary files a/proprietary/vendor/lib/libOmxApeDecSw.so and b/proprietary/vendor/lib/libOmxApeDecSw.so differ
diff --git a/proprietary/vendor/lib/libOmxDsdDec.so b/proprietary/vendor/lib/libOmxDsdDec.so
index 353eae9..931f90c 100644
Binary files a/proprietary/vendor/lib/libOmxDsdDec.so and b/proprietary/vendor/lib/libOmxDsdDec.so differ
diff --git a/proprietary/vendor/lib/libOmxEvrcDec.so b/proprietary/vendor/lib/libOmxEvrcDec.so
index 42b016f..aae6d61 100644
Binary files a/proprietary/vendor/lib/libOmxEvrcDec.so and b/proprietary/vendor/lib/libOmxEvrcDec.so differ
diff --git a/proprietary/vendor/lib/libOmxG711Dec.so b/proprietary/vendor/lib/libOmxG711Dec.so
index b4335ab..84933bb 100644
Binary files a/proprietary/vendor/lib/libOmxG711Dec.so and b/proprietary/vendor/lib/libOmxG711Dec.so differ
diff --git a/proprietary/vendor/lib/libOmxMpeghDecSw.so b/proprietary/vendor/lib/libOmxMpeghDecSw.so
index a4a9a80..41dec7c 100644
Binary files a/proprietary/vendor/lib/libOmxMpeghDecSw.so and b/proprietary/vendor/lib/libOmxMpeghDecSw.so differ
diff --git a/proprietary/vendor/lib/libOmxMpeghEncSw.so b/proprietary/vendor/lib/libOmxMpeghEncSw.so
index 6544813..4022770 100644
Binary files a/proprietary/vendor/lib/libOmxMpeghEncSw.so and b/proprietary/vendor/lib/libOmxMpeghEncSw.so differ
diff --git a/proprietary/vendor/lib/libOmxQcelp13Dec.so b/proprietary/vendor/lib/libOmxQcelp13Dec.so
index 1450392..da4adb9 100644
Binary files a/proprietary/vendor/lib/libOmxQcelp13Dec.so and b/proprietary/vendor/lib/libOmxQcelp13Dec.so differ
diff --git a/proprietary/vendor/lib/libOmxVideoDSMode.so b/proprietary/vendor/lib/libOmxVideoDSMode.so
index 14ac1fb..93ab1c0 100644
Binary files a/proprietary/vendor/lib/libOmxVideoDSMode.so and b/proprietary/vendor/lib/libOmxVideoDSMode.so differ
diff --git a/proprietary/vendor/lib/libOmxWmaDec.so b/proprietary/vendor/lib/libOmxWmaDec.so
index 121aa62..a832187 100644
Binary files a/proprietary/vendor/lib/libOmxWmaDec.so and b/proprietary/vendor/lib/libOmxWmaDec.so differ
diff --git a/proprietary/vendor/lib/libVkLayer_q3dtools.so b/proprietary/vendor/lib/libVkLayer_q3dtools.so
index 53fb571..080af2a 100644
Binary files a/proprietary/vendor/lib/libVkLayer_q3dtools.so and b/proprietary/vendor/lib/libVkLayer_q3dtools.so differ
diff --git a/proprietary/vendor/lib/libacdbrtac.so b/proprietary/vendor/lib/libacdbrtac.so
index 86f0a90..293c51c 100644
Binary files a/proprietary/vendor/lib/libacdbrtac.so and b/proprietary/vendor/lib/libacdbrtac.so differ
diff --git a/proprietary/vendor/lib/libadpcmdec.so b/proprietary/vendor/lib/libadpcmdec.so
deleted file mode 100644
index da1e9b8..0000000
Binary files a/proprietary/vendor/lib/libadpcmdec.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libadreno_app_profiles.so b/proprietary/vendor/lib/libadreno_app_profiles.so
index 6c7ac9e..e716dca 100644
Binary files a/proprietary/vendor/lib/libadreno_app_profiles.so and b/proprietary/vendor/lib/libadreno_app_profiles.so differ
diff --git a/proprietary/vendor/lib/libadreno_utils.so b/proprietary/vendor/lib/libadreno_utils.so
index acf6a5c..c5bbfd7 100644
Binary files a/proprietary/vendor/lib/libadreno_utils.so and b/proprietary/vendor/lib/libadreno_utils.so differ
diff --git a/proprietary/vendor/lib/libadsprpc.so b/proprietary/vendor/lib/libadsprpc.so
index b35c8b3..75846d5 100644
Binary files a/proprietary/vendor/lib/libadsprpc.so and b/proprietary/vendor/lib/libadsprpc.so differ
diff --git a/proprietary/vendor/lib/libaudcal.so b/proprietary/vendor/lib/libaudcal.so
index 9a0baf7..cd13fc4 100644
Binary files a/proprietary/vendor/lib/libaudcal.so and b/proprietary/vendor/lib/libaudcal.so differ
diff --git a/proprietary/vendor/lib/libbluetooth_audio_session_qti.so b/proprietary/vendor/lib/libbluetooth_audio_session_qti.so
index 8971037..2eaa3ef 100644
Binary files a/proprietary/vendor/lib/libbluetooth_audio_session_qti.so and b/proprietary/vendor/lib/libbluetooth_audio_session_qti.so differ
diff --git a/proprietary/vendor/lib/libcdsprpc.so b/proprietary/vendor/lib/libcdsprpc.so
index 32a2efc..719a626 100644
Binary files a/proprietary/vendor/lib/libcdsprpc.so and b/proprietary/vendor/lib/libcdsprpc.so differ
diff --git a/proprietary/vendor/lib/libcvp_util.so b/proprietary/vendor/lib/libcvp_util.so
index fd3c9fa..4199a7e 100644
Binary files a/proprietary/vendor/lib/libcvp_util.so and b/proprietary/vendor/lib/libcvp_util.so differ
diff --git a/proprietary/vendor/lib/libcvpcpuRev_skel.so b/proprietary/vendor/lib/libcvpcpuRev_skel.so
index e805273..ea0845d 100644
Binary files a/proprietary/vendor/lib/libcvpcpuRev_skel.so and b/proprietary/vendor/lib/libcvpcpuRev_skel.so differ
diff --git a/proprietary/vendor/lib/libdiag.so b/proprietary/vendor/lib/libdiag.so
index f7d61d9..955572f 100644
Binary files a/proprietary/vendor/lib/libdiag.so and b/proprietary/vendor/lib/libdiag.so differ
diff --git a/proprietary/vendor/lib/libdsi_netctrl.so b/proprietary/vendor/lib/libdsi_netctrl.so
index 85023e7..faebbaa 100644
Binary files a/proprietary/vendor/lib/libdsi_netctrl.so and b/proprietary/vendor/lib/libdsi_netctrl.so differ
diff --git a/proprietary/vendor/lib/libdsutils.so b/proprietary/vendor/lib/libdsutils.so
index 09ff421..4d45ce8 100644
Binary files a/proprietary/vendor/lib/libdsutils.so and b/proprietary/vendor/lib/libdsutils.so differ
diff --git a/proprietary/vendor/lib/libgpudataproducer.so b/proprietary/vendor/lib/libgpudataproducer.so
index a92fe69..d3010f0 100644
Binary files a/proprietary/vendor/lib/libgpudataproducer.so and b/proprietary/vendor/lib/libgpudataproducer.so differ
diff --git a/proprietary/vendor/lib/libgsl.so b/proprietary/vendor/lib/libgsl.so
index 201b5d1..d80cd83 100644
Binary files a/proprietary/vendor/lib/libgsl.so and b/proprietary/vendor/lib/libgsl.so differ
diff --git a/proprietary/vendor/lib/libllvm-glnext.so b/proprietary/vendor/lib/libllvm-glnext.so
index 7ba80b5..0d26bcf 100644
Binary files a/proprietary/vendor/lib/libllvm-glnext.so and b/proprietary/vendor/lib/libllvm-glnext.so differ
diff --git a/proprietary/vendor/lib/libmmosal.so b/proprietary/vendor/lib/libmmosal.so
index 0ea7a08..9801cd3 100644
Binary files a/proprietary/vendor/lib/libmmosal.so and b/proprietary/vendor/lib/libmmosal.so differ
diff --git a/proprietary/vendor/lib/libperfgluelayer.so b/proprietary/vendor/lib/libperfgluelayer.so
index ccfdba5..ffa4e30 100644
Binary files a/proprietary/vendor/lib/libperfgluelayer.so and b/proprietary/vendor/lib/libperfgluelayer.so differ
diff --git a/proprietary/vendor/lib/libqc2vppfilter.so b/proprietary/vendor/lib/libqc2vppfilter.so
index a91d9e2..8856d72 100644
Binary files a/proprietary/vendor/lib/libqc2vppfilter.so and b/proprietary/vendor/lib/libqc2vppfilter.so differ
diff --git a/proprietary/vendor/lib/libqcmaputils.so b/proprietary/vendor/lib/libqcmaputils.so
index 7280cb4..0b4a1c6 100644
Binary files a/proprietary/vendor/lib/libqcmaputils.so and b/proprietary/vendor/lib/libqcmaputils.so differ
diff --git a/proprietary/vendor/lib/libqcodec2_base.so b/proprietary/vendor/lib/libqcodec2_base.so
index 5e6f837..34e13f7 100644
Binary files a/proprietary/vendor/lib/libqcodec2_base.so and b/proprietary/vendor/lib/libqcodec2_base.so differ
diff --git a/proprietary/vendor/lib/libqcodec2_basecodec.so b/proprietary/vendor/lib/libqcodec2_basecodec.so
index 7ee32a1..4650cbb 100644
Binary files a/proprietary/vendor/lib/libqcodec2_basecodec.so and b/proprietary/vendor/lib/libqcodec2_basecodec.so differ
diff --git a/proprietary/vendor/lib/libqcodec2_core.so b/proprietary/vendor/lib/libqcodec2_core.so
index 53b4cba..edc8de4 100644
Binary files a/proprietary/vendor/lib/libqcodec2_core.so and b/proprietary/vendor/lib/libqcodec2_core.so differ
diff --git a/proprietary/vendor/lib/libqcodec2_platform.so b/proprietary/vendor/lib/libqcodec2_platform.so
index 4c22ed2..00d2636 100644
Binary files a/proprietary/vendor/lib/libqcodec2_platform.so and b/proprietary/vendor/lib/libqcodec2_platform.so differ
diff --git a/proprietary/vendor/lib/libqcodec2_utils.so b/proprietary/vendor/lib/libqcodec2_utils.so
index 603c9f8..10e75be 100644
Binary files a/proprietary/vendor/lib/libqcodec2_utils.so and b/proprietary/vendor/lib/libqcodec2_utils.so differ
diff --git a/proprietary/vendor/lib/libqcodec2_v4l2codec.so b/proprietary/vendor/lib/libqcodec2_v4l2codec.so
index 8234027..f99d694 100644
Binary files a/proprietary/vendor/lib/libqcodec2_v4l2codec.so and b/proprietary/vendor/lib/libqcodec2_v4l2codec.so differ
diff --git a/proprietary/vendor/lib/libqmi_cci.so b/proprietary/vendor/lib/libqmi_cci.so
index e25b59a..d90c536 100644
Binary files a/proprietary/vendor/lib/libqmi_cci.so and b/proprietary/vendor/lib/libqmi_cci.so differ
diff --git a/proprietary/vendor/lib/libqmi_client_helper.so b/proprietary/vendor/lib/libqmi_client_helper.so
index bd4cfad..4308dd9 100644
Binary files a/proprietary/vendor/lib/libqmi_client_helper.so and b/proprietary/vendor/lib/libqmi_client_helper.so differ
diff --git a/proprietary/vendor/lib/libqmi_client_qmux.so b/proprietary/vendor/lib/libqmi_client_qmux.so
index ead6d3f..39918f0 100644
Binary files a/proprietary/vendor/lib/libqmi_client_qmux.so and b/proprietary/vendor/lib/libqmi_client_qmux.so differ
diff --git a/proprietary/vendor/lib/libqmiservices.so b/proprietary/vendor/lib/libqmiservices.so
index e6821d0..f98f5ca 100644
Binary files a/proprietary/vendor/lib/libqmiservices.so and b/proprietary/vendor/lib/libqmiservices.so differ
diff --git a/proprietary/vendor/lib/libqti-perfd-client.so b/proprietary/vendor/lib/libqti-perfd-client.so
index 169f12f..43819f0 100644
Binary files a/proprietary/vendor/lib/libqti-perfd-client.so and b/proprietary/vendor/lib/libqti-perfd-client.so differ
diff --git a/proprietary/vendor/lib/libqti-perfd.so b/proprietary/vendor/lib/libqti-perfd.so
index 2ed05f8..2e59160 100644
Binary files a/proprietary/vendor/lib/libqti-perfd.so and b/proprietary/vendor/lib/libqti-perfd.so differ
diff --git a/proprietary/vendor/lib/libwfdconfigutils_proprietary.so b/proprietary/vendor/lib/libwfdconfigutils_proprietary.so
index c5da58e..8c5c99b 100644
Binary files a/proprietary/vendor/lib/libwfdconfigutils_proprietary.so and b/proprietary/vendor/lib/libwfdconfigutils_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfddisplayconfig_proprietary.so b/proprietary/vendor/lib/libwfddisplayconfig_proprietary.so
index 9894b28..e54a75a 100644
Binary files a/proprietary/vendor/lib/libwfddisplayconfig_proprietary.so and b/proprietary/vendor/lib/libwfddisplayconfig_proprietary.so differ
diff --git a/proprietary/vendor/lib/rfsa/adsp/libQnnHtpAltPrepSkel.so b/proprietary/vendor/lib/rfsa/adsp/libQnnHtpAltPrepSkel.so
deleted file mode 100644
index 8612e15..0000000
Binary files a/proprietary/vendor/lib/rfsa/adsp/libQnnHtpAltPrepSkel.so and /dev/null differ
diff --git a/proprietary/vendor/lib/rfsa/adsp/libbitml_nsp_v2_skel.so b/proprietary/vendor/lib/rfsa/adsp/libbitml_nsp_v2_skel.so
index 6272087..81e3e0e 100644
Binary files a/proprietary/vendor/lib/rfsa/adsp/libbitml_nsp_v2_skel.so and b/proprietary/vendor/lib/rfsa/adsp/libbitml_nsp_v2_skel.so differ
diff --git a/proprietary/vendor/lib/soundfx/libqcbassboost.so b/proprietary/vendor/lib/soundfx/libqcbassboost.so
index b66668d..98c4194 100644
Binary files a/proprietary/vendor/lib/soundfx/libqcbassboost.so and b/proprietary/vendor/lib/soundfx/libqcbassboost.so differ
diff --git a/proprietary/vendor/lib/soundfx/libqcreverb.so b/proprietary/vendor/lib/soundfx/libqcreverb.so
index fc6f7c3..b120d49 100644
Binary files a/proprietary/vendor/lib/soundfx/libqcreverb.so and b/proprietary/vendor/lib/soundfx/libqcreverb.so differ
diff --git a/proprietary/vendor/lib/soundfx/libqcvirt.so b/proprietary/vendor/lib/soundfx/libqcvirt.so
index c301d27..4441b0e 100644
Binary files a/proprietary/vendor/lib/soundfx/libqcvirt.so and b/proprietary/vendor/lib/soundfx/libqcvirt.so differ
diff --git a/proprietary/vendor/lib/soundfx/libshoebox.so b/proprietary/vendor/lib/soundfx/libshoebox.so
index 51b3fbb..43d300f 100644
Binary files a/proprietary/vendor/lib/soundfx/libshoebox.so and b/proprietary/vendor/lib/soundfx/libshoebox.so differ
diff --git a/proprietary/vendor/lib/soundfx/libspeakerbundle.so b/proprietary/vendor/lib/soundfx/libspeakerbundle.so
index 79de862..416fce7 100644
Binary files a/proprietary/vendor/lib/soundfx/libspeakerbundle.so and b/proprietary/vendor/lib/soundfx/libspeakerbundle.so differ
diff --git a/proprietary/vendor/lib/vendor.qti.hardware.qccsyshal@1.0.so b/proprietary/vendor/lib/vendor.qti.hardware.qccsyshal@1.0.so
new file mode 100644
index 0000000..e1f23a4
Binary files /dev/null and b/proprietary/vendor/lib/vendor.qti.hardware.qccsyshal@1.0.so differ
diff --git a/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so b/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so
index 98fcd95..672c2a5 100644
Binary files a/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so and b/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so differ
diff --git a/proprietary/vendor/lib64/egl/eglSubDriverAndroid.so b/proprietary/vendor/lib64/egl/eglSubDriverAndroid.so
index c0c4914..5a73021 100644
Binary files a/proprietary/vendor/lib64/egl/eglSubDriverAndroid.so and b/proprietary/vendor/lib64/egl/eglSubDriverAndroid.so differ
diff --git a/proprietary/vendor/lib64/egl/libGLESv2_adreno.so b/proprietary/vendor/lib64/egl/libGLESv2_adreno.so
index c7c418d..4de9644 100644
Binary files a/proprietary/vendor/lib64/egl/libGLESv2_adreno.so and b/proprietary/vendor/lib64/egl/libGLESv2_adreno.so differ
diff --git a/proprietary/vendor/lib64/egl/libq3dtools_esx.so b/proprietary/vendor/lib64/egl/libq3dtools_esx.so
index 0b4cf89..877f0cb 100644
Binary files a/proprietary/vendor/lib64/egl/libq3dtools_esx.so and b/proprietary/vendor/lib64/egl/libq3dtools_esx.so differ
diff --git a/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so b/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so
index 8460baf..ac57871 100644
Binary files a/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so and b/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so differ
diff --git a/proprietary/vendor/lib64/hw/vendor.qti.gnss@4.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.gnss@4.0-impl.so
index db7d99a..6024534 100644
Binary files a/proprietary/vendor/lib64/hw/vendor.qti.gnss@4.0-impl.so and b/proprietary/vendor/lib64/hw/vendor.qti.gnss@4.0-impl.so differ
diff --git a/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so
index dde3d3a..77bffa1 100644
Binary files a/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so and b/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so differ
diff --git a/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so
new file mode 100644
index 0000000..2389315
Binary files /dev/null and b/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so differ
diff --git a/proprietary/vendor/lib64/hw/vendor.qti.hardware.qseecom@1.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.hardware.qseecom@1.0-impl.so
index 834e93b..65f0f69 100644
Binary files a/proprietary/vendor/lib64/hw/vendor.qti.hardware.qseecom@1.0-impl.so and b/proprietary/vendor/lib64/hw/vendor.qti.hardware.qseecom@1.0-impl.so differ
diff --git a/proprietary/vendor/lib64/hw/vulkan.adreno.so b/proprietary/vendor/lib64/hw/vulkan.adreno.so
index 38a460e..c524f5d 100644
Binary files a/proprietary/vendor/lib64/hw/vulkan.adreno.so and b/proprietary/vendor/lib64/hw/vulkan.adreno.so differ
diff --git a/proprietary/vendor/lib64/lib-imscommon.so b/proprietary/vendor/lib64/lib-imscommon.so
index 43afbd3..5c2a941 100644
Binary files a/proprietary/vendor/lib64/lib-imscommon.so and b/proprietary/vendor/lib64/lib-imscommon.so differ
diff --git a/proprietary/vendor/lib64/lib-imsdpl.so b/proprietary/vendor/lib64/lib-imsdpl.so
index 7ce7944..fc9f965 100644
Binary files a/proprietary/vendor/lib64/lib-imsdpl.so and b/proprietary/vendor/lib64/lib-imsdpl.so differ
diff --git a/proprietary/vendor/lib64/lib-imsrcsservice.so b/proprietary/vendor/lib64/lib-imsrcsservice.so
index 171c552..7d293ba 100644
Binary files a/proprietary/vendor/lib64/lib-imsrcsservice.so and b/proprietary/vendor/lib64/lib-imsrcsservice.so differ
diff --git a/proprietary/vendor/lib64/lib-imsservice.so b/proprietary/vendor/lib64/lib-imsservice.so
index cc6042f..a490fde 100644
Binary files a/proprietary/vendor/lib64/lib-imsservice.so and b/proprietary/vendor/lib64/lib-imsservice.so differ
diff --git a/proprietary/vendor/lib64/lib-imsvtcore.so b/proprietary/vendor/lib64/lib-imsvtcore.so
index f5fdc35..75c62ea 100644
Binary files a/proprietary/vendor/lib64/lib-imsvtcore.so and b/proprietary/vendor/lib64/lib-imsvtcore.so differ
diff --git a/proprietary/vendor/lib64/lib-imsxml.so b/proprietary/vendor/lib64/lib-imsxml.so
index fba3f4e..d514712 100644
Binary files a/proprietary/vendor/lib64/lib-imsxml.so and b/proprietary/vendor/lib64/lib-imsxml.so differ
diff --git a/proprietary/vendor/lib64/lib-rtpcommon.so b/proprietary/vendor/lib64/lib-rtpcommon.so
index c4084e1..2485792 100644
Binary files a/proprietary/vendor/lib64/lib-rtpcommon.so and b/proprietary/vendor/lib64/lib-rtpcommon.so differ
diff --git a/proprietary/vendor/lib64/lib-rtpcore.so b/proprietary/vendor/lib64/lib-rtpcore.so
index c200b2e..decadff 100644
Binary files a/proprietary/vendor/lib64/lib-rtpcore.so and b/proprietary/vendor/lib64/lib-rtpcore.so differ
diff --git a/proprietary/vendor/lib64/libCB.so b/proprietary/vendor/lib64/libCB.so
index 5b7e4d2..4448d14 100644
Binary files a/proprietary/vendor/lib64/libCB.so and b/proprietary/vendor/lib64/libCB.so differ
diff --git a/proprietary/vendor/lib64/libGPreqcancel_svc.so b/proprietary/vendor/lib64/libGPreqcancel_svc.so
index 0070c57..f2d3548 100644
Binary files a/proprietary/vendor/lib64/libGPreqcancel_svc.so and b/proprietary/vendor/lib64/libGPreqcancel_svc.so differ
diff --git a/proprietary/vendor/lib64/libOmxAacDec.so b/proprietary/vendor/lib64/libOmxAacDec.so
index 1e06cd5..8bca33d 100644
Binary files a/proprietary/vendor/lib64/libOmxAacDec.so and b/proprietary/vendor/lib64/libOmxAacDec.so differ
diff --git a/proprietary/vendor/lib64/libOmxAlacDec.so b/proprietary/vendor/lib64/libOmxAlacDec.so
index 8d0382a..252223b 100644
Binary files a/proprietary/vendor/lib64/libOmxAlacDec.so and b/proprietary/vendor/lib64/libOmxAlacDec.so differ
diff --git a/proprietary/vendor/lib64/libOmxAlacDecSw.so b/proprietary/vendor/lib64/libOmxAlacDecSw.so
index 34c1911..7f49676 100644
Binary files a/proprietary/vendor/lib64/libOmxAlacDecSw.so and b/proprietary/vendor/lib64/libOmxAlacDecSw.so differ
diff --git a/proprietary/vendor/lib64/libOmxAmrDec.so b/proprietary/vendor/lib64/libOmxAmrDec.so
index f70594b..5ffb710 100644
Binary files a/proprietary/vendor/lib64/libOmxAmrDec.so and b/proprietary/vendor/lib64/libOmxAmrDec.so differ
diff --git a/proprietary/vendor/lib64/libOmxAmrwbplusDec.so b/proprietary/vendor/lib64/libOmxAmrwbplusDec.so
index 874206d..69f8ba6 100644
Binary files a/proprietary/vendor/lib64/libOmxAmrwbplusDec.so and b/proprietary/vendor/lib64/libOmxAmrwbplusDec.so differ
diff --git a/proprietary/vendor/lib64/libOmxApeDec.so b/proprietary/vendor/lib64/libOmxApeDec.so
index 4f58e6a..6164a00 100644
Binary files a/proprietary/vendor/lib64/libOmxApeDec.so and b/proprietary/vendor/lib64/libOmxApeDec.so differ
diff --git a/proprietary/vendor/lib64/libOmxApeDecSw.so b/proprietary/vendor/lib64/libOmxApeDecSw.so
index ea02012..a9b06d8 100644
Binary files a/proprietary/vendor/lib64/libOmxApeDecSw.so and b/proprietary/vendor/lib64/libOmxApeDecSw.so differ
diff --git a/proprietary/vendor/lib64/libOmxEvrcDec.so b/proprietary/vendor/lib64/libOmxEvrcDec.so
index 0dd3cef..f6ae775 100644
Binary files a/proprietary/vendor/lib64/libOmxEvrcDec.so and b/proprietary/vendor/lib64/libOmxEvrcDec.so differ
diff --git a/proprietary/vendor/lib64/libOmxG711Dec.so b/proprietary/vendor/lib64/libOmxG711Dec.so
index f2795d9..374f1c7 100644
Binary files a/proprietary/vendor/lib64/libOmxG711Dec.so and b/proprietary/vendor/lib64/libOmxG711Dec.so differ
diff --git a/proprietary/vendor/lib64/libOmxMpeghEncSw.so b/proprietary/vendor/lib64/libOmxMpeghEncSw.so
index 145ce76..59ba1a5 100644
Binary files a/proprietary/vendor/lib64/libOmxMpeghEncSw.so and b/proprietary/vendor/lib64/libOmxMpeghEncSw.so differ
diff --git a/proprietary/vendor/lib64/libOmxQcelp13Dec.so b/proprietary/vendor/lib64/libOmxQcelp13Dec.so
index 8fa4d47..60752a2 100644
Binary files a/proprietary/vendor/lib64/libOmxQcelp13Dec.so and b/proprietary/vendor/lib64/libOmxQcelp13Dec.so differ
diff --git a/proprietary/vendor/lib64/libOmxWmaDec.so b/proprietary/vendor/lib64/libOmxWmaDec.so
index 6999d14..ba68ef9 100644
Binary files a/proprietary/vendor/lib64/libOmxWmaDec.so and b/proprietary/vendor/lib64/libOmxWmaDec.so differ
diff --git a/proprietary/vendor/lib64/libQSEEComAPI.so b/proprietary/vendor/lib64/libQSEEComAPI.so
index 0246c7d..60ab5f4 100644
Binary files a/proprietary/vendor/lib64/libQSEEComAPI.so and b/proprietary/vendor/lib64/libQSEEComAPI.so differ
diff --git a/proprietary/vendor/lib64/libQnnHtp.so b/proprietary/vendor/lib64/libQnnHtp.so
new file mode 100644
index 0000000..1ed20f4
Binary files /dev/null and b/proprietary/vendor/lib64/libQnnHtp.so differ
diff --git a/proprietary/vendor/lib64/libQnnHtpAltPrepStub.so b/proprietary/vendor/lib64/libQnnHtpAltPrepStub.so
deleted file mode 100644
index e1239c3..0000000
Binary files a/proprietary/vendor/lib64/libQnnHtpAltPrepStub.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libQnnHtpV68Stub.so b/proprietary/vendor/lib64/libQnnHtpV68Stub.so
new file mode 100644
index 0000000..0d9a51d
Binary files /dev/null and b/proprietary/vendor/lib64/libQnnHtpV68Stub.so differ
diff --git a/proprietary/vendor/lib64/libTrustedUITZ.so b/proprietary/vendor/lib64/libTrustedUITZ.so
index 5a2f003..dd4f41b 100644
Binary files a/proprietary/vendor/lib64/libTrustedUITZ.so and b/proprietary/vendor/lib64/libTrustedUITZ.so differ
diff --git a/proprietary/vendor/lib64/libTrustedUIVM.so b/proprietary/vendor/lib64/libTrustedUIVM.so
index 2461a17..9601199 100644
Binary files a/proprietary/vendor/lib64/libTrustedUIVM.so and b/proprietary/vendor/lib64/libTrustedUIVM.so differ
diff --git a/proprietary/vendor/lib64/libVkLayer_q3dtools.so b/proprietary/vendor/lib64/libVkLayer_q3dtools.so
index c830f70..42fcd12 100644
Binary files a/proprietary/vendor/lib64/libVkLayer_q3dtools.so and b/proprietary/vendor/lib64/libVkLayer_q3dtools.so differ
diff --git a/proprietary/vendor/lib64/libacdbrtac.so b/proprietary/vendor/lib64/libacdbrtac.so
index 91bee87..b5f610e 100644
Binary files a/proprietary/vendor/lib64/libacdbrtac.so and b/proprietary/vendor/lib64/libacdbrtac.so differ
diff --git a/proprietary/vendor/lib64/libadaptlaunch.so b/proprietary/vendor/lib64/libadaptlaunch.so
index 3c953bb..2f86f28 100644
Binary files a/proprietary/vendor/lib64/libadaptlaunch.so and b/proprietary/vendor/lib64/libadaptlaunch.so differ
diff --git a/proprietary/vendor/lib64/libadreno_app_profiles.so b/proprietary/vendor/lib64/libadreno_app_profiles.so
index 741e533..f07f0fc 100644
Binary files a/proprietary/vendor/lib64/libadreno_app_profiles.so and b/proprietary/vendor/lib64/libadreno_app_profiles.so differ
diff --git a/proprietary/vendor/lib64/libadreno_utils.so b/proprietary/vendor/lib64/libadreno_utils.so
index 372422f..6894d94 100644
Binary files a/proprietary/vendor/lib64/libadreno_utils.so and b/proprietary/vendor/lib64/libadreno_utils.so differ
diff --git a/proprietary/vendor/lib64/libadsprpc.so b/proprietary/vendor/lib64/libadsprpc.so
index 5f29f5f..22cf34e 100644
Binary files a/proprietary/vendor/lib64/libadsprpc.so and b/proprietary/vendor/lib64/libadsprpc.so differ
diff --git a/proprietary/vendor/lib64/libappclassifier.so b/proprietary/vendor/lib64/libappclassifier.so
index 96bfaf4..3780490 100644
Binary files a/proprietary/vendor/lib64/libappclassifier.so and b/proprietary/vendor/lib64/libappclassifier.so differ
diff --git a/proprietary/vendor/lib64/libaudcal.so b/proprietary/vendor/lib64/libaudcal.so
index bf5995b..04b63f4 100644
Binary files a/proprietary/vendor/lib64/libaudcal.so and b/proprietary/vendor/lib64/libaudcal.so differ
diff --git a/proprietary/vendor/lib64/libbluetooth_audio_session_qti.so b/proprietary/vendor/lib64/libbluetooth_audio_session_qti.so
index 92e9267..26e30b8 100644
Binary files a/proprietary/vendor/lib64/libbluetooth_audio_session_qti.so and b/proprietary/vendor/lib64/libbluetooth_audio_session_qti.so differ
diff --git a/proprietary/vendor/lib64/libcdfw.so b/proprietary/vendor/lib64/libcdfw.so
index 993c71a..04c45e3 100644
Binary files a/proprietary/vendor/lib64/libcdfw.so and b/proprietary/vendor/lib64/libcdfw.so differ
diff --git a/proprietary/vendor/lib64/libcdsprpc.so b/proprietary/vendor/lib64/libcdsprpc.so
index 67ab9e4..37d5693 100644
Binary files a/proprietary/vendor/lib64/libcdsprpc.so and b/proprietary/vendor/lib64/libcdsprpc.so differ
diff --git a/proprietary/vendor/lib64/libcne.so b/proprietary/vendor/lib64/libcne.so
index 6e7b4c5..690bbd7 100644
Binary files a/proprietary/vendor/lib64/libcne.so and b/proprietary/vendor/lib64/libcne.so differ
diff --git a/proprietary/vendor/lib64/libcneapiclient.so b/proprietary/vendor/lib64/libcneapiclient.so
index acbc852..c6bb48d 100644
Binary files a/proprietary/vendor/lib64/libcneapiclient.so and b/proprietary/vendor/lib64/libcneapiclient.so differ
diff --git a/proprietary/vendor/lib64/libconfigdb.so b/proprietary/vendor/lib64/libconfigdb.so
index 3aaf437..c2ee04f 100644
Binary files a/proprietary/vendor/lib64/libconfigdb.so and b/proprietary/vendor/lib64/libconfigdb.so differ
diff --git a/proprietary/vendor/lib64/libcvp_util.so b/proprietary/vendor/lib64/libcvp_util.so
index 2cb3b1a..5c7df78 100644
Binary files a/proprietary/vendor/lib64/libcvp_util.so and b/proprietary/vendor/lib64/libcvp_util.so differ
diff --git a/proprietary/vendor/lib64/libcvpcpuRev_skel.so b/proprietary/vendor/lib64/libcvpcpuRev_skel.so
index ca52508..ed6ecb5 100644
Binary files a/proprietary/vendor/lib64/libcvpcpuRev_skel.so and b/proprietary/vendor/lib64/libcvpcpuRev_skel.so differ
diff --git a/proprietary/vendor/lib64/libdiag.so b/proprietary/vendor/lib64/libdiag.so
index 15fe9b0..5c19499 100644
Binary files a/proprietary/vendor/lib64/libdiag.so and b/proprietary/vendor/lib64/libdiag.so differ
diff --git a/proprietary/vendor/lib64/libdisp-aba.so b/proprietary/vendor/lib64/libdisp-aba.so
index c95a201..7d5af08 100644
Binary files a/proprietary/vendor/lib64/libdisp-aba.so and b/proprietary/vendor/lib64/libdisp-aba.so differ
diff --git a/proprietary/vendor/lib64/libdisplayskuutils.so b/proprietary/vendor/lib64/libdisplayskuutils.so
index b39a75a..84da006 100644
Binary files a/proprietary/vendor/lib64/libdisplayskuutils.so and b/proprietary/vendor/lib64/libdisplayskuutils.so differ
diff --git a/proprietary/vendor/lib64/libdpps.so b/proprietary/vendor/lib64/libdpps.so
index b0327f7..1b8ee06 100644
Binary files a/proprietary/vendor/lib64/libdpps.so and b/proprietary/vendor/lib64/libdpps.so differ
diff --git a/proprietary/vendor/lib64/libdsi_netctrl.so b/proprietary/vendor/lib64/libdsi_netctrl.so
index 8d27e43..77e4206 100644
Binary files a/proprietary/vendor/lib64/libdsi_netctrl.so and b/proprietary/vendor/lib64/libdsi_netctrl.so differ
diff --git a/proprietary/vendor/lib64/libdsutils.so b/proprietary/vendor/lib64/libdsutils.so
index b00848e..0938076 100644
Binary files a/proprietary/vendor/lib64/libdsutils.so and b/proprietary/vendor/lib64/libdsutils.so differ
diff --git a/proprietary/vendor/lib64/libgameoptfeature.so b/proprietary/vendor/lib64/libgameoptfeature.so
index 8b3566d..0d135f3 100644
Binary files a/proprietary/vendor/lib64/libgameoptfeature.so and b/proprietary/vendor/lib64/libgameoptfeature.so differ
diff --git a/proprietary/vendor/lib64/libgplaf.so b/proprietary/vendor/lib64/libgplaf.so
index b53bf30..8e7a8c1 100644
Binary files a/proprietary/vendor/lib64/libgplaf.so and b/proprietary/vendor/lib64/libgplaf.so differ
diff --git a/proprietary/vendor/lib64/libgpudataproducer.so b/proprietary/vendor/lib64/libgpudataproducer.so
index ba26484..82e4cb2 100644
Binary files a/proprietary/vendor/lib64/libgpudataproducer.so and b/proprietary/vendor/lib64/libgpudataproducer.so differ
diff --git a/proprietary/vendor/lib64/libgsl.so b/proprietary/vendor/lib64/libgsl.so
index df03065..7b891d9 100644
Binary files a/proprietary/vendor/lib64/libgsl.so and b/proprietary/vendor/lib64/libgsl.so differ
diff --git a/proprietary/vendor/lib64/libizat_core.so b/proprietary/vendor/lib64/libizat_core.so
index 3dd66ed..91f8c91 100644
Binary files a/proprietary/vendor/lib64/libizat_core.so and b/proprietary/vendor/lib64/libizat_core.so differ
diff --git a/proprietary/vendor/lib64/libjnihelper.so b/proprietary/vendor/lib64/libjnihelper.so
index 6b4c5db..225e9df 100644
Binary files a/proprietary/vendor/lib64/libjnihelper.so and b/proprietary/vendor/lib64/libjnihelper.so differ
diff --git a/proprietary/vendor/lib64/libkeymasterdeviceutils.so b/proprietary/vendor/lib64/libkeymasterdeviceutils.so
index 6a62d2c..d4dd360 100644
Binary files a/proprietary/vendor/lib64/libkeymasterdeviceutils.so and b/proprietary/vendor/lib64/libkeymasterdeviceutils.so differ
diff --git a/proprietary/vendor/lib64/libkeymasterprovision.so b/proprietary/vendor/lib64/libkeymasterprovision.so
index c39426c..a26d459 100644
Binary files a/proprietary/vendor/lib64/libkeymasterprovision.so and b/proprietary/vendor/lib64/libkeymasterprovision.so differ
diff --git a/proprietary/vendor/lib64/liblbs_core.so b/proprietary/vendor/lib64/liblbs_core.so
index b118020..99003e0 100644
Binary files a/proprietary/vendor/lib64/liblbs_core.so and b/proprietary/vendor/lib64/liblbs_core.so differ
diff --git a/proprietary/vendor/lib64/liblearningmodule.so b/proprietary/vendor/lib64/liblearningmodule.so
index 8d537ea..2a066a2 100644
Binary files a/proprietary/vendor/lib64/liblearningmodule.so and b/proprietary/vendor/lib64/liblearningmodule.so differ
diff --git a/proprietary/vendor/lib64/libllvm-glnext.so b/proprietary/vendor/lib64/libllvm-glnext.so
index d68c336..b67102f 100644
Binary files a/proprietary/vendor/lib64/libllvm-glnext.so and b/proprietary/vendor/lib64/libllvm-glnext.so differ
diff --git a/proprietary/vendor/lib64/liblmutils-ns.so b/proprietary/vendor/lib64/liblmutils-ns.so
index 243898d..60293fa 100644
Binary files a/proprietary/vendor/lib64/liblmutils-ns.so and b/proprietary/vendor/lib64/liblmutils-ns.so differ
diff --git a/proprietary/vendor/lib64/libloc_api_v02.so b/proprietary/vendor/lib64/libloc_api_v02.so
index 01fa154..fc8019b 100644
Binary files a/proprietary/vendor/lib64/libloc_api_v02.so and b/proprietary/vendor/lib64/libloc_api_v02.so differ
diff --git a/proprietary/vendor/lib64/liblowi_wifihal.so b/proprietary/vendor/lib64/liblowi_wifihal.so
index 6bb068e..647ac08 100644
Binary files a/proprietary/vendor/lib64/liblowi_wifihal.so and b/proprietary/vendor/lib64/liblowi_wifihal.so differ
diff --git a/proprietary/vendor/lib64/liblqe.so b/proprietary/vendor/lib64/liblqe.so
index 24d1194..73397d8 100644
Binary files a/proprietary/vendor/lib64/liblqe.so and b/proprietary/vendor/lib64/liblqe.so differ
diff --git a/proprietary/vendor/lib64/libmdmcutback.so b/proprietary/vendor/lib64/libmdmcutback.so
index 65dfabc..215b053 100644
Binary files a/proprietary/vendor/lib64/libmdmcutback.so and b/proprietary/vendor/lib64/libmdmcutback.so differ
diff --git a/proprietary/vendor/lib64/libmemperfd.so b/proprietary/vendor/lib64/libmemperfd.so
index b04deac..d3f20a7 100644
Binary files a/proprietary/vendor/lib64/libmemperfd.so and b/proprietary/vendor/lib64/libmemperfd.so differ
diff --git a/proprietary/vendor/lib64/libmeters-ns.so b/proprietary/vendor/lib64/libmeters-ns.so
index 804b78f..de04066 100644
Binary files a/proprietary/vendor/lib64/libmeters-ns.so and b/proprietary/vendor/lib64/libmeters-ns.so differ
diff --git a/proprietary/vendor/lib64/libminksocket.so b/proprietary/vendor/lib64/libminksocket.so
index 0a0b1ae..a368c04 100644
Binary files a/proprietary/vendor/lib64/libminksocket.so and b/proprietary/vendor/lib64/libminksocket.so differ
diff --git a/proprietary/vendor/lib64/libmmosal.so b/proprietary/vendor/lib64/libmmosal.so
index 62dbbdc..a82644f 100644
Binary files a/proprietary/vendor/lib64/libmmosal.so and b/proprietary/vendor/lib64/libmmosal.so differ
diff --git a/proprietary/vendor/lib64/libmotext_inf.so b/proprietary/vendor/lib64/libmotext_inf.so
index 6de8098..538f77f 100644
Binary files a/proprietary/vendor/lib64/libmotext_inf.so and b/proprietary/vendor/lib64/libmotext_inf.so differ
diff --git a/proprietary/vendor/lib64/libnetmgr.so b/proprietary/vendor/lib64/libnetmgr.so
index 82c8e9e..66809ac 100644
Binary files a/proprietary/vendor/lib64/libnetmgr.so and b/proprietary/vendor/lib64/libnetmgr.so differ
diff --git a/proprietary/vendor/lib64/libnetmgr_nr_fusion.so b/proprietary/vendor/lib64/libnetmgr_nr_fusion.so
index fb7f54a..1888e7f 100644
Binary files a/proprietary/vendor/lib64/libnetmgr_nr_fusion.so and b/proprietary/vendor/lib64/libnetmgr_nr_fusion.so differ
diff --git a/proprietary/vendor/lib64/libnetmgr_rmnet_ext.so b/proprietary/vendor/lib64/libnetmgr_rmnet_ext.so
index 926508a..0e48c49 100644
Binary files a/proprietary/vendor/lib64/libnetmgr_rmnet_ext.so and b/proprietary/vendor/lib64/libnetmgr_rmnet_ext.so differ
diff --git a/proprietary/vendor/lib64/libnlnetmgr.so b/proprietary/vendor/lib64/libnlnetmgr.so
index 362a01f..e814cc2 100644
Binary files a/proprietary/vendor/lib64/libnlnetmgr.so and b/proprietary/vendor/lib64/libnlnetmgr.so differ
diff --git a/proprietary/vendor/lib64/libops.so b/proprietary/vendor/lib64/libops.so
index 29df5bc..7d0df73 100644
Binary files a/proprietary/vendor/lib64/libops.so and b/proprietary/vendor/lib64/libops.so differ
diff --git a/proprietary/vendor/lib64/libperfgluelayer.so b/proprietary/vendor/lib64/libperfgluelayer.so
index f5bec65..3e36fb5 100644
Binary files a/proprietary/vendor/lib64/libperfgluelayer.so and b/proprietary/vendor/lib64/libperfgluelayer.so differ
diff --git a/proprietary/vendor/lib64/libprekill.so b/proprietary/vendor/lib64/libprekill.so
index d6a4a92..f7ba047 100644
Binary files a/proprietary/vendor/lib64/libprekill.so and b/proprietary/vendor/lib64/libprekill.so differ
diff --git a/proprietary/vendor/lib64/libqcmaputils.so b/proprietary/vendor/lib64/libqcmaputils.so
index 62938bd..b1ebdf7 100644
Binary files a/proprietary/vendor/lib64/libqcmaputils.so and b/proprietary/vendor/lib64/libqcmaputils.so differ
diff --git a/proprietary/vendor/lib64/libqcrilNr.so b/proprietary/vendor/lib64/libqcrilNr.so
index 4167b21..720f921 100644
Binary files a/proprietary/vendor/lib64/libqcrilNr.so and b/proprietary/vendor/lib64/libqcrilNr.so differ
diff --git a/proprietary/vendor/lib64/libqcrilNrFramework.so b/proprietary/vendor/lib64/libqcrilNrFramework.so
index 23a39dd..c8c6262 100644
Binary files a/proprietary/vendor/lib64/libqcrilNrFramework.so and b/proprietary/vendor/lib64/libqcrilNrFramework.so differ
diff --git a/proprietary/vendor/lib64/libqcrilNrLogger.so b/proprietary/vendor/lib64/libqcrilNrLogger.so
index aff70e9..e76b229 100644
Binary files a/proprietary/vendor/lib64/libqcrilNrLogger.so and b/proprietary/vendor/lib64/libqcrilNrLogger.so differ
diff --git a/proprietary/vendor/lib64/libqcrilNrQtiBus.so b/proprietary/vendor/lib64/libqcrilNrQtiBus.so
index d5982d8..bc48478 100644
Binary files a/proprietary/vendor/lib64/libqcrilNrQtiBus.so and b/proprietary/vendor/lib64/libqcrilNrQtiBus.so differ
diff --git a/proprietary/vendor/lib64/libqcrilNrQtiMutex.so b/proprietary/vendor/lib64/libqcrilNrQtiMutex.so
index 54fe9f9..351fd70 100644
Binary files a/proprietary/vendor/lib64/libqcrilNrQtiMutex.so and b/proprietary/vendor/lib64/libqcrilNrQtiMutex.so differ
diff --git a/proprietary/vendor/lib64/libqdi.so b/proprietary/vendor/lib64/libqdi.so
index 79c2508..b5a67d5 100644
Binary files a/proprietary/vendor/lib64/libqdi.so and b/proprietary/vendor/lib64/libqdi.so differ
diff --git a/proprietary/vendor/lib64/libqmi_cci.so b/proprietary/vendor/lib64/libqmi_cci.so
index 8bfb4e5..368db77 100644
Binary files a/proprietary/vendor/lib64/libqmi_cci.so and b/proprietary/vendor/lib64/libqmi_cci.so differ
diff --git a/proprietary/vendor/lib64/libqmi_client_helper.so b/proprietary/vendor/lib64/libqmi_client_helper.so
index 8157edc..d8d17ff 100644
Binary files a/proprietary/vendor/lib64/libqmi_client_helper.so and b/proprietary/vendor/lib64/libqmi_client_helper.so differ
diff --git a/proprietary/vendor/lib64/libqmi_client_qmux.so b/proprietary/vendor/lib64/libqmi_client_qmux.so
index 7b49a94..fef9d1f 100644
Binary files a/proprietary/vendor/lib64/libqmi_client_qmux.so and b/proprietary/vendor/lib64/libqmi_client_qmux.so differ
diff --git a/proprietary/vendor/lib64/libqmiservices.so b/proprietary/vendor/lib64/libqmiservices.so
index 794b7ea..7e0f742 100644
Binary files a/proprietary/vendor/lib64/libqmiservices.so and b/proprietary/vendor/lib64/libqmiservices.so differ
diff --git a/proprietary/vendor/lib64/libqrtr.so b/proprietary/vendor/lib64/libqrtr.so
index affb312..dccdd81 100644
Binary files a/proprietary/vendor/lib64/libqrtr.so and b/proprietary/vendor/lib64/libqrtr.so differ
diff --git a/proprietary/vendor/lib64/libqrtrclient.so b/proprietary/vendor/lib64/libqrtrclient.so
index 671fa66..794d01a 100644
Binary files a/proprietary/vendor/lib64/libqrtrclient.so and b/proprietary/vendor/lib64/libqrtrclient.so differ
diff --git a/proprietary/vendor/lib64/libqti-perfd-client.so b/proprietary/vendor/lib64/libqti-perfd-client.so
index 7fa7d8c..718427e 100644
Binary files a/proprietary/vendor/lib64/libqti-perfd-client.so and b/proprietary/vendor/lib64/libqti-perfd-client.so differ
diff --git a/proprietary/vendor/lib64/libqti-perfd.so b/proprietary/vendor/lib64/libqti-perfd.so
index 9fb91c0..fd0a05e 100644
Binary files a/proprietary/vendor/lib64/libqti-perfd.so and b/proprietary/vendor/lib64/libqti-perfd.so differ
diff --git a/proprietary/vendor/lib64/libqtikeymaster4.so b/proprietary/vendor/lib64/libqtikeymaster4.so
index b2e1d18..3fa945d 100644
Binary files a/proprietary/vendor/lib64/libqtikeymaster4.so and b/proprietary/vendor/lib64/libqtikeymaster4.so differ
diff --git a/proprietary/vendor/lib64/librcc.so b/proprietary/vendor/lib64/librcc.so
index 035132e..bd4970b 100644
Binary files a/proprietary/vendor/lib64/librcc.so and b/proprietary/vendor/lib64/librcc.so differ
diff --git a/proprietary/vendor/lib64/libril-db.so b/proprietary/vendor/lib64/libril-db.so
index 04f61c8..3c974ea 100644
Binary files a/proprietary/vendor/lib64/libril-db.so and b/proprietary/vendor/lib64/libril-db.so differ
diff --git a/proprietary/vendor/lib64/librpmb.so b/proprietary/vendor/lib64/librpmb.so
index 9f62d01..64c2400 100644
Binary files a/proprietary/vendor/lib64/librpmb.so and b/proprietary/vendor/lib64/librpmb.so differ
diff --git a/proprietary/vendor/lib64/libsdmextension.so b/proprietary/vendor/lib64/libsdmextension.so
index 8ee3260..b97d68d 100644
Binary files a/proprietary/vendor/lib64/libsdmextension.so and b/proprietary/vendor/lib64/libsdmextension.so differ
diff --git a/proprietary/vendor/lib64/libsdsprpc.so b/proprietary/vendor/lib64/libsdsprpc.so
index 24a312f..c20d16f 100644
Binary files a/proprietary/vendor/lib64/libsdsprpc.so and b/proprietary/vendor/lib64/libsdsprpc.so differ
diff --git a/proprietary/vendor/lib64/libskewknob.so b/proprietary/vendor/lib64/libskewknob.so
new file mode 100644
index 0000000..edf3cf5
Binary files /dev/null and b/proprietary/vendor/lib64/libskewknob.so differ
diff --git a/proprietary/vendor/lib64/libsnsapi.so b/proprietary/vendor/lib64/libsnsapi.so
index b545fbd..ee4bfe4 100644
Binary files a/proprietary/vendor/lib64/libsnsapi.so and b/proprietary/vendor/lib64/libsnsapi.so differ
diff --git a/proprietary/vendor/lib64/libsnsdiaglog.so b/proprietary/vendor/lib64/libsnsdiaglog.so
index c1d1184..de7a74a 100644
Binary files a/proprietary/vendor/lib64/libsnsdiaglog.so and b/proprietary/vendor/lib64/libsnsdiaglog.so differ
diff --git a/proprietary/vendor/lib64/libsplh.so b/proprietary/vendor/lib64/libsplh.so
index 759b33d..86b14d1 100644
Binary files a/proprietary/vendor/lib64/libsplh.so and b/proprietary/vendor/lib64/libsplh.so differ
diff --git a/proprietary/vendor/lib64/libssd.so b/proprietary/vendor/lib64/libssd.so
index 10fc065..4b433bd 100644
Binary files a/proprietary/vendor/lib64/libssd.so and b/proprietary/vendor/lib64/libssd.so differ
diff --git a/proprietary/vendor/lib64/libvideooptfeature.so b/proprietary/vendor/lib64/libvideooptfeature.so
new file mode 100644
index 0000000..e8d1352
Binary files /dev/null and b/proprietary/vendor/lib64/libvideooptfeature.so differ
diff --git a/proprietary/vendor/lib64/libwms.so b/proprietary/vendor/lib64/libwms.so
index 48c254e..4024676 100644
Binary files a/proprietary/vendor/lib64/libwms.so and b/proprietary/vendor/lib64/libwms.so differ
diff --git a/proprietary/vendor/lib64/libwqe.so b/proprietary/vendor/lib64/libwqe.so
index a2e9ded..d04d7f3 100644
Binary files a/proprietary/vendor/lib64/libwqe.so and b/proprietary/vendor/lib64/libwqe.so differ
diff --git a/proprietary/vendor/lib64/libxml.so b/proprietary/vendor/lib64/libxml.so
index f420f04..ab03a8e 100644
Binary files a/proprietary/vendor/lib64/libxml.so and b/proprietary/vendor/lib64/libxml.so differ
diff --git a/proprietary/vendor/lib64/libxtwifi_server_protocol.so b/proprietary/vendor/lib64/libxtwifi_server_protocol.so
index ad5c49c..7829196 100644
Binary files a/proprietary/vendor/lib64/libxtwifi_server_protocol.so and b/proprietary/vendor/lib64/libxtwifi_server_protocol.so differ
diff --git a/proprietary/vendor/lib64/qcrilMarshal.so b/proprietary/vendor/lib64/qcrilMarshal.so
index ecad363..5c922c2 100644
Binary files a/proprietary/vendor/lib64/qcrilMarshal.so and b/proprietary/vendor/lib64/qcrilMarshal.so differ
diff --git a/proprietary/vendor/lib64/qtiril-utils.so b/proprietary/vendor/lib64/qtiril-utils.so
index b925853..161ef8e 100644
Binary files a/proprietary/vendor/lib64/qtiril-utils.so and b/proprietary/vendor/lib64/qtiril-utils.so differ
diff --git a/proprietary/vendor/lib64/qtiwakelock.so b/proprietary/vendor/lib64/qtiwakelock.so
index a738052..83a8fc3 100644
Binary files a/proprietary/vendor/lib64/qtiwakelock.so and b/proprietary/vendor/lib64/qtiwakelock.so differ
diff --git a/proprietary/vendor/lib64/soundfx/libqcbassboost.so b/proprietary/vendor/lib64/soundfx/libqcbassboost.so
index 245e10d..e177c48 100644
Binary files a/proprietary/vendor/lib64/soundfx/libqcbassboost.so and b/proprietary/vendor/lib64/soundfx/libqcbassboost.so differ
diff --git a/proprietary/vendor/lib64/soundfx/libqcreverb.so b/proprietary/vendor/lib64/soundfx/libqcreverb.so
index 229f61c..cc22a2d 100644
Binary files a/proprietary/vendor/lib64/soundfx/libqcreverb.so and b/proprietary/vendor/lib64/soundfx/libqcreverb.so differ
diff --git a/proprietary/vendor/lib64/soundfx/libqcvirt.so b/proprietary/vendor/lib64/soundfx/libqcvirt.so
index 4f64e38..cee8ce3 100644
Binary files a/proprietary/vendor/lib64/soundfx/libqcvirt.so and b/proprietary/vendor/lib64/soundfx/libqcvirt.so differ
diff --git a/proprietary/vendor/lib64/soundfx/libshoebox.so b/proprietary/vendor/lib64/soundfx/libshoebox.so
index 68517da..76b607d 100644
Binary files a/proprietary/vendor/lib64/soundfx/libshoebox.so and b/proprietary/vendor/lib64/soundfx/libshoebox.so differ
diff --git a/proprietary/vendor/lib64/unnhal-acc-common.so b/proprietary/vendor/lib64/unnhal-acc-common.so
deleted file mode 100644
index 2e6a88e..0000000
Binary files a/proprietary/vendor/lib64/unnhal-acc-common.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/unnhal-acc-gpu.so b/proprietary/vendor/lib64/unnhal-acc-gpu.so
deleted file mode 100644
index ff9b4bd..0000000
Binary files a/proprietary/vendor/lib64/unnhal-acc-gpu.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/unnhal-acc-htp.so b/proprietary/vendor/lib64/unnhal-acc-htp.so
deleted file mode 100644
index 03c49c0..0000000
Binary files a/proprietary/vendor/lib64/unnhal-acc-htp.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.7.so b/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.7.so
new file mode 100644
index 0000000..0095c3b
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.7.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.ims.configservice@1.0.so b/proprietary/vendor/lib64/vendor.qti.ims.configservice@1.0.so
new file mode 100644
index 0000000..1ebe7f6
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.qti.ims.configservice@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.ims.configservice@1.1.so b/proprietary/vendor/lib64/vendor.qti.ims.configservice@1.1.so
new file mode 100644
index 0000000..871c46c
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.qti.ims.configservice@1.1.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.ims.connection@1.0.so b/proprietary/vendor/lib64/vendor.qti.ims.connection@1.0.so
new file mode 100644
index 0000000..49ab1d0
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.qti.ims.connection@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.ims.factory@2.0.so b/proprietary/vendor/lib64/vendor.qti.ims.factory@2.0.so
new file mode 100644
index 0000000..09bd926
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.qti.ims.factory@2.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.ims.factory@2.1.so b/proprietary/vendor/lib64/vendor.qti.ims.factory@2.1.so
new file mode 100644
index 0000000..30ac3b1
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.qti.ims.factory@2.1.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.ims.factory@2.2.so b/proprietary/vendor/lib64/vendor.qti.ims.factory@2.2.so
new file mode 100644
index 0000000..75cb4b6
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.qti.ims.factory@2.2.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.ims.rcssip@1.0.so b/proprietary/vendor/lib64/vendor.qti.ims.rcssip@1.0.so
new file mode 100644
index 0000000..29cc4ae
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.qti.ims.rcssip@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.ims.rcssip@1.1.so b/proprietary/vendor/lib64/vendor.qti.ims.rcssip@1.1.so
new file mode 100644
index 0000000..5baa27c
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.qti.ims.rcssip@1.1.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.ims.rcssip@1.2.so b/proprietary/vendor/lib64/vendor.qti.ims.rcssip@1.2.so
new file mode 100644
index 0000000..b5c8c12
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.qti.ims.rcssip@1.2.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.ims.rcsuce@1.0.so b/proprietary/vendor/lib64/vendor.qti.ims.rcsuce@1.0.so
new file mode 100644
index 0000000..1289f56
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.qti.ims.rcsuce@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.ims.rcsuce@1.1.so b/proprietary/vendor/lib64/vendor.qti.ims.rcsuce@1.1.so
new file mode 100644
index 0000000..f848e28
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.qti.ims.rcsuce@1.1.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.ims.rcsuce@1.2.so b/proprietary/vendor/lib64/vendor.qti.ims.rcsuce@1.2.so
new file mode 100644
index 0000000..bf64839
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.qti.ims.rcsuce@1.2.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.0-service-Impl.so b/proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.0-service-Impl.so
index a870318..5dbadd5 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.0-service-Impl.so and b/proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.0-service-Impl.so differ
diff --git a/sm7325-common-vendor.mk b/sm7325-common-vendor.mk
index aca91bf..6b72520 100644
--- a/sm7325-common-vendor.mk
+++ b/sm7325-common-vendor.mk
@@ -8,17 +8,18 @@ PRODUCT_SOONG_NAMESPACES += \
 PRODUCT_COPY_FILES += \
     vendor/motorola/sm7325-common/proprietary/product/etc/permissions/UimGba.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/UimGba.xml \
     vendor/motorola/sm7325-common/proprietary/product/etc/permissions/UimGbaManager.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/UimGbaManager.xml \
+    vendor/motorola/sm7325-common/proprietary/product/etc/permissions/UimService.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/UimService.xml \
     vendor/motorola/sm7325-common/proprietary/system_ext/etc/permissions/moto-telephony.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/moto-telephony.xml \
     vendor/motorola/sm7325-common/proprietary/system/etc/permissions/privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-qti.xml \
     vendor/motorola/sm7325-common/proprietary/system/etc/sysconfig/qti_whitelist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/qti_whitelist.xml \
     vendor/motorola/sm7325-common/proprietary/system_ext/bin/dpmd:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/dpmd \
-    vendor/motorola/sm7325-common/proprietary/system_ext/bin/qccsyshal@1.1-service:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/qccsyshal@1.1-service \
+    vendor/motorola/sm7325-common/proprietary/system_ext/bin/qccsyshal@1.2-service:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/qccsyshal@1.2-service \
     vendor/motorola/sm7325-common/proprietary/system_ext/bin/qspmsvc:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/qspmsvc \
     vendor/motorola/sm7325-common/proprietary/system_ext/bin/wfdservice:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/wfdservice \
     vendor/motorola/sm7325-common/proprietary/system_ext/etc/dpm/dpm.conf:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/dpm/dpm.conf \
     vendor/motorola/sm7325-common/proprietary/system_ext/etc/init/dpmd.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/dpmd.rc \
     vendor/motorola/sm7325-common/proprietary/system_ext/etc/init/qspmsvc.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/qspmsvc.rc \
-    vendor/motorola/sm7325-common/proprietary/system_ext/etc/init/vendor.qti.hardware.qccsyshal@1.1-service.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/vendor.qti.hardware.qccsyshal@1.1-service.rc \
+    vendor/motorola/sm7325-common/proprietary/system_ext/etc/init/vendor.qti.hardware.qccsyshal@1.2-service.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/vendor.qti.hardware.qccsyshal@1.2-service.rc \
     vendor/motorola/sm7325-common/proprietary/system_ext/etc/init/wfdservice.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/wfdservice.rc \
     vendor/motorola/sm7325-common/proprietary/system_ext/etc/permissions/com.qti.dpmframework.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.qti.dpmframework.xml \
     vendor/motorola/sm7325-common/proprietary/system_ext/etc/permissions/dpmapi.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/dpmapi.xml \
@@ -30,13 +31,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sm7325-common/proprietary/system_ext/etc/seccomp_policy/wfdservice.policy:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/seccomp_policy/wfdservice.policy \
     vendor/motorola/sm7325-common/proprietary/system_ext/etc/wfdconfigsink.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/wfdconfigsink.xml \
     vendor/motorola/sm7325-common/proprietary/system_ext/lib/com.qualcomm.qti.ant@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/com.qualcomm.qti.ant@1.0.so \
-    vendor/motorola/sm7325-common/proprietary/system_ext/lib/com.qualcomm.qti.dpm.api@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/com.qualcomm.qti.dpm.api@1.0.so \
-    vendor/motorola/sm7325-common/proprietary/system_ext/lib/hw/vendor.qti.hardware.qccsyshal@1.0-impl.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/hw/vendor.qti.hardware.qccsyshal@1.0-impl.so \
-    vendor/motorola/sm7325-common/proprietary/system_ext/lib/hw/vendor.qti.hardware.qccsyshal@1.1-impl.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/hw/vendor.qti.hardware.qccsyshal@1.1-impl.so \
-    vendor/motorola/sm7325-common/proprietary/system_ext/lib/libdpmctmgr.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libdpmctmgr.so \
-    vendor/motorola/sm7325-common/proprietary/system_ext/lib/libdpmfdmgr.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libdpmfdmgr.so \
-    vendor/motorola/sm7325-common/proprietary/system_ext/lib/libdpmframework.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libdpmframework.so \
-    vendor/motorola/sm7325-common/proprietary/system_ext/lib/libdpmtcm.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libdpmtcm.so \
     vendor/motorola/sm7325-common/proprietary/system_ext/lib/libmmosal.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libmmosal.so \
     vendor/motorola/sm7325-common/proprietary/system_ext/lib/libmmparser_lite.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libmmparser_lite.so \
     vendor/motorola/sm7325-common/proprietary/system_ext/lib/libmmrtpdecoder.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libmmrtpdecoder.so \
@@ -59,15 +53,13 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sm7325-common/proprietary/system_ext/lib/libwfduibcsrc.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfduibcsrc.so \
     vendor/motorola/sm7325-common/proprietary/system_ext/lib/libwfduibcsrcinterface.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfduibcsrcinterface.so \
     vendor/motorola/sm7325-common/proprietary/system_ext/lib/vendor.qti.diaghal@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/vendor.qti.diaghal@1.0.so \
-    vendor/motorola/sm7325-common/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.0-halimpl.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/vendor.qti.hardware.qccsyshal@1.0-halimpl.so \
     vendor/motorola/sm7325-common/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/vendor.qti.hardware.qccsyshal@1.0.so \
-    vendor/motorola/sm7325-common/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.1-halimpl.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/vendor.qti.hardware.qccsyshal@1.1-halimpl.so \
     vendor/motorola/sm7325-common/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/vendor.qti.hardware.qccsyshal@1.1.so \
+    vendor/motorola/sm7325-common/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.2-halimpl.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/vendor.qti.hardware.qccsyshal@1.2-halimpl.so \
+    vendor/motorola/sm7325-common/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.2.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/vendor.qti.hardware.qccsyshal@1.2.so \
     vendor/motorola/sm7325-common/proprietary/system_ext/lib/vendor.qti.hardware.wifidisplaysession@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/vendor.qti.hardware.wifidisplaysession@1.0.so \
     vendor/motorola/sm7325-common/proprietary/system_ext/lib64/com.qualcomm.qti.ant@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.qualcomm.qti.ant@1.0.so \
     vendor/motorola/sm7325-common/proprietary/system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.qualcomm.qti.dpm.api@1.0.so \
-    vendor/motorola/sm7325-common/proprietary/system_ext/lib64/hw/vendor.qti.hardware.qccsyshal@1.0-impl.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/hw/vendor.qti.hardware.qccsyshal@1.0-impl.so \
-    vendor/motorola/sm7325-common/proprietary/system_ext/lib64/hw/vendor.qti.hardware.qccsyshal@1.1-impl.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/hw/vendor.qti.hardware.qccsyshal@1.1-impl.so \
     vendor/motorola/sm7325-common/proprietary/system_ext/lib64/lib-imsvideocodec.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imsvideocodec.so \
     vendor/motorola/sm7325-common/proprietary/system_ext/lib64/lib-imsvt.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imsvt.so \
     vendor/motorola/sm7325-common/proprietary/system_ext/lib64/lib-imsvtextutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imsvtextutils.so \
@@ -100,11 +92,13 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sm7325-common/proprietary/system_ext/lib64/libwfduibcsrc.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfduibcsrc.so \
     vendor/motorola/sm7325-common/proprietary/system_ext/lib64/libwfduibcsrcinterface.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfduibcsrcinterface.so \
     vendor/motorola/sm7325-common/proprietary/system_ext/lib64/vendor.qti.diaghal@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.diaghal@1.0.so \
-    vendor/motorola/sm7325-common/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.0-halimpl.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.qccsyshal@1.0-halimpl.so \
+    vendor/motorola/sm7325-common/proprietary/system_ext/lib64/vendor.qti.hardware.dpmservice@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.dpmservice@1.0.so \
     vendor/motorola/sm7325-common/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.qccsyshal@1.0.so \
-    vendor/motorola/sm7325-common/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.1-halimpl.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.qccsyshal@1.1-halimpl.so \
     vendor/motorola/sm7325-common/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.qccsyshal@1.1.so \
+    vendor/motorola/sm7325-common/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.2-halimpl.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.qccsyshal@1.2-halimpl.so \
+    vendor/motorola/sm7325-common/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.2.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.qccsyshal@1.2.so \
     vendor/motorola/sm7325-common/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.imsrtpservice@3.0.so \
+    vendor/motorola/sm7325-common/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.imsrtpservice@3.1.so \
     vendor/motorola/sm7325-common/proprietary/system_ext/lib64/vendor.qti.qspmhal@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.qspmhal@1.0.so \
     vendor/motorola/sm7325-common/proprietary/vendor/bin/ATFWD-daemon:$(TARGET_COPY_OUT_VENDOR)/bin/ATFWD-daemon \
     vendor/motorola/sm7325-common/proprietary/vendor/bin/adpl:$(TARGET_COPY_OUT_VENDOR)/bin/adpl \
@@ -122,7 +116,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sm7325-common/proprietary/vendor/bin/hw/android.hardware.drm@1.3-service.widevine:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.drm@1.3-service.widevine \
     vendor/motorola/sm7325-common/proprietary/vendor/bin/hw/android.hardware.gatekeeper@1.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.gatekeeper@1.0-service-qti \
     vendor/motorola/sm7325-common/proprietary/vendor/bin/hw/android.hardware.keymaster@4.1-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.keymaster@4.1-service-qti \
-    vendor/motorola/sm7325-common/proprietary/vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.neuralnetworks@1.3-service-qti \
     vendor/motorola/sm7325-common/proprietary/vendor/bin/hw/qconfigservice:$(TARGET_COPY_OUT_VENDOR)/bin/hw/qconfigservice \
     vendor/motorola/sm7325-common/proprietary/vendor/bin/hw/qcrilNrd:$(TARGET_COPY_OUT_VENDOR)/bin/hw/qcrilNrd \
     vendor/motorola/sm7325-common/proprietary/vendor/bin/hw/vendor.display.color@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.display.color@1.0-service \
@@ -168,8 +161,11 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sm7325-common/proprietary/vendor/bin/qrtr-ns:$(TARGET_COPY_OUT_VENDOR)/bin/qrtr-ns \
     vendor/motorola/sm7325-common/proprietary/vendor/bin/qseecomd:$(TARGET_COPY_OUT_VENDOR)/bin/qseecomd \
     vendor/motorola/sm7325-common/proprietary/vendor/bin/qti:$(TARGET_COPY_OUT_VENDOR)/bin/qti \
+    vendor/motorola/sm7325-common/proprietary/vendor/bin/qtigetprop:$(TARGET_COPY_OUT_VENDOR)/bin/qtigetprop \
+    vendor/motorola/sm7325-common/proprietary/vendor/bin/qtisetprop:$(TARGET_COPY_OUT_VENDOR)/bin/qtisetprop \
     vendor/motorola/sm7325-common/proprietary/vendor/bin/rmt_storage:$(TARGET_COPY_OUT_VENDOR)/bin/rmt_storage \
     vendor/motorola/sm7325-common/proprietary/vendor/bin/sensors.qti:$(TARGET_COPY_OUT_VENDOR)/bin/sensors.qti \
+    vendor/motorola/sm7325-common/proprietary/vendor/bin/shsusrd:$(TARGET_COPY_OUT_VENDOR)/bin/shsusrd \
     vendor/motorola/sm7325-common/proprietary/vendor/bin/sscrpcd:$(TARGET_COPY_OUT_VENDOR)/bin/sscrpcd \
     vendor/motorola/sm7325-common/proprietary/vendor/bin/tftp_server:$(TARGET_COPY_OUT_VENDOR)/bin/tftp_server \
     vendor/motorola/sm7325-common/proprietary/vendor/bin/thermal-engine:$(TARGET_COPY_OUT_VENDOR)/bin/thermal-engine \
@@ -231,7 +227,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/init/android.hardware.drm@1.3-service.widevine.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.drm@1.3-service.widevine.rc \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/init/android.hardware.keymaster@4.1-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.keymaster@4.1-service-qti.rc \
-    vendor/motorola/sm7325-common/proprietary/vendor/etc/init/android.hardware.neuralnetworks@1.3-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.neuralnetworks@1.3-service-qti.rc \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/init/cnd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/cnd.rc \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/init/com.qualcomm.qti.wifidisplayhal@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/com.qualcomm.qti.wifidisplayhal@1.0-service.rc \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/init/dataadpl.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/dataadpl.rc \
@@ -254,6 +249,7 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/init/qdcmss.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/qdcmss.rc \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/init/qmipriod.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/qmipriod.rc \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/init/qseecomd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/qseecomd.rc \
+    vendor/motorola/sm7325-common/proprietary/vendor/etc/init/shsusrd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/shsusrd.rc \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/init/vendor.display.color@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.display.color@1.0-service.rc \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/init/vendor.qti.adsprpc-guestos-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.adsprpc-guestos-service.rc \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/init/vendor.qti.cdsprpc-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.cdsprpc-service.rc \
@@ -300,9 +296,12 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/perf/targetresourceconfigs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/targetresourceconfigs.xml \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/permissions/vendor-qti-hardware-sensorscalibrate.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/vendor-qti-hardware-sensorscalibrate.xml \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/powerhint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.xml \
+    vendor/motorola/sm7325-common/proprietary/vendor/etc/pwr/PowerFeatureConfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/pwr/PowerFeatureConfig.xml \
+    vendor/motorola/sm7325-common/proprietary/vendor/etc/pwr/VideoPowerOptFeature.xml:$(TARGET_COPY_OUT_VENDOR)/etc/pwr/VideoPowerOptFeature.xml \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/qcrilNr.db:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/qcrilNr.db \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/config/10.0_config.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/config/10.0_config.sql \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/config/11.0_config.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/config/11.0_config.sql \
+    vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/config/12.0_config.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/config/12.0_config.sql \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/config/6.0_config.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/config/6.0_config.sql \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/config/9.0_config.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/config/9.0_config.sql \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/ecc/0_initial.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/ecc/0_initial.sql \
@@ -328,10 +327,18 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/ecc/29_version_qcrildb.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/ecc/29_version_qcrildb.sql \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/ecc/30_version_qcrildb.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/ecc/30_version_qcrildb.sql \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/ecc/31_version_qcrildb.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/ecc/31_version_qcrildb.sql \
+    vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/ecc/33_version_qcrildb.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/ecc/33_version_qcrildb.sql \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/ecc/34_version_qcrildb.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/ecc/34_version_qcrildb.sql \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/ecc/35_version_qcrildb.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/ecc/35_version_qcrildb.sql \
+    vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/ecc/36_version_qcrildb.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/ecc/36_version_qcrildb.sql \
+    vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/ecc/37_version_qcrildb.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/ecc/37_version_qcrildb.sql \
+    vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/ecc/38_version_qcrildb.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/ecc/38_version_qcrildb.sql \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/ecc/39_version_qcrildb.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/ecc/39_version_qcrildb.sql \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/ecc/3_version_qcrildb.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/ecc/3_version_qcrildb.sql \
+    vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/ecc/40_version_qcrildb.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/ecc/40_version_qcrildb.sql \
+    vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/ecc/41_version_qcrildb.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/ecc/41_version_qcrildb.sql \
+    vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/ecc/42_version_qcrildb.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/ecc/42_version_qcrildb.sql \
+    vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/ecc/43_version_qcrildb.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/ecc/43_version_qcrildb.sql \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/ecc/4_version_qcrildb.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/ecc/4_version_qcrildb.sql \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/ecc/5_version_qcrildb.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/ecc/5_version_qcrildb.sql \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/ecc/6_version_qcrildb.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/ecc/6_version_qcrildb.sql \
@@ -469,6 +476,7 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sm7325-common/proprietary/vendor/lib/egl/libq3dtools_esx.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/libq3dtools_esx.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib/hw/audio.bluetooth_qti.default.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/audio.bluetooth_qti.default.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so \
+    vendor/motorola/sm7325-common/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so \
@@ -503,7 +511,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sm7325-common/proprietary/vendor/lib/libacdbrtac.so:$(TARGET_COPY_OUT_VENDOR)/lib/libacdbrtac.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib/libadiertac.so:$(TARGET_COPY_OUT_VENDOR)/lib/libadiertac.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib/libadm.so:$(TARGET_COPY_OUT_VENDOR)/lib/libadm.so \
-    vendor/motorola/sm7325-common/proprietary/vendor/lib/libadpcmdec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libadpcmdec.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib/libadreno_app_profiles.so:$(TARGET_COPY_OUT_VENDOR)/lib/libadreno_app_profiles.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib/libadreno_utils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libadreno_utils.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib/libadsprpc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libadsprpc.so \
@@ -611,7 +618,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sm7325-common/proprietary/vendor/lib/rfsa/adsp/capi_v2_aptX_CLHDADV_Encoder.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/capi_v2_aptX_CLHDADV_Encoder.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib/rfsa/adsp/capi_v2_aptX_CLHDAD_Speech_Decoder.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/capi_v2_aptX_CLHDAD_Speech_Decoder.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib/rfsa/adsp/libQ6MSFR_manager_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libQ6MSFR_manager_skel.so \
-    vendor/motorola/sm7325-common/proprietary/vendor/lib/rfsa/adsp/libQnnHtpAltPrepSkel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libQnnHtpAltPrepSkel.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib/rfsa/adsp/libQnnHtpV68Skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libQnnHtpV68Skel.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib/rfsa/adsp/libSuperSensor_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libSuperSensor_skel.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib/rfsa/adsp/libVppAisQnnHtp.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libVppAisQnnHtp.so \
@@ -652,6 +658,7 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sm7325-common/proprietary/vendor/lib/vendor.qti.hardware.bluetooth_sar@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.bluetooth_sar@1.1.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib/vendor.qti.hardware.cvp@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.cvp@1.0.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib/vendor.qti.hardware.dsp@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.dsp@1.0.so \
+    vendor/motorola/sm7325-common/proprietary/vendor/lib/vendor.qti.hardware.qccsyshal@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.qccsyshal@1.0.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib/vendor.qti.hardware.qconfig@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.qconfig@1.0.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib/vendor.qti.hardware.vpp@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.vpp@1.1.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib/vendor.qti.hardware.vpp@1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.vpp@1.2.so \
@@ -685,6 +692,7 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/hw/vendor.qti.gnss@4.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.gnss@4.0-impl.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so \
+    vendor/motorola/sm7325-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so \
@@ -731,7 +739,8 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/libOpenCL.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOpenCL.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/libQSEEComAPI.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libQSEEComAPI.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/libQTEEConnector_vendor.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libQTEEConnector_vendor.so \
-    vendor/motorola/sm7325-common/proprietary/vendor/lib64/libQnnHtpAltPrepStub.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libQnnHtpAltPrepStub.so \
+    vendor/motorola/sm7325-common/proprietary/vendor/lib64/libQnnHtp.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libQnnHtp.so \
+    vendor/motorola/sm7325-common/proprietary/vendor/lib64/libQnnHtpV68Stub.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libQnnHtpV68Stub.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/libTouchInputVM.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libTouchInputVM.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/libTrustedInput.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libTrustedInput.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/libTrustedInputTZ.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libTrustedInputTZ.so \
@@ -907,6 +916,7 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/libsensorcal.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsensorcal.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/libsensorslog.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsensorslog.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/libsi.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsi.so \
+    vendor/motorola/sm7325-common/proprietary/vendor/lib64/libskewknob.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libskewknob.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/libslimclient.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libslimclient.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/libsnapdragoncolor-manager.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsnapdragoncolor-manager.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/libsnapdragoncolor-qdcm.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsnapdragoncolor-qdcm.so \
@@ -928,6 +938,7 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/libtinyxml2_1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libtinyxml2_1.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/libtrustedapploader.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libtrustedapploader.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/libtzdrmgenprov.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libtzdrmgenprov.so \
+    vendor/motorola/sm7325-common/proprietary/vendor/lib64/libvideooptfeature.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libvideooptfeature.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/libvppclient.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libvppclient.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/libvpphcp.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libvpphcp.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/libvpphvx.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libvpphvx.so \
@@ -950,9 +961,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/soundfx/libqcreverb.so:$(TARGET_COPY_OUT_VENDOR)/lib64/soundfx/libqcreverb.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/soundfx/libqcvirt.so:$(TARGET_COPY_OUT_VENDOR)/lib64/soundfx/libqcvirt.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/soundfx/libshoebox.so:$(TARGET_COPY_OUT_VENDOR)/lib64/soundfx/libshoebox.so \
-    vendor/motorola/sm7325-common/proprietary/vendor/lib64/unnhal-acc-common.so:$(TARGET_COPY_OUT_VENDOR)/lib64/unnhal-acc-common.so \
-    vendor/motorola/sm7325-common/proprietary/vendor/lib64/unnhal-acc-gpu.so:$(TARGET_COPY_OUT_VENDOR)/lib64/unnhal-acc-gpu.so \
-    vendor/motorola/sm7325-common/proprietary/vendor/lib64/unnhal-acc-htp.so:$(TARGET_COPY_OUT_VENDOR)/lib64/unnhal-acc-htp.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.display.color@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.display.color@1.0.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.display.color@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.display.color@1.1.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.display.color@1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.display.color@1.2.so \
@@ -1023,6 +1031,7 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.4.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.qtiradio@2.4.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.5.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.qtiradio@2.5.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.6.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.qtiradio@2.6.so \
+    vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.7.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.qtiradio@2.7.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.uim@1.0.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.uim@1.1.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.uim@1.2.so \
@@ -1043,12 +1052,24 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.qti.hardware.vpp@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.vpp@2.0.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.qti.ims.callcapability@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.callcapability@1.0.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.qti.ims.callinfo@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.callinfo@1.0.so \
+    vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.qti.ims.configservice@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.configservice@1.0.so \
+    vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.qti.ims.configservice@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.configservice@1.1.so \
+    vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.qti.ims.connection@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.connection@1.0.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.qti.ims.factory@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.factory@1.0.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.qti.ims.factory@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.factory@1.1.so \
+    vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.qti.ims.factory@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.factory@2.0.so \
+    vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.qti.ims.factory@2.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.factory@2.1.so \
+    vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.qti.ims.factory@2.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.factory@2.2.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.rcsconfig@1.0.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.rcsconfig@1.1.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.rcsconfig@2.0.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@2.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.rcsconfig@2.1.so \
+    vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.qti.ims.rcssip@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.rcssip@1.0.so \
+    vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.qti.ims.rcssip@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.rcssip@1.1.so \
+    vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.qti.ims.rcssip@1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.rcssip@1.2.so \
+    vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.qti.ims.rcsuce@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.rcsuce@1.0.so \
+    vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.qti.ims.rcsuce@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.rcsuce@1.1.so \
+    vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.qti.ims.rcsuce@1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.rcsuce@1.2.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.0-service-Impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.imsrtpservice@3.0-service-Impl.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.imsrtpservice@3.0.so \
     vendor/motorola/sm7325-common/proprietary/vendor/lib64/vendor.qti.latency@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.latency@2.0.so \
@@ -1068,24 +1089,35 @@ PRODUCT_PACKAGES += \
     PowerOffAlarm \
     uimgbaservice \
     ImsRcsService \
+    QtiTelephony \
     QtiTelephonyService \
     WfdService \
+    dpmserviceapp \
     ims \
     qcrilmsgtunnel \
     WfdCommon \
     tcmclient \
     uimgbalibrary \
     uimgbamanagerlibrary \
+    uimservicelibrary \
     moto-telephony \
     com.qti.dpmframework \
     dpmapi \
     qcrilhook \
     vendor.qti.hardware.alarm-V1.0-java \
+    vendor.qti.ims.configservice-V1.0-java \
+    vendor.qti.ims.configservice-V1.1-java \
     vendor.qti.ims.connection-V1.0-java \
+    vendor.qti.ims.factory-V1.1-java \
     vendor.qti.ims.factory-V2.0-java \
+    vendor.qti.ims.factory-V2.1-java \
+    vendor.qti.ims.factory-V2.2-java \
     vendor.qti.ims.rcssip-V1.0-java \
+    vendor.qti.ims.rcssip-V1.1-java \
+    vendor.qti.ims.rcssip-V1.2-java \
     vendor.qti.ims.rcsuce-V1.0-java \
-    android.hardware.neuralnetworks@1.3-service-qti \
+    vendor.qti.ims.rcsuce-V1.1-java \
+    vendor.qti.ims.rcsuce-V1.2-java \
     manifest_android.hardware.drm@1.3-service.widevine \
     vendor.dolby.media.c2@1.0-service \
     vendor.qti.diag.hal.service \