diff --git a/resource-overlay/common/CarrierConfig/Android.mk b/resource-overlay/common/CarrierConfig/Android.mk
index 55cb8ec..110f2a4 100644
--- a/resource-overlay/common/CarrierConfig/Android.mk
+++ b/resource-overlay/common/CarrierConfig/Android.mk
@@ -8,7 +8,8 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
-LOCAL_PACKAGE_NAME := CarrierConfigResCommon
+LOCAL_PACKAGE_NAME := CarrierConfigResCommon_Sys
+
 LOCAL_SDK_VERSION := current
 
 LOCAL_AAPT_FLAGS := --keep-raw-values
diff --git a/resource-overlay/common/CarrierConfig/res/xml/vendor.xml b/resource-overlay/common/CarrierConfig/res/xml/vendor.xml
index 08e609d..6f397b2 100644
--- a/resource-overlay/common/CarrierConfig/res/xml/vendor.xml
+++ b/resource-overlay/common/CarrierConfig/res/xml/vendor.xml
@@ -111,6 +111,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <!-- Config for explicit call transfer support for an IMS call -->
         <boolean name="carrier_allow_transfer_ims_call_bool" value="true" />
         <long name="carrier_data_call_apn_retry_after_disconnect_long" value="100" />
+        <!-- Config to enable the example android location attribution app by default -->
+        <string name="gps.nfw_proxy_apps">com.example.android.locationattribution</string>
     </carrier_config>
 
     <carrier_config mcc="001" mnc="01">
@@ -186,6 +188,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="carrier_wfc_supports_ims_preferred_bool" value="true" />
         <int name="carrier_default_wfc_ims_mode_int" value="1" />
         <int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
+        <boolean name="force_home_network_bool" value="true" />
     </carrier_config>
 
     <carrier_config mcc="204" mnc="20">
@@ -196,6 +199,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <int name="carrier_default_wfc_ims_mode_int" value="1" />
         <int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
         <boolean name="fallback_sms_not_allowed_in_roaming" value="true" />
+        <boolean name="force_home_network_bool" value="true" />
     </carrier_config>
 
     <carrier_config mcc="206" mnc="10">
@@ -206,17 +210,28 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="fallback_sms_not_allowed_in_roaming" value="true" />
+        <boolean name="allow_hold_call_during_emergency_bool" value="false" />
     </carrier_config>
 
     <carrier_config mcc="208" mnc="02">
         <boolean name="fallback_sms_not_allowed_in_roaming" value="true" />
     </carrier_config>
 
+    <carrier_config mcc="208" mnc="08">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+    </carrier_config>
+
     <carrier_config mcc="208" mnc="09">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
 
+    <carrier_config mcc="208" mnc="10">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+    </carrier_config>
+
     <carrier_config mcc="208" mnc="11">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -319,6 +334,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="carrier_wfc_supports_ims_preferred_bool" value="true" />
         <boolean name="editable_wfc_roaming_mode_bool" value="true" />
         <int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
+        <boolean name="force_home_network_bool" value="true" />
     </carrier_config>
 
     <carrier_config mcc="230" mnc="03">
@@ -574,6 +590,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="editable_wfc_roaming_mode_bool" value="true" />
         <boolean name="carrier_wfc_supports_ims_preferred_bool" value="true" />
         <int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
+        <boolean name="force_home_network_bool" value="true" />
     </carrier_config>
 
     <carrier_config mcc="260" mnc="03">
@@ -599,6 +616,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="editable_wfc_roaming_mode_bool" value="true" />
         <boolean name="carrier_wfc_supports_ims_preferred_bool" value="true" />
         <int name="carrier_default_wfc_ims_mode_int" value="1" />
+        <boolean name="allow_hold_call_during_emergency_bool" value="false" />
     </carrier_config>
 
     <carrier_config mcc="262" mnc="02">
@@ -1341,12 +1359,30 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="carrier_volte_available_bool" value="true" />
     </carrier_config>
 
