vendor: update apn list

Change-Id: I7e4950df5c281239de93c042cc5fea29b50e009c
diff --git a/prebuilt/etc/apns-conf.xml b/prebuilt/etc/apns-conf.xml
index dffe23c..0404c1b 100644
--- a/prebuilt/etc/apns-conf.xml
+++ b/prebuilt/etc/apns-conf.xml
@@ -7,7 +7,7 @@
 */
 -->
 
-<apns version="8">
+<apns version="8" onlineconfig_v="10">
   <apn carrier="Cosmote Wireless Internet"
       mcc="202"
       mnc="01"
@@ -40,6 +40,14 @@
       mmsport="5080"
       type="mms"
   />
+<!-- VENDOR_EDIT start Patch#0547 [2018-5-29]-->
+  <apn carrier="Q Internet"
+      mcc="202"
+      mnc="09"
+      apn="myq"
+      type="default,supl"
+  />
+<!-- VENDOR_EDIT end Patch#0547-->
   <apn carrier="Q-Telecom MMS GPRS"
       mcc="202"
       mnc="09"
@@ -497,6 +505,23 @@
        mmsport="80"
        type="mms"
   />
+
+  <!-- VENDOR_EDIT start Patch#0560 [2018-09-26] -->
+  <apn carrier="Virgin Media Mobile Internet"
+      mcc="206"
+      mnc="01"
+      apn="goto.virginmobile.uk"
+      user="user"
+      mmsc="http://mms.virginmobile.co.uk:8002"
+      mmsproxy="193.30.166.2"
+      mmsport="8080"
+      authtype="1"
+      type="default,supl,mms"
+      mvno_match_data="28"
+      mvno_type="gid"
+  />
+  <!-- VENDOR_EDIT end Patch#0560 [2018-09-26] -->
+
   <apn carrier="Virgin mobile"
       mcc="206"
       mnc="01"
@@ -654,18 +679,22 @@
       type="mms"
       read_only="true"
   />
-  <apn carrier="Mobistar Internet"
+
+  <!-- VENDOR_EDIT start Patch#0525 [2018-05-22] -->
+  <apn carrier="Mobile Internet"
       mcc="206"
       mnc="10"
       apn="mworld.be"
-      user="mobistar"
-      password="mobistar"
-      proxy="212.65.63.143"
-      port="8080"
-      authtype="1"
-      type="default,wap"
-      read_only="true"
+      type="default,supl"
   />
+  <apn carrier="Mobile Internet (business)"
+      mcc="206"
+      mnc="10"
+      apn="Internet.be"
+      type="default,supl"
+  />
+  <!-- VENDOR_EDIT end Patch#0525 [2018-05-22] -->
+
   <apn carrier="Base"
       mcc="206"
       mnc="20"
@@ -688,6 +717,29 @@
       type="mms"
   />
 
+  <!-- VENDOR_EDIT start Patch#0509 -->
+  <apn carrier="Mobile Vikings"
+      mcc="206"
+      mnc="20"
+      apn="web.be"
+      user="web"
+      password="web"
+      authtype="1"
+      type="default,supl"
+  />
+  <apn carrier="Mobile Vikings MMS"
+      mcc="206"
+      mnc="20"
+      apn="mms.be"
+      user="mms"
+      password="mms"
+      mmsc="http://mmsc.be"
+      mmsproxy="217.72.235.1"
+      mmsport="8080"
+      type="mms"
+  />
+  <!-- VENDOR_EDIT end Patch#0509 -->
+
 <apn carrier="Orange GPRS"
   apn="orange.fr"
   mcc="208"
@@ -730,6 +782,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
+
   <apn carrier="Orange World"
       mcc="208"
       mnc="01"
@@ -739,6 +792,7 @@
       authtype="2"
       type="default,supl"
   />
+
   <apn carrier="Orange MMS"
       mcc="208"
       mnc="01"
@@ -878,6 +932,17 @@
       type="tethering"
   />
 
+<!-- VENDOR_EDIT start Patch#0522 [2018-02-21]-->
+  <apn carrier="SYMA Mobile"
+      mcc="208"
+      mnc="01"
+      apn="symamobile.com"
+      mvno_type="spn"
+      mvno_match_data="SYMA"
+      type="default"
+  />
+<!-- VENDOR_EDIT end Patch#0522-->
+
 <apn carrier="Orange GPRS ISP"
   apn="orange.fr"
   mcc="208"
@@ -1297,55 +1362,23 @@
       apn="bornsipmms"
       type="mms"
   />
-  <apn carrier="Bouygues Telecom"
+
+  <!-- VENDOR_EDIT start Patch#0535 [2018-04-14] -->
+  <!-- VENDOR_EDIT start Patch#0551-->
+  <!-- VENDOR_EDIT start Patch#0557-->
+  <apn carrier="Bouygues Internet"
       mcc="208"
       mnc="20"
       apn="mmsbouygtel.com"
       mmsc="http://mms.bouyguestelecom.fr/mms/wapenc"
-      mmsproxy="62.201.129.226"
-      mmsport="8080"
-      type="default,supl,mms"
+      type="default,mms,xcap,email"
+      protocol="IPV6"
+      authtype="1"
+      roaming_protocol="IP"
   />
-
-  <apn carrier="Bouygues Pro"
-      mcc="208"
-      mnc="20"
-      apn="a2bouygtel.com"
-      user="a2b"
-      password="access"
-      type="default,supl"
-  />
-
-  <apn carrier="Bouygues WAP"
-      mcc="208"
-      mnc="20"
-      apn="mmsbouygtel.com"
-      type="default,supl"
-  />
-
-  <apn carrier="Numericable 3G"
-      mcc="208"
-      mnc="20"
-      apn="numericable.fr"
-      type="default,supl"
-  />
-
-  <apn carrier="Simyo Web"
-      mcc="208"
-      mnc="20"
-      apn="gprs-service-fr.net"
-      proxy="195.230.105.25"
-      port="8080"
-      authtype="3"
-      type="default,supl"
-  />
-
-  <apn carrier="Prime Tel"
-      mcc="208"
-      mnc="20"
-      apn="ip.primetel"
-      type="default,supl"
-  />
+  <!-- VENDOR_EDIT end Patch#0557 -->
+  <!-- VENDOR_EDIT end Patch#0551 -->
+  <!-- VENDOR_EDIT end Patch#0535 [2018-04-14] -->
 
 <apn carrier="Bouygues pro"
   apn="a2bouygtel.com"
@@ -1480,14 +1513,8 @@
       type="dun"
   />
 
-<apn carrier="Vodafone ES-Internet"
-  apn="ac.vodafone.es"
-  mcc="214"
-  mnc="01"
-  user="vodafone"
-  password="vodafone"
-  type="default,supl"
- />
+<!-- VENDOR_EDIT start Patch#0528 -->
+<!-- VENDOR_EDIT end Patch#0528 -->
 
   <apn carrier="MMS VODAFONE"
       mcc="214"
@@ -1792,17 +1819,22 @@
       mmsport="80"
       type="mms"
   />
-  <apn carrier="TLF ES"
+  <!-- VENDOR_EDIT start Patch#0524 -->
+  <apn carrier="Movistar"
       mcc="214"
       mnc="07"
       apn="telefonica.es"
-      proxy="10.138.255.133"
-      port="8080"
       user="telefonica"
       password="telefonica"
+      proxy="10.138.255.133"
+      port="8080"
+      mmsc="http://mms.movistar.com"
+      mmsproxy="10.138.255.5"
+      mmsport="8080"
       authtype="1"
-      type="default"
+      type="default,supl,mms"
   />
+  <!-- VENDOR_EDIT end Patch#0524 -->
   <apn carrier="TLF ES"
       mcc="214"
       mnc="07"
@@ -1814,24 +1846,16 @@
       authtype="1"
       type="default"
   />
-  <apn carrier="TLF ES"
-      mcc="214"
-      mnc="07"
-      apn="telefonica.es"
-      user="telefonica"
-      password="telefonica"
-      mmsc="http://mms.movistar.com"
-      mmsproxy="10.138.255.5"
-      mmsport="8080"
-      authtype="1"
-      type="mms"
-  />
+  <!-- VENDOR_EDIT start Patch#0524 [2018-03-16] -->
   <apn carrier="Jazztel Internet"
       mcc="214"
       mnc="07"
       apn="jazzinternet"
       type="default,supl"
+      mvno_match_data="JAZZTEL"
+      mvno_type="spn"
   />
+  <!-- VENDOR_EDIT end Patch#0524 [2018-03-16] -->
   <apn carrier="Jazztel MMS"
       mcc="214"
       mnc="07"
@@ -2100,6 +2124,8 @@
       apn="wnw"
       type="default,supl"
   />
+
+  <!-- VENDOR_EDIT start Patch#0510 -->
   <apn carrier="Vodafone Internet"
       mcc="216"
       mnc="70"
@@ -2110,11 +2136,32 @@
       mcc="216"
       mnc="70"
       apn="mms.vodafone.net"
-      mmsc="http://mms.vodafone.hu/servlets/mms"
       mmsproxy="80.244.97.2"
       mmsport="8080"
+      mmsc="http://mms.vodafone.hu/servlets/mms"
       type="mms"
   />
+  <apn carrier="Vodafone Internet"
+      mcc="216"
+      mnc="70"
+      apn="internet.vodafone.net"
+      type="default,supl"
+      authtype="0"
+      mvno_match_data="21670xx2xxx"
+      mvno_type="imsi"
+  />
+  <apn carrier="Vodafone MMS"
+      mcc="216"
+      mnc="70"
+      apn="mms.vodafone.net"
+      mmsproxy="80.244.97.2"
+      mmsport="8080"
+      mmsc="http://mms.vodafone.hu/servlets/mms"
+      type="mms"
+      authtype="0"
+      mvno_match_data="21670xx2xxx"
+      mvno_type="imsi"
+  />
   <apn carrier="Vodafone Live!"
       mcc="216"
       mnc="70"
@@ -2128,20 +2175,24 @@
       mvno_match_data="21670xx2xxx"
       mvno_type="imsi"
   />
-  <apn carrier="VMAX Internet"
+  <apn carrier="Vodafone Internet VitaMAX"
       mcc="216"
-      mnc="70" 
+      mnc="70"
       apn="vitamax.internet.vodafone.net"
       type="default,supl"
+      mvno_match_data="21670xx1xxx"
+      mvno_type="imsi"
   />
   <apn carrier="Vodafone MMS"
       mcc="216"
       mnc="70"
       apn="mms.vodafone.net"
-      mmsc="http://mms.vodafone.hu/servlets/mms"
       mmsproxy="80.244.97.2"
       mmsport="8080"
+      mmsc="http://mms.vodafone.hu/servlets/mms"
       type="mms"
+      mvno_match_data="21670xx1xxx"
+      mvno_type="imsi"
   />
   <apn carrier="Vodafone Live! VitaMAX"
       mcc="216"
@@ -2156,6 +2207,7 @@
       mvno_match_data="21670xx1xxx"
       mvno_type="imsi"
   />
+  <!-- VENDOR_EDIT end Patch#0510 -->
 
   <apn carrier="HT Eronet WAP"
       mcc="218"
@@ -2524,6 +2576,7 @@
       type="mms"
   />
 
+  <!-- VENDOR_EDIT start Patch#0532 [2018-03-27] -->
   <apn carrier="TIM WAP"
       mcc="222"
       mnc="01"
@@ -2537,7 +2590,7 @@
       mcc="222"
       mnc="01"
       apn="ibox.tim.it"
-      type="default,supl,dun"
+      type="dun"
   />
   <apn carrier="TIM MMS"
       mcc="222"
@@ -2548,6 +2601,30 @@
       mmsport="80"
       type="mms"
   />
+  <!-- VENDOR_EDIT end Patch#0532 [2018-03-27] -->
+
+  <!-- VENDOR_EDIT start Patch#0561 [2018-09-19] -->
+  <apn carrier="Kenamobile web"
+      mcc="222"
+      mnc="01"
+      apn="web.kenamobile.it"
+      type="default"
+      mvno_type="spn"
+      mvno_match_data="Kena Mobile R"
+  />
+  <apn carrier="Kenamobile MMS"
+      mcc="222"
+      mnc="01"
+      apn="mms.kenamobile.it"
+      mmsc="http://mms.kenamobile.it"
+      mmsproxy="10.248.1.12"
+      mmsport="80"
+      type="mms"
+      mvno_type="spn"
+      mvno_match_data="Kena Mobile R"
+  />
+  <!-- VENDOR_EDIT end Patch#0561 [2018-09-19] -->
+
   <apn carrier="Internet"
       mcc="222"
       mnc="01"
@@ -2683,6 +2760,28 @@
                        8991870,8991871,8991872,8991873,8991874"
   />
 
+  <!-- VENDOR_EDIT start Patch#0561 [2018-09-19] -->
+  <apn carrier="Kenamobile web"
+      mcc="222"
+      mnc="07"
+      apn="web.kenamobile.it"
+      type="default"
+      mvno_type="spn"
+      mvno_match_data="Kena Mobile"
+  />
+  <apn carrier="Kenamobile MMS"
+      mcc="222"
+      mnc="07"
+      apn="mms.kenamobile.it"
+      mmsc="http://mms.kenamobile.it"
+      mmsproxy="10.248.1.12"
+      mmsport="80"
+      type="mms"
+      mvno_type="spn"
+      mvno_match_data="Kena Mobile"
+  />
+  <!-- VENDOR_EDIT end Patch#0561 [2018-09-19] -->
+
   <apn carrier="MMS Vodafone"
       mcc="222"
       mnc="10"
@@ -3087,7 +3186,14 @@
   mmsc="http://mms.iusacell3g.com/"
   type="mms"
  />
-
+<!-- VENDOR_EDIT start Patch#0521 [2018-02-18]-->
+  <apn carrier="lyca"
+      mcc="222"
+      mnc="35"
+      apn="data.lycamobile.it"
+      type="default,supl"
+  />
+<!-- VENDOR_EDIT end Patch#0521-->
   <apn carrier="WIND WEB"
       mcc="222"
       mnc="88"
@@ -3138,6 +3244,16 @@
       mmsport="8080"
       type="mms"
   />
+
+<!-- VENDOR_EDIT start Patch#0534 [2018-04-03] -->
+  <apn carrier="3 IA"
+      apn=""
+      mcc="222"
+      mnc="99"
+      type="ia"
+  />
+<!-- VENDOR_EDIT end Patch#0534 [2018-04-03] -->
+
   <apn carrier="3"
       mcc="222"
       mnc="99"
@@ -3454,7 +3570,6 @@
   <apn carrier="O2 internet"
       mcc="230"
       mnc="02"
-      authtype="1"
       apn="internet"
       type="default,supl"
   />
@@ -3922,7 +4037,8 @@
   type="mms"
  />
 
-<apn carrier="O2 Pay monthly"
+ <!-- VENDOR_EDIT start Patch#0498 [2018-03-12] -->
+ <apn carrier="O2 Pay monthly"
   apn="mobile.o2.co.uk"
   mcc="234"
   mnc="10"
@@ -3937,7 +4053,7 @@
   read_only ="true"
  />
 
-<apn carrier="O2 Pay As You Go"
+ <apn carrier="O2 Pay As You Go"
   apn="payandgo.o2.co.uk"
   mcc="234"
   mnc="10"
@@ -3956,7 +4072,7 @@
   read_only ="true"
  />
 
-<apn carrier="giffgaff"
+ <apn carrier="giffgaff"
   apn="giffgaff.com"
   mcc="234"
   mnc="10"
@@ -3965,12 +4081,12 @@
   mmsproxy=""
   mmsport=""
   mmsc="http://mmsc.mediamessaging.co.uk:8002"
-  type="default,supl,mms,hipri,dun"
+  type="default,supl,mms,hipri,dun,ia"
   mvno_type="gid"
   mvno_match_data="508"
  />
 
-<apn carrier="TESCO"
+ <apn carrier="TESCO"
   apn="prepay.tesco-mobile.com"
   mcc="234"
   mnc="10"
@@ -3985,7 +4101,7 @@
   mvno_type="gid"
   mvno_match_data="0a"
  />
-
+ <!-- VENDOR_EDIT end Patch#0498 [2018-03-12] -->
 
   <apn carrier="O2 MOBILE WEB"
       mcc="234"
@@ -4047,6 +4163,8 @@
       mmsport="8080"
       type="mms"
   />
+
+  <!-- VENDOR_EDIT start Patch#0527 [2018-08-24] -->
   <apn carrier="Vodafone UK IMS"
       mcc="234"
       mnc="15"
@@ -4054,23 +4172,12 @@
       type="ims"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
+      user_visible="false"
   />
+  <!-- VENDOR_EDIT end Patch#0527 [2018-08-24] -->
 
-  <apn carrier="Vodafone pre"
-      mcc="234"
-      mnc="15"
-      apn="pp.vodafone.co.uk"
-      user="wap"
-      password="wap"
-      proxy="212.183.137.12"
-      port="8799"
-      mmsc="http://mms.vodafone.co.uk/servlets/mms"
-      mmsproxy="212.183.137.12"
-      mmsport="8799"
-      type="default,supl,mms"
-  />
-
-  <apn carrier="Vodafone post"
+  <!-- VENDOR_EDIT start Patch#0527 [2018-11-29] -->
+  <apn carrier="Contract WAP"
       mcc="234"
       mnc="15"
       apn="wap.vodafone.co.uk"
@@ -4082,7 +4189,18 @@
       authtype="1"
       type="default,supl,mms"
   />
-
+  <apn carrier="PAY WAP"
+      mcc="234"
+      mnc="15"
+      apn="pp.vodafone.co.uk"
+      user="wap"
+      password="wap"
+      mmsc="http://mms.vodafone.co.uk/servlets/mms"
+      mmsproxy="212.183.137.12"
+      mmsport="8799"
+      type="default,supl,mms"
+  />
+  <!-- VENDOR_EDIT end Patch#0527 [2018-11-29] -->
 
   <apn carrier="ASDA WAP"
       mcc="234"
@@ -4217,7 +4335,7 @@
       mmsport="8799"
       authtype="1"
       protocol="IPV4V6"
-      roaming_protocol="IPV4"
+      roaming_protocol="IP"
       type="default,supl,mms"
       mvno_match_data="0305"
       mvno_type="gid"
@@ -4240,27 +4358,31 @@
       mvno_type="spn"
       mvno_match_data="Lycamobile"
   />
-  <apn carrier="EE IMS"
-      mcc="234"
-      mnc="30"
-      apn="ims"
-      type="ims"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-  />
+
+  <!-- VENDOR_EDIT start Patch#0526 -->
+  <!-- VENDOR_EDIT start Patch#0550 -->
+  <!-- VENDOR_EDIT start Patch#0554 -->
+  <!-- VENDOR_EDIT end Patch#0550 -->
+  <!-- VENDOR_EDIT end Patch#0526 -->
+
+  <!-- VENDOR_EDIT start Patch#0560 -->
   <apn carrier="Virgin Media Mobile Internet"
       mcc="234"
       mnc="30"
-      mvno_match_data="28"
-      mvno_type="gid"
       apn="goto.virginmobile.uk"
       user="user"
       mmsc="http://mms.virginmobile.co.uk:8002"
       mmsproxy="193.30.166.2"
       mmsport="8080"
+      authtype="1"
       type="default,supl,mms"
+      mvno_match_data="28"
+      mvno_type="gid"
   />
-  <apn carrier="Internet"
+  <!-- VENDOR_EDIT end Patch#0560 -->
+
+  <!-- VENDOR_EDIT start Patch#0550 -->
+  <apn carrier="EE Internet"
       mcc="234"
       mnc="30"
       apn="everywhere"
@@ -4268,10 +4390,12 @@
       password="secure"
       authtype="1"
       protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
+      roaming_protocol="IP"
       type="default,supl"
+      read_only ="true"
   />
-  <apn carrier="MMS"
+  
+  <apn carrier="EE MMS"
       mcc="234"
       mnc="30"
       apn="eezone"
@@ -4284,89 +4408,247 @@
       protocol="IP"
       roaming_protocol="IP"
       type="mms"
+      read_only ="true"
   />
-  <apn carrier="BT One Phone Internet"
+
+  <apn carrier="EE IMS"
       mcc="234"
       mnc="30"
-      apn="internet.btonephone.com"
-      mvno_type="gid"
-      mvno_match_data="B2"
-      type="default,supl"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      user_visible="false"
   />
-  <apn carrier="BT One Phone MMS"
+
+  <apn carrier="EE Emergency"
       mcc="234"
       mnc="30"
-      apn="mms.btonephone.com"
-      mmsc="http://MMSC/"
-      mmsproxy="proxy.btonephone.com"
-      mmsport="8080"
-      mvno_type="gid"
-      mvno_match_data="B2"
-      type="mms"
-  />
-  <apn carrier="BT Internet"
-      mcc="234"
-      mnc="30"
-      apn="btmobile.bt.com"
-      user="bt"
-      password="bt"
+      apn="SOS"
       authtype="1"
+      type="emergency"
+      protocol="IPV6"
+      user_visible="false"
+  />
+
+  <apn carrier="EE Internet"
+      mcc="234"
+      mnc="30"
+      apn="everywhere"
+      user="eesecure"
+      password="secure"
+      authtype="1"
+      protocol="IPV4V6"
+      roaming_protocol="IP"
+      type="default,supl"
+      read_only ="true"
+      mvno_type="gid"
+      mvno_match_data="EE"
+  />
+  
+  <apn carrier="EE MMS"
+      mcc="234"
+      mnc="30"
+      apn="eezone"
+      user="eesecure"
+      password="secure"
+      mmsc="http://mms/"
+      mmsproxy="149.254.201.135"
+      mmsport="8080"
+      authtype="1"
+      protocol="IP"
+      roaming_protocol="IP"
+      type="mms"
+      read_only ="true"
+      mvno_type="gid"
+      mvno_match_data="EE"
+  />
+
+  <apn carrier="EE IMS"
+      mcc="234"
+      mnc="30"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      user_visible="false"
+      mvno_type="gid"
+      mvno_match_data="EE"
+  />
+
+  <apn carrier="EE Emergency"
+      mcc="234"
+      mnc="30"
+      apn="SOS"
+      authtype="1"
+      type="emergency"
+      protocol="IPV6"
+      user_visible="false"
+      mvno_type="gid"
+      mvno_match_data="EE"
+  />
+  <!-- VENDOR_EDIT end Patch#0550 -->
+<apn carrier="BT Internet"
+      mcc="234"
+      mnc="30"
+      apn="everywhere"
+      user="eesecure"
+      password="secure"
+      authtype="1"
+      protocol="IPV4V6"
+      roaming_protocol="IP"
+      type="default,supl"
+      read_only ="true"
       mvno_type="gid"
       mvno_match_data="B3"
-      type="default,supl"
   />
+  
   <apn carrier="BT MMS"
       mcc="234"
       mnc="30"
-      apn="mms.bt.com"
-      user="bt"
-      password="bt"
-      authtype="1"
-      mmsc="http://MMS/"
+      apn="eezone"
+      user="eesecure"
+      password="secure"
+      mmsc="http://mms/"
       mmsproxy="149.254.201.135"
       mmsport="8080"
+      authtype="1"
+      protocol="IP"
+      roaming_protocol="IP"
+      type="mms"
+      read_only ="true"
       mvno_type="gid"
       mvno_match_data="B3"
-      type="mms"
   />
+
+  <apn carrier="BT IMS"
+      mcc="234"
+      mnc="30"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      user_visible="false"
+      mvno_type="gid"
+      mvno_match_data="B3"
+  />
+
+  <apn carrier="BT Emergency"
+      mcc="234"
+      mnc="30"
+      apn="SOS"
+      authtype="1"
+      type="emergency"
+      protocol="IPV6"
+      user_visible="false"
+      mvno_type="gid"
+      mvno_match_data="B3"
+  />
+
   <apn carrier="BT Internet"
       mcc="234"
       mnc="30"
-      apn="btmobile.bt.com"
-      user="bt"
-      password="bt"
+      apn="everywhere"
+      user="eesecure"
+      password="secure"
       authtype="1"
+      protocol="IPV4V6"
+      roaming_protocol="IP"
+      type="default,supl"
+      read_only ="true"
       mvno_type="gid"
       mvno_match_data="C3"
-      type="default,supl"
   />
+  
   <apn carrier="BT MMS"
       mcc="234"
       mnc="30"
-      apn="mms.bt.com"
-      user="bt"
-      password="bt"
-      authtype="1"
-      mmsc="http://MMS/"
+      apn="eezone"
+      user="eesecure"
+      password="secure"
+      mmsc="http://mms/"
       mmsproxy="149.254.201.135"
       mmsport="8080"
+      authtype="1"
+      protocol="IP"
+      roaming_protocol="IP"
+      type="mms"
+      read_only ="true"
       mvno_type="gid"
       mvno_match_data="C3"
-      type="mms"
   />
 
-<apn carrier="T-Mobile UK"
-  apn="general.t-mobile.uk"
-  mcc="234"
-  mnc="30"
-  user="t-mobile"
-  password="tm"
-  mmsproxy="149.254.201.135"
-  mmsport="8080"
-  mmsc="http://mmsc.t-mobile.co.uk:8002"
-  type="default,supl,mms"
- />
+  <apn carrier="BT IMS"
+      mcc="234"
+      mnc="30"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      user_visible="false"
+      mvno_type="gid"
+      mvno_match_data="C3"
+  />
 
+  <apn carrier="BT Emergency"
+      mcc="234"
+      mnc="30"
+      apn="SOS"
+      authtype="1"
+      type="emergency"
+      protocol="IPV6"
+      user_visible="false"
+      mvno_type="gid"
+      mvno_match_data="C3"
+  />
+  <apn carrier="EE Internet"
+      mcc="234"
+      mnc="33"
+      apn="everywhere"
+      user="eesecure"
+      password="secure"
+      authtype="1"
+      protocol="IPV4V6"
+      roaming_protocol="IP"
+      type="default,supl"
+      read_only ="true"
+  />
+  
+  <apn carrier="EE MMS"
+      mcc="234"
+      mnc="33"
+      apn="eezone"
+      user="eesecure"
+      password="secure"
+      mmsc="http://mms/"
+      mmsproxy="149.254.201.135"
+      mmsport="8080"
+      authtype="1"
+      protocol="IP"
+      roaming_protocol="IP"
+      type="mms"
+      read_only ="true"
+  />
+
+  <apn carrier="EE IMS"
+      mcc="234"
+      mnc="33"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      user_visible="false"
+  />
+
+  <apn carrier="EE Emergency"
+      mcc="234"
+      mnc="33"
+      apn="SOS"
+      authtype="1"
+      type="emergency"
+      protocol="IPV6"
+      user_visible="false"
+  />
+  <!-- VENDOR_EDIT end Patch#0554 -->
+<!-- VENDOR_EDIT start Patch#0555 -->
+<!-- VENDOR_EDIT end Patch#0555 -->
+ 
+ <!-- VENDOR_EDIT start Patch#0550 -->
   <apn carrier="EE IMS"
       mcc="234"
       mnc="31"
@@ -4374,7 +4656,9 @@
       type="ims"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
+      user_visible="false"
   />
+  <!-- VENDOR_EDIT end Patch#0550 -->
 
   <apn carrier="T-Mobile Internet"
       mcc="234"
@@ -4397,26 +4681,7 @@
   type="default,supl,mms"
  />
 
-<apn carrier="Virgin UK"
-  apn="goto.virginmobile.uk"
-  mcc="234"
-  mnc="31"
-  user="user"
-  type="default,supl"
- />
-
-<apn carrier="Virgin UK MMS"
-  apn="goto.virginmobile.uk"
-  mcc="234"
-  mnc="31"
-  user=""
-  password=""
-  mmsproxy="193.30.166.2"
-  mmsport="8080"
-  mmsc="http://mms.virginmobile.co.uk:8002"
-  type="default,supl,mms"
- />
-
+  <!-- VENDOR_EDIT start Patch#0550 -->
   <apn carrier="EE Internet"
       mcc="234"
       mnc="31"
@@ -4424,9 +4689,11 @@
       user="eesecure"
       password="secure"
       authtype="1"
+      protocol="IPV4V6"
       type="default,supl"
+      read_only ="true"
   />
-
+  
   <apn carrier="EE MMS"
       mcc="234"
       mnc="31"
@@ -4438,7 +4705,10 @@
       mmsport="8080"
       authtype="1"
       type="mms"
+      read_only ="true"
   />
+  <!-- VENDOR_EDIT end Patch#0550 -->
+  
   <apn carrier="T-Mobile Picture Message"
       mcc="234"
       mnc="31"
@@ -4451,6 +4721,7 @@
       type="mms"
   />
 
+  <!-- VENDOR_EDIT start Patch#0550 -->
   <apn carrier="EE IMS"
       mcc="234"
       mnc="32"
@@ -4458,6 +4729,7 @@
       type="ims"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
+      user_visible="false"
   />
 
 <apn carrier="EE Internet"
@@ -4466,30 +4738,14 @@
   mnc="32"
   user="eesecure"
   password="secure"
+  protocol="IPV4V6"
   type="default,supl,dun"
   authtype="1"
+  read_only ="true"
  />
-
-<apn carrier="Virgin UK"
-  apn="goto.virginmobile.uk"
-  mcc="234"
-  mnc="32"
-  user="user"
-  type="default,supl"
- />
-
-<apn carrier="Virgin UK MMS"
-  apn="goto.virginmobile.uk"
-  mcc="234"
-  mnc="32"
-  user=""
-  password=""
-  mmsproxy="193.30.166.2"
-  mmsport="8080"
-  mmsc="http://mms.virginmobile.co.uk:8002"
-  type="default,supl,mms"
- />
-
+<!-- VENDOR_EDIT end Patch#0550 -->
+ 
+<!-- VENDOR_EDIT start Patch#0550 -->
 <apn carrier="EE MMS"
   apn="eezone"
   mcc="234"
@@ -4501,7 +4757,9 @@
   mmsc="http://mms/"
   type="mms"
   authtype="1"
+  read_only ="true"
  />
+ <!-- VENDOR_EDIT end Patch#0550 -->
 
   <apn carrier="T-Mobile Internet"
       mcc="234"
@@ -4523,40 +4781,14 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="EE IMS"
-      mcc="234"
-      mnc="33"
-      apn="ims"
-      type="ims"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-  />
+  <!-- VENDOR_EDIT start Patch#0526 -->
+  <!-- VENDOR_EDIT start Patch#0550 -->
 
-  <apn carrier="EE Internet"
-      mcc="234"
-      mnc="33"
-      apn="everywhere"
-      user="eesecure"
-      password="secure"
-      authtype="1"
-      protocol="IP"
-      roaming_protocol="IP"
-      type="default,supl,dun"
-  />
-  <apn carrier="EE MMS"
-      mcc="234"
-      mnc="33"
-      apn="eezone"
-      user="eesecure"
-      password="secure"
-      mmsc="http://mms/"
-      mmsproxy="149.254.201.135"
-      mmsport="8080"
-      authtype="1"
-      type="mms"
-      protocol="IP"
-      roaming_protocol="IP"
-  />
+  <!-- VENDOR_EDIT start Patch#0554 -->
+  <!-- VENDOR_EDIT end Patch#0526 -->
+  <!-- VENDOR_EDIT end Patch#0554 -->
+  <!-- VENDOR_EDIT end Patch#0550 -->
+  
   <apn carrier="Internet"
       mcc="234"
       mnc="33"
@@ -4566,13 +4798,7 @@
       mvno_type="spn"
       mvno_match_data="LIFE"
   />
-  <apn carrier="Orange Internet"
-      mcc="234"
-      mnc="33"
-      apn="orangeinternet"
-      authtype="2"
-      type="default"
-  />
+
   <apn carrier="MMS"
       mcc="234"
       mnc="33"
