diff --git a/Android.bp b/Android.bp
index 7ca2056..71e90e4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1107,67 +1107,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libdsi_netctrl",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libdsi_netctrl.so",
-            ],
-            shared_libs: [
-                "libqdi",
-                "libdiag",
-                "libcutils",
-                "liblog",
-                "libnetmgr",
-                "libdsutils",
-                "libconfigdb",
-                "libqmiservices",
-                "libqmi_cci",
-                "libqmi_common_so",
-                "libqmi_client_qmux",
-                "libqmi_client_helper",
-                "libqmi",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libdsi_netctrl.so",
-            ],
-            shared_libs: [
-                "libqdi",
-                "libdiag",
-                "libcutils",
-                "liblog",
-                "libnetmgr",
-                "libdsutils",
-                "libconfigdb",
-                "libqmiservices",
-                "libqmi_cci",
-                "libqmi_common_so",
-                "libqmi_client_qmux",
-                "libqmi_client_helper",
-                "libqmi",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libdsutils",
     owner: "samsung",
@@ -1685,104 +1624,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libnetmgr",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libnetmgr.so",
-            ],
-            shared_libs: [
-                "libdsutils",
-                "libconfigdb",
-                "libdiag",
-                "libcutils",
-                "liblog",
-                "libhardware_legacy",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libnetmgr.so",
-            ],
-            shared_libs: [
-                "libdsutils",
-                "libconfigdb",
-                "libdiag",
-                "libcutils",
-                "liblog",
-                "libhardware_legacy",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libnetmgr_common",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libnetmgr_common.so",
-            ],
-            shared_libs: [
-                "libdsutils",
-                "libconfigdb",
-                "libdiag",
-                "libcutils",
-                "liblog",
-                "libnetmgr",
-                "libqmi_cci",
-                "libqmiservices",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libnetmgr_common.so",
-            ],
-            shared_libs: [
-                "libdsutils",
-                "libconfigdb",
-                "libdiag",
-                "libcutils",
-                "liblog",
-                "libnetmgr",
-                "libqmi_cci",
-                "libqmiservices",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "liboemcrypto",
     owner: "samsung",
@@ -2847,49 +2688,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libsemnativecarrierfeature",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libsemnativecarrierfeature.so",
-            ],
-            shared_libs: [
-                "libexpat",
-                "libcutils",
-                "libz",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libsemnativecarrierfeature.so",
-            ],
-            shared_libs: [
-                "libexpat",
-                "libcutils",
-                "libz",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libsi",
     owner: "samsung",
@@ -6296,6 +6094,43 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libdsi_netctrl",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libdsi_netctrl.so",
+            ],
+            shared_libs: [
+                "libqdi",
+                "libdiag",
+                "libcutils",
+                "liblog",
+                "libnetmgr",
+                "libdsutils",
+                "libconfigdb",
+                "libqmiservices",
+                "libqmi_cci",
+                "libqmi_common_so",
+                "libqmi_client_qmux",
+                "libqmi_client_helper",
+                "libqmi",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libengmode_client",
     owner: "samsung",
@@ -7006,6 +6841,270 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libnetmgr",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libnetmgr.so",
+            ],
+            shared_libs: [
+                "libdsutils",
+                "libconfigdb",
+                "libdiag",
+                "libcutils",
+                "liblog",
+                "libhardware_legacy",
+                "libnetmgrxfrmutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libnetmgr_common",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libnetmgr_common.so",
+            ],
+            shared_libs: [
+                "libdsutils",
+                "libconfigdb",
+                "libdiag",
+                "libcutils",
+                "liblog",
+                "libnetmgr",
+                "libqmi_cci",
+                "libqmiservices",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libnetmgr_datapath_proxy",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libnetmgr_datapath_proxy.so",
+            ],
+            shared_libs: [
+                "libdsutils",
+                "libconfigdb",
+                "libdiag",
+                "libcutils",
+                "liblog",
+                "libnetmgr",
+                "libnetmgr_common",
+                "libnlnetmgr",
+                "libnetmgrportutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libnetmgr_sscm3",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libnetmgr_sscm3.so",
+            ],
+            shared_libs: [
+                "libdsutils",
+                "libconfigdb",
+                "libdiag",
+                "libcutils",
+                "liblog",
+                "libnetmgr",
+                "libnetmgr_common",
+                "libnlnetmgr",
+                "libqmiservices",
+                "libqmi_common_so",
+                "libqmi_cci",
+                "libqmi_client_helper",
+                "libqmi",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libnetmgr_utils",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libnetmgr_utils.so",
+            ],
+            shared_libs: [
+                "libdsutils",
+                "libconfigdb",
+                "libdiag",
+                "libcutils",
+                "liblog",
+                "libnetmgr",
+                "libnetmgr_common",
+                "libhidlbase",
+                "libandroid_net",
+                "libutils",
+                "android.system.net.netd@1.1",
+                "libbinder",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libnetmgrmodemproxy",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libnetmgrmodemproxy.so",
+            ],
+            shared_libs: [
+                "libdsutils",
+                "libconfigdb",
+                "libdiag",
+                "libcutils",
+                "liblog",
+                "libnetmgr",
+                "libnetmgr_common",
+                "libqmiservices",
+                "libqmi_common_so",
+                "libqmi_cci",
+                "libnetmgr_utils",
+                "libnetmgrportutils",
+                "libnetmgr_datapath_proxy",
+                "libnlnetmgr",
+                "libshsc",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libnetmgrportutils",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libnetmgrportutils.so",
+            ],
+            shared_libs: [
+                "libdsutils",
+                "libconfigdb",
+                "libdiag",
+                "libcutils",
+                "liblog",
+                "libnetmgr",
+                "libnetmgr_common",
+                "libutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libnetmgrxfrmutils",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libnetmgrxfrmutils.so",
+            ],
+            shared_libs: [
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libnlnetmgr",
     owner: "samsung",
@@ -7023,6 +7122,9 @@ cc_prebuilt_library_shared {
                 "libdiag",
                 "libcutils",
                 "liblog",
+                "libnetmgr",
+                "libnetmgr_common",
+                "libnetmgrxfrmutils",
                 "libc++",
                 "libc",
                 "libm",
@@ -7291,27 +7393,30 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib64/libril_sem.so",
             ],
             shared_libs: [
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libhardware_legacy",
-                "librilutils",
+                "libhidlbase",
                 "android.hardware.radio@1.0",
                 "android.hardware.radio@1.1",
-                "android.hardware.radio.deprecated@1.0",
-                "android.hardware.radio.config@1.0",
-                "android.hardware.radio.config@1.1",
-                "android.hardware.radio.config@1.2",
-                "libhidlbase",
                 "android.hardware.radio@1.2",
-                "android.hardware.radio@1.3",
-                "android.hardware.radio@1.4",
-                "android.hardware.radio@1.5",
-                "vendor.samsung.hardware.radio@2.0",
-                "vendor.samsung.hardware.radio.bridge@2.0",
-                "vendor.samsung.hardware.radio.bridge@2.1",
-                "vendor.samsung.hardware.radio@2.1",
-                "vendor.samsung.hardware.radio@2.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",
+                "vendor.samsung.hardware.radio.bridge-V1-ndk",
+                "vendor.samsung.hardware.radio.data-V1-ndk",
+                "vendor.samsung.hardware.radio.messaging-V1-ndk",
+                "vendor.samsung.hardware.radio.network-V1-ndk",
+                "vendor.samsung.hardware.radio.sim-V1-ndk",
+                "libcutils",
+                "libhardware_legacy",
+                "liblog",
+                "librilutils",
+                "libutils",
+                "libfloatingfeature",
                 "libc++",
                 "libc",
                 "libm",
@@ -7711,13 +7816,13 @@ cc_prebuilt_library_shared {
                 "libSemDataProps",
                 "libvkmanager_vendor",
                 "libengmode_client",
-                "libhidlbase",
-                "libhidltransport",
-                "libhwbinder",
-                "vendor.samsung.hardware.radio.channel@2.0",
+                "libbase",
+                "libbinder_ndk",
+                "vendor.samsung.hardware.radio.channel-V1-ndk",
                 "libsecnativefeature",
                 "libfloatingfeature",
                 "libsemnativecarrierfeature",
+                "libnlnetmgr",
                 "libtime_genoff",
                 "libmdmdetect",
                 "libdsutils",
@@ -7726,11 +7831,8 @@ cc_prebuilt_library_shared {
                 "libperipheral_client",
                 "libqmi_cci",
                 "libqmi_client_helper",
-                "libqmi",
-                "libqmiservices",
-                "libqmiservices-ext",
-                "libqmiservices-sem-ext",
-                "libidl",
+                "libqmi_common_so",
+                "libqmi_encdec",
                 "libdiag",
                 "libc++",
                 "libprotobuf-cpp-full-3.9.1-vendorcompat",
@@ -7808,6 +7910,34 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libsemnativecarrierfeature",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libsemnativecarrierfeature.so",
+            ],
+            shared_libs: [
+                "libexpat",
+                "libcutils",
+                "libz",
+                "liblog",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libsensorlistener",
     owner: "samsung",
@@ -7863,6 +7993,31 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libshsc",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libshsc.so",
+            ],
+            shared_libs: [
+                "liblog",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libskeymaster4device",
     owner: "samsung",
@@ -9733,7 +9888,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-    name: "vendor.samsung.hardware.radio.bridge@2.0",
+    name: "vendor.samsung.hardware.radio-V1-ndk",
     owner: "samsung",
     strip: {
         none: true,
@@ -9741,14 +9896,10 @@ cc_prebuilt_library_shared {
     target: {
         android_arm64: {
             srcs: [
-                "proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge@2.0.so",
+                "proprietary/vendor/lib64/vendor.samsung.hardware.radio-V1-ndk.so",
             ],
             shared_libs: [
-                "android.hardware.radio@1.0",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
+                "libbinder_ndk",
                 "libc++",
                 "libc",
                 "libm",
@@ -9762,7 +9913,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-    name: "vendor.samsung.hardware.radio.bridge@2.1",
+    name: "vendor.samsung.hardware.radio.bridge-V1-ndk",
     owner: "samsung",
     strip: {
         none: true,
@@ -9770,15 +9921,11 @@ cc_prebuilt_library_shared {
     target: {
         android_arm64: {
             srcs: [
-                "proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge@2.1.so",
+                "proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge-V1-ndk.so",
             ],
             shared_libs: [
-                "android.hardware.radio@1.0",
-                "vendor.samsung.hardware.radio.bridge@2.0",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
+                "libbinder_ndk",
+                "vendor.samsung.hardware.radio-V1-ndk",
                 "libc++",
                 "libc",
                 "libm",
@@ -9792,7 +9939,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-    name: "vendor.samsung.hardware.radio.channel@2.0",
+    name: "vendor.samsung.hardware.radio.channel-V1-ndk",
     owner: "samsung",
     strip: {
         none: true,
@@ -9800,13 +9947,89 @@ cc_prebuilt_library_shared {
     target: {
         android_arm64: {
             srcs: [
-                "proprietary/vendor/lib64/vendor.samsung.hardware.radio.channel@2.0.so",
+                "proprietary/vendor/lib64/vendor.samsung.hardware.radio.channel-V1-ndk.so",
             ],
             shared_libs: [
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
+                "libbinder_ndk",
+                "vendor.samsung.hardware.radio-V1-ndk",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "vendor.samsung.hardware.radio.data-V1-ndk",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/vendor.samsung.hardware.radio.data-V1-ndk.so",
+            ],
+            shared_libs: [
+                "libbinder_ndk",
+                "vendor.samsung.hardware.radio-V1-ndk",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "vendor.samsung.hardware.radio.messaging-V1-ndk",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/vendor.samsung.hardware.radio.messaging-V1-ndk.so",
+            ],
+            shared_libs: [
+                "libbinder_ndk",
+                "vendor.samsung.hardware.radio-V1-ndk",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "vendor.samsung.hardware.radio.sim-V1-ndk",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/vendor.samsung.hardware.radio.sim-V1-ndk.so",
+            ],
+            shared_libs: [
+                "libbinder_ndk",
+                "vendor.samsung.hardware.radio-V1-ndk",
                 "libc++",
                 "libc",
                 "libm",
@@ -10082,6 +10305,15 @@ prebuilt_etc_xml {
     soc_specific: true,
 }
 
+prebuilt_etc_xml {
+    name: "vendor.samsung.hardware.radio.exclude.qcom.xml",
+    owner: "samsung",
+    src: "proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.radio.exclude.qcom.xml",
+    filename_from_src: true,
+    sub_dir: "vintf/manifest",
+    soc_specific: true,
+}
+
 prebuilt_etc_xml {
     name: "vendor.samsung.hardware.thermal@1.0-manifest.xml",
     owner: "samsung",
diff --git a/proprietary/vendor/bin/hw/rild b/proprietary/vendor/bin/hw/rild
index ef7010f..b7e149b 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.exclude.qcom.xml b/proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.radio.exclude.qcom.xml
new file mode 100644
index 0000000..357ceef
--- /dev/null
+++ b/proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.radio.exclude.qcom.xml
@@ -0,0 +1,108 @@
+<manifest version="1.0" type="device">
+    <!-- << QCOM HAL RELATED RIL -->
+    <hal override="true" format="hidl">
+        <name>vendor.qti.hardware.radio.am</name>
+        <transport>hwbinder</transport>
+    </hal>
+
+    <hal override="true" format="hidl">
+        <name>vendor.qti.hardware.radio.ims</name>
+        <transport>hwbinder</transport>
+    </hal>
+
+    <hal override="true" format="hidl">
+        <name>vendor.qti.hardware.radio.qcrilhook</name>
+        <transport>hwbinder</transport>
+    </hal>
+
+    <hal override="true" format="hidl">
+        <name>vendor.qti.hardware.radio.uim_remote_client</name>
+        <transport>hwbinder</transport>
+    </hal>
+
+    <hal override="true" format="hidl">
+        <name>vendor.qti.hardware.radio.uim_remote_server</name>
+        <transport>hwbinder</transport>
+    </hal>
+
+    <hal override="true" format="hidl">
+        <name>vendor.qti.hardware.radio.lpa</name>
+        <transport>hwbinder</transport>
+    </hal>
+
+    <hal override="true" format="hidl">
+        <name>vendor.qti.hardware.radio.uim</name>
+        <transport>hwbinder</transport>
+    </hal>
+
+    <hal override="true" format="hidl">
+        <name>vendor.qti.hardware.radio.qtiradio</name>
+        <transport>hwbinder</transport>
+    </hal>
+
+    <hal override="true" format="hidl">
+        <name>vendor.qti.hardware.radio.internal.deviceinfo</name>
+        <transport>hwbinder</transport>
+    </hal>
+
+    <hal override="true" format="hidl">
+        <name>vendor.qti.hardware.embmssl</name>
+        <transport>hwbinder</transport>
+    </hal>
+
+    <!-- >> QCOM HAL RELATED RIL -->
+
+    <!-- << QCOM HAL RELATED IMS -->
+    <hal override="true" format="hidl">
+        <name>vendor.qti.imsrtpservice</name>
+        <transport>hwbinder</transport>
+    </hal>
+
+    <hal override="true" format="hidl">
+       <name>vendor.qti.ims.callinfo</name>
+       <transport>hwbinder</transport>
+    </hal>
+
+    <hal override="true" format="hidl">
+       <name>com.qualcomm.qti.imscmservice</name>
+       <transport>hwbinder</transport>
+    </hal>
+
+    <hal override="true" format="hidl">
+       <name>com.qualcomm.qti.uceservice</name>
+       <transport>hwbinder</transport>
+    </hal>
+    <!-- >> QCOM HAL RELATED IMS -->
+
+    <!-- << QCOM HAL RELATED DATA -->
+    <hal override="true" format="hidl">
+        <name>com.qualcomm.qti.dpm.api</name>
+        <transport>hwbinder</transport>
+    </hal>
+
+    <hal override="true" format="hidl">
+        <name>vendor.qti.hardware.data.latency</name>
+        <transport>hwbinder</transport>
+    </hal>
+
+    <hal override="true" format="hidl">
+        <name>vendor.qti.data.factory</name>
+        <transport>hwbinder</transport>
+    </hal>
+
+    <hal override="true" format="hidl">
+        <name>vendor.qti.hardware.data.connection</name>
+        <transport>hwbinder</transport>
+    </hal>
+    
+    <hal override="true" format="hidl">
+        <name>vendor.qti.hardware.mwqemadapter</name>
+        <transport>hwbinder</transport>
+    </hal>
+    
+    <hal override="true" format="hidl">
+        <name>vendor.qti.hardware.dpmservice</name>
+        <transport>hwbinder</transport>
+    </hal>
+    <!-- >> QCOM HAL RELATED DATA -->
+</manifest>
diff --git a/proprietary/vendor/lib/libdsi_netctrl.so b/proprietary/vendor/lib/libdsi_netctrl.so
deleted file mode 100644
index 24802a2..0000000
Binary files a/proprietary/vendor/lib/libdsi_netctrl.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libnetmgr.so b/proprietary/vendor/lib/libnetmgr.so
deleted file mode 100644
index 1aa5e8b..0000000
Binary files a/proprietary/vendor/lib/libnetmgr.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libnetmgr_common.so b/proprietary/vendor/lib/libnetmgr_common.so
deleted file mode 100644
index 81df28e..0000000
Binary files a/proprietary/vendor/lib/libnetmgr_common.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libsemnativecarrierfeature.so b/proprietary/vendor/lib/libsemnativecarrierfeature.so
deleted file mode 100644
index f5e54ca..0000000
Binary files a/proprietary/vendor/lib/libsemnativecarrierfeature.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libSemDataProps.so b/proprietary/vendor/lib64/libSemDataProps.so
index db131d6..af754c5 100644
Binary files a/proprietary/vendor/lib64/libSemDataProps.so and b/proprietary/vendor/lib64/libSemDataProps.so differ
diff --git a/proprietary/vendor/lib64/libSemTelephonyProps.so b/proprietary/vendor/lib64/libSemTelephonyProps.so
index 562ac3c..d653ea6 100644
Binary files a/proprietary/vendor/lib64/libSemTelephonyProps.so and b/proprietary/vendor/lib64/libSemTelephonyProps.so differ
diff --git a/proprietary/vendor/lib64/libnetmgr.so b/proprietary/vendor/lib64/libnetmgr.so
index f1709a6..bbb152d 100644
Binary files a/proprietary/vendor/lib64/libnetmgr.so and b/proprietary/vendor/lib64/libnetmgr.so differ
diff --git a/proprietary/vendor/lib64/libnetmgr_common.so b/proprietary/vendor/lib64/libnetmgr_common.so
index 155fd6a..8aa044c 100644
Binary files a/proprietary/vendor/lib64/libnetmgr_common.so and b/proprietary/vendor/lib64/libnetmgr_common.so differ
diff --git a/proprietary/vendor/lib64/libnetmgr_datapath_proxy.so b/proprietary/vendor/lib64/libnetmgr_datapath_proxy.so
new file mode 100644
index 0000000..c6d40a6
Binary files /dev/null and b/proprietary/vendor/lib64/libnetmgr_datapath_proxy.so differ
diff --git a/proprietary/vendor/lib64/libnetmgr_sscm3.so b/proprietary/vendor/lib64/libnetmgr_sscm3.so
new file mode 100644
index 0000000..cec2c0b
Binary files /dev/null and b/proprietary/vendor/lib64/libnetmgr_sscm3.so differ
diff --git a/proprietary/vendor/lib64/libnetmgr_utils.so b/proprietary/vendor/lib64/libnetmgr_utils.so
new file mode 100644
index 0000000..40728fd
Binary files /dev/null and b/proprietary/vendor/lib64/libnetmgr_utils.so differ
diff --git a/proprietary/vendor/lib64/libnetmgrmodemproxy.so b/proprietary/vendor/lib64/libnetmgrmodemproxy.so
new file mode 100644
index 0000000..da2aa9c
Binary files /dev/null and b/proprietary/vendor/lib64/libnetmgrmodemproxy.so differ
diff --git a/proprietary/vendor/lib64/libnetmgrportutils.so b/proprietary/vendor/lib64/libnetmgrportutils.so
new file mode 100644
index 0000000..920a6c0
Binary files /dev/null and b/proprietary/vendor/lib64/libnetmgrportutils.so differ
diff --git a/proprietary/vendor/lib64/libnetmgrxfrmutils.so b/proprietary/vendor/lib64/libnetmgrxfrmutils.so
new file mode 100644
index 0000000..5fdf4a3
Binary files /dev/null and b/proprietary/vendor/lib64/libnetmgrxfrmutils.so differ
diff --git a/proprietary/vendor/lib64/libnlnetmgr.so b/proprietary/vendor/lib64/libnlnetmgr.so
index bc97d0c..2580530 100644
Binary files a/proprietary/vendor/lib64/libnlnetmgr.so and b/proprietary/vendor/lib64/libnlnetmgr.so differ
diff --git a/proprietary/vendor/lib64/libril_sem.so b/proprietary/vendor/lib64/libril_sem.so
index 84165b1..bee33c3 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 5198b07..2252d01 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/libsemnativecarrierfeature.so b/proprietary/vendor/lib64/libsemnativecarrierfeature.so
index d3244e4..01df4b3 100644
Binary files a/proprietary/vendor/lib64/libsemnativecarrierfeature.so and b/proprietary/vendor/lib64/libsemnativecarrierfeature.so differ
diff --git a/proprietary/vendor/lib64/libshsc.so b/proprietary/vendor/lib64/libshsc.so
new file mode 100644
index 0000000..e40498a
Binary files /dev/null and b/proprietary/vendor/lib64/libshsc.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
new file mode 100644
index 0000000..0466a38
Binary files /dev/null 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
new file mode 100644
index 0000000..8c16fd2
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge-V1-ndk.so differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge@2.0.so b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge@2.0.so
deleted file mode 100644
index ccb3d5e..0000000
Binary files a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge@2.0.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge@2.1.so b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge@2.1.so
deleted file mode 100644
index cb54a98..0000000
Binary files a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge@2.1.so and /dev/null 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
new file mode 100644
index 0000000..9173ee4
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.channel-V1-ndk.so differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.channel@2.0.so b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.channel@2.0.so
deleted file mode 100644
index 3aaf7c9..0000000
Binary files a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.channel@2.0.so and /dev/null 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
new file mode 100644
index 0000000..abbdcb6
Binary files /dev/null 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
new file mode 100644
index 0000000..bca40dd
Binary files /dev/null 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
new file mode 100644
index 0000000..af7bee6
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.sim-V1-ndk.so differ
diff --git a/sm8250-common-vendor.mk b/sm8250-common-vendor.mk
index 7f19c05..7c62743 100644
--- a/sm8250-common-vendor.mk
+++ b/sm8250-common-vendor.mk
@@ -119,7 +119,6 @@ PRODUCT_PACKAGES += \
     libdiagjni \
     libdrmfs \
     libdrmtime \
-    libdsi_netctrl \
     libdsutils \
     libfastcvdsp_stub \
     libfastcvopt \
@@ -133,8 +132,6 @@ PRODUCT_PACKAGES += \
     libminkdescriptor \
     libminksocket \
     libnative-api \
-    libnetmgr \
-    libnetmgr_common \
     liboemcrypto \
     libops \
     libpdmapper \
@@ -159,7 +156,6 @@ PRODUCT_PACKAGES += \
     libqsocket \
     librpmb \
     libsecnativefeature \
-    libsemnativecarrierfeature \
     libsi \
     libspl \
     libssd \
@@ -273,6 +269,7 @@ PRODUCT_PACKAGES += \
     libdisplayqos \
     libdisplayskuutils \
     libdpps \
+    libdsi_netctrl \
     libengmode_client \
     libhandgesture.arcsoft \
     libhdr_tm \
@@ -299,6 +296,14 @@ PRODUCT_PACKAGES += \
     libmultiviewspin_interface \
     libmultiviewzoom_interface \
     libnanopb \
+    libnetmgr \
+    libnetmgr_common \
+    libnetmgr_datapath_proxy \
+    libnetmgr_sscm3 \
+    libnetmgr_utils \
+    libnetmgrmodemproxy \
+    libnetmgrportutils \
+    libnetmgrxfrmutils \
     libnlnetmgr \
     libnpu \
     libofflinelog \
@@ -326,8 +331,10 @@ PRODUCT_PACKAGES += \
     libsec-ril \
     libsecureui \
     libsecureui_svcsock \
+    libsemnativecarrierfeature \
     libsensorlistener \
     libsensorslog \
+    libshsc \
     libskeymaster4device \
     libsmartfocus_interface \
     libsnap_compute \
@@ -393,9 +400,12 @@ PRODUCT_PACKAGES += \
     vendor.qti.hardware.vpp@1.3 \
     vendor.samsung.hardware.bluetooth@2.0 \
     vendor.samsung.hardware.hyper-V2-ndk_platform \
-    vendor.samsung.hardware.radio.bridge@2.0 \
-    vendor.samsung.hardware.radio.bridge@2.1 \
-    vendor.samsung.hardware.radio.channel@2.0 \
+    vendor.samsung.hardware.radio-V1-ndk \
+    vendor.samsung.hardware.radio.bridge-V1-ndk \
+    vendor.samsung.hardware.radio.channel-V1-ndk \
+    vendor.samsung.hardware.radio.data-V1-ndk \
+    vendor.samsung.hardware.radio.messaging-V1-ndk \
+    vendor.samsung.hardware.radio.sim-V1-ndk \
     vendor.samsung.hardware.thermal@1.0 \
     capi_v2_aptX_CLHDAD_Encoder \
     libQ6MSFR_manager_skel \
@@ -422,6 +432,7 @@ PRODUCT_PACKAGES += \
     android.hardware.neuralnetworks@1.3-service-qti.xml \
     c2_manifest_vendor.xml \
     manifest_android.hardware.drm@1.3-service.widevine.xml \
+    vendor.samsung.hardware.radio.exclude.qcom.xml \
     vendor.samsung.hardware.thermal@1.0-manifest.xml \
     adpl \
     adsprpcd \