+    <carrier_config mcc="450" mnc="02">
+        <boolean name="carrier_vt_available_bool" value="true" />
+        <boolean name="allow_video_call_in_low_battery" value="false" />
+        <boolean name="config_carrier_cs_retry_available" value="true" />
+        <boolean name="carrier_allow_turnoff_ims_bool" value="false"/>
+        <boolean name="allow_hold_call_during_emergency_bool" value="false" />
+    </carrier_config>
+
+    <carrier_config mcc="450" mnc="03">
+        <boolean name="carrier_vt_available_bool" value="true" />
+        <boolean name="allow_video_call_in_low_battery" value="false" />
+        <boolean name="config_carrier_cs_retry_available" value="true" />
+        <boolean name="support_add_conference_participants_bool" value="true" />
+        <boolean name="carrier_allow_turnoff_ims_bool" value="false"/>
+        <boolean name="allow_hold_call_during_emergency_bool" value="false" />
+    </carrier_config>
+
     <carrier_config mcc="450" mnc="05">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="allow_video_call_in_low_battery" value="false" />
         <boolean name="config_carrier_cs_retry_available" value="true" />
         <boolean name="support_add_conference_participants_bool" value="true" />
         <boolean name="carrier_allow_turnoff_ims_bool" value="false"/>
+        <boolean name="allow_hold_call_during_emergency_bool" value="false" />
     </carrier_config>
 
     <carrier_config mcc="450" mnc="06">
@@ -1355,6 +1391,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="support_adhoc_conference_calls_bool" value="true" />
         <boolean name="support_add_conference_participants_bool" value="true" />
         <boolean name="carrier_allow_turnoff_ims_bool" value="false"/>
+        <boolean name="allow_hold_call_during_emergency_bool" value="false" />
     </carrier_config>
 
     <carrier_config mcc="450" mnc="08">
@@ -1362,6 +1399,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="allow_video_call_in_low_battery" value="false" />
         <boolean name="config_carrier_cs_retry_available" value="true" />
         <boolean name="carrier_allow_turnoff_ims_bool" value="false"/>
+        <boolean name="allow_hold_call_during_emergency_bool" value="false" />
     </carrier_config>
 
     <carrier_config mcc="454" mnc="00">
@@ -1484,6 +1522,17 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
         <boolean name="carrier_video_crs_supported_bool" value="true" />
         <boolean name="carrier_call_progress_notification" value="true" />
+        <boolean name="transmit_static_image" value="true"/>
+        <boolean name="show_static_image_ui" value="true"/>
+        <string-array name="carrier_support_video_service_numbers" num="2">
+            <item value="0532100860086"/>
+            <item value="0201008616"/>
+        </string-array>
+        <boolean name="carrier_support_send_media_configs_to_radio_layer_bool" value="true"/>
+        <int-array name="carrier_nr_availabilities_int_array" num="1">
+            <item value="1"/>
+        </int-array>
+        <boolean name="allow_hold_call_during_emergency_bool" value="false" />
     </carrier_config>
 
     <carrier_config mcc="460" mnc="01">
@@ -1517,6 +1566,10 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="allow_hold_video_call_bool" value="false" />
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
         <boolean name="carrier_video_crs_supported_bool" value="true" />
+        <int-array name="carrier_nr_availabilities_int_array" num="1">
+            <item value="1"/>
+        </int-array>
+        <boolean name="allow_hold_call_during_emergency_bool" value="false" />
     </carrier_config>
 
     <carrier_config mcc="460" mnc="02">
@@ -1573,6 +1626,17 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
         <boolean name="carrier_video_crs_supported_bool" value="true" />
         <boolean name="carrier_call_progress_notification" value="true" />
+        <boolean name="transmit_static_image" value="true"/>
+        <boolean name="show_static_image_ui" value="true"/>
+        <string-array name="carrier_support_video_service_numbers" num="2">
+            <item value="0532100860086"/>
+            <item value="0201008616"/>
+        </string-array>
+        <boolean name="carrier_support_send_media_configs_to_radio_layer_bool" value="true"/>
+        <int-array name="carrier_nr_availabilities_int_array" num="1">
+            <item value="1"/>
+        </int-array>
+        <boolean name="allow_hold_call_during_emergency_bool" value="false" />
     </carrier_config>
 
     <carrier_config mcc="460" mnc="03">
@@ -1613,7 +1677,11 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="support_swap_after_merge_bool" value="false"/>
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
         <boolean name="disable_filter_out_conference_host" value="true" />
+        <int-array name="carrier_nr_availabilities_int_array" num="1">
+            <item value="1"/>
+        </int-array>
         <boolean name="carrier_video_crs_supported_bool" value="true" />
+        <boolean name="allow_hold_call_during_emergency_bool" value="false" />
     </carrier_config>
 
     <carrier_config mcc="460" mnc="04">