@@ -4588,24 +4814,21 @@
       mvno_match_data="LIFE"
   />
 
-<apn carrier="Orange Internet"
-  apn="orangeinternet"
-  mcc="234"
-  mnc="33"
-  type="default"
-  authtype="2"
- />
-
-  <apn carrier="Orange MMS"
+  <!-- VENDOR_EDIT start Patch#0560 -->
+  <apn carrier="Virgin Media Mobile Internet"
       mcc="234"
       mnc="33"
-      apn="orangemms"
-      mmsc="http://mms.orange.co.uk/"
-      mmsproxy="192.168.224.10"
+      apn="goto.virginmobile.uk"
+      user="user"
+      mmsc="http://mms.virginmobile.co.uk:8002"
+      mmsproxy="193.30.166.2"
       mmsport="8080"
-      authtype="2"
-      type="mms"
+      authtype="1"
+      type="default,supl,mms"
+      mvno_match_data="28"
+      mvno_type="gid"
   />
+  <!-- VENDOR_EDIT end Patch#0560 -->
 
   <apn carrier="EE IMS"
       mcc="234"
@@ -4652,6 +4875,21 @@
       authtype="1"
       type="mms"
   />
+
+  <!-- VENDOR_EDIT start Patch#0560 -->
+  <apn carrier="Virgin Media Mobile Internet"
+      mcc="234"
+      mnc="38"
+      apn="goto.virginmobile.uk"
+      user="user"
+      mmsc="http://mms.virginmobile.co.uk:8002"
+      mmsproxy="193.30.166.2"
+      mmsport="8080"
+      authtype="1"
+      type="default,supl,mms"
+  />
+  <!-- VENDOR_EDIT end Patch#0560 -->
+
   <apn carrier="Jersey Telecom"
       mcc="234"
       mnc="50"
@@ -4966,6 +5204,8 @@
       type="mms"
       authtype="1"
   />
+
+  <!-- VENDOR_EDIT start Patch#0553 [2018-08-06] -->
   <apn carrier="3"
       mcc="238"
       mnc="06"
@@ -4977,16 +5217,15 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-
-   <apn carrier="IMS"
+  <apn carrier="IMS"
       mcc="238"
       mnc="06"
       apn="ims"
       type="ims"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
+      user_visible="false"
   />
-
   <apn carrier="H3G DK MMS"
       mcc="238"
       mnc="06"
@@ -4998,58 +5237,183 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
+  <!-- VENDOR_EDIT end Patch#0553 [2018-08-06] -->
 
-<apn carrier="Lycamobile DK"
-  apn="data.lycamobile.dk"
-  mcc="238"
-  mnc="12"
-  user="lmdk"
-  password="plus"
-  type="default,supl"
- />
-
-  <apn carrier="Telia SurfPort"
+  <apn carrier="Lycamobile DK"
+      apn="data.lycamobile.dk"
       mcc="238"
-      mnc="20"
-      apn="www.internet.mtelia.dk"
+      mnc="12"
+      user="lmdk"
+      password="plus"
       type="default,supl"
-      mvno_type="imsi"
-      mvno_match_data="2382010x"
   />
-  <apn carrier="Telia SurfPort"
+
+  <!-- VENDOR_EDIT start Patch#0563 [2018-10-05] -->
+  <apn carrier="Telia DK"
       mcc="238"
       mnc="20"
-      mvno_type="imsi"
-      mvno_match_data="2382030x"
       apn="www.internet.mtelia.dk"
+      protocol="IPV4V6"
       type="default,supl"
+      mvno_type="spn"
+      mvno_match_data="TELIA DK"
   />
   <apn carrier="Telia MMS"
       mcc="238"
       mnc="20"
       apn="www.mms.mtelia.dk"
+      protocol="IPV4V6"
       mmsc="http://mms.telia.dk"
       mmsproxy="193.209.134.131"
       mmsport="8080"
       type="mms"
-      mvno_type="imsi"
-      mvno_match_data="2382010x"
+      mvno_type="spn"
+      mvno_match_data="TELIA DK"
   />
-  <apn carrier="Telia MMS"
+  <apn carrier="Telia IMS"
       mcc="238"
       mnc="20"
-      mvno_type="imsi"
-      mvno_match_data="2382030x"
-      apn="www.mms.mtelia.dk"
+      apn="ims"
+      protocol="IPV4V6"
+      type="ims"
+      mvno_type="spn"
+      mvno_match_data="TELIA DK"
+  />
+  <apn carrier="Telia XCAP"
+      mcc="238"
+      mnc="20"
+      apn="hos"
+      protocol="IPV4V6"
+      type="xcap"
+      mvno_type="spn"
+      mvno_match_data="TELIA DK"
+  />
+
+  <apn carrier="Internet"
+      mcc="238"
+      mnc="20"
+      apn="websp"
+      protocol="IPV4V6"
+      type="default,supl"
+      mvno_type="spn"
+      mvno_match_data="Telavox"
+  />
+  <apn carrier="MMS"
+      mcc="238"
+      mnc="20"
+      apn="mmssp"
+      protocol="IPV4V6"
       mmsc="http://mms.telia.dk"
       mmsproxy="193.209.134.131"
       mmsport="8080"
       type="mms"
+      mvno_type="spn"
+      mvno_match_data="Telavox"
   />
+  <apn carrier="IMS"
+      mcc="238"
+      mnc="20"
+      apn="ims"
+      protocol="IPV4V6"
+      type="ims"
+      mvno_type="spn"
+      mvno_match_data="Telavox"
+  />
+  <apn carrier="XCAP"
+      mcc="238"
+      mnc="20"
+      apn="hos"
+      protocol="IPV4V6"
+      type="xcap"
+      mvno_type="spn"
+      mvno_match_data="Telavox"
+  />
+
+  <apn carrier="Internet"
+      mcc="238"
+      mnc="20"
+      apn="websp"
+      protocol="IPV4V6"
+      type="default,supl"
+      mvno_type="spn"
+      mvno_match_data="Ditmobilselskab"
+  />
+  <apn carrier="MMS"
+      mcc="238"
+      mnc="20"
+      apn="mmssp"
+      protocol="IPV4V6"
+      mmsc="http://mms.telia.dk"
+      mmsproxy="193.209.134.131"
+      mmsport="8080"
+      type="mms"
+      mvno_type="spn"
+      mvno_match_data="Ditmobilselskab"
+  />
+  <apn carrier="IMS"
+      mcc="238"
+      mnc="20"
+      apn="ims"
+      protocol="IPV4V6"
+      type="ims"
+      mvno_type="spn"
+      mvno_match_data="Ditmobilselskab"
+  />
+  <apn carrier="XCAP"
+      mcc="238"
+      mnc="20"
+      apn="hos"
+      protocol="IPV4V6"
+      type="xcap"
+      mvno_type="spn"
+      mvno_match_data="Ditmobilselskab"
+  />
+
+  <apn carrier="Mit Tele"
+      mcc="238"
+      mnc="20"
+      apn="websp"
+      protocol="IPV4V6"
+      type="default,supl"
+      mvno_type="spn"
+      mvno_match_data="Mit Tele"
+  />
+  <apn carrier="Mit Tele"
+      mcc="238"
+      mnc="20"
+      apn="mmssp"
+      protocol="IPV4V6"
+      mmsc="http://mms.telia.dk"
+      mmsproxy="193.209.134.131"
+      mmsport="8080"
+      type="mms"
+      mvno_type="spn"
+      mvno_match_data="Mit Tele"
+  />
+  <apn carrier="Mit Tele IMS"
+      mcc="238"
+      mnc="20"
+      apn="ims"
+      protocol="IPV4V6"
+      type="ims"
+      mvno_type="spn"
+      mvno_match_data="Mit Tele"
+  />
+  <apn carrier="Mit Tele XCAP"
+      mcc="238"
+      mnc="20"
+      apn="hos"
+      protocol="IPV4V6"
+      type="xcap"
+      mvno_type="spn"
+      mvno_match_data="Mit Tele"
+  />
+
   <apn carrier="Call me Internet"
       mcc="238"
       mnc="20"
       apn="websp"
+      protocol="IPV4V6"
       type="default,supl"
       mvno_type="spn"
       mvno_match_data="Call me"
@@ -5058,33 +5422,34 @@
       mcc="238"
       mnc="20"
       apn="mmssp"
+      protocol="IPV4V6"
+      mmsc="http://mms.telia.dk"
       mmsproxy="193.209.134.131"
       mmsport="8080"
-      mmsc="http://mms.telia.dk"
       type="mms"
-      authtype="2"
       mvno_type="spn"
       mvno_match_data="Call me"
   />
-  <apn carrier="DLG Tele GPRS"
+  <apn carrier="Call me IMS"
       mcc="238"
       mnc="20"
-      apn="websp"
-      type="default,supl"
+      apn="ims"
+      protocol="IPV4V6"
+      type="ims"
       mvno_type="spn"
-      mvno_match_data="DLG Tele"
+      mvno_match_data="Call me"
   />
-  <apn carrier="DLG Tele MMS"
+  <apn carrier="Call me XCAP"
       mcc="238"
       mnc="20"
-      apn="mmssp"
-      mmsproxy="193.209.134.131"
-      mmsport="8080"
-      mmsc="http://mms.telia.dk"
-      type="mms"
+      apn="hos"
+      protocol="IPV4V6"
+      type="xcap"
       mvno_type="spn"
-      mvno_match_data="DLG Tele"
+      mvno_match_data="Call me"
   />
+  <!-- VENDOR_EDIT end Patch#0563 [2018-10-05] -->
+
   <apn carrier="Orange DE"
       mcc="238"
       mnc="30"
@@ -5092,6 +5457,49 @@
       user=""
       password=""
   />
+
+  <!-- VENDOR_EDIT start Patch#0563 [2018-10-05] -->
+  <apn carrier="Telia DK"
+      mcc="238"
+      mnc="30"
+      apn="www.internet.mtelia.dk"
+      protocol="IPV4V6"
+      type="default,supl"
+      mvno_type="spn"
+      mvno_match_data="TELIA DK"
+  />
+  <apn carrier="Telia MMS"
+      mcc="238"
+      mnc="30"
+      apn="www.mms.mtelia.dk"
+      protocol="IPV4V6"
+      mmsc="http://mms.telia.dk"
+      mmsproxy="193.209.134.131"
+      mmsport="8080"
+      type="mms"
+      mvno_type="spn"
+      mvno_match_data="TELIA DK"
+  />
+  <apn carrier="Telia IMS"
+      mcc="238"
+      mnc="30"
+      apn="ims"
+      protocol="IPV4V6"
+      type="ims"
+      mvno_type="spn"
+      mvno_match_data="TELIA DK"
+  />
+  <apn carrier="Telia XCAP"
+      mcc="238"
+      mnc="30"
+      apn="hos"
+      protocol="IPV4V6"
+      type="xcap"
+      mvno_type="spn"
+      mvno_match_data="TELIA DK"
+  />
+  <!-- VENDOR_EDIT end Patch#0563 [2018-10-05] -->
+
   <apn carrier="Telenor Internet"
       mcc="238"
       mnc="77"
@@ -5108,6 +5516,7 @@
       type="mms"
   />
 
+  <!-- VENDOR_EDIT start Patch#0541 [2018-10-17] -->
   <apn carrier="Telia SE MMS"
       mcc="240"
       mnc="01"
@@ -5117,19 +5526,28 @@
       mmsport="80"
       type="mms"
   />
-  <apn carrier="Telia"
+  <apn carrier="Telia SE Internet"
       mcc="240"
       mnc="01"
       apn="online.telia.se"
       type="default,supl"
   />
+  <apn carrier="Telia SE IMS"
+      mcc="240"
+      mnc="01"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV6"
+      user_visible="false"
+  />
   <apn carrier="Halebop Internet"
       mcc="240"
       mnc="01"
       apn="halebop.telia.se"
       type="default,supl"
-      mvno_match_data="240017xxxxxxxxx"
-      mvno_type="imsi"
+      mvno_match_data="Halebop"
+      mvno_type="spn"
   />
   <apn carrier="Halebop MMS"
       mcc="240"
@@ -5141,9 +5559,11 @@
       mmsproxy="193.209.134.132"
       mmsport="80"
       type="mms"
-      mvno_match_data="240017xxxxxxxxx"
-      mvno_type="imsi"
+      mvno_match_data="Halebop"
+      mvno_type="spn"
   />
+  <!-- VENDOR_EDIT end Patch#0541 [2018-10-17] -->
+
   <apn carrier="3"
       mcc="240"
       mnc="02"
@@ -5163,19 +5583,9 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="Telenor SE"
-      mcc="240"
-      mnc="04"
-      apn="services.telenor.se"
-      mvno_match_data="Telenor SE"
-      mvno_type="spn"
-      proxy="172.30.253.241"
-      port="8799"
-      mmsc="http://mms"
-      mmsproxy="172.30.253.241"
-      mmsport="8799"
-      type="default,supl,mms"
-  />
+  <!-- VENDOR_EDIT start Patch#0562 [2018-10-02] -->
+  <!-- Review Telenor Sweden APN settings as carrier requirement (remove 24004/24009/24024) -->
+  <!-- VENDOR_EDIT end Patch#0562 [2018-10-02] -->
 
   <apn carrier="Tele2 4G"
       mcc="240"
@@ -5241,62 +5651,66 @@
       mvno_type="spn"
   />
 
-  <apn carrier="Telenor"
+  <!-- VENDOR_EDIT start Patch#0562 [2018-10-02] -->
+  <apn carrier="Internet"
       mcc="240"
       mnc="06"
-      apn="services.telenor.se"
-      proxy="172.30.253.241"
-      port="8799"
-      mmsc="http://mms"
-      mmsproxy="172.30.253.241"
-      mmsport="8799"
-      type="default,supl,mms"
+      apn="internet"
+      type="default,supl"
+      mvno_match_data="24006"
+      mvno_type="imsi"
   />
+  <apn carrier="MMS"
+      mcc="240"
+      mnc="06"
+      apn="mms"
+      mmsc="http://mms.media"
+      type="mms"
+      mvno_match_data="24006"
+      mvno_type="imsi"
+  />
+  <!-- VENDOR_EDIT end Patch#0562 [2018-10-02] -->
 
-
+  <!-- VENDOR_EDIT start Patch#0533 [2018-04-02] -->
   <apn carrier="Tele2 4G"
       mcc="240"
       mnc="07"
       apn="4g.tele2.se"
       mmsc="http://mmsc.tele2.se"
-      mmsproxy="130.244.202.30"
+      mmsproxy="mmsproxy.tele2.se"
       mmsport="8080"
       type="default,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IP"
   />
+  <!-- VENDOR_EDIT end Patch#0533 [2018-04-02] -->
 
-  <apn carrier="Tele2 3G"
-      mcc="240"
-      mnc="07"
-      apn="internet.tele2.se"
-      mmsc="http://mmsc.tele2.se"
-      mmsproxy="130.244.202.30"
-      mmsport="8080"
-      type="default,supl,mms"
-  />
-
-  <apn carrier="Telenor"
+  <!-- VENDOR_EDIT start Patch#0562 [2018-10-02] -->
+  <apn carrier="Telenor Mobilsurf"
       mcc="240"
       mnc="08"
       apn="services.telenor.se"
-      proxy="172.30.253.241"
-      port="8799"
-      mmsc="http://mms"
-      mmsproxy="172.30.253.241"
-      mmsport="8799"
-      type="default,supl,mms"
+      type="default,supl"
+      mvno_match_data="24008"
+      mvno_type="imsi"
   />
-
-  <apn carrier="Telenor"
+  <apn carrier="Telenor MMS"
       mcc="240"
-      mnc="09"
-      apn="services.telenor.se"
-      proxy="172.30.253.241"
-      port="8799"
+      mnc="08"
+      apn="mms"
       mmsc="http://mms"
       mmsproxy="172.30.253.241"
       mmsport="8799"
-      type="default,supl,mms"
+      type="mms"
+      mvno_match_data="24008"
+      mvno_type="imsi"
   />
+  <!-- VENDOR_EDIT end Patch#0562 [2018-10-02] -->
+
+  <!-- VENDOR_EDIT start Patch#0562 [2018-10-02] -->
+  <!-- Review Telenor Sweden APN settings as carrier requirement (remove 24004/24009/24024) -->
+  <!-- VENDOR_EDIT end Patch#0562 [2018-10-02] -->
+
   <apn carrier="Spring data"
       mcc="240"
       mnc="10"
@@ -5364,26 +5778,12 @@
       mvno_type="spn"
   />
 
-  <apn carrier="Telenor SE"
-      mcc="240"
-      mnc="24"
-      apn="services.telenor.se"
-      mmsc="http://mms"
-      mmsproxy="172.30.253.241"
-      mmsport="8799"
-      type="default,supl,mms"
-      mvno_match_data="Telenor SE"
-      mvno_type="spn"
-  />
+  <!-- VENDOR_EDIT start Patch#0562 [2018-10-02] -->
+  <!-- Review Telenor Sweden APN settings as carrier requirement (remove 24004/24009/24024) -->
+  <!-- VENDOR_EDIT end Patch#0562 [2018-10-02] -->
 
-<apn carrier="Talkmore"
-  apn="telenor"
-  mcc="242"
-  mnc="01"
-  type="default,supl,mms"
- />
-
-  <apn carrier="Ventelo Internett"
+  <!-- VENDOR_EDIT start Patch#0542 [2018-04-30] -->
+  <apn carrier="Ventelo Internet"
       mcc="242"
       mnc="01"
       mvno_match_data="24201700xxxxxxx"
@@ -5404,72 +5804,93 @@
       mmsport="8080"
       type="mms"
   />
-
-<apn carrier="Telenor"
-  apn="telenor.smart"
-  mcc="242"
-  mnc="01"
-  mmsproxy="mms-proxy.telenor.no"
-  mmsport="8080"
-  mmsc="http://mmsc/"
-  type="default,supl,mms"
-  protocol="IPV4V6"
-  roaming_protocol="IPV4"
- />
-
-  <apn carrier="Mobitalk"
+  <apn carrier="Telenor Internet"
+      apn="telenor.smart"
       mcc="242"
       mnc="01"
-      apn="telenor"
-      user="dj"
-      password="dj"
-      proxy="10.10.10.10"
-      port="8080"
-      mmsc="http://mmsc"
+      mmsproxy="mms-proxy.telenor.no"
+      mmsport="8080"
+      mmsc="http://mmsc/"
+      type="default,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="Telenor IMS"
+      mcc="242"
+      mnc="01"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV6"
+  />
+  <apn carrier="Telenor XCAP"
+      mcc="242"
+      mnc="01"
+      apn="hos"
+      type="xcap"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+  />
+  <apn carrier="Phonero MMS"
+      mcc="242"
+      mnc="01"
+      apn="mms.phonero.no"
+      user="Phonero"
+      password="1111"
+      mmsc="http://mmsc/"
       mmsproxy="10.10.10.11"
       mmsport="8080"
-      type="default,supl,mms"
+      mvno_match_data="24201700"
+      mvno_type="imsi"
+      type="mms"
   />
- <apn carrier="NetCom"
+  <apn carrier="Phonero Internet"
+      mcc="242"
+      mnc="01"
+      apn="internet.phonero.no"
+      mvno_match_data="24201700"
+      mvno_type="imsi"
+      type="default,supl"
+  />
+  <!-- VENDOR_EDIT end Patch#0542 [2018-04-30] -->
+
+  <!-- VENDOR_EDIT start Patch#0543 [2018-05-30] -->
+  <apn carrier="Telia Internet"
       mcc="242"
       mnc="02"
-      apn="netcom"
-      mmsc="http://mm/"
+      apn="telia"
+      type="default,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="Telia MMS"
+      mcc="242"
+      mnc="02"
+      apn="mms"
+      mmsc="http://mm"
       mmsproxy="212.169.66.4"
       mmsport="8080"
-      type="default,supl,mms"
+      type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IP"
   />
-
-<apn carrier="NetCom Internet"
-  apn="wap"
-  mcc="242"
-  mnc="02"
-  type="default,supl"
- />
-
-<apn carrier="NetCom MMS"
-  apn="mms.netcom.no"
-  mcc="242"
-  mnc="02"
-  mmsproxy="212.169.66.4"
-  mmsport="8080"
-  mmsc="http://mm/"
-  type="mms"
- />
-
-
-<apn carrier="Chess MMS"
-  apn="mms.netcom.no"
-  mcc="242"
-  mnc="02"
-  user="chess"
-  password="chess"
-  mmsproxy="193.209.134.133"
-  mmsport="8080"
-  mmsc="http://mms/"
-  type="mms"
- />
-
+  <apn carrier="Telia IMS"
+      mcc="242"
+      mnc="02"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV6"
+      user_visible="false"
+  />
+  <apn carrier="Telia XCAP"
+      mcc="242"
+      mnc="02"
+      apn="hos"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
   <apn carrier="Chess MMS"
       mcc="242"
       mnc="02"
@@ -5488,14 +5909,11 @@
       mcc="242"
       mnc="02"
       apn="netcom"
-      user="chess"
-      password="chess"
-      proxy="10.254.254.10"
-      port="8080"
       type="default,supl"
       mvno_match_data="2420256xxxxxxxx"
       mvno_type="imsi"
   />
+  <!-- VENDOR_EDIT end Patch#0543 [2018-05-30] -->
 
 <apn carrier="Tele2 NO Internet"
   apn="internet.tele2.no"
@@ -5603,6 +6021,8 @@
       mmsport="8080"
       type="mms"
   />
+
+  <!-- VENDOR_EDIT start Patch#0552 [2018-08-06] -->
   <apn carrier="Elisa Internet"
       mcc="244"
       mnc="05"
@@ -5622,15 +6042,16 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-
-   <apn carrier="IMS"
+  <apn carrier="IMS"
       mcc="244"
       mnc="05"
       apn="ims"
       type="ims"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
+      user_visible="false"
   />
+  <!-- VENDOR_EDIT end Patch#0552 [2018-08-06] -->
 
   <apn carrier="TDC Internet"
       mcc="244"
@@ -5717,20 +6138,20 @@
       mmsport="8080"
       type="mms"
   />
+
+  <!-- VENDOR_EDIT start Patch#0552 [2018-08-06] -->
   <apn carrier="Saunalahti Internet"
       mcc="244"
       mnc="21"
       apn="internet.saunalahti"
       type="default,supl"
   />
-
-<apn carrier="Saunalahti Wap"
-  apn="wap.saunalahti.fi"
-  mcc="244"
-  mnc="21"
-  type="default,supl"
- />
-
+  <apn carrier="Saunalahti Wap"
+      apn="wap.saunalahti.fi"
+      mcc="244"
+      mnc="21"
+      type="default,supl"
+  />
   <apn carrier="Saunalahti MMS"
       mcc="244"
       mnc="21"
@@ -5740,31 +6161,77 @@
       mmsport="8080"
       type="mms"
   />
-
-   <apn carrier="IMS"
+  <apn carrier="IMS"
       mcc="244"
       mnc="21"
       apn="ims"
       type="ims"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
+      user_visible="false"
   />
+  <!-- VENDOR_EDIT end Patch#0552 [2018-08-06] -->
 
-  <apn carrier="SONERA Internet"
+  <!-- VENDOR_EDIT start Patch#0545 [2018-05-30] -->
+  <apn carrier="Telia Internet"
       mcc="244"
       mnc="91"
       apn="internet"
-      type="default,supl"
+      type="default,ia"
+      protocol="IP"
+      roaming_protocol="IP"
   />
-  <apn carrier="SONERA MMS"
+  <apn carrier="Telia MMS"
       mcc="244"
       mnc="91"
-      apn="wap.sonera.net"
-      mmsc="http://mms.sonera.fi:8002"
+      apn="mms"
+      type="mms"
+      mmsc="http://mms/"
+      mmsproxy="195.156.25.33"
+      mmsport="8080"
+      protocol="IP"
+      roaming_protocol="IP"
+  />
+  <apn carrier="Telia IMS"
+      mcc="244"
+      mnc="91"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+  <apn carrier="Telia XCAP"
+      mcc="244"
+      mnc="91"
+      apn="hos"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV6"
+      user_visible="false"
+  />
+  <apn carrier="Aina Internet (S)"
+      mcc="244"
+      mnc="91"
+      apn="internet.aina.fi"
+      authtype="1"
+      type="default,supl"
+      mvno_match_data="2449192"
+      mvno_type="imsi"
+  />
+  <apn carrier="Aina MMS (S)"
+      mcc="244"
+      mnc="91"
+      apn="mediapiste"
+      mmsc="http://mms.sonera.fi:8002/"
       mmsproxy="195.156.25.33"
       mmsport="80"
+      authtype="1"
       type="mms"
+      mvno_match_data="2449192"
+      mvno_type="imsi"
   />
+  <!-- VENDOR_EDIT end Patch#0545 [2018-05-30] -->
 
   <apn carrier="Omnitel MMS"
       mcc="246"
@@ -5878,7 +6345,7 @@
  />
 
 <apn carrier="VZW Test IMS"
-  apn="VZWIMS"
+  apn="IMS"
   mcc="246"
   mnc="81"
   type="ims"
@@ -5915,7 +6382,7 @@
  />
 
 <apn carrier="VZW Test IMS"
-  apn="VZWIMS"
+  apn="IMS"
   mcc="246"
   mnc="081"
   type="ims"
@@ -6008,14 +6475,8 @@
       mmsport="8080"
       type="mms"
   />
-  <apn carrier="EMT WAP"
-      mcc="248"
-      mnc="01"
-      apn="wap.emt.ee"
-      proxy="217.71.32.236"
-      port="8080"
-      type="default,supl"
-  />
+  <!-- VENDOR_EDIT start Patch#0546 [2018-05-25] -->
+  <!-- VENDOR_EDIT end Patch#0546 [2018-05-25] -->
   <apn carrier="Send"
       mcc="248"
       mnc="01"
@@ -6038,6 +6499,8 @@
       mvno_match_data="248010x3"
       mvno_type="imsi"
   />
+
+  <!-- VENDOR_EDIT start Patch#0564 [2018-10-19] -->
   <apn carrier="Elisa Internet"
       mcc="248"
       mnc="02"
@@ -6048,19 +6511,13 @@
       mcc="248"
       mnc="02"
       apn="mms"
-      mmsc="http://194.204.2.10"
+      mmsc="http://194.150.66.35"
       mmsproxy="194.204.2.6"
       mmsport="8000"
       type="mms"
   />
-  <apn carrier="Elisa WAP"
-      mcc="248"
-      mnc="02"
-      apn="wap"
-      proxy="194.204.2.6"
-      port="8000"
-      type="default,supl"
-  />
+  <!-- VENDOR_EDIT end Patch#0564 [2018-10-19] -->
+
   <apn carrier="Tele2 Internet"
       mcc="248"
       mnc="03"
@@ -6786,10 +7243,11 @@
       type="mms"
   />
 
+  <!-- VENDOR_EDIT start Patch#0511 -->
   <apn carrier="Plus Internet"
       mcc="260"
       mnc="01"
-      apn="internet"
+      apn="plus"
       type="default,supl"
   />
   <apn carrier="Plus MMS"
@@ -6801,6 +7259,8 @@
       mmsport="8080"
       type="mms"
   />
+  <!-- VENDOR_EDIT end Patch#0511 -->
+
   <apn carrier="T-mobile.pl"
       mcc="260"
       mnc="02"
@@ -6969,7 +7429,8 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn carrier="VF DE Event"
+<!-- VENDOR_EDIT start Patch#0520 [2018-02-16]-->
+  <apn carrier="Vodafone MMS"
       mcc="262"
       mnc="02"
       apn="event.vodafone.de"
@@ -6979,19 +7440,13 @@
       type="mms"
       protocol="IPV4V6"
   />
-  <apn carrier="VF DE Web"
+  <apn carrier="Vodafone Internet"
       mcc="262"
       mnc="02"
       apn="web.vodafone.de"
-      type="default"
+      type="default,supl"
   />
-  <apn carrier="Vodafone Internet"
-       mcc="262"
-       mnc="02"
-       apn="supl.vodafone.com"
-       port="7275"
-       type="supl"
-  />
+<!-- VENDOR_EDIT end Patch#0520 -->
   <apn carrier="VF DE live!"
       mcc="262"
       mnc="02"
@@ -7774,7 +8229,7 @@
       mmsc="http://mms.mobitel.si/servlets/mms"
       mmsproxy="213.229.249.40"
       mmsport="8080"
-      type="default,mms,supl"
+      type="default,supl,mms"
   />
   <apn carrier="T2"
       mcc="293"
@@ -8199,9 +8654,6 @@
  />
 
   <!-- VENDOR_EDIT start Patch#0499 -->
-  <!-- For 302490, add -->
-  <!-- For 302490, remove -->
-  <!-- For 302490, modify "Internet" and "MMS" -->
   <apn carrier="Internet"
       mcc="302"
       mnc="490"
@@ -8250,15 +8702,7 @@
       mmsc="http://mms.bell.ca/mms/wapenc"
       type="default,mms,supl"
   />
-  <apn carrier="PC Mobile"
-       mcc="302"
-       mnc="610"
-       apn="proxy.bell.ca"
-       mmsproxy="web.wireless.bell.ca"
-       mmsport="80"
-       mmsc="http://mms.bell.ca/mms/wapenc"
-       type="default,mms,supl"
-  />
+
 <apn carrier="CA - Bell Web"
   apn="pda2.bell.ca"
   mcc="302"
@@ -8580,7 +9024,7 @@
   <apn carrier="Bluewire IMS"
       mcc="310"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="bluewire"
@@ -8591,7 +9035,7 @@
   <apn carrier="Bluewire IMS"
       mcc="310"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="bluewire"
@@ -8667,7 +9111,7 @@
   <apn carrier="Flatwire IMS"
       mcc="310"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="flatwire"
@@ -8678,7 +9122,7 @@
   <apn carrier="Flatwire IMS"
       mcc="310"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="flatwire"
@@ -8754,7 +9198,7 @@
   <apn carrier="Mobipcs IMS"
       mcc="310"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="mobipcs"
@@ -8765,7 +9209,7 @@
   <apn carrier="Mobipcs IMS"
       mcc="310"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="mobipcs"
@@ -8841,7 +9285,7 @@
   <apn carrier="Mobilenation IMS"
       mcc="310"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="mobilenation"
@@ -8852,7 +9296,7 @@
   <apn carrier="Mobilenation IMS"
       mcc="310"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="mobilenation"
@@ -8928,7 +9372,7 @@
   <apn carrier="Mohave IMS"
       mcc="310"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="mohave"
@@ -8939,7 +9383,7 @@
   <apn carrier="Mohave IMS"
       mcc="310"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="mohave"
@@ -9015,7 +9459,7 @@
   <apn carrier="Peopleswire IMS"
       mcc="310"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="Peopleswire"
@@ -9026,7 +9470,7 @@
   <apn carrier="Peopleswire IMS"
       mcc="310"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="Peopleswire"
@@ -9102,7 +9546,7 @@
   <apn carrier="Revol IMS"
       mcc="310"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="revol"
@@ -9113,7 +9557,7 @@
   <apn carrier="Revol IMS"
       mcc="310"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="revol"
@@ -9204,7 +9648,7 @@
   <apn carrier="Distribution IMS"
       mcc="310"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="distribution"
@@ -9215,7 +9659,7 @@
   <apn carrier="Distribution IMS"
       mcc="310"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="distribution"
@@ -9302,7 +9746,7 @@
  />
 
 <apn carrier="Verizon IMS"
-  apn="VZWIMS"
+  apn="IMS"
   mcc="310"
   mnc="002"
   type="ims"
@@ -9348,7 +9792,7 @@
  />
 
 <apn carrier="Verizon IMS"
