diff --git a/assets/carrier_config_carrierid_1404_TELUS-Mobility.xml b/assets/carrier_config_carrierid_1404_TELUS-Mobility.xml
index ca31614..89bf3bd 100644
--- a/assets/carrier_config_carrierid_1404_TELUS-Mobility.xml
+++ b/assets/carrier_config_carrierid_1404_TELUS-Mobility.xml
@@ -15,4 +15,12 @@
     <string-array name="read_only_apn_types_string_array" num="1">
         <item value="*"/>
     </string-array>
+    <string name="5g_icon_configuration_string">connected_mmwave:5G_Plus,connected:5G,not_restricted_rrc_idle:5G,not_restricted_rrc_con:5G</string>
+    <string name="5g_icon_display_grace_period_string">connected_mmwave,connected,30;connected_mmwave,not_restricted_rrc_idle,30;connected_mmwave,not_restricted_rrc_con,30</string>
+    <int-array name="additional_nr_advanced_bands_int_array" num="1">
+        <item value="78"/>
+    </int-array>
+    <int name="nr_advanced_threshold_bandwidth_khz_int" value="60000"/>
+    <boolean name="enable_nr_advanced_for_roaming_bool" value="true"/>
+    <boolean name="include_lte_for_nr_advanced_threshold_bandwidth_bool" value="true"/>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1495_Spitfire.xml b/assets/carrier_config_carrierid_1495_Spitfire.xml
new file mode 100644
index 0000000..f42541a
--- /dev/null
+++ b/assets/carrier_config_carrierid_1495_Spitfire.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<carrier_config>
+    <boolean name="carrier_volte_available_bool" value="true"/>
+</carrier_config>
+
diff --git a/assets/carrier_config_carrierid_18_vodafone-GR.xml b/assets/carrier_config_carrierid_18_vodafone-GR.xml
new file mode 100644
index 0000000..98a5705
--- /dev/null
+++ b/assets/carrier_config_carrierid_18_vodafone-GR.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<carrier_config>
+    <string-array name="carrier_certificate_string_array" num="1">
+      <item value="DCFD5757F7AE448C5F79D224D33906880D89D3ABBF887EAC17226DBB52DFD6F6:com.myvodafone.android"/>
+    </string-array>
+</carrier_config>
diff --git a/assets/carrier_config_carrierid_1929_Movistar.xml b/assets/carrier_config_carrierid_1929_Movistar.xml
index 877d7d5..32dfa10 100644
--- a/assets/carrier_config_carrierid_1929_Movistar.xml
+++ b/assets/carrier_config_carrierid_1929_Movistar.xml
@@ -3,7 +3,4 @@
     <boolean name="enabledMMS" value="false"/>
     <boolean name="enableGroupMms" value="false"/>
     <boolean name="enableMultipartSMS" value="true"/>
-  <string-array name="carrier_certificate_string_array" num="1">
-    <item value="8C960CA3CBF4A9DA851774F2DE072E57B1289A9CF7D6BDA4A6B386A42BC4FFB3"/>
-  </string-array>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1958_Free.xml b/assets/carrier_config_carrierid_1958_Free.xml
index 945f164..c1d3ab9 100644
--- a/assets/carrier_config_carrierid_1958_Free.xml
+++ b/assets/carrier_config_carrierid_1958_Free.xml
@@ -7,8 +7,9 @@
     <string-array name="non_roaming_operator_string_array" num="1">
         <item value="20801"/>
     </string-array>