@@ -1623,6 +1691,9 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
             <string name="protocol">IPV4V6</string>
             <string name="roaming_protocol">IPV4V6</string>
         </map>
+        <int-array name="carrier_nr_availabilities_int_array" num="1">
+            <item value="1"/>
+        </int-array>
     </carrier_config>
 
     <carrier_config mcc="460" mnc="05">
@@ -1675,6 +1746,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="allow_hold_video_call_bool" value="false" />
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
         <boolean name="carrier_video_crs_supported_bool" value="true" />
+        <boolean name="allow_hold_call_during_emergency_bool" value="false" />
     </carrier_config>
 
     <carrier_config mcc="460" mnc="07">
@@ -1730,6 +1802,17 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
         <boolean name="carrier_video_crs_supported_bool" value="true" />
         <boolean name="carrier_call_progress_notification" value="true" />
+        <boolean name="transmit_static_image" value="true"/>
+        <boolean name="show_static_image_ui" value="true"/>
+        <string-array name="carrier_support_video_service_numbers" num="2">
+            <item value="0532100860086"/>
+            <item value="0201008616"/>
+        </string-array>
+        <boolean name="carrier_support_send_media_configs_to_radio_layer_bool" value="true"/>
+        <int-array name="carrier_nr_availabilities_int_array" num="1">
+            <item value="1"/>
+        </int-array>
+        <boolean name="allow_hold_call_during_emergency_bool" value="false" />
     </carrier_config>
 
     <carrier_config mcc="460" mnc="08">
@@ -1784,6 +1867,17 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
         <boolean name="carrier_video_crs_supported_bool" value="true" />
         <boolean name="carrier_call_progress_notification" value="true" />
+        <boolean name="transmit_static_image" value="true"/>
+        <boolean name="show_static_image_ui" value="true"/>
+        <string-array name="carrier_support_video_service_numbers" num="2">
+            <item value="0532100860086"/>
+            <item value="0201008616"/>
+        </string-array>
+        <boolean name="carrier_support_send_media_configs_to_radio_layer_bool" value="true"/>
+        <int-array name="carrier_nr_availabilities_int_array" num="1">
+            <item value="1"/>
+        </int-array>
+        <boolean name="allow_hold_call_during_emergency_bool" value="false" />
     </carrier_config>
 
     <carrier_config mcc="460" mnc="09">
@@ -1812,6 +1906,10 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="allow_hold_video_call_bool" value="false" />
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
         <boolean name="carrier_video_crs_supported_bool" value="true" />
+        <int-array name="carrier_nr_availabilities_int_array" num="1">
+            <item value="1"/>
+        </int-array>
+        <boolean name="allow_hold_call_during_emergency_bool" value="false" />
     </carrier_config>
 
     <carrier_config mcc="460" mnc="10">
@@ -1861,7 +1959,11 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="support_swap_after_merge_bool" value="false"/>
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
         <boolean name="disable_filter_out_conference_host" value="true" />
+        <int-array name="carrier_nr_availabilities_int_array" num="1">
+            <item value="1"/>
+        </int-array>
         <boolean name="carrier_video_crs_supported_bool" value="true" />
+        <boolean name="allow_hold_call_during_emergency_bool" value="false" />
     </carrier_config>
 
     <carrier_config mcc="460" mnc="12">
@@ -1895,6 +1997,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="call_barring_visibility_bool" value="false" />
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
         <boolean name="carrier_video_crs_supported_bool" value="true" />
+        <boolean name="allow_hold_call_during_emergency_bool" value="false" />
     </carrier_config>
 
     <carrier_config mcc="460" mnc="15">
@@ -1907,7 +2010,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
     <carrier_config mcc="310" mnc="00">
         <boolean name="rtt_auto_upgrade_bool" value="true" />
         <boolean name="rtt_supported_bool" value="true" />
-        <boolean name="rtt_supported_for_vt_bool" value="true"/>
         <boolean name="rtt_upgrade_supported_bool" value="true"/>
         <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="carrier_volte_available_bool" value="true" />
@@ -1923,7 +2025,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
     <carrier_config mcc="310" mnc="01">
         <boolean name="rtt_auto_upgrade_bool" value="true" />
         <boolean name="rtt_supported_bool" value="true" />
-        <boolean name="rtt_supported_for_vt_bool" value="true"/>
         <boolean name="rtt_upgrade_supported_bool" value="true"/>
         <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="carrier_volte_available_bool" value="true" />