-  apn="VZWIMS"
+  apn="IMS"
   mcc="310"
   mnc="003"
   type="ims"
@@ -9542,7 +9986,7 @@
   <apn carrier="Verizon IMS"
       mcc="310"
       mnc="004"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -9555,7 +9999,7 @@
   <apn carrier="Verizon IMS"
       mcc="310"
       mnc="004"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -9622,7 +10066,7 @@
  />
 
 <apn carrier="Verizon IMS"
-  apn="VZWIMS"
+  apn="IMS"
   mcc="310"
   mnc="005"
   type="ims"
@@ -9668,7 +10112,7 @@
  />
 
 <apn carrier="Verizon IMS"
-  apn="VZWIMS"
+  apn="IMS"
   mcc="310"
   mnc="006"
   type="ims"
@@ -9714,7 +10158,7 @@
  />
 
 <apn carrier="Verizon IMS"
-  apn="VZWIMS"
+  apn="IMS"
   mcc="310"
   mnc="012"
   type="ims"
@@ -9776,6 +10220,160 @@
   authtype="3"
  />
 
+  <!-- VENDOR_EDIT start Patch#0503 [2018-08-20] -->
+  <apn carrier="T-Mobile LTE"
+      mcc="310"
+      mnc="26"
+      apn="fast.t-mobile.com"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="default,supl,mms,xcap"
+      protocol="IPV6"
+      read_only="true"
+  />
+
+  <apn carrier="EPDG MMS/XCAP"
+      mcc="310"
+      mnc="26"
+      apn="tmus"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="mms,xcap"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      read_only="true"
+  />
+
+  <apn carrier="T-Mobile IMS"
+      mcc="310"
+      mnc="26"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      read_only="true"
+      user_visible="false"
+  />
+
+  <apn carrier="EPDG IMS"
+      mcc="310"
+      mnc="26"
+      apn="ims"
+      type="ims"
+      mmsc="epdg"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      read_only="true"
+      user_visible="false"
+  />
+
+  <apn carrier="T-Mobile Tethering"
+      mcc="310"
+      mnc="26"
+      apn="pcweb.tmobile.com"
+      user=""
+      password=""
+      authtype="0"
+      server=""
+      proxy=""
+      port=""
+      mmsc=""
+      mmsproxy=""
+      mmsport=""
+      type="dun"
+      read_only="true"
+      user_visible="false"
+      roaming_protocol="IP"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="T-Mobile Emergency"
+      mcc="310"
+      mnc="26"
+      apn="sos"
+      authtype="0"
+      type="emergency"
+      protocol="IPV6"
+      read_only="true"
+  />
+
+  <apn carrier="MetroPCS"
+      mcc="310"
+      mnc="26"
+      apn="fast.metropcs.com"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="default,supl,mms,xcap"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+  />
+
+  <apn carrier="EPDG MMS/XCAP"
+      mcc="310"
+      mnc="26"
+      apn="tmus"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="mms,xcap"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+  />
+
+  <apn carrier="MetroPCS IMS"
+      mcc="310"
+      mnc="26"
+      apn="ims"
+      type="ims"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+      user_visible="false"
+  />
+
+  <apn carrier="EPDG IMS"
+      mcc="310"
+      mnc="26"
+      apn="ims"
+      type="ims"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      mmsc="epdg"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      user_visible="false"
+  />
+
+  <apn carrier="MetroPCS Tethering"
+      mcc="310"
+      mnc="26"
+      apn="pcweb.metropcs.com"
+      user=""
+      password=""
+      authtype="0"
+      server=""
+      proxy=""
+      port=""
+      mmsc=""
+      mmsproxy=""
+      mmsport=""
+      type="dun"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      user_visible="false"
+      roaming_protocol="IP"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="MetroPCS Emergency"
+      mcc="310"
+      mnc="26"
+      apn="sos"
+      authtype="0"
+      type="emergency"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+  />
+  <!-- VENDOR_EDIT end Patch#0503 [2018-08-20] -->
+
 <apn carrier="metropcs"
   apn="wap.metropcs.net"
   mcc="310"
@@ -9808,7 +10406,7 @@
   <apn carrier=" ALU Test-SIM IMS"
       mcc="310"
       mnc="028"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -9839,6 +10437,26 @@
       password="priv"
       type="default,supl"
   />
+  <apn carrier="ATT Nextgenphone"
+      mcc="310"
+      mnc="030"
+      apn="nxtgenphone"
+      type="default,mms,supl,fota,hipri"
+      mmsc="http://mmsc.mobile.att.net"
+      mmsproxy="proxy.mobile.att.net"
+      mmsport="80"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="ims"
+      mcc="310"
+      mnc="030"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
 <apn carrier="ATT Phone"
   apn="phone"
   mcc="310"
@@ -9848,6 +10466,161 @@
   mmsc="http://mmsc.mobile.att.net"
   type="default,mms,supl,hipri,fota"
  />
+
+  <!-- VENDOR_EDIT start Patch#0503 [2018-08-20] -->
+  <apn carrier="T-Mobile LTE"
+      mcc="310"
+      mnc="31"
+      apn="fast.t-mobile.com"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="default,supl,mms,xcap"
+      protocol="IPV6"
+      read_only="true"
+  />
+
+  <apn carrier="EPDG MMS/XCAP"
+      mcc="310"
+      mnc="31"
+      apn="tmus"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="mms,xcap"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      read_only="true"
+  />
+
+  <apn carrier="T-Mobile IMS"
+      mcc="310"
+      mnc="31"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      read_only="true"
+      user_visible="false"
+  />
+
+  <apn carrier="EPDG IMS"
+      mcc="310"
+      mnc="31"
+      apn="ims"
+      type="ims"
+      mmsc="epdg"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      read_only="true"
+      user_visible="false"
+  />
+
+  <apn carrier="T-Mobile Tethering"
+      mcc="310"
+      mnc="31"
+      apn="pcweb.tmobile.com"
+      user=""
+      password=""
+      authtype="0"
+      server=""
+      proxy=""
+      port=""
+      mmsc=""
+      mmsproxy=""
+      mmsport=""
+      type="dun"
+      read_only="true"
+      user_visible="false"
+      roaming_protocol="IP"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="T-Mobile Emergency"
+      mcc="310"
+      mnc="31"
+      apn="sos"
+      authtype="0"
+      type="emergency"
+      protocol="IPV6"
+      read_only="true"
+  />
+
+  <apn carrier="MetroPCS"
+      mcc="310"
+      mnc="31"
+      apn="fast.metropcs.com"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="default,supl,mms,xcap"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+  />
+
+  <apn carrier="EPDG MMS/XCAP"
+      mcc="310"
+      mnc="31"
+      apn="tmus"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="mms,xcap"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+  />
+
+  <apn carrier="MetroPCS IMS"
+      mcc="310"
+      mnc="31"
+      apn="ims"
+      type="ims"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+      user_visible="false"
+  />
+
+  <apn carrier="EPDG IMS"
+      mcc="310"
+      mnc="31"
+      apn="ims"
+      type="ims"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      mmsc="epdg"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      user_visible="false"
+  />
+
+  <apn carrier="MetroPCS Tethering"
+      mcc="310"
+      mnc="31"
+      apn="pcweb.metropcs.com"
+      user=""
+      password=""
+      authtype="0"
+      server=""
+      proxy=""
+      port=""
+      mmsc=""
+      mmsproxy=""
+      mmsport=""
+      type="dun"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      user_visible="false"
+      roaming_protocol="IP"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="MetroPCS Emergency"
+      mcc="310"
+      mnc="31"
+      apn="sos"
+      authtype="0"
+      type="emergency"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+  />
+  <!-- VENDOR_EDIT end Patch#0503 [2018-08-20] -->
+
   <apn carrier="itewire"
       mcc="310"
       mnc="032"
@@ -9866,7 +10639,7 @@
   <apn carrier="Itewire IMS"
       mcc="310"
       mnc="032"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="itewire"
@@ -9877,7 +10650,7 @@
   <apn carrier="Itewire IMS"
       mcc="310"
       mnc="032"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="itewire"
@@ -9953,7 +10726,7 @@
   <apn carrier="Etex IMS"
       mcc="310"
       mnc="035"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="etex"
@@ -9964,7 +10737,7 @@
   <apn carrier="Etex IMS"
       mcc="310"
       mnc="035"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="etex"
@@ -10040,7 +10813,7 @@
   <apn carrier="Mta IMS"
       mcc="310"
       mnc="040"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="mta"
@@ -10051,7 +10824,7 @@
   <apn carrier="Mta IMS"
       mcc="310"
       mnc="040"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="mta"
@@ -10127,7 +10900,7 @@
   <apn carrier="Alaskacomm IMS"
       mcc="310"
       mnc="050"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="alaskacomm"
@@ -10138,7 +10911,7 @@
   <apn carrier="Alaskacomm IMS"
       mcc="310"
       mnc="050"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="alaskacomm"
@@ -10195,6 +10968,8 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
+
+  <!-- VENDOR_EDIT start Patch#0548 [2018-06-08]-->
   <apn carrier="U.S.Cellular"
       mcc="310"
       mnc="066"
@@ -10202,9 +10977,11 @@
       user="*"
       server="*"
       password="*"
+      type="default,mms"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
       mtu="1422"
   />
+  <!-- VENDOR_EDIT end Patch#0548 [2018-06-08]-->
 
 <apn carrier="ATT Phone"
   apn="phone"
@@ -10336,7 +11113,7 @@
  />
 
 <apn carrier="Verizon IMS"
-  apn="VZWIMS"
+  apn="IMS"
   mcc="310"
   mnc="99"
   type="ims"
@@ -10370,151 +11147,36 @@
       apn="plateauweb"
       type="default,supl"
   />
-  <apn carrier="profile1"
+
+  <!-- VENDOR_EDIT start Patch#0548 [2018-06-08]-->
+  <apn carrier="Sprint"
       mcc="310"
       mnc="120"
       apn="n.ispsn"
-      type="default,hipri,ia,supl,dun"
+      mmsc="http://mms.sprintpcs.com/servlets/mms"
+      mmsproxy="68.28.31.7"
+      mmsport="80"
+      type="default,hipri,ia,supl,dun,mms"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-
-<apn carrier="Sprint MMS"
-  apn="Sprint"
-  mcc="310"
-  mnc="120"
-  user="Sprint"
-  server="*"
-  password="*"
-  mmsproxy="68.28.31.7"
-  mmsport="80"
-  mmsc="http://mms.sprintpcs.com"
-  type="mms"
-  authtype="3"
- />
-
-<apn carrier="Sprint LTE ota"
-  apn="otasn"
-  mcc="310"
-  mnc="120"
-  type="fota"
-  protocol="IPV4V6"
-  roaming_protocol="IPV4V6"
- />
-
-<apn carrier="Sprint EHRPD ota"
-  apn="otasn"
-  mcc="310"
-  mnc="120"
-  type="fota"
-  protocol="IPV4V6"
-  roaming_protocol="IPV4V6"
- />
-
-<apn carrier="Sprint LTE internet"
-  apn="n.ispsn"
-  mcc="310"
-  mnc="120"
-  mmsproxy="68.28.31.7"
-  mmsport="80"
-  mmsc="http://mms.sprintpcs.com"
-  type="default,mms,supl,hipri"
-  protocol="IPV4V6"
-  roaming_protocol="IPV4V6"
- />
-
-<apn carrier="Sprint EHRPD internet"
-  apn="n.ispsn"
-  mcc="310"
-  mnc="120"
-  mmsproxy="68.28.31.7"
-  mmsport="80"
-  mmsc="http://mms.sprintpcs.com"
-  type="default,mms,supl,hipri"
-  protocol="IPV4V6"
-  roaming_protocol="IPV4V6"
- />
-
-<apn carrier="Sprint internet"
-  apn="n.ispsn"
-  mcc="310"
-  mnc="120"
-  mmsproxy="68.28.31.7"
-  mmsport="80"
-  mmsc="http://mms.sprintpcs.com"
-  type="mms,supl,hipri"
-  protocol="IPV4V6"
-  roaming_protocol="IPV4V6"
- />
-
-<apn carrier="Boost"
-  apn="cinet.spcs"
-  mcc="310"
-  mnc="120"
-  mmsproxy="68.28.31.7"
-  mmsport="80"
-  mmsc="http://mm.myboostmobile.com"
-  type="supl,mms,dun,fota"
-  protocol="IPV4V6"
-  roaming_protocol="IPV4V6"
- />
-
-<apn carrier="Credo Mobile"
-  apn="n.w1.ispsn"
-  mcc="310"
-  mnc="120"
-  mmsproxy="68.28.31.7"
-  mmsport="80"
-  mmsc="http://mms.plspictures.com"
-  type="mms"
-  protocol="IPV4V6"
-  roaming_protocol="IPV4V6"
- />
-
-<apn carrier="Ting"
-  apn="n.t8.ispsn"
-  mcc="310"
-  mnc="120"
-  mmsproxy="68.28.31.7"
-  mmsport="80"
-  mmsc="http://mms.plspictures.com"
-  type="mms"
-  protocol="IPV4V6"
-  roaming_protocol="IPV4V6"
- />
-
-<apn carrier="Virgin Mobile"
-  apn="n.vmu.ispsn"
-  mcc="310"
-  mnc="120"
-  user="Sprint"
-  password="*"
-  mmsproxy="68.28.31.7"
-  mmsport="80"
-  mmsc="http://mmsc.vmobl.com:8088/mms?"
-  type="supl,mms,fota,dun"
- />
-
-<apn carrier="FreedomPop LTE"
-  apn="n.f6.ispsn"
-  mcc="310"
-  mnc="120"
-  mmsproxy="68.28.31.7"
-  mmsport="80"
-  mmsc="http://mms.sprintpcs.com"
-  type="supl,mms"
- />
-
-<apn carrier="FreedomPop EHRPD"
-  apn="n.f6.ispsn"
-  mcc="310"
-  mnc="120"
-  mmsproxy="68.28.31.7"
-  mmsport="80"
-  mmsc="http://mms.sprintpcs.com"
-  type="supl,mms"
- />
-
+  <apn carrier="Sprint"
+      mcc="310"
+      mnc="120"
+      apn="vowifi"
+      type="ims"
+      protocol="IP"
+  />
+  <apn carrier="USCC"
+      mcc="310"
+      mnc="120"
+      apn="internet"
+      proxy="wap.voicestream.com"
+      user="yourMSID@uscc.net"
+      password="yourMSID"
+      type="default,supl"
+  />
+  <!-- VENDOR_EDIT end Patch#0548 [2018-06-08]-->
 
   <apn carrier="My Multi Media"
       mcc="310"
@@ -10543,7 +11205,7 @@
   <apn carrier="Carolina IMS"
       mcc="310"
       mnc="130"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="carolinawest"
@@ -10554,7 +11216,7 @@
   <apn carrier="Carolina IMS"
       mcc="310"
       mnc="130"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="carolinawest"
@@ -10625,6 +11287,7 @@
       mmsport="80"
       type="default,mms,fota,hipri,supl"
   />
+
 <apn carrier="ATT Phone"
   apn="phone"
   mcc="310"
@@ -10645,81 +11308,168 @@
   type="default,mms,fota,supl"
  />
 
- <apn carrier="T-Mobile US 160"
-  apn="fast.t-mobile.com"
-  mcc="310"
-  mnc="160"
-  mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-  type="default,supl,hipri"
-  preferred="true"
-  protocol="IPV6"
-  roaming_protocol="IP"
- />
+  <apn carrier="ims"
+      mcc="310"
+      mnc="150"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
 
-  <apn carrier="T-Mobile US 160 DUN"
+  <!-- VENDOR_EDIT start Patch#0503 [2018-08-20] -->
+  <apn carrier="T-Mobile LTE"
       mcc="310"
       mnc="160"
-      apn="pcweb.tmobile.com"
-      user="none"
-      server="*"
-      password="none"
-      protocol="IP"
-      type="dun"
-      mtu="1440"
+      apn="fast.t-mobile.com"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="default,supl,mms,xcap"
+      protocol="IPV6"
       read_only="true"
   />
-  <apn carrier="MetroPCS 160"
+
+  <apn carrier="EPDG MMS/XCAP"
       mcc="310"
       mnc="160"
-      apn="fast.metropcs.com"
-      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
-      type="default,supl,mms"
+      apn="tmus"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="mms,xcap"
       protocol="IPV6"
-      roaming_protocol="IP"
-      mvno_match_data="6D"
-      mvno_type="gid"
+      roaming_protocol="IPV6"
+      read_only="true"
   />
 
-  <apn carrier="TMobile (IMS)"
+  <apn carrier="T-Mobile IMS"
       mcc="310"
       mnc="160"
       apn="ims"
       type="ims"
       protocol="IPV6"
+      read_only="true"
+      user_visible="false"
+  />
+
+  <apn carrier="EPDG IMS"
+      mcc="310"
+      mnc="160"
+      apn="ims"
+      type="ims"
+      mmsc="epdg"
+      protocol="IPV6"
       roaming_protocol="IPV6"
       read_only="true"
+      user_visible="false"
+  />
+
+  <apn carrier="T-Mobile Tethering"
+      mcc="310"
+      mnc="160"
+      apn="pcweb.tmobile.com"
+      user=""
+      password=""
+      authtype="0"
+      server=""
+      proxy=""
+      port=""
+      mmsc=""
+      mmsproxy=""
+      mmsport=""
+      type="dun"
+      read_only="true"
+      user_visible="false"
+      roaming_protocol="IP"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="T-Mobile Emergency"
+      mcc="310"
+      mnc="160"
+      apn="sos"
+      authtype="0"
+      type="emergency"
+      protocol="IPV6"
+      read_only="true"
   />
 
-  <apn carrier="T-Mobile MMS EPDG"
+  <apn carrier="MetroPCS"
+      mcc="310"
+      mnc="160"
+      apn="fast.metropcs.com"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="default,supl,mms,xcap"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+  />
+
+  <apn carrier="EPDG MMS/XCAP"
       mcc="310"
       mnc="160"
       apn="tmus"
-      server="*"
-      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-      type="mms"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="mms,xcap"
+      mvno_match_data="6D"
+      mvno_type="gid"
       protocol="IPV6"
       roaming_protocol="IPV6"
   />
 
-<apn carrier="T-Mobile US 160"
-  apn="epc.tmobile.com"
-  mcc="310"
-  mnc="160"
-  user="none"
-  server="*"
-  password="none"
-  mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-  type="default,supl,mms"
- />
+  <apn carrier="MetroPCS IMS"
+      mcc="310"
+      mnc="160"
+      apn="ims"
+      type="ims"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+      user_visible="false"
+  />
 
- <apn carrier="T-Mobile US SOS"
-  apn="sos"
-  mcc="310"
-  mnc="160"
-  type="ims"
-  protocol="IPV6"
-  roaming_protocol="IP"
- />
+  <apn carrier="EPDG IMS"
+      mcc="310"
+      mnc="160"
+      apn="ims"
+      type="ims"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      mmsc="epdg"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      user_visible="false"
+  />
+
+  <apn carrier="MetroPCS Tethering"
+      mcc="310"
+      mnc="160"
+      apn="pcweb.metropcs.com"
+      user=""
+      password=""
+      authtype="0"
+      server=""
+      proxy=""
+      port=""
+      mmsc=""
+      mmsproxy=""
+      mmsport=""
+      type="dun"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      user_visible="false"
+      roaming_protocol="IP"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="MetroPCS Emergency"
+      mcc="310"
+      mnc="160"
+      apn="sos"
+      authtype="0"
+      type="emergency"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+  />
+  <!-- VENDOR_EDIT end Patch#0503 [2018-08-20] -->
 
   <apn carrier="DataConnect"
       mcc="310"
@@ -10768,540 +11518,1083 @@
       type="mms"
   />
 
-<apn carrier="T-Mobile US 200"
-  apn="fast.t-mobile.com"
-  mcc="310"
-  mnc="200"
-  mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-  type="default,supl,mms,hipri"
-  preferred="true"
-  protocol="IPV6"
-  roaming_protocol="IP"
- />
-
-  <apn carrier="T-Mobile US 200 DUN"
+  <!-- VENDOR_EDIT start Patch#0503 [2018-08-20] -->
+  <apn carrier="T-Mobile LTE"
       mcc="310"
       mnc="200"
-      apn="pcweb.tmobile.com"
-      user="none"
-      server="*"
-      password="none"
-      mtu="1440"
-      protocol="IP"
-      type="dun"
+      apn="fast.t-mobile.com"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="default,supl,mms,xcap"
+      protocol="IPV6"
       read_only="true"
   />
-  <apn carrier="MetroPCS 200"
+
+  <apn carrier="EPDG MMS/XCAP"
       mcc="310"
       mnc="200"
-      apn="fast.metropcs.com"
-      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
-      type="default,supl,mms"
+      apn="tmus"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="mms,xcap"
       protocol="IPV6"
-      roaming_protocol="IP"
-      mvno_match_data="6D"
-      mvno_type="gid"
+      roaming_protocol="IPV6"
+      read_only="true"
   />
 
-  <apn carrier="TMobile (IMS)"
+  <apn carrier="T-Mobile IMS"
       mcc="310"
       mnc="200"
       apn="ims"
       type="ims"
       protocol="IPV6"
+      read_only="true"
+      user_visible="false"
+  />
+
+  <apn carrier="EPDG IMS"
+      mcc="310"
+      mnc="200"
+      apn="ims"
+      type="ims"
+      mmsc="epdg"
+      protocol="IPV6"
       roaming_protocol="IPV6"
       read_only="true"
+      user_visible="false"
+  />
+
+  <apn carrier="T-Mobile Tethering"
+      mcc="310"
+      mnc="200"
+      apn="pcweb.tmobile.com"
+      user=""
+      password=""
+      authtype="0"
+      server=""
+      proxy=""
+      port=""
+      mmsc=""
+      mmsproxy=""
+      mmsport=""
+      type="dun"
+      read_only="true"
+      user_visible="false"
+      roaming_protocol="IP"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="T-Mobile Emergency"
+      mcc="310"
+      mnc="200"
+      apn="sos"
+      authtype="0"
+      type="emergency"
+      protocol="IPV6"
+      read_only="true"
   />
 
-  <apn carrier="T-Mobile MMS EPDG"
+  <apn carrier="MetroPCS"
+      mcc="310"
+      mnc="200"
+      apn="fast.metropcs.com"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="default,supl,mms,xcap"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+  />
+
+  <apn carrier="EPDG MMS/XCAP"
       mcc="310"
       mnc="200"
       apn="tmus"
-      server="*"
-      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-      type="mms"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="mms,xcap"
+      mvno_match_data="6D"
+      mvno_type="gid"
       protocol="IPV6"
       roaming_protocol="IPV6"
   />
 
-<apn carrier="T-Mobile US 200"
-  apn="epc.tmobile.com"
-  mcc="310"
-  mnc="200"
-  user="none"
-  server="*"
-  password="none"
-  mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-  type="default,supl,mms"
- />
-
- <apn carrier="T-Mobile US SOS"
-  apn="sos"
-  mcc="310"
-  mnc="200"
-  type="ims"
-  protocol="IPV6"
-  roaming_protocol="IP"
- />
-
-<apn carrier="T-Mobile US 210"
-  apn="fast.t-mobile.com"
-  mcc="310"
-  mnc="210"
-  mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-  type="default,supl,mms"
-  preferred="true"
-  protocol="IPV6"
-  roaming_protocol="IP"
- />
-
-  <apn carrier="T-Mobile US 210 DUN"
+  <apn carrier="MetroPCS IMS"
       mcc="310"
-      mnc="210"
-      apn="pcweb.tmobile.com"
-      user="none"
-      server="*"
-      password="none"
-      mtu="1440"
-      protocol="IP"
-      type="dun"
-      read_only="true"
-  />
-  <apn carrier="MetroPCS 210"
-      mcc="310"
-      mnc="210"
-      apn="fast.metropcs.com"
-      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
-      type="default,supl,mms"
-      protocol="IPV6"
-      roaming_protocol="IP"
+      mnc="200"
+      apn="ims"
+      type="ims"
       mvno_match_data="6D"
       mvno_type="gid"
+      protocol="IPV6"
+      user_visible="false"
   />
 
-  <apn carrier="TMobile (IMS)"
+  <apn carrier="EPDG IMS"
+      mcc="310"
+      mnc="200"
+      apn="ims"
+      type="ims"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      mmsc="epdg"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      user_visible="false"
+  />
+
+  <apn carrier="MetroPCS Tethering"
+      mcc="310"
+      mnc="200"
+      apn="pcweb.metropcs.com"
+      user=""
+      password=""
+      authtype="0"
+      server=""
+      proxy=""
+      port=""
+      mmsc=""
+      mmsproxy=""
+      mmsport=""
+      type="dun"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      user_visible="false"
+      roaming_protocol="IP"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="MetroPCS Emergency"
+      mcc="310"
+      mnc="200"
+      apn="sos"
+      authtype="0"
+      type="emergency"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+  />
+  <!-- VENDOR_EDIT end Patch#0503 [2018-08-20] -->
+
+  <!-- VENDOR_EDIT start Patch#0503 [2018-08-20] -->
+  <apn carrier="T-Mobile LTE"
+      mcc="310"
+      mnc="210"
+      apn="fast.t-mobile.com"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="default,supl,mms,xcap"
+      protocol="IPV6"
+      read_only="true"
+  />
+
+  <apn carrier="EPDG MMS/XCAP"
+      mcc="310"
+      mnc="210"
+      apn="tmus"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="mms,xcap"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      read_only="true"
+  />
+
+  <apn carrier="T-Mobile IMS"
       mcc="310"
       mnc="210"
       apn="ims"
       type="ims"
       protocol="IPV6"
+      read_only="true"
+      user_visible="false"
+  />
+
+  <apn carrier="EPDG IMS"
+      mcc="310"
+      mnc="210"
+      apn="ims"
+      type="ims"
+      mmsc="epdg"
+      protocol="IPV6"
       roaming_protocol="IPV6"
       read_only="true"
+      user_visible="false"
+  />
+
+  <apn carrier="T-Mobile Tethering"
+      mcc="310"
+      mnc="210"
+      apn="pcweb.tmobile.com"
+      user=""
+      password=""
+      authtype="0"
+      server=""
+      proxy=""
+      port=""
+      mmsc=""
+      mmsproxy=""
+      mmsport=""
+      type="dun"
+      read_only="true"
+      user_visible="false"
+      roaming_protocol="IP"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="T-Mobile Emergency"
+      mcc="310"
+      mnc="210"
+      apn="sos"
+      authtype="0"
+      type="emergency"
+      protocol="IPV6"
+      read_only="true"
   />
 
-  <apn carrier="T-Mobile MMS EPDG"
+  <apn carrier="MetroPCS"
+      mcc="310"
+      mnc="210"
+      apn="fast.metropcs.com"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="default,supl,mms,xcap"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+  />
+
+  <apn carrier="EPDG MMS/XCAP"
       mcc="310"
       mnc="210"
       apn="tmus"
-      server="*"
-      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-      type="mms"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="mms,xcap"
+      mvno_match_data="6D"
+      mvno_type="gid"
       protocol="IPV6"
       roaming_protocol="IPV6"
   />
 
-<apn carrier="T-Mobile US 210"
-  apn="epc.tmobile.com"
-  mcc="310"
-  mnc="210"
-  user="none"
-  server="*"
-  password="none"
-  mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-  type="default,supl,mms"
- />
-
- <apn carrier="T-Mobile US SOS"
-  apn="sos"
-  mcc="310"
-  mnc="210"
-  type="ims"
-  protocol="IPV6"
-  roaming_protocol="IP"
- />
-
- <apn carrier="T-Mobile US 220"
-  apn="fast.t-mobile.com"
-  mcc="310"
-  mnc="220"
-  mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-  type="default,supl"
-  preferred="true"
-  protocol="IPV6"
-  roaming_protocol="IP"
- />
-
-  <apn carrier="T-Mobile US 220 DUN"
+  <apn carrier="MetroPCS IMS"
       mcc="310"
-      mnc="220"
-      apn="pcweb.tmobile.com"
-      user="none"
-      server="*"
-      password="none"
-      mtu="1440"
-      protocol="IP"
-      type="dun"
-      read_only="true"
-  />
-  <apn carrier="MetroPCS 220"
-      mcc="310"
-      mnc="220"
-      apn="fast.metropcs.com"
-      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
-      type="default,supl,mms"
-      protocol="IPV6"
-      roaming_protocol="IP"
+      mnc="210"
+      apn="ims"
+      type="ims"
       mvno_match_data="6D"
       mvno_type="gid"
+      protocol="IPV6"
+      user_visible="false"
   />
 
-  <apn carrier="TMobile (IMS)"
+  <apn carrier="EPDG IMS"
+      mcc="310"
+      mnc="210"
+      apn="ims"
+      type="ims"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      mmsc="epdg"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      user_visible="false"
+  />
+
+  <apn carrier="MetroPCS Tethering"
+      mcc="310"
+      mnc="210"
+      apn="pcweb.metropcs.com"
+      user=""
+      password=""
+      authtype="0"
+      server=""
+      proxy=""
+      port=""
+      mmsc=""
+      mmsproxy=""
+      mmsport=""
+      type="dun"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      user_visible="false"
+      roaming_protocol="IP"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="MetroPCS Emergency"
+      mcc="310"
+      mnc="210"
+      apn="sos"
+      authtype="0"
+      type="emergency"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+  />
+  <!-- VENDOR_EDIT end Patch#0503 [2018-08-20] -->
+
+  <!-- VENDOR_EDIT start Patch#0503 [2018-08-20] -->
+  <apn carrier="T-Mobile LTE"
+      mcc="310"
+      mnc="220"
+      apn="fast.t-mobile.com"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="default,supl,mms,xcap"
+      protocol="IPV6"
+      read_only="true"
+  />
+
+  <apn carrier="EPDG MMS/XCAP"
+      mcc="310"
+      mnc="220"
+      apn="tmus"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="mms,xcap"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      read_only="true"
+  />
+
+  <apn carrier="T-Mobile IMS"
       mcc="310"
       mnc="220"
       apn="ims"
       type="ims"
       protocol="IPV6"
+      read_only="true"
+      user_visible="false"
+  />
+
+  <apn carrier="EPDG IMS"
+      mcc="310"
+      mnc="220"
+      apn="ims"
+      type="ims"
+      mmsc="epdg"
+      protocol="IPV6"
       roaming_protocol="IPV6"
       read_only="true"
+      user_visible="false"
+  />
+
+  <apn carrier="T-Mobile Tethering"
+      mcc="310"
+      mnc="220"
+      apn="pcweb.tmobile.com"
+      user=""
+      password=""
+      authtype="0"
+      server=""
+      proxy=""
+      port=""
+      mmsc=""
+      mmsproxy=""
+      mmsport=""
+      type="dun"
+      read_only="true"
+      user_visible="false"
+      roaming_protocol="IP"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="T-Mobile Emergency"
+      mcc="310"
+      mnc="220"
+      apn="sos"
+      authtype="0"
+      type="emergency"
+      protocol="IPV6"
+      read_only="true"
   />
 
-  <apn carrier="T-Mobile MMS EPDG"
+  <apn carrier="MetroPCS"
+      mcc="310"
+      mnc="220"
+      apn="fast.metropcs.com"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="default,supl,mms,xcap"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+  />
+
+  <apn carrier="EPDG MMS/XCAP"
       mcc="310"
       mnc="220"
       apn="tmus"
-      server="*"
-      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-      type="mms"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="mms,xcap"
+      mvno_match_data="6D"
+      mvno_type="gid"
       protocol="IPV6"
       roaming_protocol="IPV6"
   />
 
