diff --git a/Android.bp b/Android.bp
index 25801e1..c147773 100644
--- a/Android.bp
+++ b/Android.bp
@@ -5425,6 +5425,23 @@ cc_prebuilt_library_shared {
 	soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+	name: "vendor.qti.diaghal@1.0",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/vendor.qti.diaghal@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
 	name: "vendor.qti.esepowermanager@1.0",
 	owner: "xiaomi",
@@ -7625,6 +7642,15 @@ prebuilt_etc_xml {
 	soc_specific: true,
 }
 
+prebuilt_etc_xml {
+	name: "vendor.qti.diag.hal.service.xml",
+	owner: "xiaomi",
+	src: "proprietary/vendor/etc/vintf/manifest/vendor.qti.diag.hal.service.xml",
+	filename_from_src: true,
+	sub_dir: "vintf/manifest",
+	soc_specific: true,
+}
+
 prebuilt_etc_xml {
 	name: "vendor.qti.gnss@4.0-service.xml",
 	owner: "xiaomi",
@@ -7736,6 +7762,23 @@ cc_prebuilt_binary {
 	soc_specific: true,
 }
 
+cc_prebuilt_binary {
+	name: "diag-router",
+	owner: "xiaomi",
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/diag-router"],
+			shared_libs: ["libhidlbase", "libutils", "libqsocket", "libqrtr", "liblog", "vendor.qti.diaghal@1.0", "libhidlmemory", "android.hidl.allocator@1.0", "android.hidl.memory@1.0", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	strip: {
+		none: true,
+	},
+	prefer: true,
+	soc_specific: true,
+}
+
 cc_prebuilt_binary {
 	name: "dpmQmiMgr",
 	owner: "xiaomi",
diff --git a/proprietary/vendor/bin/diag-router b/proprietary/vendor/bin/diag-router
new file mode 100755
index 0000000..1d40027
Binary files /dev/null and b/proprietary/vendor/bin/diag-router differ
diff --git a/proprietary/vendor/etc/init/vendor.qti.diag.rc b/proprietary/vendor/etc/init/vendor.qti.diag.rc
new file mode 100644
index 0000000..7943829
--- /dev/null
+++ b/proprietary/vendor/etc/init/vendor.qti.diag.rc
@@ -0,0 +1,11 @@
+
+on boot
+    start vendor.diag-router
+
+service vendor.diag-router /vendor/bin/diag-router
+    class hal
+    user system
+    group system
+    capabilities KILL
+    disabled
+
diff --git a/proprietary/vendor/etc/vintf/manifest/vendor.qti.diag.hal.service.xml b/proprietary/vendor/etc/vintf/manifest/vendor.qti.diag.hal.service.xml
new file mode 100644
index 0000000..c12a367
--- /dev/null
+++ b/proprietary/vendor/etc/vintf/manifest/vendor.qti.diag.hal.service.xml
@@ -0,0 +1,17 @@
+<!--
+  Copyright (c) 2020 Qualcomm Technologies, Inc.
+  All Rights Reserved.
+  Confidential and Proprietary - Qualcomm Technologies, Inc.
+-->
+<manifest version="1.0" type="device">
+<!-- DIAG-HAL service-->
+    <hal format="hidl">
+        <name>vendor.qti.diaghal</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>Idiag</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</manifest>
diff --git a/proprietary/vendor/lib64/vendor.qti.diaghal@1.0.so b/proprietary/vendor/lib64/vendor.qti.diaghal@1.0.so
new file mode 100644
index 0000000..d0496ce
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.qti.diaghal@1.0.so differ
diff --git a/sm8350-common-vendor.mk b/sm8350-common-vendor.mk
index aa337c2..7feb5bb 100644
--- a/sm8350-common-vendor.mk
+++ b/sm8350-common-vendor.mk
@@ -83,6 +83,7 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/sm8350-common/proprietary/vendor/etc/init/vendor.display.color@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.display.color@1.0-service.rc \
     vendor/xiaomi/sm8350-common/proprietary/vendor/etc/init/vendor.qti.adsprpc-guestos-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.adsprpc-guestos-service.rc \
     vendor/xiaomi/sm8350-common/proprietary/vendor/etc/init/vendor.qti.cdsprpc-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.cdsprpc-service.rc \
+    vendor/xiaomi/sm8350-common/proprietary/vendor/etc/init/vendor.qti.diag.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.diag.rc \
     vendor/xiaomi/sm8350-common/proprietary/vendor/etc/init/vendor.qti.esepowermanager@1.1-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.esepowermanager@1.1-service.rc \
     vendor/xiaomi/sm8350-common/proprietary/vendor/etc/init/vendor.qti.hardware.alarm@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.alarm@1.0-service.rc \
     vendor/xiaomi/sm8350-common/proprietary/vendor/etc/init/vendor.qti.hardware.capabilityconfigstore@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.capabilityconfigstore@1.0-service.rc \
@@ -439,6 +440,7 @@ PRODUCT_PACKAGES += \
     vendor.qti.data.factory@2.3 \
     vendor.qti.data.mwqem@1.0 \
     vendor.qti.data.slm@1.0 \
+    vendor.qti.diaghal@1.0 \
     vendor.qti.esepowermanager@1.0 \
     vendor.qti.esepowermanager@1.1 \
     vendor.qti.gnss@1.0 \
@@ -574,6 +576,7 @@ PRODUCT_PACKAGES += \
     c2_manifest_vendor.xml \
     manifest_android.hardware.drm@1.3-service.widevine.xml \
     manifest_vendor.xiaomi.hardware.mlipay.xml \
+    vendor.qti.diag.hal.service.xml \
     vendor.qti.gnss@4.0-service.xml \
     ATFWD-daemon \
     adpl \
@@ -581,6 +584,7 @@ PRODUCT_PACKAGES += \
     cdsprpcd \
     cnd \
     cnss-daemon \
+    diag-router \
     dpmQmiMgr \
     dspservice \
     android.hardware.bluetooth@1.0-service-qti \