@@ -1942,6 +2043,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="config_enable_display_14digit_imei" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="rtt_upgrade_supported_bool" value="true"/>
+        <boolean name="allow_merging_rtt_calls_bool" value="true"/>
         <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="rtt_auto_upgrade_bool" value="true" />
         <boolean name="carrier_volte_tty_supported_bool" value="false" />
@@ -1956,6 +2058,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="rtt_supported_bool" value="true" />
         <boolean name="rtt_upgrade_supported_bool" value="true"/>
+        <boolean name="allow_merging_rtt_calls_bool" value="true"/>
         <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="rtt_auto_upgrade_bool" value="true" />
         <boolean name="carrier_volte_tty_supported_bool" value="false" />
@@ -1975,6 +2078,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="rtt_upgrade_supported_bool" value="true"/>
         <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="rtt_auto_upgrade_bool" value="true" />
+        <boolean name="allow_merging_rtt_calls_bool" value="true"/>
         <boolean name="carrier_volte_tty_supported_bool" value="false" />
     </carrier_config>
 
@@ -1997,6 +2101,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="rtt_upgrade_supported_bool" value="true"/>
         <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="rtt_auto_upgrade_bool" value="true" />
+        <boolean name="allow_merging_rtt_calls_bool" value="true"/>
         <boolean name="carrier_volte_tty_supported_bool" value="false" />
         <boolean name="carrier_allow_turnoff_ims_bool" value="false"/>
     </carrier_config>
@@ -2011,6 +2116,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="rtt_upgrade_supported_bool" value="true"/>
         <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="rtt_auto_upgrade_bool" value="true" />
+        <boolean name="allow_merging_rtt_calls_bool" value="true"/>
         <boolean name="carrier_volte_tty_supported_bool" value="false" />
         <boolean name="carrier_allow_turnoff_ims_bool" value="false"/>
     </carrier_config>
@@ -2025,6 +2131,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="rtt_upgrade_supported_bool" value="true"/>
         <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="rtt_auto_upgrade_bool" value="true" />
+        <boolean name="allow_merging_rtt_calls_bool" value="true"/>
         <boolean name="carrier_volte_tty_supported_bool" value="false" />
         <boolean name="require_apn_filtering_with_radio_capability_bool" value="true"/>
     </carrier_config>
@@ -2039,6 +2146,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="rtt_upgrade_supported_bool" value="true"/>
         <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="rtt_auto_upgrade_bool" value="true" />
+        <boolean name="allow_merging_rtt_calls_bool" value="true"/>
         <boolean name="carrier_volte_tty_supported_bool" value="false" />
         <boolean name="carrier_allow_turnoff_ims_bool" value="false"/>
     </carrier_config>
@@ -2053,6 +2161,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="rtt_upgrade_supported_bool" value="true"/>
         <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="rtt_auto_upgrade_bool" value="true" />
+        <boolean name="allow_merging_rtt_calls_bool" value="true"/>
         <boolean name="carrier_volte_tty_supported_bool" value="false" />
         <boolean name="carrier_name_override_bool" value="false" />
         <string name="carrier_name_string"></string>
@@ -2070,6 +2179,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="rtt_upgrade_supported_bool" value="true"/>
         <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="rtt_auto_upgrade_bool" value="true" />
+        <boolean name="allow_merging_rtt_calls_bool" value="true"/>
         <boolean name="carrier_volte_tty_supported_bool" value="false" />
         <boolean name="carrier_allow_turnoff_ims_bool" value="false"/>
     </carrier_config>
@@ -2085,6 +2195,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="rtt_upgrade_supported_bool" value="true"/>
         <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="rtt_auto_upgrade_bool" value="true" />
+        <boolean name="allow_merging_rtt_calls_bool" value="true"/>
         <boolean name="carrier_volte_tty_supported_bool" value="false" />
         <boolean name="carrier_allow_turnoff_ims_bool" value="false"/>
     </carrier_config>
@@ -2098,6 +2209,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="rtt_upgrade_supported_bool" value="true"/>
         <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="rtt_auto_upgrade_bool" value="true" />
+        <boolean name="allow_merging_rtt_calls_bool" value="true"/>
         <boolean name="carrier_volte_tty_supported_bool" value="false" />
         <boolean name="carrier_allow_turnoff_ims_bool" value="false"/>
     </carrier_config>