-<apn carrier="T-Mobile US 220"
-  apn="epc.tmobile.com"
-  mcc="310"
-  mnc="220"
-  user="none"
-  server="*"
-  password="none"
-  mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-  type="default,supl,mms"
- />
-
- <apn carrier="T-Mobile US SOS"
-  apn="sos"
-  mcc="310"
-  mnc="220"
-  type="ims"
-  protocol="IPV6"
-  roaming_protocol="IP"
- />
-
- <apn carrier="T-Mobile US 230"
-  apn="fast.t-mobile.com"
-  mcc="310"
-  mnc="230"
-  mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-  type="default,supl"
-  preferred="true"
-  protocol="IPV6"
-  roaming_protocol="IP"
- />
- 
-  <apn carrier="T-Mobile US 230 DUN"
+  <apn carrier="MetroPCS IMS"
       mcc="310"
-      mnc="230"
-      apn="pcweb.tmobile.com"
-      user="none"
-      server="*"
-      password="none"
-      mtu="1440"
-      protocol="IP"
-      type="dun"
-      read_only="true"
-  />
-  <apn carrier="MetroPCS 230"
-      mcc="310"
-      mnc="230"
-      apn="fast.metropcs.com"
-      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
-      type="default,supl,mms"
-      protocol="IPV6"
-      roaming_protocol="IP"
+      mnc="220"
+      apn="ims"
+      type="ims"
       mvno_match_data="6D"
       mvno_type="gid"
+      protocol="IPV6"
+      user_visible="false"
   />
 
-  <apn carrier="TMobile (IMS)"
+  <apn carrier="EPDG IMS"
+      mcc="310"
+      mnc="220"
+      apn="ims"
+      type="ims"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      mmsc="epdg"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      user_visible="false"
+  />
+
+  <apn carrier="MetroPCS Tethering"
+      mcc="310"
+      mnc="220"
+      apn="pcweb.metropcs.com"
+      user=""
+      password=""
+      authtype="0"
+      server=""
+      proxy=""
+      port=""
+      mmsc=""
+      mmsproxy=""
+      mmsport=""
+      type="dun"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      user_visible="false"
+      roaming_protocol="IP"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="MetroPCS Emergency"
+      mcc="310"
+      mnc="220"
+      apn="sos"
+      authtype="0"
+      type="emergency"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+  />
+  <!-- VENDOR_EDIT end Patch#0503 [2018-08-20] -->
+
+  <!-- VENDOR_EDIT start Patch#0503 [2018-08-20] -->
+  <apn carrier="T-Mobile LTE"
+      mcc="310"
+      mnc="230"
+      apn="fast.t-mobile.com"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="default,supl,mms,xcap"
+      protocol="IPV6"
+      read_only="true"
+  />
+
+  <apn carrier="EPDG MMS/XCAP"
+      mcc="310"
+      mnc="230"
+      apn="tmus"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="mms,xcap"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      read_only="true"
+  />
+
+  <apn carrier="T-Mobile IMS"
       mcc="310"
       mnc="230"
       apn="ims"
       type="ims"
       protocol="IPV6"
+      read_only="true"
+      user_visible="false"
+  />
+
+  <apn carrier="EPDG IMS"
+      mcc="310"
+      mnc="230"
+      apn="ims"
+      type="ims"
+      mmsc="epdg"
+      protocol="IPV6"
       roaming_protocol="IPV6"
       read_only="true"
+      user_visible="false"
+  />
+
+  <apn carrier="T-Mobile Tethering"
+      mcc="310"
+      mnc="230"
+      apn="pcweb.tmobile.com"
+      user=""
+      password=""
+      authtype="0"
+      server=""
+      proxy=""
+      port=""
+      mmsc=""
+      mmsproxy=""
+      mmsport=""
+      type="dun"
+      read_only="true"
+      user_visible="false"
+      roaming_protocol="IP"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="T-Mobile Emergency"
+      mcc="310"
+      mnc="230"
+      apn="sos"
+      authtype="0"
+      type="emergency"
+      protocol="IPV6"
+      read_only="true"
   />
 
-  <apn carrier="T-Mobile MMS EPDG"
+  <apn carrier="MetroPCS"
+      mcc="310"
+      mnc="230"
+      apn="fast.metropcs.com"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="default,supl,mms,xcap"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+  />
+
+  <apn carrier="EPDG MMS/XCAP"
       mcc="310"
       mnc="230"
       apn="tmus"
-      server="*"
-      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-      type="mms"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="mms,xcap"
+      mvno_match_data="6D"
+      mvno_type="gid"
       protocol="IPV6"
       roaming_protocol="IPV6"
   />
 
-<apn carrier="T-Mobile US 230"
-  apn="epc.tmobile.com"
-  mcc="310"
-  mnc="230"
-  user="none"
-  server="*"
-  password="none"
-  mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-  type="default,supl,mms"
- />
-
- <apn carrier="T-Mobile US SOS"
-  apn="sos"
-  mcc="310"
-  mnc="230"
-  type="ims"
-  protocol="IPV6"
-  roaming_protocol="IP"
- />
-
-<apn carrier="T-Mobile US 240"
-  apn="fast.t-mobile.com"
-  mcc="310"
-  mnc="240"
-  mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-  type="default,supl,mms"
-  preferred="true"
-  protocol="IPV6"
-  roaming_protocol="IP"
- />
-
-  <apn carrier="T-Mobile US 240 DUN"
+  <apn carrier="MetroPCS IMS"
       mcc="310"
-      mnc="240"
-      apn="pcweb.tmobile.com"
-      user="none"
-      server="*"
-      password="none"
-      mtu="1440"
-      protocol="IP"
-      type="dun"
-      read_only="true"
-  />
-  <apn carrier="MetroPCS 240"
-      mcc="310"
-      mnc="240"
-      apn="fast.metropcs.com"
-      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
-      type="default,supl,mms"
-      protocol="IPV6"
-      roaming_protocol="IP"
+      mnc="230"
+      apn="ims"
+      type="ims"
       mvno_match_data="6D"
       mvno_type="gid"
+      protocol="IPV6"
+      user_visible="false"
   />
 
-  <apn carrier="TMobile (IMS)"
+  <apn carrier="EPDG IMS"
+      mcc="310"
+      mnc="230"
+      apn="ims"
+      type="ims"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      mmsc="epdg"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      user_visible="false"
+  />
+
+  <apn carrier="MetroPCS Tethering"
+      mcc="310"
+      mnc="230"
+      apn="pcweb.metropcs.com"
+      user=""
+      password=""
+      authtype="0"
+      server=""
+      proxy=""
+      port=""
+      mmsc=""
+      mmsproxy=""
+      mmsport=""
+      type="dun"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      user_visible="false"
+      roaming_protocol="IP"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="MetroPCS Emergency"
+      mcc="310"
+      mnc="230"
+      apn="sos"
+      authtype="0"
+      type="emergency"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+  />
+  <!-- VENDOR_EDIT end Patch#0503 [2018-08-20] -->
+
+  <!-- VENDOR_EDIT start Patch#0503 [2018-08-20] -->
+  <apn carrier="T-Mobile LTE"
+      mcc="310"
+      mnc="240"
+      apn="fast.t-mobile.com"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="default,supl,mms,xcap"
+      protocol="IPV6"
+      read_only="true"
+  />
+
+  <apn carrier="EPDG MMS/XCAP"
+      mcc="310"
+      mnc="240"
+      apn="tmus"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="mms,xcap"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      read_only="true"
+  />
+
+  <apn carrier="T-Mobile IMS"
       mcc="310"
       mnc="240"
       apn="ims"
       type="ims"
       protocol="IPV6"
+      read_only="true"
+      user_visible="false"
+  />
+
+  <apn carrier="EPDG IMS"
+      mcc="310"
+      mnc="240"
+      apn="ims"
+      type="ims"
+      mmsc="epdg"
+      protocol="IPV6"
       roaming_protocol="IPV6"
       read_only="true"
+      user_visible="false"
+  />
+
+  <apn carrier="T-Mobile Tethering"
+      mcc="310"
+      mnc="240"
+      apn="pcweb.tmobile.com"
+      user=""
+      password=""
+      authtype="0"
+      server=""
+      proxy=""
+      port=""
+      mmsc=""
+      mmsproxy=""
+      mmsport=""
+      type="dun"
+      read_only="true"
+      user_visible="false"
+      roaming_protocol="IP"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="T-Mobile Emergency"
+      mcc="310"
+      mnc="240"
+      apn="sos"
+      authtype="0"
+      type="emergency"
+      protocol="IPV6"
+      read_only="true"
   />
 
-  <apn carrier="T-Mobile MMS EPDG"
+  <apn carrier="MetroPCS"
+      mcc="310"
+      mnc="240"
+      apn="fast.metropcs.com"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="default,supl,mms,xcap"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+  />
+
+  <apn carrier="EPDG MMS/XCAP"
       mcc="310"
       mnc="240"
       apn="tmus"
-      server="*"
-      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-      type="mms"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="mms,xcap"
+      mvno_match_data="6D"
+      mvno_type="gid"
       protocol="IPV6"
       roaming_protocol="IPV6"
   />
 
-<apn carrier="T-Mobile US 240"
-  apn="epc.tmobile.com"
-  mcc="310"
-  mnc="240"
-  user="none"
-  server="*"
-  password="none"
-  mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-  type="default,supl,mms"
- />
-
- <apn carrier="T-Mobile US SOS"
-  apn="sos"
-  mcc="310"
-  mnc="240"
-  type="ims"
-  protocol="IPV6"
-  roaming_protocol="IP"
- />
-
- <apn carrier="T-Mobile US 250"
-  apn="fast.t-mobile.com"
-  mcc="310"
-  mnc="250"
-  mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-  type="default,supl"
-  preferred="true"
-  protocol="IPV6"
-  roaming_protocol="IP"
- />
-
-  <apn carrier="T-Mobile US 250 DUN"
+  <apn carrier="MetroPCS IMS"
       mcc="310"
-      mnc="250"
-      apn="pcweb.tmobile.com"
-      user="none"
-      server="*"
-      password="none"
-      mtu="1440"
-      protocol="IP"
-      type="dun"
-      read_only="true"
-  />
-  <apn carrier="MetroPCS 250"
-      mcc="310"
-      mnc="250"
-      apn="fast.metropcs.com"
-      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
-      type="default,supl,mms"
-      protocol="IPV6"
-      roaming_protocol="IP"
+      mnc="240"
+      apn="ims"
+      type="ims"
       mvno_match_data="6D"
       mvno_type="gid"
+      protocol="IPV6"
+      user_visible="false"
   />
 
-  <apn carrier="TMobile (IMS)"
+  <apn carrier="EPDG IMS"
+      mcc="310"
+      mnc="240"
+      apn="ims"
+      type="ims"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      mmsc="epdg"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      user_visible="false"
+  />
+
+  <apn carrier="MetroPCS Tethering"
+      mcc="310"
+      mnc="240"
+      apn="pcweb.metropcs.com"
+      user=""
+      password=""
+      authtype="0"
+      server=""
+      proxy=""
+      port=""
+      mmsc=""
+      mmsproxy=""
+      mmsport=""
+      type="dun"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      user_visible="false"
+      roaming_protocol="IP"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="MetroPCS Emergency"
+      mcc="310"
+      mnc="240"
+      apn="sos"
+      authtype="0"
+      type="emergency"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+  />
+  <!-- VENDOR_EDIT end Patch#0503 [2018-08-20] -->
+
+  <!-- VENDOR_EDIT start Patch#0503 [2018-08-20] -->
+  <apn carrier="T-Mobile LTE"
+      mcc="310"
+      mnc="250"
+      apn="fast.t-mobile.com"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="default,supl,mms,xcap"
+      protocol="IPV6"
+      read_only="true"
+  />
+
+  <apn carrier="EPDG MMS/XCAP"
+      mcc="310"
+      mnc="250"
+      apn="tmus"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="mms,xcap"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      read_only="true"
+  />
+
+  <apn carrier="T-Mobile IMS"
       mcc="310"
       mnc="250"
       apn="ims"
       type="ims"
       protocol="IPV6"
+      read_only="true"
+      user_visible="false"
+  />
+
+  <apn carrier="EPDG IMS"
+      mcc="310"
+      mnc="250"
+      apn="ims"
+      type="ims"
+      mmsc="epdg"
+      protocol="IPV6"
       roaming_protocol="IPV6"
       read_only="true"
+      user_visible="false"
+  />
+
+  <apn carrier="T-Mobile Tethering"
+      mcc="310"
+      mnc="250"
+      apn="pcweb.tmobile.com"
+      user=""
+      password=""
+      authtype="0"
+      server=""
+      proxy=""
+      port=""
+      mmsc=""
+      mmsproxy=""
+      mmsport=""
+      type="dun"
+      read_only="true"
+      user_visible="false"
+      roaming_protocol="IP"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="T-Mobile Emergency"
+      mcc="310"
+      mnc="250"
+      apn="sos"
+      authtype="0"
+      type="emergency"
+      protocol="IPV6"
+      read_only="true"
   />
 
-  <apn carrier="T-Mobile MMS EPDG"
+  <apn carrier="MetroPCS"
+      mcc="310"
+      mnc="250"
+      apn="fast.metropcs.com"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="default,supl,mms,xcap"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+  />
+
+  <apn carrier="EPDG MMS/XCAP"
       mcc="310"
       mnc="250"
       apn="tmus"
-      server="*"
-      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-      type="mms"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="mms,xcap"
+      mvno_match_data="6D"
+      mvno_type="gid"
       protocol="IPV6"
       roaming_protocol="IPV6"
   />
 
-<apn carrier="T-Mobile US 250"
-  apn="epc.tmobile.com"
-  mcc="310"
-  mnc="250"
-  user="none"
-  server="*"
-  password="none"
-  mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-  type="default,supl,mms"
- />
+  <apn carrier="MetroPCS IMS"
+      mcc="310"
+      mnc="250"
+      apn="ims"
+      type="ims"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+      user_visible="false"
+  />
 
- <apn carrier="T-Mobile US SOS"
-  apn="sos"
-  mcc="310"
-  mnc="250"
-  type="ims"
-  protocol="IPV6"
-  roaming_protocol="IP"
- />
+  <apn carrier="EPDG IMS"
+      mcc="310"
+      mnc="250"
+      apn="ims"
+      type="ims"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      mmsc="epdg"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      user_visible="false"
+  />
 
-<apn carrier="T-Mobile US Data"
-  apn="fast.t-mobile.com"
-  mcc="310"
-  mnc="260"
-  mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-  type="default,supl,hipri,mms"
-  preferred="true"
-  protocol="IPV6"
-  roaming_protocol="IP"
-  read_only="true"
- />
+  <apn carrier="MetroPCS Tethering"
+      mcc="310"
+      mnc="250"
+      apn="pcweb.metropcs.com"
+      user=""
+      password=""
+      authtype="0"
+      server=""
+      proxy=""
+      port=""
+      mmsc=""
+      mmsproxy=""
+      mmsport=""
+      type="dun"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      user_visible="false"
+      roaming_protocol="IP"
+      protocol="IPV4V6"
+  />
 
-  <apn carrier="T-Mobile US Tethering"
+  <apn carrier="MetroPCS Emergency"
+      mcc="310"
+      mnc="250"
+      apn="sos"
+      authtype="0"
+      type="emergency"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+  />
+  <!-- VENDOR_EDIT end Patch#0503 [2018-08-20] -->
+
+  <!-- VENDOR_EDIT start Patch#0503 [2018-08-20] -->
+  <apn carrier="T-Mobile LTE"
       mcc="310"
       mnc="260"
-      apn="pcbweb.tmobile.com"
-      protocol="IP"
-      type="dun"
+      apn="fast.t-mobile.com"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="default,supl,mms,xcap"
+      protocol="IPV6"
       read_only="true"
   />
 
-  <apn carrier="T-Mobile MMS EPDG"
+  <apn carrier="EPDG MMS/XCAP"
       mcc="310"
       mnc="260"
       apn="tmus"
-      server="*"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-      type="mms"
+      type="mms,xcap"
       protocol="IPV6"
       roaming_protocol="IPV6"
       read_only="true"
   />
 
-  <apn carrier="MetroPCS Data"
+  <apn carrier="T-Mobile IMS"
+      mcc="310"
+      mnc="260"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      read_only="true"
+      user_visible="false"
+  />
+
+  <apn carrier="EPDG IMS"
+      mcc="310"
+      mnc="260"
+      apn="ims"
+      type="ims"
+      mmsc="epdg"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      read_only="true"
+      user_visible="false"
+  />
+
+  <apn carrier="T-Mobile Tethering"
+      mcc="310"
+      mnc="260"
+      apn="pcweb.tmobile.com"
+      user=""
+      password=""
+      authtype="0"
+      server=""
+      proxy=""
+      port=""
+      mmsc=""
+      mmsproxy=""
+      mmsport=""
+      type="dun"
+      read_only="true"
+      user_visible="false"
+      roaming_protocol="IP"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="T-Mobile Emergency"
+      mcc="310"
+      mnc="260"
+      apn="sos"
+      authtype="0"
+      type="emergency"
+      protocol="IPV6"
+      read_only="true"
+  />
+
+  <apn carrier="MetroPCS"
       mcc="310"
       mnc="260"
       apn="fast.metropcs.com"
       mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
-      type="default,supl,hipri,mms"
-      protocol="IPV6"
-      roaming_protocol="IP"
+      type="default,supl,mms,xcap"
       mvno_match_data="6D"
       mvno_type="gid"
-      read_only="true"
+      protocol="IPV6"
+  />
+
+  <apn carrier="EPDG MMS/XCAP"
+      mcc="310"
+      mnc="260"
+      apn="tmus"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="mms,xcap"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+  />
+
+  <apn carrier="MetroPCS IMS"
+      mcc="310"
+      mnc="260"
+      apn="ims"
+      type="ims"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+      user_visible="false"
+  />
+
+  <apn carrier="EPDG IMS"
+      mcc="310"
+      mnc="260"
+      apn="ims"
+      type="ims"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      mmsc="epdg"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      user_visible="false"
   />
 
   <apn carrier="MetroPCS Tethering"
       mcc="310"
       mnc="260"
-      apn="pcweb.commetropcs.com"
-      protocol="IP"
+      apn="pcweb.metropcs.com"
+      user=""
+      password=""
+      authtype="0"
+      server=""
+      proxy=""
+      port=""
+      mmsc=""
+      mmsproxy=""
+      mmsport=""
       type="dun"
       mvno_match_data="6D"
       mvno_type="gid"
-      read_only="true"
+      user_visible="false"
+      roaming_protocol="IP"
+      protocol="IPV4V6"
   />
 
-  <apn carrier="T-Mobile (IMS)"
+  <apn carrier="MetroPCS Emergency"
       mcc="310"
       mnc="260"
-      apn="ims"
-      type="ims"
-      protocol="IPV6"
-      roaming_protocol="IP"
-      read_only="true"
-  />
-
-  <apn carrier="MetroPCS (IMS)"
-      mcc="310"
-      mnc="260"
-      apn="ims"
-      type="ims"
-      protocol="IPV6"
-      roaming_protocol="IP"
+      apn="sos"
+      authtype="0"
+      type="emergency"
       mvno_match_data="6D"
       mvno_type="gid"
-      read_only="true"
+      protocol="IPV6"
   />
+  <!-- VENDOR_EDIT end Patch#0503 [2018-08-20] -->
 
   <apn carrier="SIMPLE"
       mcc="310"
@@ -11359,105 +12652,173 @@
       read_only="true"
   />
 
-  <!-- VENDOR_EDIT start Patch#0503 -->
+  <!-- VENDOR_EDIT start Patch#0503 [2018-12-25] -->
   <apn carrier="Project Fi - T"
       mcc="310"
       mnc="260"
       apn="h2g2"
-      type="ia"
+	  mmsc="http://mmsc1.g-mms.com/mms/wapenc"
+      type="ia,default,mms"
       protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      mvno_type="imsi"
-      mvno_match_data="31026097"
-  />
-  <apn carrier="Project Fi - T"
-      mcc="310"
-      mnc="260"
-      apn="h2g2"
-      mmsc="http://mmsc1.g-mms.com/mms/wapenc"
-      protocol="IPV6"
-      roaming_protocol="IPV4"
-      mvno_type="imsi"
-      mvno_match_data="31026097"
-  />
-  <!-- VENDOR_EDIT end Patch#0503 -->
-
-  <apn carrier="T-Mobile US 270 DUN"
-      mcc="310"
-      mnc="270"
-      apn="pcweb.tmobile.com"
-      user="none"
-      server="*"
-      password="none"
-      protocol="IP"
-      type="dun"
-      mtu="1440"
-      read_only="true"
-  />
-  <apn carrier="MetroPCS 270"
-      mcc="310"
-      mnc="270"
-      apn="fast.metropcs.com"
-      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
-      type="default,supl,mms"
-      protocol="IPV6"
       roaming_protocol="IP"
-      mvno_match_data="6D"
-      mvno_type="gid"
+      mvno_type="imsi"
+      mvno_match_data="31026097"
+  />
+  <!-- VENDOR_EDIT end Patch#0503 [2018-06-21] -->
+
+  <!-- VENDOR_EDIT start Patch#0503 [2018-08-20] -->
+  <apn carrier="T-Mobile LTE"
+      mcc="310"
+      mnc="270"
+      apn="fast.t-mobile.com"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="default,supl,mms,xcap"
+      protocol="IPV6"
       read_only="true"
   />
 
- <apn carrier="T-Mobile US 270"
-  apn="fast.t-mobile.com"
-  mcc="310"
-  mnc="270"
-  mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-  type="default,supl"
-  preferred="true"
-  protocol="IPV6"
-  roaming_protocol="IP"
- />
+  <apn carrier="EPDG MMS/XCAP"
+      mcc="310"
+      mnc="270"
+      apn="tmus"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="mms,xcap"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      read_only="true"
+  />
 
-  <apn carrier="TMobile (IMS)"
+  <apn carrier="T-Mobile IMS"
       mcc="310"
       mnc="270"
       apn="ims"
       type="ims"
       protocol="IPV6"
+      read_only="true"
+      user_visible="false"
+  />
+
+  <apn carrier="EPDG IMS"
+      mcc="310"
+      mnc="270"
+      apn="ims"
+      type="ims"
+      mmsc="epdg"
+      protocol="IPV6"
       roaming_protocol="IPV6"
       read_only="true"
+      user_visible="false"
+  />
+
+  <apn carrier="T-Mobile Tethering"
+      mcc="310"
+      mnc="270"
+      apn="pcweb.tmobile.com"
+      user=""
+      password=""
+      authtype="0"
+      server=""
+      proxy=""
+      port=""
+      mmsc=""
+      mmsproxy=""
+      mmsport=""
+      type="dun"
+      read_only="true"
+      user_visible="false"
+      roaming_protocol="IP"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="T-Mobile Emergency"
+      mcc="310"
+      mnc="270"
+      apn="sos"
+      authtype="0"
+      type="emergency"
+      protocol="IPV6"
+      read_only="true"
   />
 
-  <apn carrier="T-Mobile MMS EPDG"
+  <apn carrier="MetroPCS"
+      mcc="310"
+      mnc="270"
+      apn="fast.metropcs.com"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="default,supl,mms,xcap"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+  />
+
+  <apn carrier="EPDG MMS/XCAP"
       mcc="310"
       mnc="270"
       apn="tmus"
-      server="*"
-      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-      type="mms"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="mms,xcap"
+      mvno_match_data="6D"
+      mvno_type="gid"
       protocol="IPV6"
       roaming_protocol="IPV6"
   />
 
-<apn carrier="T-Mobile US 270"
-  apn="epc.tmobile.com"
-  mcc="310"
-  mnc="270"
-  user="none"
-  server="*"
-  password="none"
-  mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-  type="default,supl,mms"
- />
+  <apn carrier="MetroPCS IMS"
+      mcc="310"
+      mnc="270"
+      apn="ims"
+      type="ims"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+      user_visible="false"
+  />
 
- <apn carrier="T-Mobile US SOS"
-  apn="sos"
-  mcc="310"
-  mnc="270"
-  type="ims"
-  protocol="IPV6"
-  roaming_protocol="IP"
- />
+  <apn carrier="EPDG IMS"
+      mcc="310"
+      mnc="270"
+      apn="ims"
+      type="ims"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      mmsc="epdg"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      user_visible="false"
+  />
+
+  <apn carrier="MetroPCS Tethering"
+      mcc="310"
+      mnc="270"
+      apn="pcweb.metropcs.com"
+      user=""
+      password=""
+      authtype="0"
+      server=""
+      proxy=""
+      port=""
+      mmsc=""
+      mmsproxy=""
+      mmsport=""
+      type="dun"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      user_visible="false"
+      roaming_protocol="IP"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="MetroPCS Emergency"
+      mcc="310"
+      mnc="270"
+      apn="sos"
+      authtype="0"
+      type="emergency"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+  />
+  <!-- VENDOR_EDIT end Patch#0503 [2018-08-20] -->
 
   <apn carrier="agms"
       mcc="310"
@@ -11465,6 +12826,27 @@
       apn="agms"
       type="default,supl"
   />
+
+  <apn carrier="ATT Nextgenphone"
+      mcc="310"
+      mnc="280"
+      apn="nxtgenphone"
+      type="default,mms,supl,fota,hipri"
+      mmsc="http://mmsc.mobile.att.net"
+      mmsproxy="proxy.mobile.att.net"
+      mmsport="80"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="ims"
+      mcc="310"
+      mnc="280"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
 <apn carrier="ATT Phone"
   apn="phone"
   mcc="310"
@@ -11474,6 +12856,7 @@
   mmsc="http://mmsc.mobile.att.net"
   type="default,mms,supl,hipri,fota"
  />
+
   <apn carrier="T-Mobile US 300"
       mcc="310"
       mnc="300"
@@ -11544,82 +12927,159 @@
   roaming_protocol="IP"
  />
 
-<apn carrier="T-Mobile US 310"
-  apn="fast.t-mobile.com"
-  mcc="310"
-  mnc="310"
-  mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-  type="default,supl,mms"
-  preferred="true"
-  protocol="IPV6"
-  roaming_protocol="IP"
- />
-
-  <apn carrier="T-Mobile US 310 DUN"
+  <!-- VENDOR_EDIT start Patch#0503 [2018-08-20] -->
+  <apn carrier="T-Mobile LTE"
       mcc="310"
       mnc="310"
-      apn="pcweb.tmobile.com"
-      user="none"
-      server="*"
-      password="none"
-      protocol="IP"
-      type="dun"
-      mtu="1440"
-      read_only="true"
-  />
-  <apn carrier="MetroPCS 310"
-      mcc="310"
-      mnc="310"
-      apn="fast.metropcs.com"
-      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
-      type="default,supl,mms"
+      apn="fast.t-mobile.com"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="default,supl,mms,xcap"
       protocol="IPV6"
-      roaming_protocol="IP"
-      mvno_match_data="6D"
-      mvno_type="gid"
       read_only="true"
   />
 
-  <apn carrier="TMobile (IMS)"
+  <apn carrier="EPDG MMS/XCAP"
+      mcc="310"
+      mnc="310"
+      apn="tmus"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="mms,xcap"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      read_only="true"
+  />
+
+  <apn carrier="T-Mobile IMS"
       mcc="310"
       mnc="310"
       apn="ims"
       type="ims"
       protocol="IPV6"
+      read_only="true"
+      user_visible="false"
+  />
+
+  <apn carrier="EPDG IMS"
+      mcc="310"
+      mnc="310"
+      apn="ims"
+      type="ims"
+      mmsc="epdg"
+      protocol="IPV6"
       roaming_protocol="IPV6"
       read_only="true"
+      user_visible="false"
+  />
+
+  <apn carrier="T-Mobile Tethering"
+      mcc="310"
+      mnc="310"
+      apn="pcweb.tmobile.com"
+      user=""
+      password=""
+      authtype="0"
+      server=""
+      proxy=""
+      port=""
+      mmsc=""
+      mmsproxy=""
+      mmsport=""
+      type="dun"
+      read_only="true"
+      user_visible="false"
+      roaming_protocol="IP"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="T-Mobile Emergency"
+      mcc="310"
+      mnc="310"
+      apn="sos"
+      authtype="0"
+      type="emergency"
+      protocol="IPV6"
+      read_only="true"
   />
 
-  <apn carrier="T-Mobile MMS EPDG"
+  <apn carrier="MetroPCS"
+      mcc="310"
+      mnc="310"
+      apn="fast.metropcs.com"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="default,supl,mms,xcap"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+  />
+
+  <apn carrier="EPDG MMS/XCAP"
       mcc="310"
       mnc="310"
       apn="tmus"
-      server="*"
-      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-      type="mms"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="mms,xcap"
+      mvno_match_data="6D"
+      mvno_type="gid"
       protocol="IPV6"
       roaming_protocol="IPV6"
   />
 
-<apn carrier="T-Mobile US 310"
-  apn="epc.tmobile.com"
-  mcc="310"
-  mnc="310"
-  user="none"
-  server="*"
-  password="none"
-  mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-  type="default,supl,mms"
- />
+  <apn carrier="MetroPCS IMS"
+      mcc="310"
+      mnc="310"
+      apn="ims"
+      type="ims"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+      user_visible="false"
+  />
 
- <apn carrier="T-Mobile US SOS"
-  apn="sos"
-  mcc="310"
-  mnc="310"
-  type="ims"
-  protocol="IPV6"
-  roaming_protocol="IP"
- />
+  <apn carrier="EPDG IMS"
+      mcc="310"
+      mnc="310"
+      apn="ims"
+      type="ims"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      mmsc="epdg"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      user_visible="false"
+  />
+
+  <apn carrier="MetroPCS Tethering"
+      mcc="310"
+      mnc="310"
+      apn="pcweb.metropcs.com"
+      user=""
+      password=""
+      authtype="0"
+      server=""
+      proxy=""
+      port=""
+      mmsc=""
+      mmsproxy=""
+      mmsport=""
+      type="dun"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      user_visible="false"
+      roaming_protocol="IP"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="MetroPCS Emergency"
+      mcc="310"
+      mnc="310"
+      apn="sos"
+      authtype="0"
+      type="emergency"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+  />
+  <!-- VENDOR_EDIT end Patch#0503 [2018-08-20] -->
 
   <apn carrier="Cellular One NEAZ ISP"
       mcc="310"
@@ -11654,7 +13114,7 @@
   <apn carrier="Alltel2 IMS"
       mcc="310"
       mnc="330"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="alltel2"
@@ -11665,7 +13125,7 @@
   <apn carrier="Alltel2 IMS"
       mcc="310"
       mnc="330"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="alltel2"
@@ -11741,7 +13201,7 @@
   <apn carrier="Pioneer IMS"
       mcc="310"
       mnc="360"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="pioneer"
@@ -11752,7 +13212,7 @@
   <apn carrier="Pioneer IMS"
       mcc="310"
       mnc="360"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="pioneer"
@@ -11869,6 +13329,7 @@
       mmsport="8080"
       type="mms"
   />
+ <!-- VENDOR_EDIT start Patch#0517 -->
   <apn carrier="ATT Nextgenphone"
       mcc="310"
       mnc="410"
@@ -11877,8 +13338,10 @@
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
-
+<!-- VENDOR_EDIT end Patch#0517 -->
 <apn carrier="H2O"
   apn="prodata"
   mcc="310"
@@ -11900,17 +13363,11 @@
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
   />
-  <apn carrier="ATT WAP"
-      mcc="310"
-      mnc="410"
-      apn="wap.cingular"
-      proxy="wireless.cingular.com"
-      port="80"
-      server="cingulargprs.com"
-      mmsc="http://mmsc.cingular.com/"
-      mmsproxy="wireless.cingular.com"
-      type="default,supl,mms"
-  />
+
+  <!-- VENDOR_EDIT start Patch#0517 -->
+  <!-- Network reject it. Remove QCT ATT wap.cingular APN -->
+  <!-- VENDOR_EDIT end Patch#0517 -->
+
   <apn carrier="Defense Mobile"
       mcc="310"
       mnc="410"
