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 208c85d..d44d4b7 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -74,7 +74,7 @@ PRODUCT_COPY_FILES += \
         device/google/comet/comet/panel_config_google-ct3e_cal1.pb:$(TARGET_COPY_OUT_VENDOR)/etc/panel_config_google-ct3e_cal1.pb
 
 ifeq ($(filter factory_comet, $(TARGET_PRODUCT)),)
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.xrr.version=2.1@202504:1.2@202404
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.xrr.version=2.1
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.headsup_ns=30000000
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.timeout_ns=500000000
 endif
@@ -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
diff --git a/location/user/gps.cfg b/location/user/gps.cfg
index 1e40b7b..33da69e 100644
--- a/location/user/gps.cfg
+++ b/location/user/gps.cfg
@@ -34,7 +34,7 @@ mailboxDisabled=0x0
 gnss_rfic_chip_id=55400000
 UseRtcForAiding=1
 additional_rtc_uncertainty_ms=10
-Sif_UseFwXtraInterface=0
+Sif_UseFwXtraInterface=1
 Agnss_IsGloAidingEnable=0
 SETCaps_IsOtdoa=1
 SETCaps_IsLpp=1
diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg
index 480bf79..3d631ad 100644
--- a/location/userdebug/gps.cfg
+++ b/location/userdebug/gps.cfg
@@ -12,7 +12,7 @@ uni_log_max_file_count=5
 uni_log_max_size_mb=20
 uni_log_total_max_size_mb=100
 
-debug_enable=1
+debug_enable=4
 mem_dump_to_node=1
 
 gnss_device_type=K042
@@ -145,7 +145,7 @@ UseRtcForAiding=1
 additional_rtc_uncertainty_ms=10
 
 # set to 1 for FW SGEE download - Requires Android FW to be properly configured
-Sif_UseFwXtraInterface=0
+Sif_UseFwXtraInterface=1
 
 # ChipCfg_GetGpsWeekFloor variable allows testing of old GPS weeks.
 # Used here to adjust the GPS week for carrier testing.