diff --git a/device.mk b/device.mk
index bd571ea2..3b66eaac 100644
--- a/device.mk
+++ b/device.mk
@@ -151,6 +151,12 @@ else
       $(LOCAL_PATH)/init.hardware.mpssrfs.rc.user:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.$(PRODUCT_PLATFORM).mpssrfs.rc
 endif
 
+# Enable DIAG issue debug
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+  PRODUCT_COPY_FILES += \
+      $(LOCAL_PATH)/init.diagdebug.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.diagdebug.rc
+endif
+
 # A/B support
 PRODUCT_PACKAGES += \
     otapreopt_script \
diff --git a/init.diagdebug.rc.userdebug b/init.diagdebug.rc.userdebug
new file mode 100644
index 00000000..29d7ec9b
--- /dev/null
+++ b/init.diagdebug.rc.userdebug
@@ -0,0 +1,20 @@
+#
+# Copyright (C) 2020 The Android Open-Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Trigger ramdump when property on
+on property:vendor.radio.diag_debug=true
+    write /dev/kmsg "RIL Diag Issue Detected!"
+    write /proc/sysrq-trigger "c"