-    <string-array name="carrier_certificate_string_array" num="2">
-      <item value="d543e9f245aa584a84c608069cffe1f507be61eb496d7585ac02a2fce05dcb28:fr.freemobile.android.mobileconf,fr.freemobile.android.freenetworkmonitor,it.iliad.android.mobileconf,it.iliad.android.iccid"/>
-      <item value="a1fe35ab00f6301fdafda1309b8faac2895bf5d46ef5d9ae6895c5a5ad84eeb7:fr.freemobile.android.mobileconf,fr.freemobile.android.freenetworkmonitor,it.iliad.android.mobileconf,it.iliad.android.iccid"/>
+    <string-array name="carrier_certificate_string_array" num="3">
+      <item value="d543e9f245aa584a84c608069cffe1f507be61eb496d7585ac02a2fce05dcb28:fr.freemobile.android.mobileconf,fr.freemobile.android.freenetworkmonitor,fr.free.moncomptefree"/>
+      <item value="a1fe35ab00f6301fdafda1309b8faac2895bf5d46ef5d9ae6895c5a5ad84eeb7:fr.freemobile.android.mobileconf,fr.freemobile.android.freenetworkmonitor,fr.free.moncomptefree"/>
+      <item value="176461745f20b294b43960e9357bd6daffc87def7ddd75b9596e74076e5b19b0:fr.freemobile.android.mobileconf,fr.freemobile.android.freenetworkmonitor,fr.free.moncomptefree"/>
     </string-array>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1961_Airtel.xml b/assets/carrier_config_carrierid_1961_Airtel.xml
index 37efcee..727063e 100644
--- a/assets/carrier_config_carrierid_1961_Airtel.xml
+++ b/assets/carrier_config_carrierid_1961_Airtel.xml
@@ -9,7 +9,7 @@
         <item value="405"/>
     </string-array>
     <string-array name="carrier_certificate_string_array" num="2">
-        <item value="7170F9C35AC5966C1687372089AF55713DACC17635BAD248370DA67DDF8472B6"/>
-        <item value="FB9FD5425AB63FA933CF8125B2F3EFC0DF11F0DE0C9C01EF2F2B71A3EBD135A3"/>
+        <item value="7170F9C35AC5966C1687372089AF55713DACC17635BAD248370DA67DDF8472B6:com.myairtelapp"/>
+        <item value="FB9FD5425AB63FA933CF8125B2F3EFC0DF11F0DE0C9C01EF2F2B71A3EBD135A3:com.airtelx.airtelkiosk"/>
     </string-array>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_19_Vodafone-IE.xml b/assets/carrier_config_carrierid_19_Vodafone-IE.xml
new file mode 100644
index 0000000..0ae4b5b
--- /dev/null
+++ b/assets/carrier_config_carrierid_19_Vodafone-IE.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<carrier_config>
+    <string-array name="carrier_certificate_string_array" num="1">
+      <item value="DD839AD437E56CDCE41B683F35777EA73DD2B5571FE6849B26176FC26F03CC40:com.VodafoneIreland.MyVodafone"/>
+    </string-array>
+</carrier_config>
diff --git a/assets/carrier_config_carrierid_1_T-Mobile-US.xml b/assets/carrier_config_carrierid_1_T-Mobile-US.xml
index cec6091..f871ffa 100644
--- a/assets/carrier_config_carrierid_1_T-Mobile-US.xml
+++ b/assets/carrier_config_carrierid_1_T-Mobile-US.xml
@@ -48,4 +48,27 @@
         <item value="41"/>
     </int-array>
     <boolean name="enable_nr_advanced_for_roaming_bool" value="false"/>
+    <boolean name="show_roaming_indicator_bool" value="false"/>
+    <string-array name="data_connected_roaming_notification_excluded_mccs_string_array" num="7">
+        <item value="310"/>
+        <item value="311"/>
+        <item value="312"/>
+        <item value="313"/>
+        <item value="314"/>
+        <item value="315"/>
+        <item value="316"/>
+    </string-array>
+    <string-array name="data_connected_roaming_notification_included_mcc_mncs_string_array" num="11">
+        <item value="310032"/>
+        <item value="310033"/>
+        <item value="310110"/>
+        <item value="310140"/>
+        <item value="310370"/>
+        <item value="310400"/>
+        <item value="310470"/>
+        <item value="310500"/>
+        <item value="310970"/>
+        <item value="311170"/>
+        <item value="311250"/>
+    </string-array>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_2020_Koodo-Mobile.xml b/assets/carrier_config_carrierid_2020_Koodo-Mobile.xml
index 6e9e160..48d8918 100644
--- a/assets/carrier_config_carrierid_2020_Koodo-Mobile.xml
+++ b/assets/carrier_config_carrierid_2020_Koodo-Mobile.xml
@@ -1,4 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
     <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
