diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Dialer/java/com/android/voicemail/impl/res/xml/vvm_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Dialer/java/com/android/voicemail/impl/res/xml/vvm_config.xml
index bec6652a..0984bf72 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Dialer/java/com/android/voicemail/impl/res/xml/vvm_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Dialer/java/com/android/voicemail/impl/res/xml/vvm_config.xml
@@ -7,14 +7,12 @@
     </pbundle_as_map>
     <pbundle_as_map>
         <string-array name="mccmnc">
-            <item value="20601" />
-            <item value="20810" />
-            <item value="20826" />
+            <item value="20826?gid1=NRJ1" />
         </string-array>
         <string name="feature_flag_name">vvm_carrier_flag_el_telecom</string>
         <int name="vvm_port_number_int" value="5499" />
         <string name="vvm_destination_number_string">8860</string>
-        <string name="vvm_type_string">vvm_type_omtp</string>
+        <string name="vvm_type_string">vvm_type_omtp_1_3</string>
     </pbundle_as_map>
     <pbundle_as_map>
         <string-array name="mccmnc">
@@ -22,7 +20,6 @@
             <item value="20821" />
             <item value="20888" />
         </string-array>
-        <string name="feature_flag_name">vvm_carrier_flag_20820</string>
         <int name="vvm_port_number_int" value="5499" />
         <string name="vvm_destination_number_string">22344</string>
         <string name="vvm_type_string">vvm_type_omtp</string>
@@ -33,12 +30,11 @@
             <item value="302490" />
             <item value="302491" />
         </string-array>
-        <string name="feature_flag_name">vvm_carrier_freedom_ca</string>
         <int name="vvm_port_number_int" value="0" />
         <string name="vvm_destination_number_string">455677</string>
         <string name="vvm_type_string">vvm_type_omtp</string>
         <boolean name="vvm_cellular_data_required_bool" value="true" />
-        <string name="vvm_transcription_allowed_for_carrier_flag_name"> vvm_freedom_ca_allows_transcription </string>
+        <boolean name="vvm_transcription_always_allowed" value="true" />
         <string name="vvm_network_capability_string">mms</string>
     </pbundle_as_map>
     <pbundle_as_map>
@@ -76,7 +72,6 @@
         <string name="vvm_type_string">vvm_type_disabled</string>
     </pbundle_as_map>
     <pbundle_as_map>
-        <string name="feature_flag_name">vvm_carrier_flag_27099</string>
         <string-array name="mccmnc">
             <item value="27099" />
         </string-array>
@@ -117,7 +112,6 @@
         <string name="vvm_type_string">vvm_type_disabled</string>
     </pbundle_as_map>
     <pbundle_as_map>
-        <string name="feature_flag_name">vvm_carrier_flag_swisscom_ch</string>
         <string-array name="mccmnc">
             <item value="22801" />
         </string-array>
@@ -163,6 +157,13 @@
         <boolean name="vvm_ignore_transcription" value="true" />
         <boolean name="vvm_change_greeting_enabled_bool" value="true" />
     </pbundle_as_map>
+    <pbundle_as_map>
+        <string-array name="mccmnc">
+            <item value="310240?gid1=6430" />
+            <item value="310240?gid1=6432" />
+        </string-array>
+        <string name="vvm_type_string">vvm_type_disabled</string>
+    </pbundle_as_map>
     <pbundle_as_map>
         <string-array name="mccmnc">
             <item value="310240?gid1=6230" />
@@ -170,7 +171,6 @@
         <string name="vvm_type_string">vvm_type_disabled</string>
     </pbundle_as_map>
     <pbundle_as_map>
-        <string name="feature_flag_name">vvm_carrier_flag_tracfone_usa_tmo_enable </string>
         <boolean name="vvm_overrides_carrier_config" value="true" />
         <string-array name="mccmnc">
             <item value="310240?gid1=4d4b" />
