diff --git a/audio/comet/tuning/bluenote/recording.gatf b/audio/comet/tuning/bluenote/recording.gatf
index 2c8c2fe..f776027 100644
Binary files a/audio/comet/tuning/bluenote/recording.gatf and b/audio/comet/tuning/bluenote/recording.gatf differ
diff --git a/device-comet.mk b/device-comet.mk
index e44647a..66dc54c 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -451,10 +451,6 @@ PRODUCT_COPY_FILES += \
 # Support RIL Domain-selection
 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)
diff --git a/location/user/gps.cfg b/location/user/gps.cfg
index 79ab378..392b06f 100644
--- a/location/user/gps.cfg
+++ b/location/user/gps.cfg
@@ -35,6 +35,7 @@ navicUsedInUSPolicy=2
 Chip_Configuration_FeatureCfg_DVS = 1
 Chip_Configuration_FeatureCfg_DFS = 1
 Chip_Configuration_FeatureCfg_MTPL = 0
+Chip_Configuration_FeatureCfg_SDL_BYASS = 1
 mailboxDisabled=0x0
 gnss_rfic_chip_id=55400000
 UseRtcForAiding=1
diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg
index 885ce5d..e3f79ea 100644
--- a/location/userdebug/gps.cfg
+++ b/location/userdebug/gps.cfg
@@ -125,6 +125,8 @@ Chip_Configuration_FeatureCfg_DVS = 1
 Chip_Configuration_FeatureCfg_DFS = 1
 # Disable MTPL
 Chip_Configuration_FeatureCfg_MTPL = 0
+# MCW Link failure behavior: 0 = SW Assert (default), 1 = GNSS restart (hot start)
+Chip_Configuration_FeatureCfg_SDL_BYASS = 1
 
 # This is a bitfield that will disable incoming interrupts for mailboxes
 # AP   = 0x1
diff --git a/thermal/thermal_info_config_charge_comet.json b/thermal/thermal_info_config_charge_comet.json
index 8ab9979..88f9098 100644
--- a/thermal/thermal_info_config_charge_comet.json
+++ b/thermal/thermal_info_config_charge_comet.json
@@ -123,18 +123,21 @@
       "Type": "UNKNOWN",
       "VirtualSensor": true,
       "Formula": "COUNT_THRESHOLD",
+      "StepRatio": 0.2,
       "Combination": ["WLC_CHECK"],
       "Coefficient": [2],
-      "Multiplier": 1
+      "Multiplier": 1,
+      "PassiveDelay": 7000
     },
     {
       "Name": "NO_WLC",
       "Type": "UNKNOWN",
       "Hidden": true,
       "VirtualSensor": true,
-      "Formula": "COUNT_THRESHOLD",
-      "Combination": ["WLC_CHECK"],
-      "Coefficient": [-2],
+      "Formula": "WEIGHTED_AVG",
+      "Combination": ["1", "IS_WLC"],
+      "CombinationType": ["CONSTANT", "SENSOR"],
+      "Coefficient": [1.0, -1.0],
       "Multiplier": 1
     },
     {
@@ -231,7 +234,7 @@
       "Version": "2.0",
       "VirtualSensor": true,
       "TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"],
-      "Formula": "MAXIMUM",
+      "Formula": "WEIGHTED_AVG",
       "Combination":["VIRTUAL-SKIN-CHARGE-WLC-EQ", "VIRTUAL-SKIN-CHARGE-WIRED-EQ"],
       "Coefficient":["IS_WLC", "NO_WLC"],
       "CoefficientType": ["SENSOR", "SENSOR"],
diff --git a/thermal/thermal_info_config_comet.json b/thermal/thermal_info_config_comet.json
index 290607c..2e625c6 100644
--- a/thermal/thermal_info_config_comet.json
+++ b/thermal/thermal_info_config_comet.json
@@ -676,11 +676,28 @@
         {
             "Name": "VIRTUAL-SKIN-OUTER-DISPLAY",
             "Type": "DISPLAY",
+            "Version": "2.0",
+            "VirtualSensor": true,
+            "TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"],
+            "Formula": "MAXIMUM",
+            "Combination": ["display_therm"],
+            "Coefficient": [0.956],
+            "Offset": 1102,
+            "HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 53.0, 57.0],
+            "HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
+            "Multiplier": 0.001,
+            "SendCallback": true,
+            "PollingDelay": 300000,
+            "PassiveDelay": 7000
+        },
+        {
+            "Name": "VIRTUAL-SKIN-INNER-DISPLAY",
+            "Type": "DISPLAY",
             "Version": "1.0",
             "VirtualSensor": true,
             "TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"],
             "Formula": "MAXIMUM",
-            "Combination": ["VIRTUAL-SKIN"],
+            "Combination": ["VIRTUAL-SKIN-OPEN"],
             "Coefficient": [1.0],
             "HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 53.0, 57.0],
             "HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
@@ -709,18 +726,21 @@
             "Type": "UNKNOWN",
             "VirtualSensor": true,
             "Formula": "COUNT_THRESHOLD",
+            "StepRatio": 0.2,
             "Combination": ["WLC_CHECK"],
             "Coefficient": [2],
-            "Multiplier": 1
+            "Multiplier": 1,
+            "PassiveDelay": 7000
         },
         {
             "Name": "NO_WLC",
             "Type": "UNKNOWN",
             "Hidden": true,
             "VirtualSensor": true,
-            "Formula": "COUNT_THRESHOLD",
-            "Combination": ["WLC_CHECK"],
-            "Coefficient": [-2],
+            "Formula": "WEIGHTED_AVG",
+            "Combination": ["1", "IS_WLC"],
+            "CombinationType": ["CONSTANT", "SENSOR"],
+            "Coefficient": [1.0, -1.0],
             "Multiplier": 1
         },
         {
@@ -817,7 +837,7 @@
             "Version": "2.0",
             "VirtualSensor": true,
             "TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"],
-            "Formula": "MAXIMUM",
+            "Formula": "WEIGHTED_AVG",
             "Combination":["VIRTUAL-SKIN-CHARGE-WLC-EQ", "VIRTUAL-SKIN-CHARGE-WIRED-EQ"],
             "Coefficient":["IS_WLC", "NO_WLC"],
             "CoefficientType": ["SENSOR", "SENSOR"],
@@ -902,6 +922,7 @@
             "HotThreshold": ["NAN", 37.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis": [0.0, 1.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "Multiplier": 0.001,
+            "StepRatio": 0.4,
             "PollingDelay": 300000,
             "PassiveDelay": 7000,
             "SendCallback": true