diff --git a/comet/BoardConfig.mk b/comet/BoardConfig.mk
index 8b4b17d..dbaf783 100644
--- a/comet/BoardConfig.mk
+++ b/comet/BoardConfig.mk
@@ -30,6 +30,10 @@ include device/google/zumapro/BoardConfig-common.mk
 include device/google/comet-sepolicy/comet-sepolicy.mk
 include device/google/comet/wifi/BoardConfig-wifi.mk
 
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+-include device/google/common/etm/6_1/BoardUserdebugModules.mk
+endif
+
 else
 
 include device/google/comet23/comet23/BoardConfig.mk
diff --git a/device-comet.mk b/device-comet.mk
index 3bfeae1..0d0557d 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -383,3 +383,8 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Exynos RIL and telephony
 # Support RIL Domain-selection
 SUPPORT_RIL_DOMAIN_SELECTION := true
+
+# ETM
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
+endif