diff --git a/Android.bp b/Android.bp
index e4ac86d..118a356 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1085,6 +1085,32 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libprotobuf-cpp-full-21.7",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libprotobuf-cpp-full-21.7.so",
+            ],
+            shared_libs: [
+                "libz",
+                "liblog",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libqfp_sensortest",
     owner: "samsung",
@@ -1153,19 +1179,16 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib64/libril_sem.so",
             ],
             shared_libs: [
-                "libhidlbase",
-                "android.hardware.radio@1.0",
-                "android.hardware.radio@1.1",
-                "android.hardware.radio@1.2",
                 "libbase",
                 "libbinder_ndk",
-                "android.hardware.radio.config-V1-ndk",
-                "android.hardware.radio.data-V1-ndk",
-                "android.hardware.radio.messaging-V1-ndk",
-                "android.hardware.radio.modem-V1-ndk",
-                "android.hardware.radio.network-V1-ndk",
-                "android.hardware.radio.sim-V1-ndk",
-                "android.hardware.radio.voice-V1-ndk",
+                "android.hardware.radio.config-V2-ndk",
+                "android.hardware.radio.data-V2-ndk",
+                "android.hardware.radio.messaging-V2-ndk",
+                "android.hardware.radio.modem-V2-ndk",
+                "android.hardware.radio.network-V2-ndk",
+                "android.hardware.radio.sap-V1-ndk",
+                "android.hardware.radio.sim-V2-ndk",
+                "android.hardware.radio.voice-V2-ndk",
                 "vendor.samsung.hardware.radio.bridge-V1-ndk",
                 "vendor.samsung.hardware.radio.data-V1-ndk",
                 "vendor.samsung.hardware.radio.messaging-V1-ndk",
@@ -1215,7 +1238,7 @@ cc_prebuilt_library_shared {
                 "libjsoncpp",
                 "libVendorSemTelephonyProps",
                 "libVendorSemDataProps",
-                "libprotobuf-cpp-full-3.9.1-vendorcompat",
+                "libprotobuf-cpp-full-21.7",
                 "libvkmanager_vendor",
                 "libengmode_client",
                 "libbase",
@@ -1796,6 +1819,33 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libvk_cass_interface",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libvk_cass_interface.so",
+            ],
+            shared_libs: [
+                "libcutils",
+                "liblog",
+                "libvkmanager_vendor",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libvkmanager_vendor",
     owner: "samsung",
@@ -2399,18 +2449,18 @@ prebuilt_etc_xml {
 }
 
 prebuilt_etc_xml {
-    name: "vendor.samsung.hardware.radio_manifest_2_33.xml",
+    name: "vendor.samsung.hardware.radio_manifest_2_34.xml",
     owner: "samsung",
-    src: "proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.radio_manifest_2_33.xml",
+    src: "proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.radio_manifest_2_34.xml",
     filename_from_src: true,
     sub_dir: "vintf/manifest",
     soc_specific: true,
 }
 
 prebuilt_etc_xml {
-    name: "vendor.samsung.hardware.sehradio_manifest_2_33.xml",
+    name: "vendor.samsung.hardware.sehradio_manifest_2_34.xml",
     owner: "samsung",
-    src: "proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.sehradio_manifest_2_33.xml",
+    src: "proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.sehradio_manifest_2_34.xml",
     filename_from_src: true,
     sub_dir: "vintf/manifest",
     soc_specific: true,
@@ -2425,15 +2475,11 @@ cc_prebuilt_binary {
                 "proprietary/vendor/bin/cass",
             ],
             shared_libs: [
-                "libengmode_client",
-                "libvkmanager_vendor",
-                "libsecril-client",
-                "libcutils",
                 "liblog",
-                "libc++",
                 "libc",
-                "libm",
-                "libdl",
+                "libvk_cass_interface",
+                "libsecril-client",
+                "libengmode_client",
             ],
         },
     },
diff --git a/proprietary/vendor/bin/cass b/proprietary/vendor/bin/cass
index e26b400..ee46aaf 100755
Binary files a/proprietary/vendor/bin/cass and b/proprietary/vendor/bin/cass differ
diff --git a/proprietary/vendor/bin/hw/rild b/proprietary/vendor/bin/hw/rild
index 252153d..e8c01a6 100755
Binary files a/proprietary/vendor/bin/hw/rild and b/proprietary/vendor/bin/hw/rild differ
diff --git a/proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.radio_manifest_2_33.xml b/proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.radio_manifest_2_34.xml
similarity index 80%
rename from proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.radio_manifest_2_33.xml
rename to proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.radio_manifest_2_34.xml
index a2a9509..e8231b3 100644
--- a/proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.radio_manifest_2_33.xml
+++ b/proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.radio_manifest_2_34.xml
@@ -7,19 +7,16 @@
         <name>android.hardware.radio</name>
         <transport>hwbinder</transport>
     </hal>
-    <hal override="true" format="hidl">
-        <name>android.hardware.radio</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.2::ISap/slot1</fqname>
-        <fqname>@1.2::ISap/slot2</fqname>
-    </hal>
     <hal override="true" format="hidl">
         <name>android.hardware.radio.config</name>
         <transport>hwbinder</transport>
     </hal>
+    <hal override="true" format="aidl">
+        <name>android.hardware.radio.ims</name>
+    </hal>
     <hal override="true" format="aidl">
         <name>android.hardware.radio.modem</name>
-        <version>1</version>
+        <version>2</version>
         <interface>
             <name>IRadioModem</name>
             <instance>slot1</instance>
@@ -28,7 +25,7 @@
     </hal>
     <hal override="true" format="aidl">
         <name>android.hardware.radio.network</name>
-        <version>1</version>
+        <version>2</version>
         <interface>
             <name>IRadioNetwork</name>
             <instance>slot1</instance>
@@ -37,7 +34,7 @@
     </hal>
     <hal override="true" format="aidl">
         <name>android.hardware.radio.voice</name>
-        <version>1</version>
+        <version>2</version>
         <interface>
             <name>IRadioVoice</name>
             <instance>slot1</instance>
@@ -46,7 +43,7 @@
     </hal>
     <hal override="true" format="aidl">
         <name>android.hardware.radio.config</name>
-        <version>1</version>
+        <version>2</version>
         <interface>
             <name>IRadioConfig</name>
             <instance>default</instance>
@@ -54,7 +51,7 @@
     </hal>
     <hal override="true" format="aidl">
         <name>android.hardware.radio.sim</name>
-        <version>1</version>
+        <version>2</version>
         <interface>
             <name>IRadioSim</name>
             <instance>slot1</instance>
@@ -63,7 +60,7 @@
     </hal>
     <hal override="true" format="aidl">
         <name>android.hardware.radio.data</name>
-        <version>1</version>
+        <version>2</version>
         <interface>
             <name>IRadioData</name>
             <instance>slot1</instance>
@@ -72,11 +69,20 @@
     </hal>
     <hal override="true" format="aidl">
         <name>android.hardware.radio.messaging</name>
-        <version>1</version>
+        <version>2</version>
         <interface>
             <name>IRadioMessaging</name>
             <instance>slot1</instance>
             <instance>slot2</instance>
         </interface>
     </hal>
+    <hal override="true" format="aidl">
+        <name>android.hardware.radio.sap</name>
+        <version>1</version>
+        <interface>
+            <name>ISap</name>
+            <instance>slot1</instance>
+            <instance>slot2</instance>
+        </interface>
+    </hal>
 </manifest>
diff --git a/proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.sehradio_manifest_2_33.xml b/proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.sehradio_manifest_2_34.xml
similarity index 100%
rename from proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.sehradio_manifest_2_33.xml
rename to proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.sehradio_manifest_2_34.xml
diff --git a/proprietary/vendor/lib64/libVendorSemDataProps.so b/proprietary/vendor/lib64/libVendorSemDataProps.so
index 2189836..f6f9e37 100644
Binary files a/proprietary/vendor/lib64/libVendorSemDataProps.so and b/proprietary/vendor/lib64/libVendorSemDataProps.so differ
diff --git a/proprietary/vendor/lib64/libVendorSemTelephonyProps.so b/proprietary/vendor/lib64/libVendorSemTelephonyProps.so
index 7ff5ae4..cef50b2 100644
Binary files a/proprietary/vendor/lib64/libVendorSemTelephonyProps.so and b/proprietary/vendor/lib64/libVendorSemTelephonyProps.so differ
diff --git a/proprietary/vendor/lib64/libengmode_client.so b/proprietary/vendor/lib64/libengmode_client.so
index 70def97..e246b34 100644
Binary files a/proprietary/vendor/lib64/libengmode_client.so and b/proprietary/vendor/lib64/libengmode_client.so differ
diff --git a/proprietary/vendor/lib64/libfloatingfeature.so b/proprietary/vendor/lib64/libfloatingfeature.so
index e0c9fd4..9cd6d5f 100644
Binary files a/proprietary/vendor/lib64/libfloatingfeature.so and b/proprietary/vendor/lib64/libfloatingfeature.so differ
diff --git a/proprietary/vendor/lib64/libprotobuf-cpp-full-21.7.so b/proprietary/vendor/lib64/libprotobuf-cpp-full-21.7.so
new file mode 100644
index 0000000..5c30fc7
Binary files /dev/null and b/proprietary/vendor/lib64/libprotobuf-cpp-full-21.7.so differ
diff --git a/proprietary/vendor/lib64/libril_sem.so b/proprietary/vendor/lib64/libril_sem.so
index e06a212..2d4edb4 100644
Binary files a/proprietary/vendor/lib64/libril_sem.so and b/proprietary/vendor/lib64/libril_sem.so differ
diff --git a/proprietary/vendor/lib64/libsec-ril.so b/proprietary/vendor/lib64/libsec-ril.so
index 4c7c2eb..a57581a 100644
Binary files a/proprietary/vendor/lib64/libsec-ril.so and b/proprietary/vendor/lib64/libsec-ril.so differ
diff --git a/proprietary/vendor/lib64/libsecnativefeature.so b/proprietary/vendor/lib64/libsecnativefeature.so
index 63dfd2f..31d1e48 100644
Binary files a/proprietary/vendor/lib64/libsecnativefeature.so and b/proprietary/vendor/lib64/libsecnativefeature.so differ
diff --git a/proprietary/vendor/lib64/libsecril-client.so b/proprietary/vendor/lib64/libsecril-client.so
index 6b3101b..da7acb7 100644
Binary files a/proprietary/vendor/lib64/libsecril-client.so and b/proprietary/vendor/lib64/libsecril-client.so differ
diff --git a/proprietary/vendor/lib64/libsemnativecarrierfeature.so b/proprietary/vendor/lib64/libsemnativecarrierfeature.so
index f0f5d62..fc753f0 100644
Binary files a/proprietary/vendor/lib64/libsemnativecarrierfeature.so and b/proprietary/vendor/lib64/libsemnativecarrierfeature.so differ
diff --git a/proprietary/vendor/lib64/libvk_cass_interface.so b/proprietary/vendor/lib64/libvk_cass_interface.so
new file mode 100644
index 0000000..ae2d43a
Binary files /dev/null and b/proprietary/vendor/lib64/libvk_cass_interface.so differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.radio-V1-ndk.so b/proprietary/vendor/lib64/vendor.samsung.hardware.radio-V1-ndk.so
index d583674..37b7267 100644
Binary files a/proprietary/vendor/lib64/vendor.samsung.hardware.radio-V1-ndk.so and b/proprietary/vendor/lib64/vendor.samsung.hardware.radio-V1-ndk.so differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge-V1-ndk.so b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge-V1-ndk.so
index c9d9313..894c8f7 100644
Binary files a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge-V1-ndk.so and b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge-V1-ndk.so differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.channel-V1-ndk.so b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.channel-V1-ndk.so
index f3d5cf3..65d4cd4 100644
Binary files a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.channel-V1-ndk.so and b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.channel-V1-ndk.so differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.data-V1-ndk.so b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.data-V1-ndk.so
index baca0c2..40d51b8 100644
Binary files a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.data-V1-ndk.so and b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.data-V1-ndk.so differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.messaging-V1-ndk.so b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.messaging-V1-ndk.so
index d8cb7d9..0bb2cde 100644
Binary files a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.messaging-V1-ndk.so and b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.messaging-V1-ndk.so differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.sim-V1-ndk.so b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.sim-V1-ndk.so
index acdcb67..e3ac904 100644
Binary files a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.sim-V1-ndk.so and b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.sim-V1-ndk.so differ
diff --git a/s5e8825-common-vendor.mk b/s5e8825-common-vendor.mk
index 6382457..c554102 100644
--- a/s5e8825-common-vendor.mk
+++ b/s5e8825-common-vendor.mk
@@ -94,6 +94,7 @@ PRODUCT_PACKAGES += \
     liblastaboxmsg \
     liboemcrypto \
     libprofileparamstorage \
+    libprotobuf-cpp-full-21.7 \
     libqfp_sensortest \
     librecordalive \
     libril_sem \
@@ -118,6 +119,7 @@ PRODUCT_PACKAGES += \
     libuniapi \
     libuniplugin \
     libuuid_vendor \
+    libvk_cass_interface \
     libvkmanager_vendor \
     libvkservice \
     libwrappergps \
@@ -141,8 +143,8 @@ PRODUCT_PACKAGES += \
     manifest_android.hardware.drm-service.widevine.xml \
     secaudiohalaidl_manifest.xml \
     vendor.samsung.hardware.radio.exclude.slsi.xml \
-    vendor.samsung.hardware.radio_manifest_2_33.xml \
-    vendor.samsung.hardware.sehradio_manifest_2_33.xml \
+    vendor.samsung.hardware.radio_manifest_2_34.xml \
+    vendor.samsung.hardware.sehradio_manifest_2_34.xml \
     cass \
     epic \
     android.hardware.drm-service.widevine \