diff --git a/device-comet.mk b/device-comet.mk
index 450b9b7..5400edd 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -49,7 +49,6 @@ include device/google/zumapro/device-shipping-common.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/touch/gti/predump_gti_dual.mk
-include device/google/gs-common/touch/syna/predump_syna19.mk
 include device/google/gs-common/display/dump_second_display.mk
 
 # go/lyric-soong-variables
@@ -77,6 +76,7 @@ PRODUCT_COPY_FILES += \
 
 ifeq ($(filter factory_comet, $(TARGET_PRODUCT)),)
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.xrr.version=2.1
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.blocking_zone.min_refresh_rate_by_nits=20:120,30:60,: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
diff --git a/thermal/thermal_info_config_comet.json b/thermal/thermal_info_config_comet.json
index e94cab8..f225c00 100644
--- a/thermal/thermal_info_config_comet.json
+++ b/thermal/thermal_info_config_comet.json
@@ -233,7 +233,8 @@
             "Formula": "USE_ML_MODEL",
             "Combination":["soc_therm", "rffe_therm", "charger_therm", "usb_conn_therm", "modem_therm", "inner_display_therm", "display_therm",  "gnss_tcxo_therm", "maxfg_base", "maxfg_secondary", "inner_brightness"],
             "Multiplier":0.001,
-            "PreviousSampleCount": 3
+            "PreviousSampleCount": 3,
+            "SupportUnderSampling": true
         },
         {
             "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
@@ -876,7 +877,8 @@
             "Formula": "USE_ML_MODEL",
             "Combination": ["soc_therm", "rffe_therm", "charger_therm", "usb_conn_therm", "modem_therm", "inner_display_therm", "display_therm",  "gnss_tcxo_therm", "maxfg_base", "maxfg_secondary", "inner_brightness"],
             "Multiplier": 0.001,
-            "PreviousSampleCount": 3
+            "PreviousSampleCount": 3,
+            "SupportUnderSampling": true
         },
         {
             "Name": "VIRTUAL-SKIN-SPEAKER-MODEL-LEGACY-DIFF",