@@ -2105,96 +2217,106 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
     <carrier_config mcc="310" mnc="260">
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="rtt_auto_upgrade_bool" value="true" />
-        <boolean name="rtt_supported_for_vt_bool" value="false"/>
         <boolean name="rtt_upgrade_supported_bool" value="true"/>
         <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="carrier_wfc_supports_wifi_only_bool" value="true"/>
         <boolean name="allow_one_way_accept_video_call" value="false" />
         <boolean name="carrier_call_composer_supported_bool" value="true"/>
         <boolean name="editable_enhanced_4g_lte_bool" value="false" />
+        <boolean name="force_home_network_bool" value="true" />
     </carrier_config>
 
     <carrier_config mcc="310" mnc="160">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="editable_enhanced_4g_lte_bool" value="false" />
+        <boolean name="force_home_network_bool" value="true" />
     </carrier_config>
 
     <carrier_config mcc="310" mnc="200">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="editable_enhanced_4g_lte_bool" value="false" />
+        <boolean name="force_home_network_bool" value="true" />
     </carrier_config>
 
     <carrier_config mcc="310" mnc="210">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="rtt_auto_upgrade_bool" value="true" />
-        <boolean name="rtt_supported_for_vt_bool" value="false"/>
         <boolean name="rtt_upgrade_supported_bool" value="true"/>
         <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="carrier_wfc_supports_wifi_only_bool" value="true"/>
         <boolean name="allow_one_way_accept_video_call" value="false" />
         <boolean name="carrier_call_composer_supported_bool" value="true"/>
         <boolean name="editable_enhanced_4g_lte_bool" value="false" />
+        <boolean name="force_home_network_bool" value="true" />
     </carrier_config>
 
     <carrier_config mcc="310" mnc="220">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="editable_enhanced_4g_lte_bool" value="false" />
+        <boolean name="force_home_network_bool" value="true" />
     </carrier_config>
 
     <carrier_config mcc="310" mnc="230">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="editable_enhanced_4g_lte_bool" value="false" />
+        <boolean name="force_home_network_bool" value="true" />
     </carrier_config>
 
     <carrier_config mcc="310" mnc="240">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="editable_enhanced_4g_lte_bool" value="false" />
+        <boolean name="force_home_network_bool" value="true" />
     </carrier_config>
 
     <carrier_config mcc="310" mnc="250">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="editable_enhanced_4g_lte_bool" value="false" />
+        <boolean name="force_home_network_bool" value="true" />
     </carrier_config>
 
     <carrier_config mcc="310" mnc="270">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="editable_enhanced_4g_lte_bool" value="false" />
+        <boolean name="force_home_network_bool" value="true" />
     </carrier_config>
 
     <carrier_config mcc="310" mnc="300">
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
+        <boolean name="force_home_network_bool" value="true" />
     </carrier_config>
 
     <carrier_config mcc="310" mnc="310">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="rtt_auto_upgrade_bool" value="true" />
-        <boolean name="rtt_supported_for_vt_bool" value="false"/>
         <boolean name="rtt_upgrade_supported_bool" value="true"/>
         <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="carrier_wfc_supports_wifi_only_bool" value="true"/>
         <boolean name="allow_one_way_accept_video_call" value="false" />
         <boolean name="carrier_call_composer_supported_bool" value="true"/>
         <boolean name="editable_enhanced_4g_lte_bool" value="false" />
+        <boolean name="force_home_network_bool" value="true" />
     </carrier_config>
 
     <carrier_config mcc="310" mnc="490">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="editable_enhanced_4g_lte_bool" value="false" />
+        <boolean name="force_home_network_bool" value="true" />
     </carrier_config>
 
     <carrier_config mcc="310" mnc="530">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
+        <boolean name="force_home_network_bool" value="true" />
     </carrier_config>
 
     <carrier_config mcc="310" mnc="580">
@@ -2205,28 +2327,31 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
     <carrier_config mcc="310" mnc="590">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
+        <boolean name="force_home_network_bool" value="true" />
     </carrier_config>
 
     <carrier_config mcc="310" mnc="640">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
+        <boolean name="force_home_network_bool" value="true" />
     </carrier_config>
 
     <carrier_config mcc="310" mnc="660">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="editable_enhanced_4g_lte_bool" value="false" />
+        <boolean name="force_home_network_bool" value="true" />
     </carrier_config>
 
     <carrier_config mcc="310" mnc="800">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="editable_enhanced_4g_lte_bool" value="false" />