@@ -11977,7 +13434,7 @@
   <apn carrier="Gci IMS"
       mcc="310"
       mnc="430"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="gci"
@@ -11988,7 +13445,7 @@
   <apn carrier="Gci IMS"
       mcc="310"
       mnc="430"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="gci"
@@ -12190,7 +13647,7 @@
  />
 
 <apn carrier="Verizon IMS"
-  apn="VZWIMS"
+  apn="IMS"
   mcc="310"
   mnc="480"
   type="ims"
@@ -12236,7 +13693,7 @@
  />
 
 <apn carrier="Verizon IMS"
-  apn="VZWIMS"
+  apn="IMS"
   mcc="310"
   mnc="481"
   type="ims"
@@ -12282,7 +13739,7 @@
  />
 
 <apn carrier="Verizon IMS"
-  apn="VZWIMS"
+  apn="IMS"
   mcc="310"
   mnc="483"
   type="ims"
@@ -12328,7 +13785,7 @@
  />
 
 <apn carrier="Verizon IMS"
-  apn="VZWIMS"
+  apn="IMS"
   mcc="310"
   mnc="486"
   type="ims"
@@ -12374,7 +13831,7 @@
  />
 
 <apn carrier="Verizon IMS"
-  apn="VZWIMS"
+  apn="IMS"
   mcc="310"
   mnc="489"
   type="ims"
@@ -12392,99 +13849,159 @@
   roaming_protocol="IPV4V6"
  />
 
-<apn carrier="T-Mobile US 490"
-  apn="fast.t-mobile.com"
-  mcc="310"
-  mnc="490"
-  mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-  type="default,supl,mms"
-  preferred="true"
-  protocol="IPV6"
-  roaming_protocol="IP"
- />
-
-  <apn carrier="T-Mobile US 490 DUN"
+  <!-- VENDOR_EDIT start Patch#0503 [2018-08-20] -->
+  <apn carrier="T-Mobile LTE"
       mcc="310"
       mnc="490"
-      apn="pcweb.tmobile.com"
-      user="none"
-      server="*"
-      password="none"
-      protocol="IP"
-      type="dun"
-      mtu="1440"
+      apn="fast.t-mobile.com"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="default,supl,mms,xcap"
+      protocol="IPV6"
       read_only="true"
   />
-  <apn carrier="MetroPCS 490"
+
+  <apn carrier="EPDG MMS/XCAP"
       mcc="310"
       mnc="490"
-      apn="fast.metropcs.com"
-      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
-      type="default,supl,mms"
+      apn="tmus"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="mms,xcap"
       protocol="IPV6"
-      roaming_protocol="IP"
-      mvno_match_data="6D"
-      mvno_type="gid"
-  />
-  <apn carrier="GoodCall Picture Message"
-      mcc="310"
-      mnc="490"
-      apn="good.call"
-      mmsc="http://mms.suncom.net:8088/mms"
-      mmsproxy="66.150.33.125"
-      mmsport="8080"
-      type="mms"
-  />
-  <apn carrier="Suncom MMS"
-      mcc="310"
-      mnc="490"
-      apn="mms"
-      mmsc="http://mms.suncom.net:8088/mms"
-      mmsproxy="66.150.33.125"
-      mmsport="8080"
-      type="mms"
+      roaming_protocol="IPV6"
+      read_only="true"
   />
 
-  <apn carrier="TMobile (IMS)"
+  <apn carrier="T-Mobile IMS"
       mcc="310"
       mnc="490"
       apn="ims"
       type="ims"
       protocol="IPV6"
+      read_only="true"
+      user_visible="false"
+  />
+
+  <apn carrier="EPDG IMS"
+      mcc="310"
+      mnc="490"
+      apn="ims"
+      type="ims"
+      mmsc="epdg"
+      protocol="IPV6"
       roaming_protocol="IPV6"
       read_only="true"
+      user_visible="false"
+  />
+
+  <apn carrier="T-Mobile Tethering"
+      mcc="310"
+      mnc="490"
+      apn="pcweb.tmobile.com"
+      user=""
+      password=""
+      authtype="0"
+      server=""
+      proxy=""
+      port=""
+      mmsc=""
+      mmsproxy=""
+      mmsport=""
+      type="dun"
+      read_only="true"
+      user_visible="false"
+      roaming_protocol="IP"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="T-Mobile Emergency"
+      mcc="310"
+      mnc="490"
+      apn="sos"
+      authtype="0"
+      type="emergency"
+      protocol="IPV6"
+      read_only="true"
   />
 
-  <apn carrier="T-Mobile MMS EPDG"
+  <apn carrier="MetroPCS"
+      mcc="310"
+      mnc="490"
+      apn="fast.metropcs.com"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="default,supl,mms,xcap"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+  />
+
+  <apn carrier="EPDG MMS/XCAP"
       mcc="310"
       mnc="490"
       apn="tmus"
-      server="*"
-      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-      type="mms"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="mms,xcap"
+      mvno_match_data="6D"
+      mvno_type="gid"
       protocol="IPV6"
       roaming_protocol="IPV6"
-   />
+  />
 
-<apn carrier="T-Mobile US 490"
-  apn="epc.tmobile.com"
-  mcc="310"
-  mnc="490"
-  user="none"
-  server="*"
-  password="none"
-  mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-  type="default,supl,mms"
- />
+  <apn carrier="MetroPCS IMS"
+      mcc="310"
+      mnc="490"
+      apn="ims"
+      type="ims"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+      user_visible="false"
+  />
 
- <apn carrier="T-Mobile US SOS"
-  apn="sos"
-  mcc="310"
-  mnc="490"
-  type="ims"
-  protocol="IPV6"
-  roaming_protocol="IP"
- />
+  <apn carrier="EPDG IMS"
+      mcc="310"
+      mnc="490"
+      apn="ims"
+      type="ims"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      mmsc="epdg"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      user_visible="false"
+  />
+
+  <apn carrier="MetroPCS Tethering"
+      mcc="310"
+      mnc="490"
+      apn="pcweb.metropcs.com"
+      user=""
+      password=""
+      authtype="0"
+      server=""
+      proxy=""
+      port=""
+      mmsc=""
+      mmsproxy=""
+      mmsport=""
+      type="dun"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      user_visible="false"
+      roaming_protocol="IP"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="MetroPCS Emergency"
+      mcc="310"
+      mnc="490"
+      apn="sos"
+      authtype="0"
+      type="emergency"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+  />
+  <!-- VENDOR_EDIT end Patch#0503 [2018-08-20] -->
 
  <apn carrier="T-Mobile US 491"
   apn="fast.t-mobile.com"
@@ -12640,12 +14157,6 @@
       type="mms"
   />
 
-  <!-- VENDOR_EDIT start Patch#0500 -->
-  <!-- For 310580, add -->
-  <!-- For 310580, remove "T-Mobile US 580" and "T-Mobile US 580 DUN" -->
-  <!-- For 310580, modify -->
-  <!-- VENDOR_EDIT end Patch#0500 -->
-
   <apn carrier="MetroPCS 580"
       mcc="310"
       mnc="580"
@@ -12659,9 +14170,6 @@
   />
 
   <!-- VENDOR_EDIT start Patch#0500 -->
-  <!-- For 310580, add "Inland", "Inland Tethering" and "Inland FOTA" -->
-  <!-- For 310580, remove -->
-  <!-- For 310580, modify -->
   <apn carrier="Inland"
       mcc="310"
       mnc="580"
@@ -12669,7 +14177,7 @@
       mmsc="http://mms.inland3g.com/inland/mms.php"
       type="default,supl,mms,ims"
       protocol="IPV4V6"
-      roaming_protocol="IPV4"
+      roaming_protocol="IP"
   />
   <apn carrier="Inland Tethering"
       mcc="310"
@@ -12677,7 +14185,7 @@
       apn="modem.inland.com"
       type="dun"
       protocol="IPV4V6"
-      roaming_protocol="IPV4"
+      roaming_protocol="IP"
   />
   <apn carrier="Inland FOTA"
       mcc="310"
@@ -12685,7 +14193,7 @@
       apn="ota.inland.com"
       type="fota"
       protocol="IPV4V6"
-      roaming_protocol="IPV4"
+      roaming_protocol="IP"
   />
   <!-- VENDOR_EDIT end Patch#0500 -->
 
@@ -12707,7 +14215,7 @@
   <apn carrier="Inland IMS"
       mcc="310"
       mnc="580"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="inland"
@@ -12718,7 +14226,7 @@
   <apn carrier="Inland IMS"
       mcc="310"
       mnc="580"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="inland"
@@ -12777,12 +14285,6 @@
       bearer="14"
   />
 
-  <!-- VENDOR_EDIT start Patch#0500 -->
-  <!-- For 310580, add -->
-  <!-- For 310580, remove "T-Mobile US IMS", "T-Mobile MMS EPDG", "T-Mobile US 580" and "T-Mobile US SOS" -->
-  <!-- For 310580, modify -->
-  <!-- VENDOR_EDIT end Patch#0500 -->
-
   <apn carrier="CellularOne MMS"
       mcc="310"
       mnc="590"
@@ -12872,7 +14374,7 @@
   <apn carrier="Cellcom IMS"
       mcc="310"
       mnc="600"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="cellcom"
@@ -12883,7 +14385,7 @@
   <apn carrier="Cellcom IMS"
       mcc="310"
       mnc="600"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="cellcom"
@@ -13017,81 +14519,159 @@
   roaming_protocol="IP"
  />
 
-<apn carrier="T-Mobile US 660"
-  apn="fast.t-mobile.com"
-  mcc="310"
-  mnc="660"
-  mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-  type="default,supl,mms"
-  preferred="true"
-  protocol="IPV6"
-  roaming_protocol="IP"
- />
-
-  <apn carrier="T-Mobile US 660 DUN"
+  <!-- VENDOR_EDIT start Patch#0503 [2018-08-20] -->
+  <apn carrier="T-Mobile LTE"
       mcc="310"
       mnc="660"
-      apn="pcweb.tmobile.com"
-      user="none"
-      server="*"
-      password="none"
-      protocol="IP"
-      type="dun"
-      mtu="1440"
+      apn="fast.t-mobile.com"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="default,supl,mms,xcap"
+      protocol="IPV6"
       read_only="true"
   />
-  <apn carrier="MetroPCS 660"
+
+  <apn carrier="EPDG MMS/XCAP"
       mcc="310"
       mnc="660"
-      apn="fast.metropcs.com"
-      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
-      type="default,supl,mms"
+      apn="tmus"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="mms,xcap"
       protocol="IPV6"
-      roaming_protocol="IP"
-      mvno_match_data="6D"
-      mvno_type="gid"
+      roaming_protocol="IPV6"
+      read_only="true"
   />
 
-  <apn carrier="TMobile (IMS)"
+  <apn carrier="T-Mobile IMS"
       mcc="310"
       mnc="660"
       apn="ims"
       type="ims"
       protocol="IPV6"
+      read_only="true"
+      user_visible="false"
+  />
+
+  <apn carrier="EPDG IMS"
+      mcc="310"
+      mnc="660"
+      apn="ims"
+      type="ims"
+      mmsc="epdg"
+      protocol="IPV6"
       roaming_protocol="IPV6"
       read_only="true"
+      user_visible="false"
+  />
+
+  <apn carrier="T-Mobile Tethering"
+      mcc="310"
+      mnc="660"
+      apn="pcweb.tmobile.com"
+      user=""
+      password=""
+      authtype="0"
+      server=""
+      proxy=""
+      port=""
+      mmsc=""
+      mmsproxy=""
+      mmsport=""
+      type="dun"
+      read_only="true"
+      user_visible="false"
+      roaming_protocol="IP"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="T-Mobile Emergency"
+      mcc="310"
+      mnc="660"
+      apn="sos"
+      authtype="0"
+      type="emergency"
+      protocol="IPV6"
+      read_only="true"
   />
 
-  <apn carrier="T-Mobile MMS EPDG"
+  <apn carrier="MetroPCS"
+      mcc="310"
+      mnc="660"
+      apn="fast.metropcs.com"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="default,supl,mms,xcap"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+  />
+
+  <apn carrier="EPDG MMS/XCAP"
       mcc="310"
       mnc="660"
       apn="tmus"
-      server="*"
-      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-      type="mms"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="mms,xcap"
+      mvno_match_data="6D"
+      mvno_type="gid"
       protocol="IPV6"
       roaming_protocol="IPV6"
   />
 
-<apn carrier="T-Mobile US 660"
-  apn="epc.tmobile.com"
-  mcc="310"
-  mnc="660"
-  user="none"
-  server="*"
-  password="none"
-  mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-  type="default,supl,mms"
- />
+  <apn carrier="MetroPCS IMS"
+      mcc="310"
+      mnc="660"
+      apn="ims"
+      type="ims"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+      user_visible="false"
+  />
 
- <apn carrier="T-Mobile US SOS"
-  apn="sos"
-  mcc="310"
-  mnc="660"
-  type="ims"
-  protocol="IPV6"
-  roaming_protocol="IP"
- />
+  <apn carrier="EPDG IMS"
+      mcc="310"
+      mnc="660"
+      apn="ims"
+      type="ims"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      mmsc="epdg"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      user_visible="false"
+  />
+
+  <apn carrier="MetroPCS Tethering"
+      mcc="310"
+      mnc="660"
+      apn="pcweb.metropcs.com"
+      user=""
+      password=""
+      authtype="0"
+      server=""
+      proxy=""
+      port=""
+      mmsc=""
+      mmsproxy=""
+      mmsport=""
+      type="dun"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      user_visible="false"
+      roaming_protocol="IP"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="MetroPCS Emergency"
+      mcc="310"
+      mnc="660"
+      apn="sos"
+      authtype="0"
+      type="emergency"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+  />
+  <!-- VENDOR_EDIT end Patch#0503 [2018-08-20] -->
 
 <apn carrier="ATT Phone"
   apn="phone"
@@ -13140,7 +14720,7 @@
   <apn carrier="Appalachian IMS"
       mcc="310"
       mnc="750"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="appalachian"
@@ -13151,7 +14731,7 @@
   <apn carrier="Appalachian IMS"
       mcc="310"
       mnc="750"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="appalachian"
@@ -13241,80 +14821,160 @@
       mmsport="9401"
       type="mms"
   />
-  <apn carrier="T-Mobile US 800"
+
+  <!-- VENDOR_EDIT start Patch#0503 [2018-08-20] -->
+  <apn carrier="T-Mobile LTE"
       mcc="310"
       mnc="800"
-      protocol="IPV6"
-      roaming_protocol="IP"
       apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-      type="default,supl,mms"
-      preferred="true"
-  />
-  <apn carrier="T-Mobile US 800 DUN"
-      mcc="310"
-      mnc="800"
-      apn="pcweb.tmobile.com"
-      user="none"
-      server="*"
-      password="none"
-      protocol="IP"
-      type="dun"
-      mtu="1440"
+      type="default,supl,mms,xcap"
+      protocol="IPV6"
       read_only="true"
   />
-  <apn carrier="MetroPCS 800"
+
+  <apn carrier="EPDG MMS/XCAP"
       mcc="310"
       mnc="800"
-      apn="fast.metropcs.com"
-      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
-      type="default,supl,mms"
-      protocol="IPV4V6"
-      roaming_protocol="IP"
-      mvno_match_data="6D"
-      mvno_type="gid"
+      apn="tmus"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="mms,xcap"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      read_only="true"
   />
 
-  <apn carrier="TMobile (IMS)"
+  <apn carrier="T-Mobile IMS"
       mcc="310"
       mnc="800"
       apn="ims"
       type="ims"
       protocol="IPV6"
+      read_only="true"
+      user_visible="false"
+  />
+
+  <apn carrier="EPDG IMS"
+      mcc="310"
+      mnc="800"
+      apn="ims"
+      type="ims"
+      mmsc="epdg"
+      protocol="IPV6"
       roaming_protocol="IPV6"
       read_only="true"
+      user_visible="false"
+  />
+
+  <apn carrier="T-Mobile Tethering"
+      mcc="310"
+      mnc="800"
+      apn="pcweb.tmobile.com"
+      user=""
+      password=""
+      authtype="0"
+      server=""
+      proxy=""
+      port=""
+      mmsc=""
+      mmsproxy=""
+      mmsport=""
+      type="dun"
+      read_only="true"
+      user_visible="false"
+      roaming_protocol="IP"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="T-Mobile Emergency"
+      mcc="310"
+      mnc="800"
+      apn="sos"
+      authtype="0"
+      type="emergency"
+      protocol="IPV6"
+      read_only="true"
   />
 
-  <apn carrier="T-Mobile MMS EPDG"
+  <apn carrier="MetroPCS"
+      mcc="310"
+      mnc="800"
+      apn="fast.metropcs.com"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="default,supl,mms,xcap"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+  />
+
+  <apn carrier="EPDG MMS/XCAP"
       mcc="310"
       mnc="800"
       apn="tmus"
-      server="*"
-      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-      type="mms"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="mms,xcap"
+      mvno_match_data="6D"
+      mvno_type="gid"
       protocol="IPV6"
       roaming_protocol="IPV6"
   />
 
-<apn carrier="T-Mobile US 800"
-  apn="epc.tmobile.com"
-  mcc="310"
-  mnc="800"
-  user="none"
-  server="*"
-  password="none"
-  mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-  type="default,supl,mms"
- />
+  <apn carrier="MetroPCS IMS"
+      mcc="310"
+      mnc="800"
+      apn="ims"
+      type="ims"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+      user_visible="false"
+  />
 
- <apn carrier="T-Mobile US SOS"
-  apn="sos"
-  mcc="310"
-  mnc="800"
-  type="ims"
-  protocol="IPV6"
-  roaming_protocol="IP"
- />
+  <apn carrier="EPDG IMS"
+      mcc="310"
+      mnc="800"
+      apn="ims"
+      type="ims"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      mmsc="epdg"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      user_visible="false"
+  />
+
+  <apn carrier="MetroPCS Tethering"
+      mcc="310"
+      mnc="800"
+      apn="pcweb.metropcs.com"
+      user=""
+      password=""
+      authtype="0"
+      server=""
+      proxy=""
+      port=""
+      mmsc=""
+      mmsproxy=""
+      mmsport=""
+      type="dun"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      user_visible="false"
+      roaming_protocol="IP"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="MetroPCS Emergency"
+      mcc="310"
+      mnc="800"
+      apn="sos"
+      authtype="0"
+      type="emergency"
+      mvno_match_data="6D"
+      mvno_type="gid"
+      protocol="IPV6"
+  />
+  <!-- VENDOR_EDIT end Patch#0503 [2018-08-20] -->
 
   <apn carrier="nepa"
       mcc="310"
@@ -13334,7 +14994,7 @@
   <apn carrier="Nepa IMS"
       mcc="310"
       mnc="820"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="nepa"
@@ -13345,7 +15005,7 @@
   <apn carrier="Nepa IMS"
       mcc="310"
       mnc="820"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="nepa"
@@ -13460,7 +15120,7 @@
   <apn carrier="Midrivers IMS"
       mcc="310"
       mnc="900"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="midrivers"
@@ -13471,7 +15131,7 @@
   <apn carrier="Midrivers IMS"
       mcc="310"
       mnc="900"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="midrivers"
@@ -13556,7 +15216,7 @@
   <apn carrier="Jamesvalley IMS"
       mcc="310"
       mnc="920"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="jamesvalley"
@@ -13567,7 +15227,7 @@
   <apn carrier="Jamesvalley IMS"
       mcc="310"
       mnc="920"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="jamesvalley"
@@ -13643,7 +15303,7 @@
   <apn carrier="Coppervalley IMS"
       mcc="310"
       mnc="930"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="coppervalley"
@@ -13654,7 +15314,7 @@
   <apn carrier="Coppervalley IMS"
       mcc="310"
       mnc="930"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="coppervalley"
@@ -13730,7 +15390,7 @@
   <apn carrier="Nntcwire IMS"
       mcc="310"
       mnc="960"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="nntcwire"
@@ -13741,7 +15401,7 @@
   <apn carrier="Nntcwire IMS"
       mcc="310"
       mnc="960"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="nntcwire"
@@ -13817,7 +15477,7 @@
   <apn carrier="Silverstar IMS"
       mcc="310"
       mnc="960"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="silverstar"
@@ -13828,7 +15488,7 @@
   <apn carrier="Silverstar IMS"
       mcc="310"
       mnc="960"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="silverstar"
@@ -13904,7 +15564,7 @@
   <apn carrier="Snakeriver IMS"
       mcc="310"
       mnc="960"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="snakeriver"
@@ -13915,7 +15575,7 @@
   <apn carrier="Snakeriver IMS"
       mcc="310"
       mnc="960"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="snakeriver"
@@ -13991,7 +15651,7 @@
   <apn carrier="Southcentral IMS"
       mcc="310"
       mnc="960"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="southcentral"
@@ -14002,7 +15662,7 @@
   <apn carrier="Southcentral IMS"
       mcc="310"
       mnc="960"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="southcentral"
@@ -14078,7 +15738,7 @@
   <apn carrier="Strata IMS"
       mcc="310"
       mnc="960"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="strata"
@@ -14089,7 +15749,7 @@
   <apn carrier="Strata IMS"
       mcc="310"
       mnc="960"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="strata"
@@ -14165,7 +15825,7 @@
   <apn carrier="Syringa IMS"
       mcc="310"
       mnc="960"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="syringa"
@@ -14176,7 +15836,7 @@
   <apn carrier="Syringa IMS"
       mcc="310"
       mnc="960"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="syringa"
@@ -14253,7 +15913,7 @@
   <apn carrier="Thumb IMS"
       mcc="311"
       mnc="050"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="thumbcellular"
@@ -14264,7 +15924,7 @@
   <apn carrier="Thumb IMS"
       mcc="311"
       mnc="050"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="thumbcellular"
@@ -14340,7 +16000,7 @@
   <apn carrier="Elementmobile IMS"
       mcc="311"
       mnc="070"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="elementmobile"
@@ -14351,7 +16011,7 @@
   <apn carrier="Elementmobile IMS"
       mcc="311"
       mnc="070"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="elementmobile"
@@ -14455,7 +16115,7 @@
   <apn carrier="Sprocket IMS"
       mcc="311"
       mnc="140"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="sprocket"
@@ -14466,7 +16126,7 @@
   <apn carrier="Sprocket IMS"
       mcc="311"
       mnc="140"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="sprocket"
@@ -14525,6 +16185,26 @@
       bearer="14"
   />
 
+  <apn carrier="ATT Nextgenphone"
+      mcc="311"
+      mnc="180"
+      apn="nxtgenphone"
+      type="default,mms,supl,fota,hipri"
+      mmsc="http://mmsc.mobile.att.net"
+      mmsproxy="proxy.mobile.att.net"
+      mmsport="80"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="ims"
+      mcc="311"
+      mnc="180"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
 <apn carrier="ATT Phone"
   apn="phone"
   mcc="311"
@@ -15804,7 +17484,7 @@
   <apn carrier="Leaco IMS"
       mcc="311"
       mnc="310"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="leaco"
@@ -15815,7 +17495,7 @@
   <apn carrier="Leaco IMS"
       mcc="311"
       mnc="310"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="leaco"
@@ -15891,7 +17571,7 @@
   <apn carrier="Illinois IMS"
       mcc="311"
       mnc="340"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="illinoisvalley"
@@ -15902,7 +17582,7 @@
   <apn carrier="Illinois IMS"
       mcc="311"
       mnc="340"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="illinoisvalley"
@@ -15978,7 +17658,7 @@
   <apn carrier="Nemont IMS"
       mcc="311"
       mnc="350"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="nemont"
@@ -15989,7 +17669,7 @@
   <apn carrier="Nemont IMS"
       mcc="311"
       mnc="350"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="nemont"
@@ -16140,7 +17820,7 @@
   <apn carrier="Ericsson Test-SIM IMS"
       mcc="311"
       mnc="390"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -16153,7 +17833,7 @@
   <apn carrier="Ericsson Test-SIM IMS"
       mcc="311"
       mnc="390"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -16209,7 +17889,7 @@
   <apn carrier="Chatmobrsa2 IMS"
       mcc="311"
       mnc="410"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="chatmobrsa2"
@@ -16220,7 +17900,7 @@
   <apn carrier="Chatmobrsa2 IMS"
       mcc="311"
       mnc="410"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="chatmobrsa2"
@@ -16296,7 +17976,7 @@
   <apn carrier="NW IMS"
       mcc="311"
       mnc="420"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="northwestcell"
@@ -16307,7 +17987,7 @@
   <apn carrier="NW IMS"
       mcc="311"
       mnc="420"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="northwestcell"
@@ -16383,7 +18063,7 @@
   <apn carrier="Chatmobrsa1 IMS"
       mcc="311"
       mnc="430"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="chatmobrsa1"
@@ -16394,7 +18074,7 @@
   <apn carrier="Chatmobrsa1 IMS"
       mcc="311"
       mnc="430"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="chatmobrsa1"
@@ -16470,7 +18150,7 @@
   <apn carrier="Bluegrass IMS"
       mcc="311"
       mnc="440"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="bluegrass"
@@ -16481,7 +18161,7 @@
   <apn carrier="Bluegrass IMS"
       mcc="311"
       mnc="440"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="bluegrass"
@@ -16557,7 +18237,7 @@
   <apn carrier="Ptci IMS"
       mcc="311"
       mnc="450"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="ptci"
@@ -16568,7 +18248,7 @@
   <apn carrier="Ptci IMS"
       mcc="311"
       mnc="450"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="ptci"
@@ -16626,604 +18306,76 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn carrier="Verizon"
-      mcc="311"
-      mnc="480"
-      apn="internet"
-      authtype="3"
-      type="default,mms,supl,fota,ims,cbs,dun"
-      mmsc="http://mms.vtext.com/servlets/mms"
-      protocol="IPV4V6"
-      bearer="4"
-  />
-  <apn carrier="Verizon"
-      mcc="311"
-      mnc="480"
-      apn="internet"
-      authtype="3"
-      type="default,mms,supl,fota,ims,cbs,dun"
-      mmsc="http://mms.vtext.com/servlets/mms"
-      protocol="IPV4V6"
-      bearer="5"
-  />
-  <apn carrier="Verizon"
-      mcc="311"
-      mnc="480"
-      apn="internet"
-      authtype="3"
-      type="default,mms,supl,fota,ims,cbs,dun"
-      mmsc="http://mms.vtext.com/servlets/mms"
-      protocol="IPV4V6"
-      bearer="6"
-  />
-  <apn carrier="Verizon"
-      mcc="311"
-      mnc="480"
-      apn="internet"
-      authtype="3"
-      type="default,mms,supl,fota,ims,cbs,dun"
-      mmsc="http://mms.vtext.com/servlets/mms"
-      protocol="IPV4V6"
-      bearer="7"
-  />
-  <apn carrier="Verizon"
-      mcc="311"
-      mnc="480"
-      apn="internet"
-      authtype="3"
-      type="default,mms,supl,fota,ims,cbs,dun"
-      mmsc="http://mms.vtext.com/servlets/mms"
-      protocol="IPV4V6"
-      bearer="8"
-  />
-  <apn carrier="Verizon"
-      mcc="311"
-      mnc="480"
-      apn="internet"
-      authtype="3"
-      type="default,mms,supl,fota,ims,cbs,dun"
-      mmsc="http://mms.vtext.com/servlets/mms"
-      protocol="IPV4V6"
-      bearer="12"
-  />
-  <apn carrier="Verizon"
+<!--  VENDOR_EDIT start Patch#0529 [2018-08-27] -->
+
+  <!-- bearer 1, 2, 3, 9, 10, 11, 13, 14, 15 -->
+  <apn carrier="Verizon Internet"
       mcc="311"
       mnc="480"
       apn="VZWINTERNET"
       type="default,dun,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      bearer="1"
+      bearer_bitmask="1|2|3|9|10|11|13|14|15|18"
       profile_id="0"
       modem_cognitive="true"
-      max_conns="1023"
+      max_conns="20"
       max_conns_time="300"
-  />
-  <apn carrier="Verizon"
-      mcc="311"
-      mnc="480"
-      apn="VZWINTERNET"
-      type="default,dun,supl"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="2"
-      profile_id="0"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="Verizon"
-      mcc="311"
-      mnc="480"
-      apn="VZWINTERNET"
-      type="default,dun,supl"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="3"
-      profile_id="0"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="Verizon"
-      mcc="311"
-      mnc="480"
-      apn="VZWINTERNET"
-      type="default,dun,supl"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="9"
-      profile_id="0"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="Verizon"
-      mcc="311"
-      mnc="480"
-      apn="VZWINTERNET"
-      type="default,dun,supl"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="10"
-      profile_id="0"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="Verizon"
-      mcc="311"
-      mnc="480"
-      apn="VZWINTERNET"
-      type="default,dun,supl"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="11"
-      profile_id="0"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="Verizon"
-      mcc="311"
-      mnc="480"
-      apn="VZWINTERNET"
-      type="default,dun,supl"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="15"
-      profile_id="0"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="EHRPD - Verizon Internet"
-      mcc="311"
-      mnc="480"
-      apn="VZWINTERNET"
-      type="default,dun,supl"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="13"
-      profile_id="0"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="LTE - Verizon Internet"
-      mcc="311"
-      mnc="480"
-      apn="VZWINTERNET"
-      type="default,dun,supl"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="14"
-      profile_id="0"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="Verizon"
-      mcc="311"
-      mnc="480"
-      apn="VZWADMIN"
-      type="fota"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="1"
-      profile_id="3"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="Verizon"
-      mcc="311"
-      mnc="480"
-      apn="VZWADMIN"
-      type="fota"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="2"
-      profile_id="3"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="Verizon"
-      mcc="311"
-      mnc="480"
-      apn="VZWADMIN"
-      type="fota"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="3"
-      profile_id="3"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="Verizon"
-      mcc="311"
-      mnc="480"
-      apn="VZWADMIN"
-      type="fota"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="9"
-      profile_id="3"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="Verizon"
-      mcc="311"
-      mnc="480"
-      apn="VZWADMIN"
-      type="fota"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="10"
-      profile_id="3"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="Verizon"
-      mcc="311"
-      mnc="480"
-      apn="VZWADMIN"
-      type="fota"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="11"
-      profile_id="3"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="Verizon"
-      mcc="311"
-      mnc="480"
-      apn="VZWADMIN"
-      type="fota"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="15"
-      profile_id="3"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="EHRPD - Verizon FOTA"
-      mcc="311"
-      mnc="480"
-      apn="VZWADMIN"
-      type="fota"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="13"
-      profile_id="3"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="LTE - Verizon FOTA"
-      mcc="311"
-      mnc="480"
-      apn="VZWADMIN"
-      type="fota"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="14"
-      profile_id="3"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="Verizon"
-      mcc="311"
-      mnc="480"
-      apn="IMS"
-      type="ims,ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="1"
-      profile_id="2"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="Verizon"
-      mcc="311"
-      mnc="480"
-      apn="IMS"
-      type="ims,ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="2"
-      profile_id="2"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="Verizon"
-      mcc="311"
-      mnc="480"
-      apn="IMS"
-      type="ims,ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="3"
-      profile_id="2"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="Verizon"
-      mcc="311"
-      mnc="480"
-      apn="IMS"
-      type="ims,ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="9"
-      profile_id="2"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="Verizon"
-      mcc="311"
-      mnc="480"
-      apn="IMS"
-      type="ims,ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="10"
-      profile_id="2"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="Verizon"
-      mcc="311"
-      mnc="480"
-      apn="IMS"
-      type="ims,ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="11"
-      profile_id="2"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="Verizon"
-      mcc="311"
-      mnc="480"
-      apn="IMS"
-      type="ims,ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="15"
-      profile_id="2"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="EHRPD - Verizon IMS"
-      mcc="311"
-      mnc="480"
-      apn="IMS"
-      type="ims,ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="13"
-      profile_id="2"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="LTE - Verizon IMS"
-      mcc="311"
-      mnc="480"
-      apn="IMS"
-      type="ims,ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="14"
-      profile_id="2"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="Verizon"
-      mcc="311"
-      mnc="480"
-      apn="VZWAPP"
-      type="cbs,mms"
-      mmsc="http://mms.vtext.com/servlets/mms"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="1"
-      profile_id="4"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="Verizon"
-      mcc="311"
-      mnc="480"
-      apn="VZWAPP"
-      type="cbs,mms"
-      mmsc="http://mms.vtext.com/servlets/mms"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="2"
-      profile_id="4"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="Verizon"
-      mcc="311"
-      mnc="480"
-      apn="VZWAPP"
-      type="cbs,mms"
-      mmsc="http://mms.vtext.com/servlets/mms"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="3"
-      profile_id="4"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="Verizon"
-      mcc="311"
-      mnc="480"
-      apn="VZWAPP"
-      type="cbs,mms"
-      mmsc="http://mms.vtext.com/servlets/mms"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="9"
-      profile_id="4"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="Verizon"
-      mcc="311"
-      mnc="480"
-      apn="VZWAPP"
-      type="cbs,mms"
-      mmsc="http://mms.vtext.com/servlets/mms"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="10"
-      profile_id="4"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="Verizon"
-      mcc="311"
-      mnc="480"
-      apn="VZWAPP"
-      type="cbs,mms"
-      mmsc="http://mms.vtext.com/servlets/mms"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="11"
-      profile_id="4"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="Verizon"
-      mcc="311"
-      mnc="480"
-      apn="VZWAPP"
-      type="cbs,mms"
-      mmsc="http://mms.vtext.com/servlets/mms"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="15"
-      profile_id="4"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="EHRPD - Verizon CBS"
-      mcc="311"
-      mnc="480"
-      apn="VZWAPP"
-      type="cbs,mms"
-      mmsc="http://mms.vtext.com/servlets/mms"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="13"
-      profile_id="4"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="LTE - Verizon CBS"
-      mcc="311"
-      mnc="480"
-      apn="VZWAPP"
-      type="cbs,mms"
-      mmsc="http://mms.vtext.com/servlets/mms"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="14"
-      profile_id="4"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="LTE - Verizon Internet"
-      mcc="311"
-      mnc="480"
-      apn="VZWINTERNET"
-      type="default,dun,supl"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="18"
-      profile_id="0"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="LTE - Verizon FOTA"
-      mcc="311"
-      mnc="480"
-      apn="VZWADMIN"
-      type="fota"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="18"
-      profile_id="3"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="LTE - Verizon IMS"
-      mcc="311"
-      mnc="480"
-      apn="VZWIMS"
-      type="ims,ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="18"
-      profile_id="2"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-  <apn carrier="LTE - Verizon CBS"
-      mcc="311"
-      mnc="480"
-      apn="VZWAPP"
-      type="cbs,mms"
-      mmsc="http://mms.vtext.com/servlets/mms"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="18"
-      profile_id="4"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
+      wait_time="0"
   />
 
