diff --git a/Android.bp b/Android.bp
index 8b1c1cf..e3b8d94 100644
--- a/Android.bp
+++ b/Android.bp
@@ -648,7 +648,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-    name: "libSemDataProps",
+    name: "libVendorSemDataProps",
     owner: "samsung",
     strip: {
         none: true,
@@ -656,7 +656,7 @@ cc_prebuilt_library_shared {
     target: {
         android_arm64: {
             srcs: [
-                "proprietary/vendor/lib64/libSemDataProps.so",
+                "proprietary/vendor/lib64/libVendorSemDataProps.so",
             ],
             shared_libs: [
                 "liblog",
@@ -673,7 +673,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-    name: "libSemTelephonyProps",
+    name: "libVendorSemTelephonyProps",
     owner: "samsung",
     strip: {
         none: true,
@@ -681,7 +681,7 @@ cc_prebuilt_library_shared {
     target: {
         android_arm64: {
             srcs: [
-                "proprietary/vendor/lib64/libSemTelephonyProps.so",
+                "proprietary/vendor/lib64/libVendorSemTelephonyProps.so",
             ],
             shared_libs: [
                 "liblog",
@@ -1999,19 +1999,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",
@@ -2022,6 +2019,7 @@ cc_prebuilt_library_shared {
                 "liblog",
                 "librilutils",
                 "libutils",
+                "libfloatingfeature",
                 "libc++",
                 "libc",
                 "libm",
@@ -2083,8 +2081,9 @@ cc_prebuilt_library_shared {
                 "libz",
                 "libutils",
                 "libjsoncpp",
-                "libSemTelephonyProps",
-                "libSemDataProps",
+                "libVendorSemTelephonyProps",
+                "libVendorSemDataProps",
+                "libprotobuf-cpp-full",
                 "libvkmanager_vendor",
                 "libengmode_client",
                 "libbase",
@@ -2094,7 +2093,6 @@ cc_prebuilt_library_shared {
                 "libfloatingfeature",
                 "libsemnativecarrierfeature",
                 "libc++",
-                "libprotobuf-cpp-full-3.9.1-vendorcompat",
                 "libc",
                 "libm",
                 "libdl",
@@ -2728,18 +2726,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,
diff --git a/proprietary/vendor/bin/hw/rild b/proprietary/vendor/bin/hw/rild
old mode 100644
new mode 100755
index 252153d..e8c01a6
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/libSemDataProps.so b/proprietary/vendor/lib64/libSemDataProps.so
deleted file mode 100644
index 2055cf6..0000000
Binary files a/proprietary/vendor/lib64/libSemDataProps.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libSemTelephonyProps.so b/proprietary/vendor/lib64/libSemTelephonyProps.so
deleted file mode 100644
index 8a92efd..0000000
Binary files a/proprietary/vendor/lib64/libSemTelephonyProps.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libVendorSemDataProps.so b/proprietary/vendor/lib64/libVendorSemDataProps.so
new file mode 100644
index 0000000..f6f9e37
Binary files /dev/null and b/proprietary/vendor/lib64/libVendorSemDataProps.so differ
diff --git a/proprietary/vendor/lib64/libVendorSemTelephonyProps.so b/proprietary/vendor/lib64/libVendorSemTelephonyProps.so
new file mode 100644
index 0000000..791d926
Binary files /dev/null and b/proprietary/vendor/lib64/libVendorSemTelephonyProps.so differ
diff --git a/proprietary/vendor/lib64/libril_sem.so b/proprietary/vendor/lib64/libril_sem.so
index 897bc10..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 69743af..f4c7e93 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/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 29483f3..fc753f0 100644
Binary files a/proprietary/vendor/lib64/libsemnativecarrierfeature.so and b/proprietary/vendor/lib64/libsemnativecarrierfeature.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/universal9830-common-vendor.mk b/universal9830-common-vendor.mk
index 66ddf3c..49693b9 100644
--- a/universal9830-common-vendor.mk
+++ b/universal9830-common-vendor.mk
@@ -117,8 +117,8 @@ PRODUCT_PACKAGES += \
     gps.default \
     vendor.samsung.hardware.gnss@2.1-impl \
     libSEF.quram \
-    libSemDataProps \
-    libSemTelephonyProps \
+    libVendorSemDataProps \
+    libVendorSemTelephonyProps \
     libbayergdccore \
     libcommon \
     libcrane_compiler \
@@ -192,8 +192,8 @@ PRODUCT_PACKAGES += \
     com.android.hotwordenrollment.common.util \
     manifest_android.hardware.drm@1.3-service.widevine.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 \
     android.hardware.drm@1.3-service.widevine \
     android.hardware.keymaster@4.0_strongbox-service \