diff --git a/scripts/gki/envsetup.sh b/scripts/gki/envsetup.sh
index 48467acca25d..b506d502ff4a 100755
--- a/scripts/gki/envsetup.sh
+++ b/scripts/gki/envsetup.sh
@@ -27,6 +27,13 @@ QCOM_GKI_FRAG=${CONFIGS_DIR}/${PLATFORM_NAME}_GKI.config
 QCOM_QGKI_FRAG=${CONFIGS_DIR}/${PLATFORM_NAME}_QGKI.config
 QCOM_DEBUG_FRAG=${CONFIGS_DIR}/${PLATFORM_NAME}_debug.config
 
+# For user variant build merge debugfs.config fragment.
+if [ ${TARGET_BUILD_VARIANT} == "user" ]; then
+	QCOM_DEBUG_FS_FRAG=`ls ${CONFIGS_DIR}/debugfs.config 2> /dev/null`
+else
+	QCOM_DEBUG_FS_FRAG=" "
+fi
+
 # Consolidate fragment may not be present for all platforms.
 QCOM_CONSOLIDATE_FRAG=`ls ${CONFIGS_DIR}/${PLATFORM_NAME}_consolidate.config 2> /dev/null`
 
diff --git a/scripts/gki/fragment_menuconfig.sh b/scripts/gki/fragment_menuconfig.sh
index e94924e5f65c..1f0c088feedc 100755
--- a/scripts/gki/fragment_menuconfig.sh
+++ b/scripts/gki/fragment_menuconfig.sh
@@ -64,6 +64,9 @@ case "$REQUIRED_DEFCONFIG" in
 		FINAL_DEFCONFIG_BLEND+=" $QCOM_CONSOLIDATE_FRAG"
 		;&	# Intentional fallthrough
 	${PLATFORM_NAME}-qgki_defconfig )
+		# DEBUG_FS fragment.
+		FINAL_DEFCONFIG_BLEND+=" $QCOM_DEBUG_FS_FRAG"
+
 		FINAL_DEFCONFIG_BLEND+=" $QCOM_QGKI_FRAG"
 		${SCRIPTS_ROOT}/fragment_allyesconfig.sh $QCOM_GKI_FRAG $QCOM_GKI_ALLYES_FRAG
 		FINAL_DEFCONFIG_BLEND+=" $QCOM_GKI_ALLYES_FRAG "
diff --git a/scripts/gki/generate_defconfig.sh b/scripts/gki/generate_defconfig.sh
index 873f5c3b68bc..04f4dff18e6e 100755
--- a/scripts/gki/generate_defconfig.sh
+++ b/scripts/gki/generate_defconfig.sh
@@ -63,6 +63,9 @@ case "$REQUIRED_DEFCONFIG" in
 		FINAL_DEFCONFIG_BLEND+=" $QCOM_CONSOLIDATE_FRAG"
 		;&	# Intentional fallthrough
 	${PLATFORM_NAME}-qgki_defconfig )
+		# DEBUG_FS fragment.
+		FINAL_DEFCONFIG_BLEND+=" $QCOM_DEBUG_FS_FRAG"
+
 		FINAL_DEFCONFIG_BLEND+=" $QCOM_QGKI_FRAG"
 		${SCRIPTS_ROOT}/fragment_allyesconfig.sh $QCOM_GKI_FRAG $QCOM_GKI_ALLYES_FRAG
 		FINAL_DEFCONFIG_BLEND+=" $QCOM_GKI_ALLYES_FRAG "