diff --git a/location/gps.cfg b/location/gps.cfg
index e6187cd..c65afa6 100644
--- a/location/gps.cfg
+++ b/location/gps.cfg
@@ -270,4 +270,8 @@ GNSS_CARRIER_ID=8
 GNSS_CARRIER_ID=9
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
+# TELUS
+GNSS_CARRIER_ID=10
+ENABLE_5G_CP_CAPS_MSA=0
+ENABLE_5G_CP_CAPS_MSB=0
 GNSS_CARRIER_CONFIG_END
diff --git a/location/gps_user.cfg b/location/gps_user.cfg
index c3ced93..6e06be8 100644
--- a/location/gps_user.cfg
+++ b/location/gps_user.cfg
@@ -140,4 +140,7 @@ GNSS_CARRIER_ID=8
 GNSS_CARRIER_ID=9
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
+GNSS_CARRIER_ID=10
+ENABLE_5G_CP_CAPS_MSA=0
+ENABLE_5G_CP_CAPS_MSB=0
 GNSS_CARRIER_CONFIG_END
diff --git a/tegu/overlay/frameworks/base/core/res/res/values/config.xml b/tegu/overlay/frameworks/base/core/res/res/values/config.xml
index 5a3e40d..9dc7fc2 100644
--- a/tegu/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/tegu/overlay/frameworks/base/core/res/res/values/config.xml
@@ -208,6 +208,9 @@
     <!-- Type of the udfps long press sensor. Empty if long press is not supported. -->
     <string name="config_dozeUdfpsLongPressSensorType" translatable="false">com.google.sensor.long_press</string>
 
+    <!-- Type of the quick pickup sensor. Empty if quick pickup is not supported. -->
+    <string name="config_quickPickupSensorType" translatable="false">com.google.sensor.quick_pickup</string>
+
     <!-- Allow the GPS_PROVIDER to be replaced by the location provider app at run-time. -->
     <bool name="config_useGnssHardwareProvider" translatable="false">false</bool>
     <!-- Package name providing GNSS location support. Used only when
diff --git a/thermal/thermal_info_config_charge_tegu.json b/thermal/thermal_info_config_charge_tegu.json
index feac279..2039952 100644
--- a/thermal/thermal_info_config_charge_tegu.json
+++ b/thermal/thermal_info_config_charge_tegu.json
@@ -108,24 +108,24 @@
             "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
             "Multiplier":0.001,
-            "PollingDelay":60000,
+            "PollingDelay":300000,
             "PassiveDelay":7000,
             "PIDInfo": {
-                "K_Po":["NAN", "NAN", 600, "NAN", "NAN", "NAN", "NAN"],
-                "K_Pu":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"],
-                "K_I":["NAN", "NAN", 21, "NAN", "NAN", "NAN", "NAN"],
+                "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"],
+                "K_Pu":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"],
+                "K_I":["NAN", "NAN", 50, "NAN", "NAN", "NAN", "NAN"],
                 "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
-                "I_Max":["NAN", "NAN", 1600, "NAN", "NAN", "NAN", "NAN"],
-                "S_Power":["NAN", "NAN", 2000, "NAN", "NAN", "NAN", "NAN"],
-                "MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"],
-                "MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"],
+                "I_Max":["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"],
+                "S_Power":["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"],
+                "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
+                "MaxAllocPower":["NAN", "NAN", 6219, "NAN", "NAN", "NAN", "NAN"],
                 "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"],
-                "I_Default":1600
+                "I_Default":846
             },
             "ExcludedPowerInfo": [
                 {
                     "PowerRail": "PARTIAL_SYSTEM_POWER",
-                    "PowerWeight": [0.1, 0.1, 0.05, 0.05, 0.2, 0.2, 0.2]
+                    "PowerWeight": [0.12, 0.12, 1.0, 1.0, 1.0, 1.0, 1.0]
                 }
             ],
             "BindedCdevInfo": [
@@ -149,27 +149,27 @@
             "Combination":["charging_therm", "usb_pwr_therm", "soc_therm"],
             "Coefficient":[0.259, 0.418, 0.23],
             "Offset":2146,
-            "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
-            "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
+            "HotThreshold":["NAN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0],
+            "HotHysteresis":[0.0, 1.9, 1.9, 3.9, 1.9, 1.9, 1.9],
             "Multiplier":0.001,
             "PollingDelay":300000,
             "PassiveDelay":7000,
             "PIDInfo": {
-                "K_Po":["NAN", "NAN", 600, "NAN", "NAN", "NAN", "NAN"],
-                "K_Pu":["NAN", "NAN", 200, "NAN", "NAN", "NAN", "NAN"],
-                "K_I":["NAN", "NAN", 21, "NAN", "NAN", "NAN", "NAN"],
+                "K_Po":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"],
+                "K_Pu":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"],
+                "K_I":["NAN", "NAN", 27, "NAN", "NAN", "NAN", "NAN"],
                 "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
-                "I_Max":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"],
-                "S_Power":["NAN", "NAN", 1400, "NAN", "NAN", "NAN", "NAN"],
-                "MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"],
-                "MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"],
-                "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"],
-                "I_Default":400
+                "I_Max":["NAN", "NAN", 1383, "NAN", "NAN", "NAN", "NAN"],
+                "S_Power":["NAN", "NAN", 1383, "NAN", "NAN", "NAN", "NAN"],
+                "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
+                "MaxAllocPower":["NAN", "NAN", 8022, "NAN", "NAN", "NAN", "NAN"],
+                "I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"],
+                "I_Default":1383
             },
             "ExcludedPowerInfo": [
                 {
                     "PowerRail": "PARTIAL_SYSTEM_POWER",
-                    "PowerWeight": [0.1, 0.1, 0.05, 0.05, 0.2, 0.2, 0.2]
+                    "PowerWeight": [0.21, 0.21, 0.21, 0.21, 0.42, 0.42, 0.42]
                 }
             ],
             "BindedCdevInfo": [
@@ -179,7 +179,7 @@
                     "MaxReleaseStep": 1,
                     "MaxThrottleStep": 1,
                     "CdevCeiling": [0, 25, 25, 25, 26, 26, 26],
-                    "LimitInfo": [0, 1, 1, 1, 1, 26, 26]
+                    "LimitInfo": [0, 0, 1, 1, 26, 26, 26]
                 }
             ]
         },