@@ -206,7 +206,6 @@
         <boolean name="vvm_change_greeting_enabled_bool" value="true" />
     </pbundle_as_map>
     <pbundle_as_map>
-        <string name="feature_flag_name">vvm_carrier_flag_visible_vzw_enable </string>
         <string-array name="mccmnc">
             <item value="311480?gid1=BAE1000000000000" />
         </string-array>
@@ -219,15 +218,6 @@
         <string name="vvm_transcription_allowed_for_carrier_flag_name"> vvm_visible_vzw_us_allows_transcription </string>
         <boolean name="vvm_change_greeting_enabled_bool" value="true" />
     </pbundle_as_map>
-    <pbundle_as_map>
-        <string name="feature_flag_name">vvm_carrier_flag_visible_vzw_disable </string>
-        <boolean name="feature_flag_default_value" value="true" />
-        <string-array name="mccmnc">
-            <item value="311480?gid1=BAE1000000000000" />
-        </string-array>
-        <string name="vvm_type_string">vvm_type_disabled</string>
-        <boolean name="vvm_change_greeting_enabled_bool" value="true" />
-    </pbundle_as_map>
     <pbundle_as_map>
         <string-array name="mccmnc">
             <item value="311480?gid1=BA01490000000000" />
@@ -261,7 +251,6 @@
         <string name="vvm_type_string">vvm_type_disabled</string>
     </pbundle_as_map>
     <pbundle_as_map>
-        <string name="feature_flag_name">vvm_carrier_flag_302220</string>
         <string-array name="mccmnc">
             <item value="302220" />
         </string-array>
@@ -271,6 +260,32 @@
         <boolean name="vvm_cellular_data_required_bool" value="false" />
         <string name="vvm_network_capability_string">mms</string>
     </pbundle_as_map>
+    <pbundle_as_map>
+        <string-array name="mccmnc">
+            <item value="20809?gid1=6332" />
+            <item value="20809?gid1=6336" />
+            <item value="20809?gid1=7330" />
+            <item value="20809?gid1=6630" />
+            <item value="20809?gid1=6538" />
+            <item value="20809?gid1=6530" />
+            <item value="20809?gid1=6532" />
+            <item value="302220?gid1=6332" />
+            <item value="302220?gid1=6336" />
+            <item value="302220?gid1=7330" />
+            <item value="302220?gid1=6630" />
+            <item value="302220?gid1=6538" />
+            <item value="302220?gid1=6530" />
+            <item value="302220?gid1=6532" />
+            <item value="313340?gid1=6332" />
+            <item value="313340?gid1=6336" />
+            <item value="313340?gid1=7330" />
+            <item value="313340?gid1=6630" />
+            <item value="313340?gid1=6538" />
+            <item value="313340?gid1=6530" />
+            <item value="313340?gid1=6532" />
+        </string-array>
+        <string name="vvm_type_string">vvm_type_disabled</string>
+    </pbundle_as_map>
     <pbundle_as_map>
         <string-array name="mccmnc">
             <item value="310004" />
@@ -350,24 +365,52 @@
             <item value="313120" />
             <item value="313130" />
             <item value="313140" />
-            <item value="313790" />
             <item value="334050" />
             <item value="334090" />
         </string-array>
-        <string name="feature_flag_name">vvm_carrier_att</string>
         <int name="vvm_port_number_int" value="5499" />
         <string name="vvm_destination_number_string">94183574</string>
         <string-array name="carrier_vvm_package_name_string_array">
             <item value="com.att.mobile.android.vvm" />
         </string-array>
-        <string name="vvm_type_string">vvm_type_omtp</string>
+        <string name="vvm_type_string">vvm_type_advvm</string>
         <boolean name="vvm_legacy_mode_enabled_bool" value="true" />
         <boolean name="vvm_ignore_transcription" value="true" />
