diff --git a/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
index beb5166..f36ea00 100644
--- a/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
+++ b/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
@@ -23,5 +23,11 @@
     <device name="dhdpcie_host_wake">
         <subsystem>Wifi</subsystem>
     </device>
+    <device name="cp2ap_wakeup">
+        <subsystem>Cellular_data</subsystem>
+    </device>
+    <device name="MAILBOX_AOCA322APx100">
+        <subsystem>Sensor</subsystem>
+    </device>
 </irq-device-map>
 
diff --git a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml
index fa61183..a0f0ac0 100644
--- a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml
@@ -156,11 +156,6 @@
         is when the system is in the suspended mode -->
     <bool translatable="false" name="config_wifiDtimMultiplierConfigEnabled">true</bool>
 
-    <!-- Boolean indicating whether the framework updates country from scan results when there is
-         no telephony country code and driver country code is 00.
-         This is applied only during the setup wizard -->
-    <bool translatable="false" name ="config_wifiUpdateCountryCodeFromScanResultSetupWizard">true</bool>
-
     <!-- Enable the feature of adjusting link layer stats polling interval based on
     device mobility state and client mode RSSI monitoring. -->
     <bool translatable="false" name="config_wifiAdjustPollRssiIntervalEnabled">true</bool>
diff --git a/device-cheetah.mk b/device-cheetah.mk
index 8ea67e5..9b3d5a5 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -340,7 +340,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 # Vibrator HAL
 ACTUATOR_MODEL := luxshare_ict_081545
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.vibrator.hal.chirp.enabled=1 \
+    ro.vendor.vibrator.hal.chirp.enabled=0 \
     ro.vendor.vibrator.hal.device.mass=0.214 \
     ro.vendor.vibrator.hal.loc.coeff=2.7
 
diff --git a/device-panther.mk b/device-panther.mk
index 4889830..feb8016 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -326,7 +326,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 # Vibrator HAL
 ACTUATOR_MODEL := luxshare_ict_081545
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.vibrator.hal.chirp.enabled=1 \
+    ro.vendor.vibrator.hal.chirp.enabled=0 \
     ro.vendor.vibrator.hal.device.mass=0.195 \
     ro.vendor.vibrator.hal.loc.coeff=2.65
 # Keyboard bottom padding in dp for portrait mode and height ratio
diff --git a/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
index beb5166..f36ea00 100644
--- a/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
+++ b/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
@@ -23,5 +23,11 @@
     <device name="dhdpcie_host_wake">
         <subsystem>Wifi</subsystem>
     </device>
+    <device name="cp2ap_wakeup">
+        <subsystem>Cellular_data</subsystem>
+    </device>
+    <device name="MAILBOX_AOCA322APx100">
+        <subsystem>Sensor</subsystem>
+    </device>
 </irq-device-map>
 
diff --git a/panther/rro_overlays/WifiOverlay/res/values/config.xml b/panther/rro_overlays/WifiOverlay/res/values/config.xml
index 29a474f..daa6e49 100644
--- a/panther/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/panther/rro_overlays/WifiOverlay/res/values/config.xml
@@ -156,11 +156,6 @@
         is when the system is in the suspended mode -->
     <bool translatable="false" name="config_wifiDtimMultiplierConfigEnabled">true</bool>
 
-    <!-- Boolean indicating whether the framework updates country from scan results when there is
-         no telephony country code and driver country code is 00.
-         This is applied only during the setup wizard -->
-    <bool translatable="false" name ="config_wifiUpdateCountryCodeFromScanResultSetupWizard">true</bool>
-
     <!-- Enable the feature of adjusting link layer stats polling interval based on
     device mobility state and client mode RSSI monitoring. -->
     <bool translatable="false" name="config_wifiAdjustPollRssiIntervalEnabled">true</bool>
diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json
index b7ba66c..6ef7ea7 100644
--- a/thermal_info_config_cheetah.json
+++ b/thermal_info_config_cheetah.json
@@ -833,5 +833,45 @@
             "PowerSampleDelay":7000,
             "PowerSampleCount":5
         }
-    ]
+    ],
+    "Stats": {
+        "Sensors": {
+            "RecordWithDefaultThreshold": ["VIRTUAL-SKIN"],
+            "RecordWithThreshold": [
+                {
+                    "Name": "VIRTUAL-GNSS-DISP",
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+                },
+                {
+                    "Name": "VIRTUAL-USB2-QUIET",
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+                },
+                {
+                    "Name": "VIRTUAL-QUIET-USB2",
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+                },
+                {
+                    "Name": "VIRTUAL-NEUTRAL-QUIET",
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+                },
+                {
+                    "Name": "VIRTUAL-QI-DISP",
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+                },
+                {
+                    "Name": "VIRTUAL-SKIN",
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+                },
+                {
+                    "Name": "VIRTUAL-USB-THROTTLING",
+                    "Thresholds": [3.0]
+                }
+            ]
+        },
+        "CoolingDevices": {
+            "RecordVotePerSensor": {
+                "DefaultThresholdEnableAll": true
+            }
+        }
+    }
 }
diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json
index f6caf0e..f0abf68 100644
--- a/thermal_info_config_panther.json
+++ b/thermal_info_config_panther.json
@@ -834,5 +834,45 @@
             "PowerSampleDelay":7000,
             "PowerSampleCount":5
         }
-    ]
+    ],
+    "Stats": {
+        "Sensors": {
+            "RecordWithDefaultThreshold": ["VIRTUAL-SKIN"],
+            "RecordWithThreshold": [
+                {
+                    "Name": "VIRTUAL-QUIET-QI",
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+                },
+                {
+                    "Name": "VIRTUAL-USB-QUIET",
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+                },
+                {
+                    "Name": "VIRTUAL-QUIET-DISP",
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+                },
+                {
+                    "Name": "VIRTUAL-NEUTRAL-QUIET",
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+                },
+                {
+                    "Name": "VIRTUAL-QI-DISP",
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+                },
+                {
+                    "Name": "VIRTUAL-SKIN",
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+                },
+                {
+                    "Name": "VIRTUAL-USB-THROTTLING",
+                    "Thresholds": [3.0]
+                }
+            ]
+        },
+        "CoolingDevices": {
+            "RecordVotePerSensor": {
+                "DefaultThresholdEnableAll": true
+            }
+        }
+    }
 }