diff --git a/Android.bp b/Android.bp
index e44b575..27aa404 100644
--- a/Android.bp
+++ b/Android.bp
@@ -15469,6 +15469,39 @@ cc_prebuilt_library_shared {
     system_ext_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libdiag_system",
+    owner: "motorola",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system_ext/lib64/libdiag_system.so",
+            ],
+            shared_libs: [
+                "vendor.qti.diaghal@1.0",
+                "libhidlbase",
+                "liblog",
+                "libutils",
+                "android.hidl.allocator@1.0",
+                "android.hidl.memory@1.0",
+                "libhidlmemory",
+                "libc",
+                "libcutils",
+                "libc++",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    check_elf_files: false,
+    prefer: true,
+    system_ext_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libimscamera_jni",
     owner: "motorola",
diff --git a/proprietary/system_ext/lib64/libdiag_system.so b/proprietary/system_ext/lib64/libdiag_system.so
new file mode 100644
index 0000000..c3fc047
Binary files /dev/null and b/proprietary/system_ext/lib64/libdiag_system.so differ
diff --git a/sm6375-common-vendor.mk b/sm6375-common-vendor.mk
index c29e8d0..06cb898 100644
--- a/sm6375-common-vendor.mk
+++ b/sm6375-common-vendor.mk
@@ -776,6 +776,7 @@ PRODUCT_PACKAGES += \
     lib-imsvt \
     lib-imsvtextutils \
     lib-imsvtutils \
+    libdiag_system \
     libimscamera_jni \
     libimsmedia_jni \
     libwfdnative \