-        <string name="vvm_transcription_allowed_for_carrier_flag_name"> vvm_att_us_allows_transcription </string>
+        <boolean name="vvm_transcription_always_allowed" value="true" />
         <boolean name="vvm_use_direct_tls_connection" value="true" />
         <boolean name="vvm_change_greeting_enabled_bool" value="true" />
         <boolean name="vvm_greeting_update_bool" value="false" />
     </pbundle_as_map>
+    <pbundle_as_map>
+        <string-array name="mccmnc">
+            <item value="313790" />
+        </string-array>
+        <int name="vvm_port_number_int" value="5499" />
+        <string name="vvm_destination_number_string">30048</string>
+        <string-array name="carrier_vvm_package_name_string_array">
+            <item value="com.att.mobile.android.vvm" />
+        </string-array>
+        <string name="vvm_type_string">vvm_type_advvm</string>
+        <boolean name="vvm_legacy_mode_enabled_bool" value="true" />
+        <boolean name="vvm_ignore_transcription" value="true" />
+        <boolean name="vvm_transcription_always_allowed" value="true" />
+        <boolean name="vvm_use_direct_tls_connection" value="true" />
+        <boolean name="vvm_change_greeting_enabled_bool" value="true" />
+        <boolean name="vvm_greeting_update_bool" value="false" />
+    </pbundle_as_map>
+    <pbundle_as_map>
+        <string-array name="mccmnc">
+            <item value="310410?gid1=3430" />
+            <item value="310410?gid1=3432" />
+            <item value="310410?gid1=3434" />
+            <item value="310410?gid1=3436" />
+            <item value="311180?gid1=3430" />
+            <item value="311180?gid1=3432" />
+            <item value="311180?gid1=3434" />
+            <item value="311180?gid1=3436" />
+        </string-array>
+        <string name="vvm_type_string">vvm_type_disabled</string>
+    </pbundle_as_map>
     <pbundle_as_map>
         <string-array name="mccmnc">
             <item value="20827" />
@@ -384,12 +427,12 @@
         <string name="feature_flag_name">vvm_carrier_cellcom</string>
         <string-array name="mccmnc">
             <item value="311480?gid1=BA00040000000000" />
-            <item value="311850" />
+            <item value="311850?gid1=BA00040000000000" />
         </string-array>
         <int name="vvm_port_number_int" value="0" />
         <string name="vvm_destination_number_string">9966</string>
         <int name="vvm_application_port_number_int" value="5499" />
-        <string name="vvm_type_string">vvm_type_omtp</string>
+        <string name="vvm_type_string">vvm_type_omtp_1_2</string>
         <boolean name="vvm_cellular_data_required_bool" value="true" />
         <string-array name="carrier_vvm_package_name_string_array">
             <item value="com.cellcom.cellcomvisualvoicemail" />
@@ -422,4 +465,4 @@
         </string-array>
         <string name="vvm_type_string">vvm_type_disabled</string>
     </pbundle_as_map>
-</list>
+</list>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc232-mnc10/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc232-mnc10/mms_config.xml
index ad73a432..19689144 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc232-mnc10/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc232-mnc10/mms_config.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<mms_config version="1">
-    <bool name="groupChatDefaultsToMMS">false</bool>
+<mms_config version="2">
+    <bool name="enabledMMS">true</bool>
+    <bool name="enableGroupMms">true</bool>
+    <bool name="groupChatDefaultsToMMS">true</bool>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc234-mnc20/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc234-mnc20/mms_config.xml
index e0a950a3..814a5dfc 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc234-mnc20/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc234-mnc20/mms_config.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<mms_config version="4">
-    <bool name="groupChatDefaultsToMMS">false</bool>
+<mms_config version="6">
+    <bool name="enabledMMS">true</bool>
+    <bool name="enableGroupMms">true</bool>
+    <bool name="groupChatDefaultsToMMS">true</bool>
     <bool name="allowEditingSmscAddress">false</bool>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc234-mnc57/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc234-mnc57/mms_config.xml