-<apn carrier="Verizon 800"
-  apn="VZW800"
-  mcc="311"
-  mnc="480"
-  type="cas"
-  protocol="IPV4V6"
- />
+  <!-- bearer 1, 2, 3, 9, 10, 11, 13, 14, 15 -->
+  <apn carrier="Verizon FOTA"
+      mcc="311"
+      mnc="480"
+      apn="VZWADMIN"
+      type="fota"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer_bitmask="1|2|3|9|10|11|13|14|15|18"
+      profile_id="3"
+      modem_cognitive="true"
+      max_conns="20"
+      max_conns_time="300"
+      wait_time="0"
+      user_visible="false"
+  />
+
+  <!-- bearer 1, 2, 3, 9, 10, 11, 13, 14, 15 -->
+  <apn carrier="Verizon IMS"
+      mcc="311"
+      mnc="480"
+      apn="IMS"
+      type="ims,ia"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer_bitmask="1|2|3|9|10|11|13|14|15|18"
+      profile_id="2"
+      modem_cognitive="true"
+      max_conns="20"
+      max_conns_time="300"
+      wait_time="0"
+      user_visible="false"
+  />
+
+  <!-- bearer 1, 2, 3, 9, 10, 11, 13, 14, 15 -->
+  <apn carrier="Verizon CBS"
+      mcc="311"
+      mnc="480"
+      apn="VZWAPP"
+      type="cbs,mms"
+      mmsc="http://mms.vtext.com/servlets/mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer_bitmask="1|2|3|9|10|11|13|14|15|18"
+      profile_id="4"
+      modem_cognitive="true"
+      max_conns="20"
+      max_conns_time="300"
+      wait_time="0"
+      user_visible="false"
+  />
+<!--  VENDOR_EDIT end Patch#0529 [2018-08-27] -->
 
 <apn carrier="Verizon"
   apn="internet"
@@ -17253,7 +18405,7 @@
  />
 
 <apn carrier="Verizon IMS"
-  apn="VZWIMS"
+  apn="IMS"
   mcc="311"
   mnc="482"
   type="ims"
@@ -17299,7 +18451,7 @@
  />
 
 <apn carrier="Verizon IMS"
-  apn="VZWIMS"
+  apn="IMS"
   mcc="311"
   mnc="485"
   type="ims"
@@ -18694,7 +19846,7 @@
   <apn carrier="Gsc IMS"
       mcc="311"
       mnc="590"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="gsc"
@@ -18705,7 +19857,7 @@
   <apn carrier="Gsc IMS"
       mcc="311"
       mnc="590"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="gsc"
@@ -18781,7 +19933,7 @@
   <apn carrier="Cox IMS"
       mcc="311"
       mnc="600"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="cox"
@@ -18792,7 +19944,7 @@
   <apn carrier="Cox IMS"
       mcc="311"
       mnc="600"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="cox"
@@ -18868,7 +20020,7 @@
   <apn carrier="Srtcomm IMS"
       mcc="311"
       mnc="610"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="srtcomm"
@@ -18879,7 +20031,7 @@
   <apn carrier="Srtcomm IMS"
       mcc="311"
       mnc="610"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="srtcomm"
@@ -18955,7 +20107,7 @@
   <apn carrier="United IMS"
       mcc="311"
       mnc="650"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="unitedwireless"
@@ -18966,7 +20118,7 @@
   <apn carrier="United IMS"
       mcc="311"
       mnc="650"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="unitedwireless"
@@ -19069,7 +20221,7 @@
   <apn carrier="Pinebelt IMS"
       mcc="311"
       mnc="670"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="pinebelt"
@@ -19080,7 +20232,7 @@
   <apn carrier="Pinebelt IMS"
       mcc="311"
       mnc="670"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="pinebelt"
@@ -19308,7 +20460,7 @@
   <apn carrier="Chariton IMS"
       mcc="311"
       mnc="920"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="charitonvalley"
@@ -19319,7 +20471,7 @@
   <apn carrier="Chariton IMS"
       mcc="311"
       mnc="920"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="charitonvalley"
@@ -19363,6 +20515,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
+
   <apn carrier="Chariton valley"
       mcc="311"
       mnc="920"
@@ -19388,7 +20541,6 @@
       type="default,internet,admin,fota,dun,mms"
       protocol="IPV4V6"
   />
-
   <apn carrier="custer"
       mcc="312"
       mnc="040"
@@ -19407,7 +20559,7 @@
   <apn carrier="Custer IMS"
       mcc="312"
       mnc="040"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="custer"
@@ -19418,7 +20570,7 @@
   <apn carrier="Custer IMS"
       mcc="312"
       mnc="040"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="custer"
@@ -19494,7 +20646,7 @@
   <apn carrier="Chatmobility IMS"
       mcc="312"
       mnc="160"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="chatmobility"
@@ -19505,7 +20657,7 @@
   <apn carrier="Chatmobility IMS"
       mcc="312"
       mnc="160"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="chatmobility"
@@ -19769,6 +20921,26 @@
       protocol="IPV4V6"
   />
 
+  <apn carrier="ATT FirstNet"
+      mcc="313"
+      mnc="100"
+      apn="firstnet-phone"
+      type="default,mms,supl,fota,hipri"
+      mmsc="http://mmsc.mobile.att.net"
+      mmsproxy="proxy.mobile.att.net"
+      mmsport="80"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="ims"
+      mcc="313"
+      mnc="100"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
   <apn carrier="Sprint APN"
       mcc="316"
       mnc="010"
@@ -19800,7 +20972,7 @@
   <apn carrier="Openmobile IMS"
       mcc="330"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="openmobile"
@@ -19811,7 +20983,7 @@
   <apn carrier="Openmobile IMS"
       mcc="330"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="openmobile"
@@ -19986,38 +21158,38 @@
       authtype="0"
       type="mms"
   />
-  <apn carrier='Nextel Localización'
-      mcc='334'
-      mnc='090'
-      apn='location.nexteldata.com.mx'
-      server='http://supl.nexteldata.com.mx'
-      authtype='0'
-      type='supl'
-      port='7275'
+  <apn carrier="Nextel Localización"
+      mcc="334"
+      mnc="090"
+      apn="location.nexteldata.com.mx"
+      server="http://supl.nexteldata.com.mx"
+      authtype="0"
+      type="supl"
+      port="7275"
   />
-  <apn carrier='Nextel MMS'
-      mcc='334'
-      mnc='090'
-      apn='mms.nexteldata.com.mx'
-      authtype='0'
-      mmsc='http://3gmms.nexteldata.com.mx'
-      mmsproxy='129.192.129.104'
-      mmsport='8080'
-      type='mms'
+  <apn carrier="Nextel MMS"
+      mcc="334"
+      mnc="090"
+      apn="mms.nexteldata.com.mx"
+      authtype="0"
+      mmsc="http://3gmms.nexteldata.com.mx"
+      mmsproxy="129.192.129.104"
+      mmsport="8080"
+      type="mms"
   />
-  <apn carrier='Nextel Modem'
-      mcc='334'
-      mnc='090'
-      apn='modem.nexteldata.com.mx'
-      authtype='0'
-      type='dun'
+  <apn carrier="Nextel Modem"
+      mcc="334"
+      mnc="090"
+      apn="modem.nexteldata.com.mx"
+      authtype="0"
+      type="dun"
   />
-  <apn carrier='Nextel Navegación'
-      mcc='334'
-      mnc='090'
-      apn='wap.nexteldata.com.mx'
-      authtype='0'
-      type='default'
+  <apn carrier="Nextel Navegación"
+      mcc="334"
+      mnc="090"
+      apn="wap.nexteldata.com.mx"
+      authtype="0"
+      type="default"
   />
 
   <apn carrier="INTERNET Digicel"
@@ -20216,13 +21388,13 @@
       mmsc="http://mmsc"
       type="mms"
   />
-  <apn carrier='Barbado:Lime:Internet'
-      mcc='342'
-      mnc='600'
-      apn='internet'
-      authtype='1'
-      mmsc='http://www.time4lime.com/'
-      type='default'
+  <apn carrier="Barbado:Lime:Internet"
+      mcc="342"
+      mnc="600"
+      apn="internet"
+      authtype="1"
+      mmsc="http://www.time4lime.com/"
+      type="default"
   />
   <apn carrier="Barbados:Lime:Mms"
       mcc="342"
@@ -20234,13 +21406,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn carrier='Barbado:Lime:Modem'
-      mcc='342'
-      mnc='600'
-      apn='internet'
-      authtype='1'
-      mmsc='http://www.time4lime.com/'
-      type='dun'
+  <apn carrier="Barbado:Lime:Modem"
+      mcc="342"
+      mnc="600"
+      apn="internet"
+      authtype="1"
+      mmsc="http://www.time4lime.com/"
+      type="dun"
   />
 
   <apn carrier="Lime Internet Postpaid"
@@ -20262,31 +21434,31 @@
       mmsc="http://mmsc"
       type="mms"
   />
-  <apn carrier='Antigua:Lime:Internet'
-      mcc='344'
-      mnc='920'
-      apn='internet'
-      authtype='1'
-      mmsc='http://www.time4lime.com/'
-      type='default'
+  <apn carrier="Antigua:Lime:Internet"
+      mcc="344"
+      mnc="920"
+      apn="internet"
+      authtype="1"
+      mmsc="http://www.time4lime.com/"
+      type="default"
   />
-  <apn carrier='Antigua:Lime:Mms'
-      mcc='344'
-      mnc='920'
-      apn='multimedia'
-      authtype='1'
-      mmsc='http://mmsc'
-      mmsproxy='10.20.5.34'
-      mmsport='8799'
-      type='mms'
+  <apn carrier="Antigua:Lime:Mms"
+      mcc="344"
+      mnc="920"
+      apn="multimedia"
+      authtype="1"
+      mmsc="http://mmsc"
+      mmsproxy="10.20.5.34"
+      mmsport="8799"
+      type="mms"
   />
-  <apn carrier='Antigua:Lime:Modem'
-      mcc='344'
-      mnc='920'
-      apn='internet'
-      authtype='1'
-      mmsc='http://www.time4lime.com/'
-      type='dun'
+  <apn carrier="Antigua:Lime:Modem"
+      mcc="344"
+      mnc="920"
+      apn="internet"
+      authtype="1"
+      mmsc="http://www.time4lime.com/"
+      type="dun"
   />
 
   <apn carrier="Lime Internet Postpaid"
@@ -20308,31 +21480,31 @@
       mmsc="http://mmsc"
       type="mms"
   />
-  <apn carrier='Cayman Islands:Lime:Internet'
-      mcc='346'
-      mnc='140'
-      apn='internet'
-      authtype='1'
-      mmsc='http://www.time4lime.com/'
-      type='default'
+  <apn carrier="Cayman Islands:Lime:Internet"
+      mcc="346"
+      mnc="140"
+      apn="internet"
+      authtype="1"
+      mmsc="http://www.time4lime.com/"
+      type="default"
   />
-  <apn carrier='Cayman Islands:Lime:Modem'
-      mcc='346'
-      mnc='140'
-      apn='internet'
-      authtype='1'
-      mmsc='http://www.time4lime.com/'
-      type='dun'
+  <apn carrier="Cayman Islands:Lime:Modem"
+      mcc="346"
+      mnc="140"
+      apn="internet"
+      authtype="1"
+      mmsc="http://www.time4lime.com/"
+      type="dun"
   />
-  <apn carrier='Cayman Islands:Mms'
-      mcc='346'
-      mnc='140'
-      apn='multimedia'
-      authtype='1'
-      mmsc='http://mmsc'
-      mmsproxy='10.20.5.34'
-      mmsport='8799'
-      type='mms'
+  <apn carrier="Cayman Islands:Mms"
+      mcc="346"
+      mnc="140"
+      apn="multimedia"
+      authtype="1"
+      mmsc="http://mmsc"
+      mmsproxy="10.20.5.34"
+      mmsport="8799"
+      type="mms"
   />
 
   <apn carrier="Lime Internet Postpaid"
@@ -20354,62 +21526,62 @@
       mmsc="http://mmsc"
       type="mms"
   />
-  <apn carrier='Bvi:Digicel:Internet'
-      mcc='348'
-      mnc='77'
-      apn='wap.digicelbvi.com'
-      authtype='1'
-      type='default'
+  <apn carrier="Bvi:Digicel:Internet"
+      mcc="348"
+      mnc="77"
+      apn="wap.digicelbvi.com"
+      authtype="1"
+      type="default"
   />
-  <apn carrier='Bvi:Digicel:Mms'
-      mcc='348'
-      mnc='77'
-      apn='wap.digicelbvi.com'
-      authtype='1'
-      mmsc='http://mmc.digiceljamaica.com/servlets/mms'
-      mmsproxy='172.16.7.12'
-      mmsport='9201'
-      type='mms'
-      user='wapbvi'
-      password='wapbvi'
+  <apn carrier="Bvi:Digicel:Mms"
+      mcc="348"
+      mnc="77"
+      apn="wap.digicelbvi.com"
+      authtype="1"
+      mmsc="http://mmc.digiceljamaica.com/servlets/mms"
+      mmsproxy="172.16.7.12"
+      mmsport="9201"
+      type="mms"
+      user="wapbvi"
+      password="wapbvi"
   />
-  <apn carrier='Bvi:Digicel:Modem'
-      mcc='348'
-      mnc='77'
-      apn='wap.digicelbvi.com'
-      port='8080'
-      authtype='1'
-      proxy='172.16.7.12'
-      mmsc='http://wapdigicel.com'
-      type='dun'
-      user='wapbvi'
-      password='wapbvi'
+  <apn carrier="Bvi:Digicel:Modem"
+      mcc="348"
+      mnc="77"
+      apn="wap.digicelbvi.com"
+      port="8080"
+      authtype="1"
+      proxy="172.16.7.12"
+      mmsc="http://wapdigicel.com"
+      type="dun"
+      user="wapbvi"
+      password="wapbvi"
   />
-  <apn carrier='Bvi:Lime:Internet'
-      mcc='348'
-      mnc='170'
-      apn='internet'
-      authtype='1'
-      mmsc='http://www.time4lime.com/'
-      type='default'
+  <apn carrier="Bvi:Lime:Internet"
+      mcc="348"
+      mnc="170"
+      apn="internet"
+      authtype="1"
+      mmsc="http://www.time4lime.com/"
+      type="default"
   />
-  <apn carrier='Bvi:Lime:Mms'
-      mcc='348'
-      mnc='170'
-      apn='multimedia'
-      authtype='1'
-      mmsc='http://mmsc'
-      mmsproxy='10.20.5.34'
-      mmsport='8799'
-      type='mms'
+  <apn carrier="Bvi:Lime:Mms"
+      mcc="348"
+      mnc="170"
+      apn="multimedia"
+      authtype="1"
+      mmsc="http://mmsc"
+      mmsproxy="10.20.5.34"
+      mmsport="8799"
+      type="mms"
   />
-  <apn carrier='Bvi:Lime:Modem'
-      mcc='348'
-      mnc='170'
-      apn='internet'
-      authtype='1'
-      mmsc='http://www.time4lime.com/'
-      type='dun'
+  <apn carrier="Bvi:Lime:Modem"
+      mcc="348"
+      mnc="170"
+      apn="internet"
+      authtype="1"
+      mmsc="http://www.time4lime.com/"
+      type="dun"
   />
 
   <apn carrier="Lime Internet Postpaid"
@@ -20431,31 +21603,31 @@
       mmsc="http://mmsc"
       type="mms"
   />
-  <apn carrier='Grenada:Lime:Internet'
-      mcc='352'
-      mnc='110'
-      apn='internet'
-      authtype='1'
-      mmsc='http://www.time4lime.com/'
-      type='default'
+  <apn carrier="Grenada:Lime:Internet"
+      mcc="352"
+      mnc="110"
+      apn="internet"
+      authtype="1"
+      mmsc="http://www.time4lime.com/"
+      type="default"
   />
-  <apn carrier='Grenada:Lime:Mms'
-      mcc='352'
-      mnc='110'
-      apn='multimedia'
-      authtype='1'
-      mmsc='http://mmsc'
-      mmsproxy='10.20.5.34'
-      mmsport='8799'
-      type='mms'
+  <apn carrier="Grenada:Lime:Mms"
+      mcc="352"
+      mnc="110"
+      apn="multimedia"
+      authtype="1"
+      mmsc="http://mmsc"
+      mmsproxy="10.20.5.34"
+      mmsport="8799"
+      type="mms"
   />
-  <apn carrier='Grenada:Lime:Modem'
-      mcc='352'
-      mnc='110'
-      apn='internet'
-      authtype='1'
-      mmsc='http://www.time4lime.com/'
-      type='dun'
+  <apn carrier="Grenada:Lime:Modem"
+      mcc="352"
+      mnc="110"
+      apn="internet"
+      authtype="1"
+      mmsc="http://www.time4lime.com/"
+      type="dun"
   />
 
   <apn carrier="Lime Internet Postpaid"
@@ -20477,31 +21649,31 @@
       mmsc="http://mmsc"
       type="mms"
   />
-  <apn carrier='Monserrat:Lime:Internet'
-      mcc='354'
-      mnc='860'
-      apn='internet'
-      authtype='1'
-      mmsc='http://www.time4lime.com/'
-      type='default'
+  <apn carrier="Monserrat:Lime:Internet"
+      mcc="354"
+      mnc="860"
+      apn="internet"
+      authtype="1"
+      mmsc="http://www.time4lime.com/"
+      type="default"
   />
-  <apn carrier='Monserrat:Lime:Mms'
-      mcc='354'
-      mnc='860'
-      apn='multimedia'
-      authtype='1'
-      mmsc='http://mmsc'
-      mmsproxy='10.20.5.34'
-      mmsport='8799'
-      type='mms'
+  <apn carrier="Monserrat:Lime:Mms"
+      mcc="354"
+      mnc="860"
+      apn="multimedia"
+      authtype="1"
+      mmsc="http://mmsc"
+      mmsproxy="10.20.5.34"
+      mmsport="8799"
+      type="mms"
   />
-  <apn carrier='Monserrat:Lime:Modem'
-      mcc='354'
-      mnc='860'
-      apn='internet'
-      authtype='1'
-      mmsc='http://www.time4lime.com/'
-      type='dun'
+  <apn carrier="Monserrat:Lime:Modem"
+      mcc="354"
+      mnc="860"
+      apn="internet"
+      authtype="1"
+      mmsc="http://www.time4lime.com/"
+      type="dun"
   />
 
   <apn carrier="Lime Internet Postpaid"
@@ -20523,31 +21695,31 @@
       mmsc="http://mmsc"
       type="mms"
   />
-  <apn carrier='St Kitts And Nevis:Lime:Internet'
-      mcc='356'
-      mnc='110'
-      apn='internet'
-      authtype='1'
-      mmsc='http://www.time4lime.com/'
-      type='default'
+  <apn carrier="St Kitts And Nevis:Lime:Internet"
+      mcc="356"
+      mnc="110"
+      apn="internet"
+      authtype="1"
+      mmsc="http://www.time4lime.com/"
+      type="default"
   />
-  <apn carrier='St Kitts And Nevis:Lime:Mms'
-      mcc='356'
-      mnc='110'
-      apn='multimedia'
-      authtype='1'
-      mmsc='http://mmsc'
-      mmsproxy='10.20.5.34'
-      mmsport='8799'
-      type='mms'
+  <apn carrier="St Kitts And Nevis:Lime:Mms"
+      mcc="356"
+      mnc="110"
+      apn="multimedia"
+      authtype="1"
+      mmsc="http://mmsc"
+      mmsproxy="10.20.5.34"
+      mmsport="8799"
+      type="mms"
   />
-  <apn carrier='St Kitts And Nevis:Lime:Modem'
-      mcc='356'
-      mnc='110'
-      apn='internet'
-      authtype='1'
-      mmsc='http://www.time4lime.com/'
-      type='dun'
+  <apn carrier="St Kitts And Nevis:Lime:Modem"
+      mcc="356"
+      mnc="110"
+      apn="internet"
+      authtype="1"
+      mmsc="http://www.time4lime.com/"
+      type="dun"
   />
 
   <apn carrier="Lime Internet Postpaid"
@@ -20569,31 +21741,31 @@
       mmsc="http://mmsc"
       type="mms"
   />
-  <apn carrier='St Lucia:Lime:Internet'
-      mcc='358'
-      mnc='110'
-      apn='internet'
-      authtype='1'
-      mmsc='http://www.time4lime.com/'
-      type='default'
+  <apn carrier="St Lucia:Lime:Internet"
+      mcc="358"
+      mnc="110"
+      apn="internet"
+      authtype="1"
+      mmsc="http://www.time4lime.com/"
+      type="default"
   />
-  <apn carrier='St Lucia:Lime:Mms'
-      mcc='358'
-      mnc='110'
-      apn='multimedia'
-      authtype='1'
-      mmsc='http://mmsc'
-      mmsproxy='10.20.5.34'
-      mmsport='8799'
-      type='mms'
+  <apn carrier="St Lucia:Lime:Mms"
+      mcc="358"
+      mnc="110"
+      apn="multimedia"
+      authtype="1"
+      mmsc="http://mmsc"
+      mmsproxy="10.20.5.34"
+      mmsport="8799"
+      type="mms"
   />
-  <apn carrier='St Lucia:Lime:Modem'
-      mcc='358'
-      mnc='110'
-      apn='internet'
-      authtype='1'
-      mmsc='http://www.time4lime.com/'
-      type='dun'
+  <apn carrier="St Lucia:Lime:Modem"
+      mcc="358"
+      mnc="110"
+      apn="internet"
+      authtype="1"
+      mmsc="http://www.time4lime.com/"
+      type="dun"
   />
 
   <apn carrier="Lime Internet Postpaid"
@@ -20615,59 +21787,59 @@
       mmsc="http://mmsc"
       type="mms"
   />
-  <apn carrier='St Vincent:Lime:Internet'
-      mcc='360'
-      mnc='110'
-      apn='internet'
-      authtype='1'
-      mmsc='http://www.time4lime.com/'
-      type='default'
+  <apn carrier="St Vincent:Lime:Internet"
+      mcc="360"
+      mnc="110"
+      apn="internet"
+      authtype="1"
+      mmsc="http://www.time4lime.com/"
+      type="default"
   />
-  <apn carrier='St Vincent:Lime:Mms'
-      mcc='360'
-      mnc='110'
-      apn='multimedia'
-      authtype='1'
-      mmsc='http://mmsc'
-      mmsproxy='10.20.5.34'
-      mmsport='8799'
-      type='mms'
+  <apn carrier="St Vincent:Lime:Mms"
+      mcc="360"
+      mnc="110"
+      apn="multimedia"
+      authtype="1"
+      mmsc="http://mmsc"
+      mmsproxy="10.20.5.34"
+      mmsport="8799"
+      type="mms"
   />
-  <apn carrier='St Vincent:Lime:Modem'
-      mcc='360'
-      mnc='110'
-      apn='internet'
-      authtype='1'
-      mmsc='http://www.time4lime.com/'
-      type='dun'
+  <apn carrier="St Vincent:Lime:Modem"
+      mcc="360"
+      mnc="110"
+      apn="internet"
+      authtype="1"
+      mmsc="http://www.time4lime.com/"
+      type="dun"
   />
 
-  <apn carrier='Curacao:Digicel:Internet'
-      mcc='362'
-      mnc='69'
-      apn='web.digicelcuracao.com'
-      authtype='1'
-      type='default'
+  <apn carrier="Curacao:Digicel:Internet"
+      mcc="362"
+      mnc="69"
+      apn="web.digicelcuracao.com"
+      authtype="1"
+      type="default"
   />
-  <apn carrier='Curacao:Digicel:Mms'
-      mcc='362'
-      mnc='69'
-      apn='wap'
-      authtype='1'
-      mmsc='http://mms.digicelgroup.com'
-      mmsproxy='172.16.7.12'
-      mmsport='9201'
-      type='mms'
+  <apn carrier="Curacao:Digicel:Mms"
+      mcc="362"
+      mnc="69"
+      apn="wap"
+      authtype="1"
+      mmsc="http://mms.digicelgroup.com"
+      mmsproxy="172.16.7.12"
+      mmsport="9201"
+      type="mms"
   />
-  <apn carrier='Curacao:Digicel:Modem'
-      mcc='362'
-      mnc='69'
-      apn='wap'
-      port='8080'
-      authtype='1'
-      proxy='172.16.7.12'
-      mmsc='http://wapdigicel.com'
-      type='dun'
+  <apn carrier="Curacao:Digicel:Modem"
+      mcc="362"
+      mnc="69"
+      apn="wap"
+      port="8080"
+      authtype="1"
+      proxy="172.16.7.12"
+      mmsc="http://wapdigicel.com"
+      type="dun"
   />
 
   <apn carrier="INTERNET Aruba"
@@ -20732,31 +21904,31 @@
       mmsc="http://mmsc"
       type="mms"
   />
-  <apn carrier='Anguilla:Lime:Internet'
-      mcc='365'
-      mnc='840'
-      apn='internet'
-      authtype='1'
-      mmsc='http://www.time4lime.com/'
-      type='default'
+  <apn carrier="Anguilla:Lime:Internet"
+      mcc="365"
+      mnc="840"
+      apn="internet"
+      authtype="1"
+      mmsc="http://www.time4lime.com/"
+      type="default"
   />
-  <apn carrier='Anguilla:Lime:Mms'
-      mcc='365'
-      mnc='840'
-      apn='multimedia'
-      authtype='1'
-      mmsc='http://mmsc'
-      mmsproxy='10.20.5.34'
-      mmsport='8799'
-      type='mms'
+  <apn carrier="Anguilla:Lime:Mms"
+      mcc="365"
+      mnc="840"
+      apn="multimedia"
+      authtype="1"
+      mmsc="http://mmsc"
+      mmsproxy="10.20.5.34"
+      mmsport="8799"
+      type="mms"
   />
-  <apn carrier='Anguilla:Lime:Modem'
-      mcc='365'
-      mnc='840'
-      apn='internet'
-      authtype='1'
-      mmsc='http://www.time4lime.com/'
-      type='dun'
+  <apn carrier="Anguilla:Lime:Modem"
+      mcc="365"
+      mnc="840"
+      apn="internet"
+      authtype="1"
+      mmsc="http://www.time4lime.com/"
+      type="dun"
   />
 
   <apn carrier="Lime Internet Postpaid"
@@ -20778,31 +21950,31 @@
       mmsc="http://mmsc"
       type="mms"
   />
-  <apn carrier='Dominica:Lime:Internet'
-      mcc='366'
-      mnc='110'
-      apn='internet'
-      authtype='1'
-      mmsc='http://www.time4lime.com/'
-      type='default'
-  />
-  <apn carrier='Dominica:Lime:Mms'
-      mcc='366'
-      mnc='110'
-      apn='multimedia'
-      authtype='1'
-      mmsc='http://mmsc'
-      mmsproxy='10.20.5.34'
-      mmsport='8799'
-      type='mms'
-  />
-  <apn carrier='Dominica:Lime:Modem'
-      mcc='366'
-      mnc='110'
+  <apn carrier="Dominica:Lime:Internet"
+      mcc="366"
+      mnc="110"
       apn="internet"
       authtype="1"
-      mmsc='http://www.time4lime.com/'
-      type='dun'
+      mmsc="http://www.time4lime.com/"
+      type="default"
+  />
+  <apn carrier="Dominica:Lime:Mms"
+      mcc="366"
+      mnc="110"
+      apn="multimedia"
+      authtype="1"
+      mmsc="http://mmsc"
+      mmsproxy="10.20.5.34"
+      mmsport="8799"
+      type="mms"
+  />
+  <apn carrier="Dominica:Lime:Modem"
+      mcc="366"
+      mnc="110"
+      apn="internet"
+      authtype="1"
+      mmsc="http://www.time4lime.com/"
+      type="dun"
   />
 
   <apn carrier="Internet"
@@ -20901,36 +22073,36 @@
       type="mms"
   />
 
-  <apn carrier='Haiti:Digicel:Internet'
-      mcc='372'
-      mnc='02'
-      apn='wap.digicelha.com'
-      authtype='1'
-      type='default'
+  <apn carrier="Haiti:Digicel:Internet"
+      mcc="372"
+      mnc="02"
+      apn="wap.digicelha.com"
+      authtype="1"
+      type="default"
   />
