diff --git a/Android.bp b/Android.bp
index 8ce5d79..66668c5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -274,6 +274,13 @@ dex_import {
 	system_ext_specific: true,
 }
 
+dex_import {
+	name: "vendor.qti.ims.connection-V1.0-java",
+	owner: "oneplus",
+	jars: ["proprietary/system_ext/framework/vendor.qti.ims.connection-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
 dex_import {
 	name: "vendor.qti.ims.factory-V2.0-java",
 	owner: "oneplus",
@@ -281,6 +288,62 @@ dex_import {
 	system_ext_specific: true,
 }
 
+dex_import {
+	name: "vendor.qti.ims.factory-V2.1-java",
+	owner: "oneplus",
+	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: "oneplus",
+	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: "oneplus",
+	jars: ["proprietary/system_ext/framework/vendor.qti.ims.rcssip-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.ims.rcssip-V1.1-java",
+	owner: "oneplus",
+	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: "oneplus",
+	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: "oneplus",
+	jars: ["proprietary/system_ext/framework/vendor.qti.ims.rcsuce-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.ims.rcsuce-V1.1-java",
+	owner: "oneplus",
+	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: "oneplus",
+	jars: ["proprietary/system_ext/framework/vendor.qti.ims.rcsuce-V1.2-java.jar"],
+	system_ext_specific: true,
+}
+
 prebuilt_etc_xml {
 	name: "android.hardware.gnss-aidl-service-qti",
 	owner: "oneplus",
diff --git a/proprietary/system_ext/app/ImsRcsService/ImsRcsService.apk b/proprietary/system_ext/app/ImsRcsService/ImsRcsService.apk
index 67a8212..0c61339 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
index 901803c..50344dd 100644
Binary files a/proprietary/system_ext/app/QtiTelephony/QtiTelephony.apk and b/proprietary/system_ext/app/QtiTelephony/QtiTelephony.apk differ
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 55611f3..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.
 **********************************************************************/
@@ -16,4 +16,14 @@
         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/sysconfig/qti_telephony_system_packages_config.xml b/proprietary/system_ext/etc/sysconfig/qti_telephony_system_packages_config.xml
index 6a303d4..aa7d399 100644
--- a/proprietary/system_ext/etc/sysconfig/qti_telephony_system_packages_config.xml
+++ b/proprietary/system_ext/etc/sysconfig/qti_telephony_system_packages_config.xml
@@ -35,6 +35,10 @@ Full documentation at frameworks/base/data/etc/preinstalled-packages-platform.xm
 
     <!-- telephony-apps -->
 
+    <install-in-user-type package="com.qti.telephonysettings">
+        <install-in user-type="SYSTEM" />
+    </install-in-user-type>
+
     <install-in-user-type package="com.qualcomm.atfwd">
         <install-in user-type="SYSTEM" />
     </install-in-user-type>
diff --git a/proprietary/system_ext/etc/sysconfig/qti_whitelist_system_ext.xml b/proprietary/system_ext/etc/sysconfig/qti_whitelist_system_ext.xml
index 59c3f63..9dad8f1 100644
--- a/proprietary/system_ext/etc/sysconfig/qti_whitelist_system_ext.xml
+++ b/proprietary/system_ext/etc/sysconfig/qti_whitelist_system_ext.xml
@@ -31,6 +31,10 @@
 -->
 
 <config>
-<!-- Broadcast actions that are currently whitelisted. -->
-<allow-implicit-broadcast action="org.codeaurora.intent.action.CALL_COMPOSER_INFO" />
+    <!-- Broadcast actions that are currently whitelisted. -->
+    <allow-implicit-broadcast action="org.codeaurora.intent.action.PRE_ALERTING_CALL_INFO" />
+    <!-- These are location components that need to freely run in the background -->
+    <allow-in-power-save package="com.qualcomm.location" />
+    <hidden-api-whitelisted-app package="com.qualcomm.location" />
+    <hidden-api-whitelisted-app package="com.skyhook.blp" />
 </config>
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
new file mode 100644
index 0000000..d6342a7
Binary files /dev/null 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-V2.0-java.jar b/proprietary/system_ext/framework/vendor.qti.ims.factory-V2.0-java.jar
index 15a3e43..2872554 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..e9daf01
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..3e3670c
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
new file mode 100644
index 0000000..bed396d
Binary files /dev/null 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..00a3349
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..e3f5c0a
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
new file mode 100644
index 0000000..6152194
Binary files /dev/null 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..2e7c237
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..ecd867b
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/lib64/lib-imsvideocodec.so b/proprietary/system_ext/lib64/lib-imsvideocodec.so
index ac17f00..03188a1 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 345267a..1bd4011 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..50c3e66 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 c4e528f..6fd1c15 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/libimscamera_jni.so b/proprietary/system_ext/lib64/libimscamera_jni.so
index 1faac5b..5fd9aa8 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 a14e518..8e1bac0 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/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/priv-app/ims/ims.apk b/proprietary/system_ext/priv-app/ims/ims.apk
index d41eef7..11b8f0a 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/sm8450-common-vendor.mk b/sm8450-common-vendor.mk
index 8cfc706..b13aae6 100644
--- a/sm8450-common-vendor.mk
+++ b/sm8450-common-vendor.mk
@@ -116,6 +116,7 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/sm8450-common/proprietary/system_ext/lib64/vendor.qti.diaghal@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.diaghal@1.0.so \
     vendor/oneplus/sm8450-common/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so \
     vendor/oneplus/sm8450-common/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.imsrtpservice@3.0.so \
+    vendor/oneplus/sm8450-common/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.imsrtpservice@3.1.so \
     vendor/oneplus/sm8450-common/proprietary/vendor/bin/ATFWD-daemon:$(TARGET_COPY_OUT_VENDOR)/bin/ATFWD-daemon \
     vendor/oneplus/sm8450-common/proprietary/vendor/bin/adpl:$(TARGET_COPY_OUT_VENDOR)/bin/adpl \
     vendor/oneplus/sm8450-common/proprietary/vendor/bin/adsprpcd:$(TARGET_COPY_OUT_VENDOR)/bin/adsprpcd \
@@ -1346,7 +1347,16 @@ PRODUCT_PACKAGES += \
     com.android.hotwordenrollment.common.util \
     qcrilhook \
     vendor.qti.hardware.alarm-V1.0-java \
+    vendor.qti.ims.connection-V1.0-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 \
+    vendor.qti.ims.rcsuce-V1.1-java \
+    vendor.qti.ims.rcsuce-V1.2-java \
     android.hardware.gnss-aidl-service-qti \
     android.hardware.gnss@2.1-service-qti \
     android.hardware.graphics.mapper-impl-qti-display \