new file mode 100644
index 00000000..2988e392
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc234-mnc57/mms_config.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mms_config version="1">
+    <bool name="enableGroupMms">true</bool>
+    <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
+</mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc10/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc10/mms_config.xml
index 0698ebe4..cc702741 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc10/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc10/mms_config.xml
@@ -12,7 +12,25 @@
     <bool name="enableSMSDeliveryReports">false</bool>
     <bool name="enableMMSDeliveryReports">false</bool>
     <bool name="supportMmsContentDisposition">false</bool>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc12/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc12/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc12/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc12/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc13/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc13/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc13/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc13/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc200/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc200/mms_config.xml
new file mode 100644
index 00000000..2988e392
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc200/mms_config.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mms_config version="1">
+    <bool name="enableGroupMms">true</bool>
+    <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
+</mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc210/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc210/mms_config.xml
new file mode 100644
index 00000000..2988e392
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc210/mms_config.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mms_config version="1">
+    <bool name="enableGroupMms">true</bool>
+    <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
+</mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc220/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc220/mms_config.xml
new file mode 100644
index 00000000..2988e392
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc220/mms_config.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mms_config version="1">
+    <bool name="enableGroupMms">true</bool>
+    <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
+</mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc230/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc230/mms_config.xml
new file mode 100644
index 00000000..2988e392
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc230/mms_config.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mms_config version="1">
+    <bool name="enableGroupMms">true</bool>
+    <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
+</mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc250/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc250/mms_config.xml
new file mode 100644
index 00000000..2988e392
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc250/mms_config.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mms_config version="1">
+    <bool name="enableGroupMms">true</bool>
+    <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
+</mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc270/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc270/mms_config.xml
new file mode 100644
index 00000000..2988e392
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc270/mms_config.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mms_config version="1">
+    <bool name="enableGroupMms">true</bool>
+    <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
+</mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc310/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc310/mms_config.xml
new file mode 100644
index 00000000..2988e392
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc310/mms_config.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mms_config version="1">
+    <bool name="enableGroupMms">true</bool>
+    <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
+</mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc4/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc4/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc4/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc4/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc490/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc490/mms_config.xml
index a3d98c94..7ad94e61 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc490/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc490/mms_config.xml
@@ -7,4 +7,5 @@
     <bool name="enableWapPushSI">true</bool>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc590/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc590/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc590/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc590/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc660/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc660/mms_config.xml
