diff --git a/device-tegu.mk b/device-tegu.mk
index 121385f..8be00e8 100644
--- a/device-tegu.mk
+++ b/device-tegu.mk
@@ -389,3 +389,6 @@ PRODUCT_COPY_FILES += \
 # IRadio HAL
 USE_RADIO_HAL_2_1 := false
 USE_RADIO_HAL_2_2 := true
+
+# Allow RIL enable/disable ENDC mode during Radio OFF
+ALLOW_SET_ENDC_DURING_RADIO_OFF := true
diff --git a/perf/powerhint-tegu.json b/perf/powerhint-tegu.json
index b604972..ce37d67 100644
--- a/perf/powerhint-tegu.json
+++ b/perf/powerhint-tegu.json
@@ -672,6 +672,7 @@
       "Values": [
         "664000",
         "233000",
+        "111000",
         "67000"
       ],
       "ResetOnInit": true
@@ -2136,6 +2137,18 @@
       "Duration": 0,
       "Value": "0x0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_EXTREME",
+      "Node": "TNRMaxFreq",
+      "Duration": 0,
+      "Value": "111000"
+    },
+    {
+      "PowerHint": "CAMERA_STREAMING_EXTREME",
+      "Node": "TNRFreq",
+      "Duration": 0,
+      "Value": "111000"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PowerHALCameraRunning",
diff --git a/thermal/thermal_info_config_tegu.json b/thermal/thermal_info_config_tegu.json
index 39e3111..22cf0a8 100644
--- a/thermal/thermal_info_config_tegu.json
+++ b/thermal/thermal_info_config_tegu.json
@@ -1180,37 +1180,13 @@
         "Sensors": {
             "RecordWithDefaultThreshold": ["VIRTUAL-SKIN"],
             "RecordWithThreshold": [
-                {
-                    "Name": "VIRTUAL-BTS-WINDOW-PARTIAL",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
-                },
                 {
                     "Name": "VIRTUAL-SKIN-SPEAKER-MODEL",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
-                },
-                {
-                    "Name": "VIRTUAL-SKIN-SUB-0",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
-                },
-                {
-                    "Name": "VIRTUAL-SKIN-SUB-1",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
-                },
-                {
-                    "Name": "VIRTUAL-SKIN-SUB-2",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
-                },
-                {
-                    "Name": "VIRTUAL-SKIN-SUB-3",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
-                },
-                {
-                    "Name": "VIRTUAL-SKIN-SUB-4",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "QUIET_THERM-VSKIN-DIFF-DURING-VSKIN-OVER-52",