+        <boolean name="force_home_network_bool" value="true" />
     </carrier_config>
 
     <carrier_config mcc="311" mnc="00">
         <boolean name="rtt_supported_bool" value="true" />
-        <boolean name="rtt_supported_for_vt_bool" value="true"/>
         <boolean name="rtt_upgrade_supported_bool" value="true"/>
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
@@ -2238,6 +2363,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="rtt_upgrade_supported_bool" value="true"/>
         <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="rtt_auto_upgrade_bool" value="true" />
+        <boolean name="allow_merging_rtt_calls_bool" value="true"/>
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -2247,13 +2373,14 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
 
     <carrier_config mcc="311" mnc="480">
         <boolean name="support_video_conference_call_bool" value="false"/>
-        <boolean name="rtt_supported_for_vt_bool" value="false"/>
         <boolean name="rtt_upgrade_supported_bool" value="false"/>
         <boolean name="support_emergency_sms_over_ims_bool" value="true" />
         <boolean name="support_downgrade_vt_to_audio_bool" value="true" />
         <boolean name="carrier_vt_tty_support_bool" value="true" />
         <boolean name="carrier_call_composer_supported_bool" value="true"/>
         <boolean name="carrier_allow_turnoff_ims_bool" value="false"/>
+        <boolean name="use_sms_callback_mode_bool" value="true"/>
+        <boolean name="editable_enhanced_4g_lte_bool" value="false" />
     </carrier_config>
 
     <carrier_config device="kona" mcc="311" mnc="480">
@@ -2286,6 +2413,12 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <int name="default_rtt_mode_int" value="1" />
     </carrier_config>
 
+    <carrier_config device="taro" mcc="311" mnc="480">
+        <boolean name="show_rtt_visibility_setting_bool" value="true" />
+        <boolean name="ignore_rtt_mode_setting_bool" value="true"/>
+        <int name="default_rtt_mode_int" value="1" />
+    </carrier_config>
+
     <carrier_config mcc="312" mnc="530">
         <boolean name="rtt_supported_bool" value="true" />
         <boolean name="rtt_upgrade_supported_bool" value="true"/>
@@ -2414,9 +2547,40 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="rtt_upgrade_supported_bool" value="true"/>
         <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="rtt_auto_upgrade_bool" value="true" />
+        <boolean name="allow_merging_rtt_calls_bool" value="true"/>
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
 
+    <carrier_config mcc="302" mnc="610">
+        <boolean name="is_ims_conference_size_enforced_bool" value="true" />
+        <int name="ims_conference_size_limit_int" value="5" />
+    </carrier_config>
+
+    <carrier_config mcc="302" mnc="370">
+        <boolean name="is_ims_conference_size_enforced_bool" value="true" />
+        <int name="ims_conference_size_limit_int" value="5" />
+    </carrier_config>
+
+    <carrier_config mcc="302" mnc="690">
+        <boolean name="is_ims_conference_size_enforced_bool" value="true" />
+        <int name="ims_conference_size_limit_int" value="5" />
+    </carrier_config>
+
+    <carrier_config mcc="302" mnc="880">
+        <boolean name="is_ims_conference_size_enforced_bool" value="true" />
+        <int name="ims_conference_size_limit_int" value="5" />
+    </carrier_config>
+
+    <carrier_config mcc="302" mnc="630">
+        <boolean name="is_ims_conference_size_enforced_bool" value="true" />
+        <int name="ims_conference_size_limit_int" value="5" />
+    </carrier_config>
+
+    <carrier_config mcc="302" mnc="640">
+        <boolean name="is_ims_conference_size_enforced_bool" value="true" />
+        <int name="ims_conference_size_limit_int" value="5" />
+    </carrier_config>
+
     <carrier_config mcc="340" mnc="01">
         <boolean name="fallback_sms_not_allowed_in_roaming" value="true" />
     </carrier_config>
@@ -2441,6 +2605,22 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="fallback_sms_not_allowed_in_roaming" value="true" />
     </carrier_config>
 
+    <carrier_config mcc="310" mnc="026">
+        <boolean name="force_home_network_bool" value="true" />
+    </carrier_config>
+
+   <carrier_config mcc="310" mnc="26">
+        <boolean name="force_home_network_bool" value="true" />
+    </carrier_config>
+
+   <carrier_config mcc="220" mnc="04">
+        <boolean name="force_home_network_bool" value="true" />
+    </carrier_config>
+
+    <carrier_config mcc="255" mnc="02">
+        <boolean name="force_home_network_bool" value="true" />
+    </carrier_config>
+
     <carrier_config>
         <string-array name="ratchet_rat_families" num="3">
         <item value="1,2" />
