diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 099c238..a37b49f 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -51,6 +51,8 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
   BOARD_KERNEL_CMDLINE += kunit.enable=1
 endif
 
+BOARD_KERNEL_CMDLINE += ehld.noehld=1
+
 TARGET_NO_BOOTLOADER := true
 TARGET_NO_RADIOIMAGE := true
 BOARD_PREBUILT_BOOTIMAGE := $(wildcard $(TARGET_KERNEL_DIR)/boot.img)