-  <apn carrier='Haiti:Digicel:Mms'
-      mcc='372'
-      mnc='02'
-      apn='wap.digicelha.com'
-      authtype='1'
-      mmsc='http://mmc.digicelhaiti.com/servlets/mms'
-      mmsproxy='172.20.200.12'
-      mmsport='9201'
-      type='mms'
-      user='wapha'
-      password='wap01ha'
+  <apn carrier="Haiti:Digicel:Mms"
+      mcc="372"
+      mnc="02"
+      apn="wap.digicelha.com"
+      authtype="1"
+      mmsc="http://mmc.digicelhaiti.com/servlets/mms"
+      mmsproxy="172.20.200.12"
+      mmsport="9201"
+      type="mms"
+      user="wapha"
+      password="wap01ha"
   />
-  <apn carrier='Haiti:Digicel:Modem'
-      mcc='372'
-      mnc='02'
-      apn='wap.digicelha.com'
-      port='8080'
-      authtype='1'
-      proxy='172.20.200.12'
-      mmsc='http://wapdigicel.com'
-      type='dun'
-      user='wapha'
-      password='wap01ha'
+  <apn carrier="Haiti:Digicel:Modem"
+      mcc="372"
+      mnc="02"
+      apn="wap.digicelha.com"
+      port="8080"
+      authtype="1"
+      proxy="172.20.200.12"
+      mmsc="http://wapdigicel.com"
+      type="dun"
+      user="wapha"
+      password="wap01ha"
   />
 
   <apn carrier="Bmobile internet"
@@ -21226,30 +22398,30 @@
       mmsc="http://mmsc"
       type="mms"
   />
-  <apn carrier='Turks And Caicos:Lime:Internet'
-      mcc='376'
-      mnc='350'
-      apn='internet'
-      authtype='1'
-      type='default'
+  <apn carrier="Turks And Caicos:Lime:Internet"
+      mcc="376"
+      mnc="350"
+      apn="internet"
+      authtype="1"
+      type="default"
   />
-  <apn carrier='Turks And Caicos:Lime:Mms'
-      mcc='376'
-      mnc='350'
-      apn='multimedia'
-      authtype='1'
-      mmsc='http://mmsc'
-      mmsproxy='10.20.5.34'
-      mmsport='8799'
-      type='mms'
+  <apn carrier="Turks And Caicos:Lime:Mms"
+      mcc="376"
+      mnc="350"
+      apn="multimedia"
+      authtype="1"
+      mmsc="http://mmsc"
+      mmsproxy="10.20.5.34"
+      mmsport="8799"
+      type="mms"
   />
-  <apn carrier='Turks And Caicos:Lime:Modem'
-      mcc='376'
-      mnc='350'
-      apn='internet'
-      authtype='1'
-      mmsc='http://www.time4lime.com/'
-      type='dun'
+  <apn carrier="Turks And Caicos:Lime:Modem"
+      mcc="376"
+      mnc="350"
+      apn="internet"
+      authtype="1"
+      mmsc="http://www.time4lime.com/"
+      type="dun"
   />
 
   <apn carrier="Azercell"
@@ -21448,6 +22620,24 @@
       mmsport="8080"
       type="mms"
   />
+<!-- VENDOR_EDIT start Patch#0523 [2018-02-21]-->
+  <apn carrier="IMS"
+      mcc="404"
+      mnc="04"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="XCAP"
+      mcc="404"
+      mnc="04"
+      apn="Internet"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+<!-- VENDOR_EDIT end Patch#0523-->
   <apn carrier="Vodafone MMS"
       mcc="404"
       mnc="05"
@@ -21510,7 +22700,24 @@
       mmsport="8080"
       type="mms"
   />
-
+<!-- VENDOR_EDIT start Patch#0523 [2018-02-21]-->
+  <apn carrier="IMS"
+      mcc="404"
+      mnc="07"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="XCAP"
+      mcc="404"
+      mnc="07"
+      apn="Internet"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+<!-- VENDOR_EDIT end Patch#0523-->
   <!-- VENDOR_EDIT start Patch#0504 -->
   <apn carrier="Reliance"
       apn="rcomnet"
@@ -21627,7 +22834,24 @@
       mmsport="8080"
       type="mms"
   />
-
+<!-- VENDOR_EDIT start Patch#0523 [2018-02-21]-->
+  <apn carrier="IMS"
+      mcc="404"
+      mnc="12"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="XCAP"
+      mcc="404"
+      mnc="12"
+      apn="Internet"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+<!-- VENDOR_EDIT end Patch#0523-->
   <apn carrier="Vodafone MMS"
       mcc="404"
       mnc="13"
@@ -21672,25 +22896,24 @@
       apn="internet"
       type="default,supl"
   />
-
-<apn carrier="SPICE"
-  apn="spicegprs"
-  mcc="404"
-  mnc="14"
-  type="default,supl"
- />
-
-<apn carrier="SPICE MMS"
-  apn="spicemms"
-  mcc="404"
-  mnc="14"
-  user="User Mobile number"
-  password="spice"
-  mmsproxy="10.200.200.3"
-  mmsport="8080"
-  mmsc="http://10.200.200.3:8514"
-  type="mms"
- />
+<!-- VENDOR_EDIT start Patch#0523 [2018-02-21]-->
+  <apn carrier="IMS"
+      mcc="404"
+      mnc="14"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="XCAP"
+      mcc="404"
+      mnc="14"
+      apn="Internet"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+<!-- VENDOR_EDIT end Patch#0523-->
 
   <apn carrier="Vodafone MMS"
       mcc="404"
@@ -21850,6 +23073,24 @@
       mmsport="8080"
       type="mms"
   />
+<!-- VENDOR_EDIT start Patch#0523 [2018-02-21]-->
+  <apn carrier="IMS"
+      mcc="404"
+      mnc="19"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="XCAP"
+      mcc="404"
+      mnc="19"
+      apn="Internet"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+<!-- VENDOR_EDIT end Patch#0523-->
   <apn carrier="Vodafone MMS"
       mcc="404"
       mnc="20"
@@ -21922,6 +23163,24 @@
       mmsport="8080"
       type="mms"
   />
+<!-- VENDOR_EDIT start Patch#0523 [2018-02-21]-->
+  <apn carrier="IMS"
+      mcc="404"
+      mnc="22"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="XCAP"
+      mcc="404"
+      mnc="22"
+      apn="Internet"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+<!-- VENDOR_EDIT end Patch#0523-->
   <apn carrier="IDEA"
       mcc="404"
       mnc="24"
@@ -21937,7 +23196,24 @@
       mmsport="8080"
       type="mms"
   />
-
+<!-- VENDOR_EDIT start Patch#0523 [2018-02-21]-->
+  <apn carrier="IMS"
+      mcc="404"
+      mnc="24"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="XCAP"
+      mcc="404"
+      mnc="24"
+      apn="Internet"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+<!-- VENDOR_EDIT end Patch#0523-->
   <!-- VENDOR_EDIT start Patch#0502 -->
   <apn carrier="Aircel"
       apn="aircelgprs"
@@ -22591,7 +23867,24 @@
       mmsport="8080"
       type="mms"
   />
-
+<!-- VENDOR_EDIT start Patch#0523 [2018-02-21]-->
+  <apn carrier="IMS"
+      mcc="404"
+      mnc="44"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="XCAP"
+      mcc="404"
+      mnc="44"
+      apn="Internet"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+<!-- VENDOR_EDIT end Patch#0523-->
   <apn carrier="Internet"
       mcc="404"
       mnc="45"
@@ -22914,7 +24207,24 @@
       mmsport="8080"
       type="mms"
   />
-
+<!-- VENDOR_EDIT start Patch#0523 [2018-02-21]-->
+  <apn carrier="IMS"
+      mcc="404"
+      mnc="56"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="XCAP"
+      mcc="404"
+      mnc="56"
+      apn="Internet"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+<!-- VENDOR_EDIT end Patch#0523-->
 <apn carrier="BSNL"
   apn="bsnlnet"
   mcc="404"
@@ -23073,15 +24383,6 @@
   authtype="1"
  />
 
-  <apn carrier="IMS"
-     mcc="404"
-     mnc="61"
-     apn="ims"
-     type="ims"
-     protocol="IPV4V6"
-     roaming_protocol="IPV4V6"
-     />
-
 <apn carrier="BSNL"
   apn="bsnlnet"
   mcc="404"
@@ -23557,6 +24858,24 @@
       mmsport="8080"
       type="mms"
   />
+<!-- VENDOR_EDIT start Patch#0523 [2018-02-21]-->
+  <apn carrier="IMS"
+      mcc="404"
+      mnc="78"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="XCAP"
+      mcc="404"
+      mnc="78"
+      apn="Internet"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+<!-- VENDOR_EDIT end Patch#0523-->
   <apn carrier="CellOne_South MMS"
       mcc="404"
       mnc="79"
@@ -23663,7 +24982,24 @@
       mmsport="8080"
       type="mms"
   />
-
+<!-- VENDOR_EDIT start Patch#0523 [2018-02-21]-->
+  <apn carrier="IMS"
+      mcc="404"
+      mnc="82"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="XCAP"
+      mcc="404"
+      mnc="82"
+      apn="Internet"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+<!-- VENDOR_EDIT end Patch#0523-->
   <!-- VENDOR_EDIT start Patch#0504 -->
   <apn carrier="Reliance"
       apn="rcomnet"
@@ -23823,7 +25159,24 @@
       mmsport="8080"
       type="mms"
   />
-
+<!-- VENDOR_EDIT start Patch#0523 [2018-02-21]-->
+  <apn carrier="IMS"
+      mcc="404"
+      mnc="87"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="XCAP"
+      mcc="404"
+      mnc="87"
+      apn="Internet"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+<!-- VENDOR_EDIT end Patch#0523-->
   <apn carrier="Vodafone MMS"
       mcc="404"
       mnc="88"
@@ -23868,6 +25221,24 @@
       mmsport="8080"
       type="mms"
   />
+<!-- VENDOR_EDIT start Patch#0523 [2018-02-21]-->
+  <apn carrier="IMS"
+      mcc="404"
+      mnc="89"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="XCAP"
+      mcc="404"
+      mnc="89"
+      apn="Internet"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+<!-- VENDOR_EDIT end Patch#0523-->
   <apn carrier="Internet"
       mcc="404"
       mnc="90"
@@ -25675,6 +27046,24 @@
       mmsport="8080"
       type="mms"
   />
+<!-- VENDOR_EDIT start Patch#0523 [2018-02-21]-->
+  <apn carrier="IMS"
+      mcc="405"
+      mnc="70"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="XCAP"
+      mcc="405"
+      mnc="70"
+      apn="Internet"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+<!-- VENDOR_EDIT end Patch#0523-->
   <apn carrier="Vodafone MMS"
       mcc="405"
       mnc="750"
@@ -25893,7 +27282,24 @@
       mmsport="8080"
       type="mms"
   />
-
+<!-- VENDOR_EDIT start Patch#0523 [2018-02-21]-->
+  <apn carrier="IMS"
+      mcc="405"
+      mnc="799"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="XCAP"
+      mcc="405"
+      mnc="799"
+      apn="Internet"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+<!-- VENDOR_EDIT end Patch#0523-->
   <!-- VENDOR_EDIT start Patch#0502 -->
   <apn carrier="AIRCEL ROI"
       mcc="405"
@@ -26790,6 +28196,24 @@
       mmsport="8080"
       type="mms"
   />
+<!-- VENDOR_EDIT start Patch#0523 [2018-02-21]-->
+  <apn carrier="IMS"
+      mcc="405"
+      mnc="845"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="XCAP"
+      mcc="405"
+      mnc="845"
+      apn="Internet"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+<!-- VENDOR_EDIT end Patch#0523-->
   <apn carrier="IDEA"
       mcc="405"
       mnc="846"
@@ -26805,6 +28229,24 @@
       mmsport="8080"
       type="mms"
   />
+<!-- VENDOR_EDIT start Patch#0523 [2018-02-21]-->
+  <apn carrier="IMS"
+      mcc="405"
+      mnc="846"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="XCAP"
+      mcc="405"
+      mnc="846"
+      apn="Internet"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+<!-- VENDOR_EDIT end Patch#0523-->
   <apn carrier="IDEA"
       mcc="405"
       mnc="847"
@@ -26820,6 +28262,24 @@
       mmsport="8080"
       type="mms"
   />
+<!-- VENDOR_EDIT start Patch#0523 [2018-02-21]-->
+  <apn carrier="IMS"
+      mcc="405"
+      mnc="847"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="XCAP"
+      mcc="405"
+      mnc="847"
+      apn="Internet"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+<!-- VENDOR_EDIT end Patch#0523-->
   <apn carrier="IDEA"
       mcc="405"
       mnc="848"
@@ -26835,6 +28295,24 @@
       mmsport="8080"
       type="mms"
   />
+<!-- VENDOR_EDIT start Patch#0523 [2018-02-21]-->
+  <apn carrier="IMS"
+      mcc="405"
+      mnc="848"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="XCAP"
+      mcc="405"
+      mnc="848"
+      apn="Internet"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+<!-- VENDOR_EDIT end Patch#0523-->
   <apn carrier="IDEA"
       mcc="405"
       mnc="849"
@@ -26850,6 +28328,24 @@
       mmsport="8080"
       type="mms"
   />
+<!-- VENDOR_EDIT start Patch#0523 [2018-02-21]-->
+  <apn carrier="IMS"
+      mcc="405"
+      mnc="849"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="XCAP"
+      mcc="405"
+      mnc="849"
+      apn="Internet"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+<!-- VENDOR_EDIT end Patch#0523-->
   <apn carrier="IDEA"
       mcc="405"
       mnc="850"
@@ -26865,6 +28361,24 @@
       mmsport="8080"
       type="mms"
   />
+<!-- VENDOR_EDIT start Patch#0523 [2018-02-21]-->
+  <apn carrier="IMS"
+      mcc="405"
+      mnc="850"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="XCAP"
+      mcc="405"
+      mnc="850"
+      apn="Internet"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+<!-- VENDOR_EDIT end Patch#0523-->
   <apn carrier="IDEA"
       mcc="405"
       mnc="851"
@@ -26880,6 +28394,24 @@
       mmsport="8080"
       type="mms"
   />
+<!-- VENDOR_EDIT start Patch#0523 [2018-02-21]-->
+  <apn carrier="IMS"
+      mcc="405"
+      mnc="851"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="XCAP"
+      mcc="405"
+      mnc="851"
+      apn="Internet"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+<!-- VENDOR_EDIT end Patch#0523-->
   <apn carrier="IDEA"
       mcc="405"
       mnc="852"
@@ -26895,6 +28427,24 @@
       mmsport="8080"
       type="mms"
   />
+<!-- VENDOR_EDIT start Patch#0523 [2018-02-21]-->
+  <apn carrier="IMS"
+      mcc="405"
+      mnc="852"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="XCAP"
+      mcc="405"
+      mnc="852"
+      apn="Internet"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+<!-- VENDOR_EDIT end Patch#0523-->
   <apn carrier="IDEA"
       mcc="405"
       mnc="853"
@@ -26910,6 +28460,24 @@
       mmsport="8080"
       type="mms"
   />
+<!-- VENDOR_EDIT start Patch#0523 [2018-02-21]-->
+  <apn carrier="IMS"
+      mcc="405"
+      mnc="853"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="XCAP"
+      mcc="405"
+      mnc="853"
+      apn="Internet"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+<!-- VENDOR_EDIT end Patch#0523-->
   <apn carrier="Jio 4G"
       apn="jionet"
       mcc="405"
@@ -27633,25 +29201,6 @@
       type="mms"
   />
 
-<apn carrier="SPICE"
-  apn="spicegprs"
-  mcc="405"
-  mnc="908"
-  type="default,supl"
- />
-
-<apn carrier="SPICE MMS"
-  apn="spicemms"
-  mcc="405"
-  mnc="908"
-  user="User Mobile number"
-  password="spice"
-  mmsproxy="10.200.200.3"
-  mmsport="8080"
-  mmsc="http://10.200.200.3:8514"
-  type="mms"
- />
-
   <apn carrier="IDEA"
       mcc="405"
       mnc="909"
@@ -27668,25 +29217,6 @@
       type="mms"
   />
 
-<apn carrier="SPICE"
-  apn="spicegprs"
-  mcc="405"
-  mnc="909"
-  type="default,supl"
- />
-
-<apn carrier="SPICE MMS"
-  apn="spicemms"
-  mcc="405"
-  mnc="909"
-  user="User Mobile number"
-  password="spice"
-  mmsproxy="10.200.200.3"
-  mmsport="8080"
-  mmsc="http://10.200.200.3:8514"
-  type="mms"
- />
-
   <apn carrier="IDEA"
       mcc="405"
       mnc="910"
@@ -27703,25 +29233,6 @@
       type="mms"
   />
 
-<apn carrier="SPICE"
-  apn="spicegprs"
-  mcc="405"
-  mnc="910"
-  type="default,supl"
- />
-
-<apn carrier="SPICE MMS"
-  apn="spicemms"
-  mcc="405"
-  mnc="910"
-  user="User Mobile number"
-  password="spice"
-  mmsproxy="10.200.200.3"
-  mmsport="8080"
-  mmsc="http://10.200.200.3:8514"
-  type="mms"
- />
-
   <apn carrier="IDEA"
       mcc="405"
       mnc="911"
@@ -27738,25 +29249,6 @@
       type="mms"
   />
 
-<apn carrier="SPICE"
-  apn="spicegprs"
-  mcc="405"
-  mnc="911"
-  type="default,supl"
- />
-
-<apn carrier="SPICE MMS"
-  apn="spicemms"
-  mcc="405"
-  mnc="911"
-  user="User Mobile number"
-  password="spice"
-  mmsproxy="10.200.200.3"
-  mmsport="8080"
-  mmsc="http://10.200.200.3:8514"
-  type="mms"
- />
-
   <apn carrier="Cheers"
       mcc="405"
       mnc="912"
@@ -28074,18 +29566,18 @@
   type="default,supl"
  />
 
-  <apn carrier='Consumer Cellular'
-      mcc='410'
-      mnc='310'
-      apn='att.mvno'
-      type='default,mms,supl,hipri,fota'
-      protocol='IP'
-      roaming_protocol='IP'
-      mmsc='http://mms.fido.ca'
-      mmsproxy='mmsproxy.fido.ca'
-      mmsport='80'
-      mvno_type='gid'
-      mvno_match_data='2AC9'
+  <apn carrier="Consumer Cellular"
+      mcc="410"
+      mnc="310"
+      apn="att.mvno"
+      type="default,mms,supl,hipri,fota"
+      protocol="IP"
+      roaming_protocol="IP"
+      mmsc="http://mms.fido.ca"
+      mmsproxy="mmsproxy.fido.ca"
+      mmsport="80"
+      mvno_type="gid"
+      mvno_match_data="2AC9"
   />
 
   <apn carrier="AWCC"
@@ -29008,6 +30500,16 @@
       mmsport="80"
       type="mms"
   />
+<!-- VENDOR_EDIT start Patch#0544 -->
+  <apn carrier="we4G Israel"
+      mcc="425"
+      mnc="09"
+      apn="we4g"
+      protocol="IPV4V6"
+      mmsc="mms.we4g.co.il"
+      type="default,supl,mms"
+  />
+<!-- VENDOR_EDIT end Patch#0544 -->
   <apn carrier="3G Portal"
       mcc="425"
       mnc="10"
@@ -30249,10 +31751,7 @@
       type="default,supl"
   />
 
-<!--
-#ifdef VENDOR_EDIT
-#zhouhanxin@oneplus.cn, 2016/11/15, modify 45406 for RAINN-1567
--->
+  <!-- VENDOR_EDIT start Patch#0497 -->
   <apn carrier="SmarTone"
       mcc="454"
       mnc="06"
@@ -30262,16 +31761,12 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-<!--
-#endif /* VENDOR_EDIT */
--->
+  <!-- VENDOR_EDIT end Patch#0497 -->
 
   <apn carrier="3gwap"
       mcc="454"
       mnc="07"
       apn="3gwap"
-      proxy="10.0.0.172"
-      port="80"
       type="default,supl"
       read_only="true"
   />
@@ -30369,10 +31864,7 @@
   read_only ="true"
  />
 
-<!--
-#ifdef VENDOR_EDIT
-#zhouhanxin@oneplus.cn, 2016/11/15, modify 45415 for RAINN-1567
--->
+  <!-- VENDOR_EDIT start Patch#0497 -->
   <apn carrier="SmarTone"
       mcc="454"
       mnc="15"
@@ -30383,9 +31875,7 @@
       authtype="3"
       type="default,supl,mms"
   />
-<!--
-#endif
--->
+  <!-- VENDOR_EDIT end Patch#0497 -->
 
   <apn carrier="PCCW 2G"
       apn="pccwdata"
@@ -30456,10 +31946,8 @@
       mmsport="8080"
       type="mms"
   />
-<!--
-#ifdef VENDOR_EDIT
-#zhouhanxin@oneplus.cn, 2016/11/15, modify 45417 for RAINN-1567
--->
+
+  <!-- VENDOR_EDIT start Patch#0497 -->
   <apn carrier="SmarTone HK"
       mcc="454"
       mnc="17"
@@ -30470,9 +31958,7 @@
       authtype="3"
       type="default,supl,mms"
   />
-<!--
-#endif /* VENDOR_EDIT */
--->
+  <!-- VENDOR_EDIT end Patch#0497 -->
 
   <apn carrier="1O1O"
       mcc="454"
@@ -30507,9 +31993,6 @@
   />
 
   <!-- VENDOR_EDIT start Patch#0501 -->
-  <!-- For 45419, add "csl"-->
-  <!-- For 45419, remove "PCCW-HKT" -->
-  <!-- For 45419, modify -->
   <apn carrier="csl"
       mcc="454"
       mnc="19"
@@ -30949,20 +32432,7 @@
       roaming_protocol="IPV4V6"
       read_only="true"
   />
-  <apn carrier="APN_NAME_CMWAP"
-      apn="cmwap"
-      mcc="460"
-      mnc="00"
-      proxy="10.0.0.172"
-      port="80"
-      mmsproxy="10.0.0.172"
-      mmsport="80"
-      mmsc="http://mmsc.monternet.com"
-      type="default,supl,wap,mms"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      read_only="true"
-  />
+
   <apn carrier="APN_NAME_CMIMS"
       mcc="460"
       mnc="00"
@@ -30976,15 +32446,8 @@
       max_conns_time="300"
       read_only="true"
   />
-  <apn carrier="China Unicom"
-      apn=""
-      mcc="460"
-      mnc="01"
-      type="ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      read_only="true"
-  />
+
+<!-- VENDOR_EDIT start Patch#0549 -->
   <apn carrier="APN_NAME_CUNET"
       apn="3gnet"
       mcc="460"
@@ -30992,6 +32455,8 @@
       port="80"
       type="default,supl"
       read_only="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
   <apn carrier="APN_NAME_CUMMS"
       apn="3gwap"
@@ -31002,24 +32467,10 @@
       mmsc="http://mmsc.myuni.com.cn"
       type="mms"
       read_only="true"
-  />
-  <apn carrier="APN_NAME_CUWAP"
-      apn="3gwap"
-      mcc="460"
-      mnc="01"
-      user=""
-      server=""
-      password=""
-      proxy="10.0.0.172"
-      port="80"
-      mmsproxy="10.0.0.172"
-      mmsport="80"
-      mmsc="http://mmsc.myuni.com.cn"
-      type="default,mms"
-      read_only ="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
+<!-- VENDOR_EDIT end Patch#0549 -->
   <apn carrier="APN_NAME_CUIMS"
       mcc="460"
       mnc="01"
@@ -31069,20 +32520,7 @@
       roaming_protocol="IPV4V6"
       read_only="true"
   />
-  <apn carrier="APN_NAME_CMWAP"
-  apn="cmwap"
-  mcc="460"
-  mnc="02"
-  proxy="10.0.0.172"
-  port="80"
-  mmsproxy="10.0.0.172"
-  mmsport="80"
-  mmsc="http://mmsc.monternet.com"
-  type="default,supl,wap,mms"
-  protocol="IPV4V6"
-  roaming_protocol="IPV4V6"
-  read_only="true"
-  />
+
   <apn carrier="APN_NAME_CMIMS"
       mcc="460"
       mnc="02"
@@ -31096,6 +32534,7 @@
       max_conns_time="300"
       read_only="true"
   />
+<!-- VENDOR_EDIT start Patch#0559 -->
   <!-- ctnet -->
   <apn carrier="APN_NAME_CTNET"
   apn="ctnet"
@@ -31103,7 +32542,7 @@
   mnc="03"
   user="ctnet@mycdma.cn"
   password="vnet.mobi"
-  type="default,hipri,ia"
+  type="default,hipri,ia,supl"
   authtype="3"
   ppp_number="#777"
   preferred="true"
@@ -31111,6 +32550,8 @@
   protocol="IPV4V6"
   roaming_protocol="IPV4V6"
   />
+<!-- VENDOR_EDIT end Patch#0559 -->
+
   <!--MMS for China MainLand -->
   <apn carrier="APN_NAME_CTMMS"
       apn="ctwap"
@@ -31153,7 +32594,66 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-
+<!-- VENDOR_EDIT start Patch#0516 [2018-12-03] -->
+  <apn carrier="China Mobile"
+      apn=""
+      mcc="460"
+      mnc="04"
+      type="ia"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="CMCC DM"
+      apn=""
+      mcc="460"
+      mnc="04"
+      type="fota"
+  />
+  <apn carrier="APN_NAME_CMNET"
+      apn="cmnet"
+      mcc="460"
+      mnc="04"
+      type="default,net,supl"
+      preferred="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="APN_NAME_CMMMS"
+      apn="cmwap"
+      mcc="460"
+      mnc="04"
+      proxy="10.0.0.172"
+      port="80"
+      mmsproxy="10.0.0.172"
+      mmsport="80"
+      mmsc="http://mmsc.monternet.com"
+      type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="APN_NAME_CMWAP"
+      apn="cmwap"
+      mcc="460"
+      mnc="04"
+      proxy="10.0.0.172"
+      port="80"
+      type="supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <apn carrier="China Mobile (IMS)"
+      mcc="460"
+      mnc="04"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      profile_id="2"
+      modem_cognitive="true"
+      max_conns="1023"
+      max_conns_time="300"
+  />
+<!-- VENDOR_EDIT end Patch#0516 [2018-12-03] -->
   <apn carrier="China Union (IMS)"
       mcc="460"
       mnc="06"
@@ -31203,20 +32703,7 @@
       roaming_protocol="IPV4V6"
       read_only="true"
   />
-  <apn carrier="APN_NAME_CMWAP"
-  apn="cmwap"
-  mcc="460"
-  mnc="07"
-  proxy="10.0.0.172"
-  port="80"
-  mmsproxy="10.0.0.172"
-  mmsport="80"
-  mmsc="http://mmsc.monternet.com"
-  type="default,supl,wap,mms"
-  read_only ="true"
-  protocol="IPV4V6"
-  roaming_protocol="IPV4V6"
-  />
+
   <apn carrier="APN_NAME_CMIMS"
       mcc="460"
       mnc="07"
@@ -31271,20 +32758,7 @@
       roaming_protocol="IPV4V6"
       read_only="true"
   />
-  <apn carrier="APN_NAME_CMWAP"
-  apn="cmwap"
-  mcc="460"
-  mnc="08"
-  proxy="10.0.0.172"
-  port="80"
-  mmsproxy="10.0.0.172"
-  mmsport="80"
-  mmsc="http://mmsc.monternet.com"
-  type="default,supl,wap,mms"
-  protocol="IPV4V6"
-  roaming_protocol="IPV4V6"
-  read_only="true"
-  />
+
   <apn carrier="APN_NAME_CMIMS"
       mcc="460"
       mnc="08"
@@ -31298,15 +32772,7 @@
       max_conns_time="300"
       read_only="true"
   />
-  <apn carrier="China Unicom"
-      apn=""
-      mcc="460"
-      mnc="09"
-      type="ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      read_only="true"
-  />
+<!-- VENDOR_EDIT start Patch#0549 -->
   <apn carrier="APN_NAME_CUNET"
       apn="3gnet"
       mcc="460"
@@ -31314,6 +32780,8 @@
       port="80"
       type="default,supl"
       read_only="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
   <apn carrier="APN_NAME_CUMMS"
       apn="3gwap"
@@ -31324,24 +32792,10 @@
       mmsc="http://mmsc.myuni.com.cn"
       type="mms"
       read_only="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
-  <apn carrier="APN_NAME_CUWAP"
-  apn="3gwap"
-  mcc="460"
-  mnc="09"
-  user=""
-  server=""
-  password=""
-  proxy="10.0.0.172"
-  port="80"
-  mmsproxy="10.0.0.172"
-  mmsport="80"
-  mmsc="http://mmsc.myuni.com.cn"
-  type="default,mms"
-  read_only ="true"
-  protocol="IPV4V6"
-  roaming_protocol="IPV4V6"
-  />
+<!-- VENDOR_EDIT end Patch#0549 -->
   <apn carrier="APN_NAME_CUIMS"
       mcc="460"
       mnc="09"
@@ -31352,13 +32806,14 @@
       read_only="true"
   />
   <!-- ctnet -->
+<!-- VENDOR_EDIT start Patch#0559 -->
   <apn carrier="APN_NAME_CTNET"
   apn="ctnet"
   mcc="460"
   mnc="11"
   user="ctnet@mycdma.cn"
   password="vnet.mobi"
-  type="default,hipri,ia"
+  type="default,hipri,ia,supl"
   authtype="3"
   ppp_number="#777"
   read_only ="true"
@@ -31366,7 +32821,10 @@
   roaming_protocol="IPV4V6"
   bearer_bitmask="6|7|8|12"
   />
+<!-- VENDOR_EDIT end Patch#0559 -->
+
   <!--MMS for China MainLand -->
+ <!-- VENDOR_EDIT start Patch#0515 -->
   <apn carrier="APN_NAME_CTMMS"
       apn="ctwap"
       mcc="460"
@@ -31376,7 +32834,7 @@
       mmsproxy="10.0.0.200"
       mmsport="80"
       mmsc="http://mmsc.vnet.mobi"
-      type="mms"
+      type="supl,mms"
       read_only="true"
       authtype="3"
       ppp_number="#777"
@@ -31385,29 +32843,14 @@
       visit_area="460"
       bearer_bitmask="6|7|8|12"
   />
-
-  <apn carrier="APN_NAME_CTWAP"
-  apn="ctwap"
-  mcc="460"
-  mnc="11"
-  user="ctwap@mycdma.cn"
-  password="vnet.mobi"
-  type="default,supl"
-  authtype="3"
-  ppp_number="#777"
-  read_only ="true"
-  protocol="IPV4V6"
-  roaming_protocol="IPV4V6"
-  visit_area="460"
-  bearer_bitmask="6|7|8|12"
-  />
-
+ <!-- VENDOR_EDIT end Patch#0515 -->
   <!-- LTE ctnet for China MainLand -->
+<!-- VENDOR_EDIT start Patch#0559 -->
   <apn carrier="APN_NAME_CTNET"
       apn="ctnet"
       mcc="460"
       mnc="11"
-      type="default,hipri,ia"
+      type="default,hipri,ia,supl"
       read_only="true"
       visit_area="460"
       protocol="IPV4V6"
@@ -31415,7 +32858,10 @@
       bearer="19"
       bearer_bitmask="13|14"
   />
+<!-- VENDOR_EDIT end Patch#0559 -->
+
   <!-- -LTE MMS, SUPL for China MainLand -->
+  <!-- VENDOR_EDIT start Patch#0515 -->
   <apn carrier="APN_NAME_CTMMS"
       apn="ctwap"
       mcc="460"
@@ -31423,7 +32869,7 @@
       mmsproxy="10.0.0.200"
       mmsport="80"
       mmsc="http://mmsc.vnet.mobi"
