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 13dc93e..d44d4b7 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -393,3 +393,8 @@ SUPPORT_RIL_DOMAIN_SELECTION := true
 # Thread HAL
 PRODUCT_PACKAGES += \
    com.google.comet.hardware.threadnetwork
+
+# ETM
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
+endif