+    <string name="5g_icon_configuration_string">connected_mmwave:5G_Plus,connected:5G,not_restricted_rrc_idle:5G,not_restricted_rrc_con:5G</string>
+    <string name="5g_icon_display_grace_period_string">connected_mmwave,connected,30;connected_mmwave,not_restricted_rrc_idle,30;connected_mmwave,not_restricted_rrc_con,30</string>
+    <int-array name="additional_nr_advanced_bands_int_array" num="1">
+        <item value="78"/>
+    </int-array>
+    <int name="nr_advanced_threshold_bandwidth_khz_int" value="60000"/>
+    <boolean name="enable_nr_advanced_for_roaming_bool" value="true"/>
+    <boolean name="include_lte_for_nr_advanced_threshold_bandwidth_bool" value="true"/>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_2089_Public-Mobile.xml b/assets/carrier_config_carrierid_2089_Public-Mobile.xml
new file mode 100644
index 0000000..dc119e9
--- /dev/null
+++ b/assets/carrier_config_carrierid_2089_Public-Mobile.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  ~ Copyright (C) 2023 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<carrier_config>
+    <string name="5g_icon_configuration_string">connected_mmwave:5G_Plus,connected:5G,not_restricted_rrc_idle:5G,not_restricted_rrc_con:5G</string>
+    <string name="5g_icon_display_grace_period_string">connected_mmwave,connected,30;connected_mmwave,not_restricted_rrc_idle,30;connected_mmwave,not_restricted_rrc_con,30</string>
+    <int-array name="additional_nr_advanced_bands_int_array" num="1">
+        <item value="78"/>
+    </int-array>
+    <int name="nr_advanced_threshold_bandwidth_khz_int" value="60000"/>
+    <boolean name="enable_nr_advanced_for_roaming_bool" value="true"/>
+    <boolean name="include_lte_for_nr_advanced_threshold_bandwidth_bool" value="true"/>
+</carrier_config>
diff --git a/assets/carrier_config_carrierid_22_Vodafone.xml b/assets/carrier_config_carrierid_22_Vodafone.xml
new file mode 100644
index 0000000..688b338
--- /dev/null
+++ b/assets/carrier_config_carrierid_22_Vodafone.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<carrier_config>
+    <string-array name="carrier_certificate_string_array" num="1">
+      <item value="1EE6A3F2CBCADB2060075A9147F5336B8B9D68E0979FD097A65CD7DD70852389:com.vodafone.mCare"/>
+    </string-array>
+</carrier_config>
diff --git a/assets/carrier_config_carrierid_23_Vodafone-RO.xml b/assets/carrier_config_carrierid_23_Vodafone-RO.xml
new file mode 100644
index 0000000..40a40ac
--- /dev/null
+++ b/assets/carrier_config_carrierid_23_Vodafone-RO.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<carrier_config>
+    <string-array name="carrier_certificate_string_array" num="1">
+      <item value="95D4443A60C07CCDEF793547C0CD76221D94A071BDAEE4D6CCE0F2C4E59D64F7:ro.vodafone.mcare.android"/>
+    </string-array>
+</carrier_config>
diff --git a/assets/carrier_config_carrierid_34_Movistar.xml b/assets/carrier_config_carrierid_34_Movistar.xml
index ae161b0..ca9cdfb 100644
--- a/assets/carrier_config_carrierid_34_Movistar.xml
+++ b/assets/carrier_config_carrierid_34_Movistar.xml
@@ -26,9 +26,6 @@
         <item value="214020"/>
         <item value="214021"/>
   </string-array>