new file mode 100644
index 00000000..2988e392
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc660/mms_config.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mms_config version="1">
+    <bool name="enableGroupMms">true</bool>
+    <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
+</mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc800/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc800/mms_config.xml
new file mode 100644
index 00000000..2988e392
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc800/mms_config.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mms_config version="1">
+    <bool name="enableGroupMms">true</bool>
+    <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
+</mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc890/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc890/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc890/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc890/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc910/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc910/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc910/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc910/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc110/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc110/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc110/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc110/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc270/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc270/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc270/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc270/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc271/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc271/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc271/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc271/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc272/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc272/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc272/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc272/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc273/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc273/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc273/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc273/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc274/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc274/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc274/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc274/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc275/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc275/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc275/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc275/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc276/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc276/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc276/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc276/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc277/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc277/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc277/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc277/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc278/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc278/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc278/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc278/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc279/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc279/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc279/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc279/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc280/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc280/mms_config.xml
index 30bb8c2e..c6dc3122 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc280/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc280/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n            \"hidden_contact\": [\n                {\n                    \"display_name\": \"Verizon Global Support\",\n                    \"return_number\": \"9085594899\",\n                    \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n                },\n                {\n                    \"display_name\": \"Verizon Wireless\",\n                    \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                              {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                              {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                              {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                              {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                              {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                              {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n                }\n            ]\n        } </string>
+    <string name="hiddenContactsData"> {
+            "hidden_contact": [
+                {
+                    "display_name": "Verizon Global Support",
+                    "return_number": "9085594899",
+                    "range": [{"start": "900080005330", "end": "900080005349"}]
+                },
+                {
+                    "display_name": "Verizon Wireless",
+                    "range": [{"start": "900080000105", "end": "900080000105"},
+                              {"start": "900080000111", "end": "900080000111"},
+                              {"start": "900080000117", "end": "900080000117"},
+                              {"start": "900080004000", "end": "900080004009"},
+                              {"start": "900080004020", "end": "900080004024"},
+                              {"start": "900080005030", "end": "900080005039"},
+                              {"start": "900090005000", "end": "900090005999"}]
+                }
+            ]
+        } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc281/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc281/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc281/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc281/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc282/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc282/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc282/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc282/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc283/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc283/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc283/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc283/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc284/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc284/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc284/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc284/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc285/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc285/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc285/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc285/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc286/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc286/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc286/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc286/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc287/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc287/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc287/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc287/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc288/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc288/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc288/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc288/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc289/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc289/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc289/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc289/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc390/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc390/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc390/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc390/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc480/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc480/mms_config.xml
index fd3386e1..83c4862e 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc480/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc480/mms_config.xml
@@ -17,7 +17,25 @@
     <int name="maxSubjectLength">80</int>
     <bool name="enableMultipartSMS">true</bool>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc481/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc481/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc481/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc481/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc482/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc482/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc482/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc482/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc483/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc483/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc483/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc483/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc484/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc484/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc484/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc484/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc485/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc485/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc485/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc485/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc486/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc486/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc486/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc486/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc487/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc487/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc487/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc487/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc488/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc488/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc488/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc488/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc489/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc489/mms_config.xml
index 35bb2312..f07f6931 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc489/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc489/mms_config.xml
@@ -18,7 +18,25 @@
     <bool name="enableMultipartSMS">true</bool>
     <int name="smsToMmsTextThreshold">7</int>
     <int name="maxFrameRate">15</int>