-      type="mms"
+      type="supl,mms"
       read_only="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -31431,19 +32877,7 @@
       bearer="19"
       bearer_bitmask="13|14"
   />
-  <apn carrier="APN_NAME_CTWAP"
-      apn="ctwap"
-      mcc="460"
-      mnc="11"
-      type="default,supl"
-      read_only="true"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      visit_area="460"
-      bearer="19"
-      bearer_bitmask="13|14"
-  />
-
+  <!-- VENDOR_EDIT end Patch#0515 -->
   <apn carrier="APN_NAME_CTIMS"
       apn="ims"
       type="ims"
@@ -31454,7 +32888,7 @@
       roaming_protocol="IPV4V6"
   />
 
-
+<!-- VENDOR_EDIT start Patch#0559 -->
   <!-- ctnet -->
   <apn carrier="APN_NAME_CTNET"
   apn="ctnet"
@@ -31462,7 +32896,7 @@
   mnc="12"
   user="ctnet@mycdma.cn"
   password="vnet.mobi"
-  type="default,hipri,ia"
+  type="default,hipri,ia,supl"
   authtype="3"
   ppp_number="#777"
   read_only ="true"
@@ -31470,6 +32904,7 @@
   roaming_protocol="IPV4V6"
   bearer_bitmask="6|7|8|12"
   />
+<!-- VENDOR_EDIT end Patch#0559 -->
 
   <apn carrier="APN_NAME_CTMMS"
       apn="ctwap"
@@ -31489,7 +32924,7 @@
       visit_area="460"
       bearer_bitmask="6|7|8|12"
   />
-
+<!-- VENDOR_EDIT start Patch#0515 -->
   <apn carrier="APN_NAME_CTWAP"
   apn="ctwap"
   mcc="460"
@@ -31499,7 +32934,7 @@
   mmsproxy="10.0.0.200"
   mmsport="80"
   mmsc="http://mmsc.vnet.mobi"
-  type="default,mms,supl"
+  type="mms,supl"
   authtype="3"
   ppp_number="#777"
   read_only ="true"
@@ -31508,13 +32943,14 @@
   visit_area="460"
   bearer_bitmask="6|7|8|12"
   />
-
+<!-- VENDOR_EDIT end Patch#0515 -->
+<!-- VENDOR_EDIT start Patch#0559 -->
   <!-- LTE ctnet for China MainLand -->
   <apn carrier="APN_NAME_CTNET"
       apn="ctnet"
       mcc="460"
       mnc="12"
-      type="default,hipri,ia"
+      type="default,hipri,ia,supl"
       read_only="true"
       visit_area="460"
       protocol="IPV4V6"
@@ -31522,6 +32958,7 @@
       bearer="19"
       bearer_bitmask="13|14"
   />
+<!-- VENDOR_EDIT end Patch#0559 -->
   <!-- -LTE MMS, SUPL for China MainLand -->
   <apn carrier="APN_NAME_CTMMS"
       apn="ctwap"
@@ -31538,6 +32975,7 @@
       bearer="19"
       bearer_bitmask="13|14"
   />
+ <!-- VENDOR_EDIT start Patch#0515 -->
   <apn carrier="APN_NAME_CTWAP"
       apn="ctwap"
       mcc="460"
@@ -31545,7 +32983,7 @@
       mmsproxy="10.0.0.200"
       mmsport="80"
       mmsc="http://mmsc.vnet.mobi"
-      type="default,supl,mms"
+      type="supl,mms"
       read_only="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -31553,7 +32991,7 @@
       bearer="19"
       bearer_bitmask="13|14"
   />
-
+<!-- VENDOR_EDIT end Patch#0515 -->
   <apn carrier="APN_NAME_CTIMS"
       apn="ims"
       type="ims"
@@ -31587,7 +33025,7 @@
   protocol="IPV4V6"
   roaming_protocol="IPV4V6"
  />
-
+ <!-- VENDOR_EDIT start Patch#0515 -->
 <apn carrier="APN_NAME_CTWAP"
   apn="ctwap"
   mcc="460"
@@ -31599,34 +33037,32 @@
   mmsproxy="10.0.0.200"
   mmsport="80"
   mmsc="http://mmsc.vnet.mobi"
-  type="default,supl,dun,mms"
+  type="supl,dun,mms"
   authtype="3"
   ppp_number="#777"
   read_only ="true"
   protocol="IPV4V6"
   roaming_protocol="IPV4V6"
  />
+<!-- VENDOR_EDIT end Patch#0515 -->
 
-  <apn carrier="遠傳電信(Far EasTone) (Internet)"
+  <!-- VENDOR_EDIT start Patch#0536 [2018-04-24] -->
+  <apn carrier="FarEasTone (MMS)"
+      mcc="466"
+      mnc="01"
+      apn="fetnet01"
+      mmsc="http://mms"
+      mmsproxy="210.241.199.199"
+      mmsport="9201"
+      type="mms"
+  />
+  <apn carrier="FarEasTone (Internet)"
       mcc="466"
       mnc="01"
       apn="internet"
       type="default,supl"
   />
-
-  <apn carrier="遠傳電信(Far EasTone) (Fetnet01)"
-      mcc="466"
-      mnc="01"
-      apn="fetnet01"
-      proxy="210.241.199.199"
-      port="80"
-      mmsc="http://mms"
-      mmsproxy="210.241.199.199"
-      mmsport="9201"
-      type="default,supl,mms"
-  />
-
-  <apn carrier="FarEasTone MMS"
+  <apn carrier="FarEasTone (MMS) (Prepaid)"
       apn="f3prepaid"
       mcc="466"
       mnc="01"
@@ -31635,75 +33071,128 @@
       mmsc="http://mms"
       type="mms"
   />
+  <apn carrier="FarEasTone (IMS)"
+      mcc="466"
+      mnc="01"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <!-- VENDOR_EDIT end Patch#0536 [2018-04-24] -->
 
-<apn carrier="gtnet"
-  apn="gtnet"
-  mcc="466"
-  mnc="05"
- />
+  <!-- VENDOR_EDIT start Patch#0536 [2018-04-24] -->
+  <apn carrier="FarEasTone (Internet)"
+      mcc="466"
+      mnc="03"
+      apn="internet"
+      type="default,supl"
+  />
+  <apn carrier="FarEasTone (MMS)"
+      mcc="466"
+      mnc="03"
+      apn="fetnet01"
+      mmsc="http://mms"
+      mmsproxy="210.241.199.199"
+      mmsport="9201"
+      type="mms"
+  />
+  <!-- VENDOR_EDIT end Patch#0536 [2018-04-24] -->
 
-  <apn carrier="和信電訊(KGT-Online) (Internet)"
+  <!-- VENDOR_EDIT start Patch#0537 [2018-04-24] -->
+  <apn carrier="GT (Internet)"
+      mcc="466"
+      mnc="05"
+      apn="gtnet"
+      type="default,supl"
+  />
+  <apn carrier="GT (IMS)"
+      mcc="466"
+      mnc="05"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <!-- VENDOR_EDIT end Patch#0537 [2018-04-24] -->
+
+  <!-- VENDOR_EDIT start Patch#0537 [2018-04-24] -->
+  <apn carrier="GT (Roaming)"
+      mcc="525"
+      mnc="05"
+      apn="gtnet"
+      mvno_type="imsi"
+      mvno_match_data="525053095x"
+      type="default,supl"
+  />
+  <apn carrier="GT (Roaming)"
+      mcc="525"
+      mnc="05"
+      apn="gtnet"
+      mvno_type="imsi"
+      mvno_match_data="525053096x"
+      type="default,supl"
+  />
+  <apn carrier="GT (Roaming)"
+      mcc="525"
+      mnc="05"
+      apn="gtnet"
+      mvno_type="gid"
+      mvno_match_data="0affffffffffffff"
+      type="default,supl"
+  />
+  <!-- VENDOR_EDIT end Patch#0537 [2018-04-24] -->
+
+  <!-- VENDOR_EDIT start Patch#0539 [2018-04-24] -->
+  <apn carrier="ChunghwaTelecom (Internet)"
+      mcc="466"
+      mnc="11"
+      apn="internet"
+      type="default,supl"
+  />
+  <apn carrier="ChunghwaTelecom (MMS)"
+      mcc="466"
+      mnc="11"
+      apn="emome"
+      mmsc="http://mms.emome.net:8002"
+      mmsproxy="10.1.1.1"
+      mmsport="8080"
+      type="mms"
+  />
+  <apn carrier="ChunghwaTelecom (IMS)"
+      mcc="466"
+      mnc="11"
+      apn="ims"
+      type="ims"
+  />
+  <!-- VENDOR_EDIT end Patch#0539 [2018-04-24] -->
+
+  <!-- VENDOR_EDIT start Patch#0536 [2018-04-24] -->
+  <apn carrier="FarEasTone (Internet)"
       mcc="466"
       mnc="88"
       apn="internet"
       type="default,supl"
   />
-  <apn carrier="和信電訊(KGT-Online) (MMS)"
+  <apn carrier="FarEasTone (MMS)"
       mcc="466"
       mnc="88"
-      apn="kgtmms"
-      mmsc="http://mms.kgtmms.net.tw/mms/wapenc"
-      mmsproxy="172.28.33.5"
-      mmsport="8080"
+      apn="fetnet01"
+      mmsc="http://mms"
+      mmsproxy="210.241.199.199"
+      mmsport="9201"
       type="mms"
   />
-  <apn carrier="AURORA (MMS)"
-      apn="aurorawap"
-      mcc="466"
-      mnc="89"
-      user=""
-      server=""
-      password=""
-      proxy=""
-      port=""
-      mmsproxy="172.24.128.36"
-      mmsport="8080"
-      mmsc="http://auroramms"
-      type="mms"
-  />
-   <apn carrier="AURORA (Internet)"
-      apn="auroraweb"
-      mcc="466"
-      mnc="89"
-      user=""
-      server=""
-      password=""
-      proxy=""
-      port=""
-      mmsproxy=""
-      mmsport=""
-      mmsc=""
-      type="default,supl"
-  />
-  <apn carrier="VIBO-vibo"
-      mcc="466"
-      mnc="89"
-      apn="vibo"
-      type="default,supl"
-  />
-  <apn carrier="T Star-internet"
+  <!-- VENDOR_EDIT end Patch#0536 [2018-04-24] -->
+
+  <!-- VENDOR_EDIT start Patch#0538 [2018-04-24] -->
+  <apn carrier="T-Star (Internet)"
       mcc="466"
       mnc="89"
       apn="internet"
       type="default,supl"
   />
-  <apn carrier="VIBOONE"
-      mcc="466"
-      mnc="89"
-      apn="viboone"
-      type="default,supl"
-  />
-  <apn carrier="T Star-MMS"
+  <apn carrier="T-Star (MMS)"
       mcc="466"
       mnc="89"
       apn="internet"
@@ -31712,22 +33201,22 @@
       mmsport="8080"
       type="mms"
   />
-  <apn carrier="中華電信(Chunghwa) (Internet)"
+  <apn carrier="T-Star (IMS)"
+      mcc="466"
+      mnc="89"
+      apn="ims"
+      type="ims"
+  />
+  <!-- VENDOR_EDIT end Patch#0538 [2018-04-24] -->
+
+  <!-- VENDOR_EDIT start Patch#0539 [2018-04-24] -->
+  <apn carrier="ChunghwaTelecom (Internet)"
       mcc="466"
       mnc="92"
       apn="internet"
       type="default,supl"
   />
-  <apn carrier="中華電信(Chunghwa)"
-      mcc="466"
-      mnc="92"
-      apn="emome"
-      mmsc="http://mms.emome.net:8002"
-      mmsproxy="10.1.1.1"
-      mmsport="8080"
-      type="default,supl,mms"
-  />
-   <apn carrier="中華電信(Chunghwa) (MMS)"
+  <apn carrier="ChunghwaTelecom (MMS)"
       apn="emome"
       mcc="466"
       mnc="92"
@@ -31736,49 +33225,28 @@
       mmsc="http://mms.emome.net:8002"
       type="mms"
   />
-   <apn carrier="CHT"
-      apn="internet"
+  <apn carrier="ChunghwaTelecom (IMS)"
       mcc="466"
       mnc="92"
-      user=""
-      server=""
-      password=""
-      proxy=""
-      port=""
-      mmsproxy=""
-      mmsport=""
-      mmsc=""
-      type="default,supl"
+      apn="ims"
+      type="ims"
   />
-  <apn carrier="Mobitai MMS"
-      apn="gprs1"
+  <apn carrier="ChunghwaTelecom (XCAP)"
       mcc="466"
-      mnc="93"
-      user="gprs"
-      server=""
-      password="gprs"
-      proxy=""
-      port=""
-      mmsproxy="192.168.77.5"
-      mmsport="80"
-      mmsc="http://mms.mobeelife.net/mms/wapenc"
-      type="mms"
+      mnc="92"
+      apn="xcap"
+      type="xcap"
   />
-  <apn carrier="台灣大哥大(TW Mobile) (Internet)"
+  <!-- VENDOR_EDIT end Patch#0539 [2018-04-24] -->
+
+  <!-- VENDOR_EDIT start Patch#0540 [2018-04-24] -->
+  <apn carrier="TaiwanMobile (Internet)"
       mcc="466"
       mnc="93"
       apn="Internet"
-      user="gprs"
-      password="gprs"
       type="default,supl"
   />
-  <apn carrier="台灣大哥大(TW Mobile) (twm)"
-      mcc="466"
-      mnc="93"
-      apn="twm"
-      type="default,supl"
-  />
-  <apn carrier="台灣大哥大(TW Mobile) (MMS)"
+  <apn carrier="TaiwanMobile (MMS)"
       mcc="466"
       mnc="93"
       apn="mms"
@@ -31787,19 +33255,22 @@
       mmsport="80"
       type="mms"
   />
-  <apn carrier="台灣大哥大(TW Mobile) (Internet)"
+  <apn carrier="TaiwanMobile (IMS)"
+      mcc="466"
+      mnc="93"
+      apn="ims"
+      type="ims"
+  />
+  <!-- VENDOR_EDIT end Patch#0540 [2018-04-24] -->
+
+  <!-- VENDOR_EDIT start Patch#0540 [2018-04-24] -->
+  <apn carrier="TaiwanMobile (Internet)"
       mcc="466"
       mnc="97"
       apn="Internet"
       type="default,supl"
   />
-  <apn carrier="台灣大哥大(TW Mobile) (twm)"
-      mcc="466"
-      mnc="97"
-      apn="twm"
-      type="default,supl"
-  />
-  <apn carrier="台灣大哥大(TW Mobile) (MMS)"
+  <apn carrier="TaiwanMobile (MMS)"
       mcc="466"
       mnc="97"
       apn="mms"
@@ -31808,28 +33279,24 @@
       mmsport="80"
       type="mms"
   />
-  <apn carrier="Taiwan Mobile (IMS)"
+  <apn carrier="TaiwanMobile (IMS)"
       mcc="466"
       mnc="97"
       apn="ims"
       type="ims"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      />
+  />
+  <!-- VENDOR_EDIT end Patch#0540 [2018-04-24] -->
 
-  <apn carrier="台灣大哥大(TW Mobile) (Internet)"
+  <!-- VENDOR_EDIT start Patch#0540 [2018-04-24] -->
+  <apn carrier="TaiwanMobile (Internet)"
       mcc="466"
       mnc="99"
       apn="Internet"
       type="default,supl"
   />
-  <apn carrier="台灣大哥大(TW Mobile) (twm)"
-      mcc="466"
-      mnc="99"
-      apn="twm"
-      type="default,supl"
-  />
-  <apn carrier="台灣大哥大(TW Mobile) (MMS)"
+  <apn carrier="TaiwanMobile (MMS)"
       mcc="466"
       mnc="99"
       apn="mms"
@@ -31838,6 +33305,16 @@
       mmsport="80"
       type="mms"
   />
+  <apn carrier="TaiwanMobile (IMS)"
+      mcc="466"
+      mnc="99"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <!-- VENDOR_EDIT end Patch#0540 [2018-04-24] -->
+
   <apn carrier="GP-INTERNET"
       mcc="470"
       mnc="01"
@@ -32254,127 +33731,23 @@
   type="default,supl,mms"
  />
 
-  <apn carrier="Optus Yes Internet"
-      mcc="505"
-      mnc="02"
-      apn="yesinternet"
-      user="*"
-      server="*"
-      password="*"
-      type="default,supl"
-  />
-  <apn carrier="Optus Business Mobile Broadband"
-      mcc="505"
-      mnc="02"
-      apn="yesbusiness"
-      type="default,supl"
-  />
-  <apn carrier="Optus Internet"
-      mcc="505"
-      mnc="02"
-      apn="internet"
-      type="default,supl"
-  />
+  <!-- VENDOR_EDIT start Patch#0531 [2017-12-07] -->
   <apn carrier="Optus MMS"
       mcc="505"
       mnc="02"
       apn="mms"
-      user="*"
-      server="*"
-      password="*"
-      proxy="202.139.83.152"
-      port="8070"
       mmsc="http://mmsc.optus.com.au:8002/"
+      mmsport="8070"
       mmsproxy="61.88.190.10"
-      mmsport="8070"
       type="mms"
   />
-
-<apn carrier="Exetel"
-  apn="exetel1"
-  mcc="505"
-  mnc="02"
-  type="default,supl"
- />
-
-  <apn carrier="Truphone"
+  <apn carrier="Optus Yes Internet"
       mcc="505"
       mnc="02"
-      apn="truphone.com"
+      apn="yesinternet"
       type="default,supl"
-      mvno_match_data="50502100"
-      mvno_type="imsi"
   />
-  <apn carrier="Virgin Internet"
-      mcc="505"
-      mnc="02"
-      apn="virgininternet"
-      type="default,supl"
-      proxy="202.139.83.152"
-      port="8070"
-      mvno_match_data="505029"
-      mvno_type="imsi"
-  />
-  <apn carrier="Virgin MMS"
-      mcc="505"
-      mnc="02"
-      apn="virginmms"
-      type="mms"
-      user="*"
-      server="*"
-      password="*"
-      proxy="202.139.083.152"
-      port="8070"
-      mmsc="http://mms.virginvibe.com.au:8002"
-      mmsproxy="202.139.83.152"
-      mmsport="8070"
-      mvno_match_data="505029"
-      mvno_type="imsi"
-  />
-
-<apn carrier="Apex Telecom"
-  apn="splns357"
-  mcc="505"
-  mnc="02"
-  user=""
-  password=""
-  mmsproxy=""
-  mmsport=""
-  mmsc=""
-  type="default,supl"
- />
-
-<apn carrier="Boost MMS"
-  apn="mms"
-  mcc="505"
-  mnc="02"
-  user=""
-  server=""
-  password=""
-  proxy="61.88.190.10"
-  port="8070"
-  mmsproxy="61.88.190.10"
-  mmsport="8070"
-  mmsc="http://mmsc.optus.com.au:8002/"
-  type="mms"
-  authtype="3"
- />
-
-<apn carrier="Boost Mobile"
-  apn="yesinternet"
-  mcc="505"
-  mnc="02"
-  user=""
-  server=""
-  password=""
-  proxy=""
-  port=""
-  mmsproxy=""
-  mmsport=""
-  mmsc=""
-  type="default,supl"
-  authtype="3"
- />
+  <!-- VENDOR_EDIT end Patch#0531 [2017-12-07] -->
 
   <apn carrier="Vodafone live!"
       mcc="505"
@@ -32934,31 +34307,40 @@
       mmsport="8080"
       type="mms"
   />
+
+  <!-- VENDOR_EDIT start Patch#0530 [2018-03-22] -->
   <apn carrier="AIS Internet"
       mcc="520"
       mnc="03"
       apn="internet"
       type="default,supl"
+      authtype="1"
+      protocol="IPV4V6"
+      roaming_protocol="IP"
   />
   <apn carrier="AIS MMS"
       mcc="520"
       mnc="03"
-      apn="internet"
-      authtype="2"
-      mmsc="http://mms.mobilelife.co.th"
-      mmsproxy="203.170.229.34"
-      mmsport="8080"
-      type="default"
-  />
-  <apn carrier="AIS MMS"
-      mcc="520"
-      mnc="03"
-      apn="multimedia"
-      mmsc="http://mms.mobilelife.co.th"
-      mmsproxy="203.170.229.34"
-      mmsport="8080"
+      apn="mms"
       type="mms"
+      authtype="1"
+      protocol="IPV4V6"
+      roaming_protocol="IP"
+      mmsc="http://mms.ais.co.th"
+      mmsproxy="203.170.229.34"
+      mmsport="8080"
   />
+  <apn carrier="IMS"
+      mcc="520"
+      mnc="03"
+      apn="ims"
+      type="ims"
+      authtype="1"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+  <!-- VENDOR_EDIT end Patch#0530 [2018-03-22] -->
+
   <apn carrier="TRUE-H INTERNET"
       mcc="520"
       mnc="04"
@@ -37055,86 +38437,86 @@
       user="CTBC"
       password="1212"
   />
-  <apn carrier='CTBC:Modem:1'
-      mcc='724'
-      mnc='32'
-      apn='ctbc.br'
-      authtype='1'
-      type='dun'
-      user='CTBC'
-      password='1212'
+  <apn carrier="CTBC:Modem:1"
+      mcc="724"
+      mnc="32"
+      apn="ctbc.br"
+      authtype="1"
+      type="dun"
+      user="CTBC"
+      password="1212"
   />
-  <apn carrier='CTBC:MMS:1'
-      mcc='724'
-      mnc='32'
-      apn='mms.ctbc.br'
-      authtype='1'
-      mmsc='http://mms.ctbccelular.com.br/was'
-      mmsproxy='172.29.7.70'
-      mmsport='8080'
-      type='mms'
-      user='CTBC'
-      password='1212'
+  <apn carrier="CTBC:MMS:1"
+      mcc="724"
+      mnc="32"
+      apn="mms.ctbc.br"
+      authtype="1"
+      mmsc="http://mms.ctbccelular.com.br/was"
+      mmsproxy="172.29.7.70"
+      mmsport="8080"
+      type="mms"
+      user="CTBC"
+      password="1212"
   />
-  <apn carrier='CTBC:Dados:2'
-      mcc='724'
-      mnc='33'
-      apn='ctbc.br'
-      authtype='1'
-      type='default'
-      user='CTBC'
-      password='1212'
+  <apn carrier="CTBC:Dados:2"
+      mcc="724"
+      mnc="33"
+      apn="ctbc.br"
+      authtype="1"
+      type="default"
+      user="CTBC"
+      password="1212"
   />
-  <apn carrier='CTBC:Modem:2'
-      mcc='724'
-      mnc='33'
-      apn='ctbc.br'
-      authtype='1'
-      type='dun'
-      user='CTBC'
-      password='1212'
+  <apn carrier="CTBC:Modem:2"
+      mcc="724"
+      mnc="33"
+      apn="ctbc.br"
+      authtype="1"
+      type="dun"
+      user="CTBC"
+      password="1212"
   />
-  <apn carrier='CTBC:MMS:2'
-      mcc='724'
-      mnc='33'
-      apn='mms.ctbc.br'
-      authtype='1'
-      mmsc='http://mms.ctbccelular.com.br/was'
-      mmsproxy='172.29.7.70'
-      mmsport='8080'
-      type='mms'
-      user='CTBC'
-      password='1212'
+  <apn carrier="CTBC:MMS:2"
+      mcc="724"
+      mnc="33"
+      apn="mms.ctbc.br"
+      authtype="1"
+      mmsc="http://mms.ctbccelular.com.br/was"
+      mmsproxy="172.29.7.70"
+      mmsport="8080"
+      type="mms"
+      user="CTBC"
+      password="1212"
   />
-  <apn carrier='CTBC:Dados:3'
-      mcc='724'
-      mnc='34'
-      apn='ctbc.br'
-      authtype='1'
-      type='default'
-      user='CTBC'
-      password='1212'
+  <apn carrier="CTBC:Dados:3"
+      mcc="724"
+      mnc="34"
+      apn="ctbc.br"
+      authtype="1"
+      type="default"
+      user="CTBC"
+      password="1212"
   />
-  <apn carrier='CTBC:Modem:3'
-      mcc='724'
-      mnc='34'
-      apn='ctbc.br'
-      authtype='1'
-      type='dun'
-      user='CTBC'
-      password='1212'
+  <apn carrier="CTBC:Modem:3"
+      mcc="724"
+      mnc="34"
+      apn="ctbc.br"
+      authtype="1"
+      type="dun"
+      user="CTBC"
+      password="1212"
   />
-  <apn carrier='CTBC:MMS:3'
-      mcc='724'
-      mnc='34'
-      apn='mms.ctbc.br'
-      authtype='1'
-      mmsc='http://mms.ctbccelular.com.br/was'
-      mmsproxy='172.29.7.70'
-      mmsport='8080'
-      type='mms'
-      user='CTBC'
-      password='1212'
+  <apn carrier="CTBC:MMS:3"
+      mcc="724"
+      mnc="34"
+      apn="mms.ctbc.br"
+      authtype="1"
+      mmsc="http://mms.ctbccelular.com.br/was"
+      mmsproxy="172.29.7.70"
+      mmsport="8080"
+      type="mms"
+      user="CTBC"
+      password="1212"
   />
   <apn carrier="Claro Dados"
       mcc="724"
@@ -37157,33 +38539,33 @@
       authtype="1"
       type="mms"
   />
-  <apn carrier='Nextel MMS'
-      mcc='724'
-      mnc='39'
-      apn='mms.nextel3g.net.br'
-      authtype='0'
-      mmsc='http://3gmms.nextel3g.net.br'
-      mmsproxy='129.192.129.104'
-      mmsport='8080'
-      type='mms'
-      protocol='IPV4V6'
-      roaming_protocol='IPV4V6'
+  <apn carrier="Nextel MMS"
+      mcc="724"
+      mnc="39"
+      apn="mms.nextel3g.net.br"
+      authtype="0"
+      mmsc="http://3gmms.nextel3g.net.br"
+      mmsproxy="129.192.129.104"
+      mmsport="8080"
+      type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
-  <apn carrier='Nextel WAP'
-      mcc='724'
-      mnc='39'
-      apn='wap.nextel3g.net.br'
-      authtype='0'
-      type='default,dun'
-      protocol='IPV4V6'
-      roaming_protocol='IPV4V6'
+  <apn carrier="Nextel WAP"
+      mcc="724"
+      mnc="39"
+      apn="wap.nextel3g.net.br"
+      authtype="0"
+      type="default,dun"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
-  <apn carrier='Porto Seguro Conecta'
-      mcc='724'
-      mnc='54'
-      authtype='0'
-      type='default,dun'
-      apn='portoconecta.br'
+  <apn carrier="Porto Seguro Conecta"
+      mcc="724"
+      mnc="54"
+      authtype="0"
+      type="default,dun"
+      apn="portoconecta.br"
   />
 
   <apn carrier="Internet Movil"
@@ -37207,22 +38589,44 @@
       authtype="1"
       type="mms"
   />
-  <apn carrier='Internet Nextel'
-      mcc='730'
-      mnc='09'
-      apn='wap.nextelmovil.cl'
-      authtype='0'
-      type='default'
+
+  <!-- VENDOR_EDIT start Patch#0512 -->
+  <apn carrier="Internet WOM"
+      mcc="730"
+      mnc="09"
+      apn="internet"
+      authtype="0"
+      type="default"
   />
-  <apn carrier='MMS Nextel'
-      mcc='730'
-      mnc='09'
-      apn='mms.nextelmovil.cl'
-      authtype='0'
-      mmsc='http://3gmms.nextelmovil.cl'
-      mmsproxy='129.192.129.104'
-      mmsport='8080'
-      type='mms'
+
+  <apn carrier="MMS WOM"
+      mcc="730"
+      mnc="09"
+      apn="mms"
+      authtype="0"
+      mmsc="http://3gmms.nextelmovil.cl"
+      mmsproxy="129.192.129.104"
+      mmsport="8080"
+      type="mms"
+  />
+  <!-- VENDOR_EDIT end Patch#0512 -->
+
+  <apn carrier="Internet Nextel"
+      mcc="730"
+      mnc="09"
+      apn="wap.nextelmovil.cl"
+      authtype="0"
+      type="default"
+  />
+  <apn carrier="MMS Nextel"
+      mcc="730"
+      mnc="09"
+      apn="mms.nextelmovil.cl"
+      authtype="0"
+      mmsc="http://3gmms.nextelmovil.cl"
+      mmsproxy="129.192.129.104"
+      mmsport="8080"
+      type="mms"
   />
   <apn carrier="Internet Movil"
       mcc="730"
@@ -37411,26 +38815,26 @@
       mmsport="9001"
       type="mms"
   />
-  <apn carrier='Movistar INTERNET'
-      mcc='732'
-      mnc='12'
-      apn='internet.movistar.com.co'
-      authtype='1'
-      type='default, dun'
-      user='movistar'
-      password='movistar'
+  <apn carrier="Movistar INTERNET"
+      mcc="732"
+      mnc="12"
+      apn="internet.movistar.com.co"
+      authtype="1"
+      type="default, dun"
+      user="movistar"
+      password="movistar"
   />
-  <apn carrier='Movistar MMS'
-      mcc='732'
-      mnc='12'
-      apn='mms.movistar.com.co'
-      authtype='1'
-      mmsc='http://mms.movistar.com.co'
-      mmsproxy='192.168.222.7'
-      mmsport='9001'
-      type='mms'
-      user='movistar'
-      password='movistar'
+  <apn carrier="Movistar MMS"
+      mcc="732"
+      mnc="12"
+      apn="mms.movistar.com.co"
+      authtype="1"
+      mmsc="http://mms.movistar.com.co"
+      mmsproxy="192.168.222.7"
+      mmsport="9001"
+      type="mms"
+      user="movistar"
+      password="movistar"
   />
   <apn carrier="WEB Claro"
       mcc="732"
@@ -38069,36 +39473,36 @@
       apn="default"
       type="default,supl"
   />
-  <apn carrier='Suriname:Digicel:Internet'
-      mcc='746'
-      mnc='03'
-      apn='web.digicelsr.com'
-      authtype='1'
-      type='default'
+  <apn carrier="Suriname:Digicel:Internet"
+      mcc="746"
+      mnc="03"
+      apn="web.digicelsr.com"
+      authtype="1"
+      type="default"
   />
-  <apn carrier='Suriname:Digicel:Mms'
-      mcc='746'
-      mnc='03'
-      apn='wap.digicelsr.com'
-      authtype='1'
-      mmsc='http://mmc.digicelsr.com/servlets/mms'
-      mmsproxy='172.20.6.12'
-      mmsport='9201'
-      type='mms'
-      user='wap'
-      password='wap'
+  <apn carrier="Suriname:Digicel:Mms"
+      mcc="746"
+      mnc="03"
+      apn="wap.digicelsr.com"
+      authtype="1"
+      mmsc="http://mmc.digicelsr.com/servlets/mms"
+      mmsproxy="172.20.6.12"
+      mmsport="9201"
+      type="mms"
+      user="wap"
+      password="wap"
   />
-  <apn carrier='Suriname:Digicel:Modem'
-      mcc='746'
-      mnc='03'
-      apn='wap.digicelsr.com'
-      port='8080'
-      authtype='1'
-      proxy='172.20.6.12'
-      mmsc='http://wapdigicel.com'
-      type='dun'
-      user='wap'
-      password='wap'
+  <apn carrier="Suriname:Digicel:Modem"
+      mcc="746"
+      mnc="03"
+      apn="wap.digicelsr.com"
+      port="8080"
+      authtype="1"
+      proxy="172.20.6.12"
+      mmsc="http://wapdigicel.com"
+      type="dun"
+      user="wap"
+      password="wap"
   />
   <apn carrier="wapANCEL"
       mcc="748"