diff --git a/resource-overlay/common/CellBroadcastReceiver/Android.mk b/resource-overlay/common/CellBroadcastReceiver/Android.mk
index 03c3dff..88b1de8 100644
--- a/resource-overlay/common/CellBroadcastReceiver/Android.mk
+++ b/resource-overlay/common/CellBroadcastReceiver/Android.mk
@@ -8,7 +8,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
-LOCAL_PACKAGE_NAME := CellBroadcastReceiverResCommon
+LOCAL_PACKAGE_NAME := CellBroadcastReceiverResCommon_Sys
 LOCAL_SDK_VERSION := current
 
 include $(BUILD_RRO_PACKAGE)
diff --git a/resource-overlay/common/Frameworks/Android.mk b/resource-overlay/common/Frameworks/Android.mk
index 11fe945..b9d6646 100644
--- a/resource-overlay/common/Frameworks/Android.mk
+++ b/resource-overlay/common/Frameworks/Android.mk
@@ -8,7 +8,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
-LOCAL_PACKAGE_NAME := FrameworksResCommon
+LOCAL_PACKAGE_NAME := FrameworksResCommon_Sys
 LOCAL_SDK_VERSION := current
 
 include $(BUILD_RRO_PACKAGE)
diff --git a/resource-overlay/common/Frameworks/res/values/config.xml b/resource-overlay/common/Frameworks/res/values/config.xml
index 836c703..985ed64 100644
--- a/resource-overlay/common/Frameworks/res/values/config.xml
+++ b/resource-overlay/common/Frameworks/res/values/config.xml
@@ -18,18 +18,6 @@
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-   <!-- Average Current for bluetooth controller when idle. 0 by default-->
-   <integer translatable="false" name="config_bluetooth_idle_cur_ma">3</integer>
-
-   <!-- Average Current for bluetooth controller when receiving. 0 by default-->
-   <integer translatable="false" name="config_bluetooth_rx_cur_ma">20</integer>
-
-   <!-- Average Current for bluetooth controller when transmitting. 0 by default-->
-   <integer translatable="false" name="config_bluetooth_tx_cur_ma">33</integer>
-
-   <!-- Operating volatage for bluetooth controller. 0 by default-->
-   <integer translatable="false" name="config_bluetooth_operating_voltage_mv">3700</integer>
-
     <!-- Set to true to add links to Cell Broadcast app from Settings and MMS app. -->
     <bool name="config_cellBroadcastAppLinks">true</bool>
 
@@ -296,9 +284,19 @@
 
     <!-- The default peak refresh rate for a given device. Change this value if you want to allow
          for higher refresh rates to be automatically used out of the box -->
-    <integer name="config_defaultPeakRefreshRate">180</integer>
+    <integer name="config_defaultPeakRefreshRate">240</integer>
+
+    <!-- Whether to select voice/data/sms preference without user confirmation -->
+    <bool name="config_voice_data_sms_auto_fallback">true</bool>
+    <!-- Package names to use with vendor iwlan implementation. -->
+    <string name="config_wlan_data_service_package" translatable="false">vendor.qti.iwlan</string>
+    <string name="config_wlan_network_service_package" translatable="false">vendor.qti.iwlan</string>
+    <string name="config_qualified_networks_service_package" translatable="false">vendor.qti.iwlan</string>
 
     <!-- set to false if we need to show user confirmation
          when alpha identifier is not provided by the UICC -->
     <bool name="config_stkNoAlphaUsrCnf">false</bool>
+
+    <!-- Configure emergency apn as empty(null) apn -->
+    <string name="config_emergency_apn" translatable="false"></string>
 </resources>
diff --git a/resource-overlay/common/SystemUI/Android.mk b/resource-overlay/common/SystemUI/Android.mk
index 32e2cc4..b40fbe9 100644
--- a/resource-overlay/common/SystemUI/Android.mk
+++ b/resource-overlay/common/SystemUI/Android.mk
@@ -8,7 +8,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
-LOCAL_PACKAGE_NAME := SystemUIResCommon
+LOCAL_PACKAGE_NAME := SystemUIResCommon_Sys
 LOCAL_SDK_VERSION := current
 
 include $(BUILD_RRO_PACKAGE)