-    <string name="hiddenContactsData"> {\n          \"hidden_contact\": [\n              {\n                  \"display_name\": \"Verizon Global Support\",\n                  \"return_number\": \"9085594899\",\n                  \"range\": [{\"start\": \"900080005330\", \"end\": \"900080005349\"}]\n              },\n              {\n                  \"display_name\": \"Verizon Wireless\",\n                  \"range\": [{\"start\": \"900080000105\", \"end\": \"900080000105\"},\n                            {\"start\": \"900080000111\", \"end\": \"900080000111\"},\n                            {\"start\": \"900080000117\", \"end\": \"900080000117\"},\n                            {\"start\": \"900080004000\", \"end\": \"900080004009\"},\n                            {\"start\": \"900080004020\", \"end\": \"900080004024\"},\n                            {\"start\": \"900080005030\", \"end\": \"900080005039\"},\n                            {\"start\": \"900090005000\", \"end\": \"900090005999\"}]\n              }\n          ]\n      } </string>
+    <string name="hiddenContactsData"> {
+          "hidden_contact": [
+              {
+                  "display_name": "Verizon Global Support",
+                  "return_number": "9085594899",
+                  "range": [{"start": "900080005330", "end": "900080005349"}]
+              },
+              {
+                  "display_name": "Verizon Wireless",
+                  "range": [{"start": "900080000105", "end": "900080000105"},
+                            {"start": "900080000111", "end": "900080000111"},
+                            {"start": "900080000117", "end": "900080000117"},
+                            {"start": "900080004000", "end": "900080004009"},
+                            {"start": "900080004020", "end": "900080004024"},
+                            {"start": "900080005030", "end": "900080005039"},
+                            {"start": "900090005000", "end": "900090005999"}]
+              }
+          ]
+      } </string>
     <string name="smsErrorDescMap">verizon_cdma</string>
     <int name="emailGatewaySmsToMmsTextThreshold">1</int>
     <bool name="supportMmsPriority">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc490/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc490/mms_config.xml
index a5d6375b..5b2e5919 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc490/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc490/mms_config.xml
@@ -21,4 +21,5 @@
     <bool name="enableWapPushSI">true</bool>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc660/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc660/mms_config.xml
new file mode 100644
index 00000000..2988e392
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc660/mms_config.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mms_config version="1">
+    <bool name="enableGroupMms">true</bool>
+    <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
+</mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc882/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc882/mms_config.xml
new file mode 100644
index 00000000..2988e392
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc882/mms_config.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mms_config version="1">
+    <bool name="enableGroupMms">true</bool>
+    <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
+</mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc312-mnc250/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc312-mnc250/mms_config.xml
new file mode 100644
index 00000000..2988e392
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc312-mnc250/mms_config.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mms_config version="1">
+    <bool name="enableGroupMms">true</bool>
+    <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
+</mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc530-mnc1/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc530-mnc1/mms_config.xml
index bad26f69..4882bbda 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc530-mnc1/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc530-mnc1/mms_config.xml
@@ -8,4 +8,5 @@
     <bool name="allowEditingSmscAddress">true</bool>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml/mms_config.xml
new file mode 100644
index 00000000..e5a9338f
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml/mms_config.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Flag indicating whether MMS should be enabled -->
+    <bool name="enabledMMS">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">307200</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">480</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">640</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">-1</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message. -->
+    <bool name="enableMultipartSMS">true</bool>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">-1</int>
+
+    <!-- Maximum length for message text. Use a value of -1
+         to indicate default value -->
+    <int name="maxMessageTextSize">-1</int>
+
+    <!-- UAProf parameter tag name -->
+    <!-- this is default to "x-wap-profile". Override if necessary. Optional -->
+    <!--
+    <string name="uaProfTagName">x-wap-profile</string>
+    -->
+
+    <!-- Reference for additional http parameters used in MMS http request.
+         Parameters are seperated by '|'. Optional.
+    -->
+    <!--
+    <string name="httpParams">
+        x-up-calling-line-id: ##LINE1##|x-carrier-magic: http://magic.google.com
+    </string>
+    -->
+
+    <!-- Suffix to the NAI header (encoded together with base64) -->
+    <!--
+    <string name="naiSuffix"></string>
+    -->
+</mms_config>
diff --git a/Patches/LineageOS-19.1/android_packages_apps_Settings/0013-Captive_Portal_Toggle.patch b/Patches/LineageOS-19.1/android_packages_apps_Settings/0013-Captive_Portal_Toggle.patch
index bc1829f3..8bcb4cfb 100644
--- a/Patches/LineageOS-19.1/android_packages_apps_Settings/0013-Captive_Portal_Toggle.patch
+++ b/Patches/LineageOS-19.1/android_packages_apps_Settings/0013-Captive_Portal_Toggle.patch
@@ -61,7 +61,7 @@ index 67c47bc7b3..58b17eeccf 100644
      <!-- Description of how many characters are used in owner info [CHAR LIMIT=40]-->
 diff --git a/src/com/android/settings/network/ConnectivityCheckPreferenceController.java b/src/com/android/settings/network/ConnectivityCheckPreferenceController.java
 new file mode 100644
-index 0000000000..ae62133141
+index 0000000000..bf16eb825a
 --- /dev/null
 +++ b/src/com/android/settings/network/ConnectivityCheckPreferenceController.java
 @@ -0,0 +1,176 @@
diff --git a/Scripts/Update_Commons.sh b/Scripts/Update_Commons.sh
index 8888288d..a502133b 100644
--- a/Scripts/Update_Commons.sh
+++ b/Scripts/Update_Commons.sh
@@ -29,3 +29,5 @@ wget "https://github.com/LineageOS/android_packages_apps_LineageParts/raw/lineag
 
 #TODO: wireless-regdb
 #https://mirrors.edge.kernel.org/pub/software/network/wireless-regdb/
+
+#TODO: MMS