diff --git a/thermal/thermal_info_config_tegu.json b/thermal/thermal_info_config_tegu.json
index aa6f5c0..da8ed91 100644
--- a/thermal/thermal_info_config_tegu.json
+++ b/thermal/thermal_info_config_tegu.json
@@ -702,24 +702,24 @@
             "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
             "Multiplier":0.001,
-            "PollingDelay":60000,
+            "PollingDelay":300000,
             "PassiveDelay":7000,
             "PIDInfo": {
-                "K_Po":["NAN", "NAN", 600, "NAN", "NAN", "NAN", "NAN"],
-                "K_Pu":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"],
-                "K_I":["NAN", "NAN", 21, "NAN", "NAN", "NAN", "NAN"],
+                "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"],
+                "K_Pu":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"],
+                "K_I":["NAN", "NAN", 50, "NAN", "NAN", "NAN", "NAN"],
                 "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
-                "I_Max":["NAN", "NAN", 1600, "NAN", "NAN", "NAN", "NAN"],
-                "S_Power":["NAN", "NAN", 2000, "NAN", "NAN", "NAN", "NAN"],
-                "MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"],
-                "MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"],
+                "I_Max":["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"],
+                "S_Power":["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"],
+                "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
+                "MaxAllocPower":["NAN", "NAN", 6219, "NAN", "NAN", "NAN", "NAN"],
                 "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"],
-                "I_Default":1600
+                "I_Default":846
             },
             "ExcludedPowerInfo": [
                 {
                     "PowerRail": "PARTIAL_SYSTEM_POWER",
-                    "PowerWeight": [0.1, 0.1, 0.05, 0.05, 0.2, 0.2, 0.2]
+                    "PowerWeight": [0.12, 0.12, 1.0, 1.0, 1.0, 1.0, 1.0]
                 }
             ],
             "BindedCdevInfo": [
@@ -743,27 +743,27 @@
             "Combination":["charging_therm", "usb_pwr_therm", "soc_therm"],
             "Coefficient":[0.259, 0.418, 0.23],
             "Offset":2146,
-            "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
-            "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
+            "HotThreshold":["NAN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0],
+            "HotHysteresis":[0.0, 1.9, 1.9, 3.9, 1.9, 1.9, 1.9],
             "Multiplier":0.001,
             "PollingDelay":300000,
             "PassiveDelay":7000,
             "PIDInfo": {
-                "K_Po":["NAN", "NAN", 600, "NAN", "NAN", "NAN", "NAN"],
-                "K_Pu":["NAN", "NAN", 200, "NAN", "NAN", "NAN", "NAN"],
-                "K_I":["NAN", "NAN", 21, "NAN", "NAN", "NAN", "NAN"],
+                "K_Po":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"],
+                "K_Pu":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"],
+                "K_I":["NAN", "NAN", 27, "NAN", "NAN", "NAN", "NAN"],
                 "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
-                "I_Max":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"],
-                "S_Power":["NAN", "NAN", 1400, "NAN", "NAN", "NAN", "NAN"],
-                "MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"],
-                "MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"],
-                "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"],
-                "I_Default":400
+                "I_Max":["NAN", "NAN", 1383, "NAN", "NAN", "NAN", "NAN"],
+                "S_Power":["NAN", "NAN", 1383, "NAN", "NAN", "NAN", "NAN"],
+                "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
+                "MaxAllocPower":["NAN", "NAN", 8022, "NAN", "NAN", "NAN", "NAN"],
+                "I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"],
+                "I_Default":1383
             },
             "ExcludedPowerInfo": [
                 {
                     "PowerRail": "PARTIAL_SYSTEM_POWER",
-                    "PowerWeight": [0.1, 0.1, 0.05, 0.05, 0.2, 0.2, 0.2]
+                    "PowerWeight": [0.21, 0.21, 0.21, 0.21, 0.42, 0.42, 0.42]
                 }
             ],
             "BindedCdevInfo": [
@@ -773,7 +773,7 @@
                     "MaxReleaseStep": 1,
                     "MaxThrottleStep": 1,
                     "CdevCeiling": [0, 25, 25, 25, 26, 26, 26],
-                    "LimitInfo": [0, 1, 1, 1, 1, 26, 26]
+                    "LimitInfo": [0, 0, 1, 1, 26, 26, 26]
                 }
             ]
         },
@@ -1035,4 +1035,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}