diff --git a/resource-overlay/common/Telecomm/Android.mk b/resource-overlay/common/Telecomm/Android.mk
index 46d09d8..9858458 100644
--- a/resource-overlay/common/Telecomm/Android.mk
+++ b/resource-overlay/common/Telecomm/Android.mk
@@ -9,7 +9,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
-LOCAL_PACKAGE_NAME := TelecommResCommon
+LOCAL_PACKAGE_NAME := TelecommResCommon_Sys
 LOCAL_SDK_VERSION := current
 
 include $(BUILD_RRO_PACKAGE)
diff --git a/resource-overlay/common/Telephony/Android.mk b/resource-overlay/common/Telephony/Android.mk
index 81f711f..232f580 100644
--- a/resource-overlay/common/Telephony/Android.mk
+++ b/resource-overlay/common/Telephony/Android.mk
@@ -8,7 +8,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
-LOCAL_PACKAGE_NAME := TelephonyResCommon
+LOCAL_PACKAGE_NAME := TelephonyResCommon_Sys
 LOCAL_SDK_VERSION := current
 
 include $(BUILD_RRO_PACKAGE)
diff --git a/resource-overlay/common/Wifi/Android.mk b/resource-overlay/common/Wifi/Android.mk
index 3adf1ac..3bff4e6 100644
--- a/resource-overlay/common/Wifi/Android.mk
+++ b/resource-overlay/common/Wifi/Android.mk
@@ -8,7 +8,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
-LOCAL_PACKAGE_NAME := WifiResCommon
+LOCAL_PACKAGE_NAME := WifiResCommon_Sys
 LOCAL_SDK_VERSION := current
 
 include $(BUILD_RRO_PACKAGE)
diff --git a/resource-overlay/common/Wifi/res/values/config.xml b/resource-overlay/common/Wifi/res/values/config.xml
index 2d43035..7f63575 100644
--- a/resource-overlay/common/Wifi/res/values/config.xml
+++ b/resource-overlay/common/Wifi/res/values/config.xml
@@ -30,9 +30,6 @@
     <!-- Indicates that p2p MAC randomization is supported on this device -->
     <bool translatable="false" name="config_wifi_p2p_mac_randomization_supported">true</bool>
 
-    <!-- dual sap mode is supported on this device. -->
-    <bool name="config_wifi_dual_sap_mode_enabled">true</bool>
-
     <!-- Boolean to provide support to keep wifi5 symbol for 8SS supported device and 11ax AP -->
     <bool translateble="false" name="config_wifi_report_he_ready">true</bool>
 
@@ -60,6 +57,11 @@
     <!-- Boolean indicating that wifi only link configuratios that have exact same credentials (i.e PSK) -->
     <bool translatable="false" name="config_wifi_only_link_same_credential_configurations">false</bool>
 
+    <!-- Boolean indicating that multiple NDPs are allowed on single NDI.
+     Enable Aware NDP interface selection on interface that already has network set up.
+     -->
+    <bool translatable="false" name="config_wifiAllowMultipleNetworksOnSameAwareNdi">true</bool>
+
     <!-- integer indicating additional disconnect delay (in ms) after IMS onLost() indication is received -->
     <integer translatable="false" name="config_wifiDelayDisconnectOnImsLostMs">1000</integer>
 
diff --git a/sm8250.mk b/sm8250.mk
index 815997b..b7ac31c 100644
--- a/sm8250.mk
+++ b/sm8250.mk
@@ -30,13 +30,13 @@ DEVICE_PACKAGE_OVERLAYS += \
 PRODUCT_ENFORCE_RRO_TARGETS := *
 
 PRODUCT_PACKAGES += \
-    FrameworksResCommon \
-    CarrierConfigResCommon \
-    CellBroadcastReceiverResCommon \
-    SystemUIResCommon \
-    TelecommResCommon \
-    TelephonyResCommon \
-    WifiResCommon \
+    FrameworksResCommon_Sys \
+    CarrierConfigResCommon_Sys \
+    CellBroadcastReceiverResCommon_Sys \
+    SystemUIResCommon_Sys \
+    TelecommResCommon_Sys \
+    TelephonyResCommon_Sys \
+    WifiResCommon_Sys \
     FrameworksResTarget \
     WifiResTarget