-  <string-array name="carrier_certificate_string_array" num="1">
-    <item value="e1b6e6cbfe0673164931be46d95fa7e43fb92dac49acc10a6c0909e5eada15fa"/>
-  </string-array>
   <string name="call_redirection_service_component_name_string">com.movistar.android.mimovistar.es/com.tuenti.messenger.callinterceptor.CallInterceptorService</string>
   <string-array name="carrier_service_name_array" num="7">
     <item value="Atención al Cliente"/>
diff --git a/assets/carrier_config_carrierid_493_SETAR.xml b/assets/carrier_config_carrierid_493_SETAR.xml
new file mode 100644
index 0000000..f914035
--- /dev/null
+++ b/assets/carrier_config_carrierid_493_SETAR.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<carrier_config>
+    <boolean name="carrier_name_override_bool" value="true"/>
+    <string name="carrier_name_string">SETAR</string>
+    <int name="default_mtu_int" value="1500"/>
+    <string name="5g_icon_configuration_string">connected_mmwave:5G_Plus,connected:5G,not_restricted_rrc_idle:5G,not_restricted_rrc_con:5G</string>
+    <boolean name="hide_lte_plus_data_icon_bool" value="false"/>
+    <boolean name="enabledMMS" value="true"/>
+    <boolean name="enableMultipartSMS" value="true"/>
+    <boolean name="carrier_volte_available_bool" value="true"/>
+    <boolean name="carrier_supports_ss_over_ut_bool" value="false"/>
+    <boolean name="carrier_wfc_ims_available_bool" value="false" />
+    <boolean name="carrier_vt_available_bool" value="false" />
+    <boolean name="hide_ims_apn_bool" value="true"/>
+</carrier_config>
diff --git a/assets/carrier_config_carrierid_529_Claro-BR.xml b/assets/carrier_config_carrierid_529_Claro-BR.xml
index 233afad..79c2e0c 100644
--- a/assets/carrier_config_carrierid_529_Claro-BR.xml
+++ b/assets/carrier_config_carrierid_529_Claro-BR.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
     <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <string-array name="carrier_certificate_string_array" num="2">
-      <item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
+    <string-array name="carrier_certificate_string_array" num="3">
       <item value="65C25B1D82052E88BC0F1A1E3773746A44F2219C06272F4CA219C4D4928EB9A7:br.com.claro.flex,br.com.claro.flex.stg"/>
+      <item value="8063CE3CC5B3F69D1B89D0218CE1B5B2FBE66F63F9046C4E0FBF1D5F44D16F4C:com.nvt.cs"/>
+      <item value="FAC61745DC0903786FB9EDE62A962B399F7348F0BB6F899B8332667591033B9C:com.claroapp.quality.assurance,com.claroapp.user.acceptance.test,com.claroapp.development"/>
     </string-array>
 </carrier_config>
\ No newline at end of file
diff --git a/assets/carrier_config_carrierid_865_Safaricom.xml b/assets/carrier_config_carrierid_865_Safaricom.xml
index 84df59f..9c380de 100644
--- a/assets/carrier_config_carrierid_865_Safaricom.xml
+++ b/assets/carrier_config_carrierid_865_Safaricom.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
-    <string-array name="carrier_certificate_string_array" num="2">
-      <item value="F86A9F41A3616F82FAB02D4F23072FAFC7FF94B266C2E0A3558F097A95EA51D8"/>
-      <item value="F047BB9ED3FDFB7B32887F9DBAC1B933E58AE5857EC3455113C34DE26286FEC9"/>
+    <string-array name="carrier_certificate_string_array" num="1">
+      <item value="F86A9F41A3616F82FAB02D4F23072FAFC7FF94B266C2E0A3558F097A95EA51D8:com.safaricom.android.financing,com.safaricom.android.simupoa_android"/>
     </string-array>
 </carrier_config>
\ No newline at end of file
diff --git a/tests/Android.bp b/tests/Android.bp
index 8e7c18e..0eeb7df 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_fwk_telephony",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }