diff --git a/audio/comet/aidl_config/audio_platform_configuration.xml b/audio/comet/aidl_config/audio_platform_configuration.xml
index e64fa26..8133645 100644
--- a/audio/comet/aidl_config/audio_platform_configuration.xml
+++ b/audio/comet/aidl_config/audio_platform_configuration.xml
@@ -25,7 +25,7 @@
       <argument name="ThermistorName" value="VIRTUAL-SKIN-SPEAKER" />
       <argument name="ThermistorType" value="UNKNOWN" />
       <argument name="ThrottlingSeverity" value="LIGHT" />
-      <argument name="SpeakerPowerPollWaitMs" value="20000" />
+      <argument name="SpeakerPowerPollWaitMs" value="5000" />
     </feature>
     <feature name="RuntimeTuningDump" />
     <feature name="SoundDose" />
diff --git a/device-comet.mk b/device-comet.mk
index cd4cb07..0f27a0d 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -29,10 +29,13 @@ $(call inherit-product-if-exists, vendor/google_devices/comet/prebuilts/device-v
 $(call inherit-product-if-exists, vendor/google_devices/zumapro/prebuilts/device-vendor.mk)
 $(call inherit-product-if-exists, vendor/google_devices/zumapro/proprietary/device-vendor.mk)
 $(call inherit-product-if-exists, vendor/google_devices/comet/proprietary/device-vendor.mk)
-$(call inherit-product-if-exists, vendor/google_devices/comet/proprietary/WallpapersComet.mk)
 $(call inherit-product-if-exists, vendor/google_devices/comet/proprietary/comet/device-vendor-comet.mk)
 $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk)
 
+ifeq ($(filter factory_comet, $(TARGET_PRODUCT)),)
+    $(call inherit-product-if-exists, vendor/google_devices/comet/proprietary/WallpapersComet.mk)
+endif
+
 DEVICE_PACKAGE_OVERLAYS += device/google/comet/comet/overlay
 
 ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true)
@@ -193,6 +196,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
        ro.audio.spatializer_transaural_enabled_default=false \
        persist.vendor.audio.spatializer.speaker_enabled=true
 
+# declare use of stereo spatialization
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.audio.stereo_spatialization_enabled=true
+
 # Sound Dose
 PRODUCT_PACKAGES += \
 	android.hardware.audio.sounddose-vendor-impl \
diff --git a/location/user/gps.cfg b/location/user/gps.cfg
index 3c1c8a8..9f54011 100644
--- a/location/user/gps.cfg
+++ b/location/user/gps.cfg
@@ -57,6 +57,8 @@ RfPathLossDb_Ap=3600
 RfPathLossDb_Cp=3600
 RfPathLossDb_L5_Ap=4300
 RfPathLossDb_L5_Cp=4300
+IsUseEntireRespTime911=1
+isForceHighAccuracyMode=1
 isUseUncalAccel=0
 
 GNSS_CARRIER_CONFIG_BEGIN
diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg
index 23d4075..50e03df 100644
--- a/location/userdebug/gps.cfg
+++ b/location/userdebug/gps.cfg
@@ -181,6 +181,12 @@ RfPathLossDb_Ap=3600
 RfPathLossDb_Cp=3600
 RfPathLossDb_L5_Ap=4300
 RfPathLossDb_L5_Cp=4300
+NmeaBitmask=0x010003fff
+
+# force engine to use entire response time for emergency session; default 0
+IsUseEntireRespTime911=1
+# force engine to engage high accuracy if entire response time used; default 0
+isForceHighAccuracyMode=1
 
 # 0: Use calibrated Accel data 1: Use uncalibrated Accel data
 isUseUncalAccel=0
diff --git a/thermal/thermal_info_config_charge_comet.json b/thermal/thermal_info_config_charge_comet.json
index 53d3b8e..ec48317 100644
--- a/thermal/thermal_info_config_charge_comet.json
+++ b/thermal/thermal_info_config_charge_comet.json
@@ -108,7 +108,7 @@
       "Coefficient": ["OPEN_WEIGHT", "CLOSE_WEIGHT"],
       "CoefficientType": ["SENSOR", "SENSOR"],
       "HotThreshold": ["NaN", 34.0, 38.0, 41.0, 45.0, 46.5, 57.0],
-      "HotHysteresis": [0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
+      "HotHysteresis": [0.0, 1.9, 3.9, 2.9, 3.9, 1.4, 1.9],
       "Multiplier": 0.001,
       "PollingDelay": 300000,
       "PassiveDelay": 7000,
diff --git a/thermal/thermal_info_config_comet.json b/thermal/thermal_info_config_comet.json
index 50aaba7..3c81577 100644
--- a/thermal/thermal_info_config_comet.json
+++ b/thermal/thermal_info_config_comet.json
@@ -543,7 +543,7 @@
             "Combination": ["VIRTUAL-SKIN"],
             "Coefficient": [1.0],
             "HotThreshold": ["NAN", 34.0, 38.0, 41.0, 45.0, 46.5, 57.0],
-            "HotHysteresis": [0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
+            "HotHysteresis": [0.0, 1.9, 3.9, 2.9, 3.9, 1.4, 1.9],
             "Multiplier": 0.001,
             "PollingDelay": 300000,
             "PassiveDelay": 7000,