Toro : Modify test-apns-conf_verizon.xml for VzW OTADM feature
New two fields (carrer_enabled, bearer) are added to the telephony db.
LTE & eHRPD have their own apn info separately.
This is a pair set with below change-ids.
- https://partner.source.android.com/g/#/c/8517/
- https://partner.source.android.com/g/#/c/8515/

Change-Id: Ib80ef45bd7fecbb811c03ad5ac8ccc6a246e0273
Signed-off-by: sinikang <sinikang@samsung.com>
diff --git a/etc/apns-conf_verizon.xml b/etc/apns-conf_verizon.xml
index d73be47..3d35816 100644
--- a/etc/apns-conf_verizon.xml
+++ b/etc/apns-conf_verizon.xml
@@ -2,7 +2,7 @@
 
 <!-- use empty string to specify no proxy or port -->
 <!-- This version must agree with that in apps/common/res/apns.xml -->
-<apns version="6">
+<apns version="7">
     <apn carrier="Verizon"
         mcc="310"
         mnc="004"
@@ -47,31 +47,34 @@
     />
 
     <!-- Modify Apn database for VZW LTE support -->
-    <apn carrier="Verizon Internet"
+    <apn carrier="LTE - Verizon Internet"
         mcc="311"
         mnc="480"
         apn="VZWINTERNET"
         type="default,dun"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="Verizon FOTA"
+    <apn carrier="LTE - Verizon FOTA"
         mcc="311"
         mnc="480"
         apn="VZWADMIN"
         type="fota"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="Verizon IMS"
+    <apn carrier="LTE - Verizon IMS"
         mcc="311"
         mnc="480"
         apn="VZWIMS"
         type="ims"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="Verizon CBS"
+    <apn carrier="LTE - Verizon CBS"
         mcc="311"
         mnc="480"
         apn="VZWAPP"
@@ -79,32 +82,36 @@
         mmsc="http://mms.vtext.com/servlets/mms"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="VZW Roaming Internet"
+    <apn carrier="LTE - VZW Roaming Internet"
         mcc="204"
         mnc="04"
         apn="VZWINTERNET"
         type="default,dun"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="VZW Roaming FOTA"
+    <apn carrier="LTE - VZW Roaming FOTA"
         mcc="204"
         mnc="04"
         apn="VZWADMIN"
         type="fota"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="VZW Roaming IMS"
+    <apn carrier="LTE - VZW Roaming IMS"
         mcc="204"
         mnc="04"
         apn="VZWIMS"
         type="ims"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="VZW Roaming CBS"
+    <apn carrier="LTE - VZW Roaming CBS"
         mcc="204"
         mnc="04"
         apn="VZWAPP"
@@ -112,32 +119,36 @@
         mmsc="http://mms.vtext.com/servlets/mms"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="Test Internet"
+    <apn carrier="LTE - Test Internet"
         mcc="001"
         mnc="01"
         apn="VZWINTERNET"
         type="default,dun"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="Test FOTA"
+    <apn carrier="LTE - Test FOTA"
         mcc="001"
         mnc="01"
         apn="VZWADMIN"
         type="fota"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="Test IMS"
+    <apn carrier="LTE - Test IMS"
         mcc="001"
         mnc="01"
         apn="VZWIMS"
         type="ims"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="Test CBS"
+    <apn carrier="LTE - Test CBS"
         mcc="001"
         mnc="01"
         apn="VZWAPP"
@@ -145,65 +156,73 @@
         mmsc="http://mms.vtext.com/servlets/mms"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="VZW Test Internet"
+    <apn carrier="LTE - VZW Test Internet"
         mcc="001"
         mnc="010"
         apn="VZWINTERNET"
         type="default,dun"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="VZW Test FOTA"
+    <apn carrier="LTE - VZW Test FOTA"
         mcc="001"
         mnc="010"
         apn="VZWADMIN"
         type="fota"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="VZW Test IMS"
+    <apn carrier="LTE - VZW Test IMS"
         mcc="001"
         mnc="010"
         apn="VZWIMS"
         type="ims"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="VZW Test CBS"
+    <apn carrier="LTE - VZW Test CBS"
         mcc="001"
         mnc="010"
         apn="VZWAPP"
         type="cbs,mms"
-        mmsc="hhtp://mms.vtext.com/servlets/mms"
+        mmsc="http://mms.vtext.com/servlets/mms"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="VZW Test Internet"
+    <apn carrier="LTE - VZW Test Internet"
         mcc="246"
         mnc="81"
         apn="VZWINTERNET"
         type="default,dun"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="VZW Test FOTA"
+    <apn carrier="LTE - VZW Test FOTA"
         mcc="246"
         mnc="81"
         apn="VZWADMIN"
         type="fota"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="VZW Test IMS"
+    <apn carrier="LTE - VZW Test IMS"
         mcc="246"
         mnc="81"
         apn="VZWIMS"
         type="ims"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="VZW Test CBS"
+    <apn carrier="LTE - VZW Test CBS"
         mcc="246"
         mnc="81"
         apn="VZWAPP"
@@ -211,32 +230,36 @@
         mmsc="http://mms.vtext.com/servlets/mms"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-   <apn carrier="VZW Test Internet"
+   <apn carrier="LTE - VZW Test Internet"
         mcc="246"
         mnc="081"
         apn="VZWINTERNET"
         type="default,dun"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="VZW Test FOTA"
+    <apn carrier="LTE - VZW Test FOTA"
         mcc="246"
         mnc="081"
         apn="VZWADMIN"
         type="fota"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="VZW Test IMS"
+    <apn carrier="LTE - VZW Test IMS"
         mcc="246"
         mnc="081"
         apn="VZWIMS"
         type="ims"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="VZW Test CBS"
+    <apn carrier="LTE - VZW Test CBS"
         mcc="246"
         mnc="081"
         apn="VZWAPP"
@@ -244,6 +267,232 @@
         mmsc="http://mms.vtext.com/servlets/mms"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
     <!-- END modify Apn database for VZW LTE support -->
+    <!-- Modify Apn database for VZW EHRPD support -->
+    <apn carrier="EHRPD - Verizon Internet"
+        mcc="311"
+        mnc="480"
+        apn="VZWINTERNET"
+        type="default,dun"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - Verizon FOTA"
+        mcc="311"
+        mnc="480"
+        apn="VZWADMIN"
+        type="fota"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - Verizon IMS"
+        mcc="311"
+        mnc="480"
+        apn="VZWIMS"
+        type="ims"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <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"
+    />
+    <apn carrier="EHRPD - VZW Roaming Internet"
+        mcc="204"
+        mnc="04"
+        apn="VZWINTERNET"
+        type="default,dun"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - VZW Roaming FOTA"
+        mcc="204"
+        mnc="04"
+        apn="VZWADMIN"
+        type="fota"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - VZW Roaming IMS"
+        mcc="204"
+        mnc="04"
+        apn="VZWIMS"
+        type="ims"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - VZW Roaming CBS"
+        mcc="204"
+        mnc="04"
+        apn="VZWAPP"
+        type="cbs,mms"
+        mmsc="http://mms.vtext.com/servlets/mms"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - Test Internet"
+        mcc="001"
+        mnc="01"
+        apn="VZWINTERNET"
+        type="default,dun"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - Test FOTA"
+        mcc="001"
+        mnc="01"
+        apn="VZWADMIN"
+        type="fota"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - Test IMS"
+        mcc="001"
+        mnc="01"
+        apn="VZWIMS"
+        type="ims"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - Test CBS"
+        mcc="001"
+        mnc="01"
+        apn="VZWAPP"
+        type="cbs,mms"
+        mmsc="http://mms.vtext.com/servlets/mms"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - VZW Test Internet"
+        mcc="001"
+        mnc="010"
+        apn="VZWINTERNET"
+        type="default,dun"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - VZW Test FOTA"
+        mcc="001"
+        mnc="010"
+        apn="VZWADMIN"
+        type="fota"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - VZW Test IMS"
+        mcc="001"
+        mnc="010"
+        apn="VZWIMS"
+        type="ims"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - VZW Test CBS"
+        mcc="001"
+        mnc="010"
+        apn="VZWAPP"
+        type="cbs,mms"
+        mmsc="http://mms.vtext.com/servlets/mms"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - VZW Test Internet"
+        mcc="246"
+        mnc="81"
+        apn="VZWINTERNET"
+        type="default,dun"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - VZW Test FOTA"
+        mcc="246"
+        mnc="81"
+        apn="VZWADMIN"
+        type="fota"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - VZW Test IMS"
+        mcc="246"
+        mnc="81"
+        apn="VZWIMS"
+        type="ims"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - VZW Test CBS"
+        mcc="246"
+        mnc="81"
+        apn="VZWAPP"
+        type="cbs,mms"
+        mmsc="http://mms.vtext.com/servlets/mms"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+   <apn carrier="EHRPD - VZW Test Internet"
+        mcc="246"
+        mnc="081"
+        apn="VZWINTERNET"
+        type="default,dun"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - VZW Test FOTA"
+        mcc="246"
+        mnc="081"
+        apn="VZWADMIN"
+        type="fota"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - VZW Test IMS"
+        mcc="246"
+        mnc="081"
+        apn="VZWIMS"
+        type="ims"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - VZW Test CBS"
+        mcc="246"
+        mnc="081"
+        apn="VZWAPP"
+        type="cbs,mms"
+        mmsc="http://mms.vtext.com/servlets/mms"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <!-- END modify Apn database for VZW EHRPD support -->
+
 </apns>
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index 7b30054..4802194 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -19,7 +19,7 @@
 
 <!-- use empty string to specify no proxy or port -->
 <!-- This version must agree with that in apps/common/res/apns.xml -->
-<apns version="6">
+<apns version="7">
   <apn carrier="Cosmote Wireless Internet"
       mcc="202"
       mnc="01"
diff --git a/etc/test-apns-conf_verizon.xml b/etc/test-apns-conf_verizon.xml
index 3315f04..8db70e4 100644
--- a/etc/test-apns-conf_verizon.xml
+++ b/etc/test-apns-conf_verizon.xml
@@ -2,7 +2,7 @@
 
 <!-- use empty string to specify no proxy or port -->
 <!-- This version must agree with that in apps/common/res/apns.xml -->
-<apns version="6">
+<apns version="7">
     <apn carrier="Verizon"
         mcc="310"
         mnc="004"
@@ -13,8 +13,7 @@
         password="vzwtest"
         protocol="IPV4V6"
     />
-
-    <apn carrier="Verizon Internet"
+   <apn carrier="Verizon Internet"
         mcc="310"
         mnc="004"
         apn="VZWINTERNET"
@@ -51,31 +50,34 @@
     />
 
     <!-- Modify Apn database for VZW LTE support -->
-    <apn carrier="Verizon Internet"
+     <apn carrier="LTE - Verizon Internet"
         mcc="311"
         mnc="480"
         apn="VZWINTERNET"
         type="default,dun"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="Verizon FOTA"
+    <apn carrier="LTE - Verizon FOTA"
         mcc="311"
         mnc="480"
         apn="VZWADMIN"
         type="fota"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="Verizon IMS"
+    <apn carrier="LTE - Verizon IMS"
         mcc="311"
         mnc="480"
         apn="VZWIMS"
         type="ims"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="Verizon CBS"
+    <apn carrier="LTE - Verizon CBS"
         mcc="311"
         mnc="480"
         apn="VZWAPP"
@@ -85,32 +87,36 @@
         password="vzwtest"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="VZW Roaming Internet"
+    <apn carrier="LTE - VZW Roaming Internet"
         mcc="204"
         mnc="04"
         apn="VZWINTERNET"
         type="default,dun"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="VZW Roaming FOTA"
+    <apn carrier="LTE - VZW Roaming FOTA"
         mcc="204"
         mnc="04"
         apn="VZWADMIN"
         type="fota"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="VZW Roaming IMS"
+    <apn carrier="LTE - VZW Roaming IMS"
         mcc="204"
         mnc="04"
         apn="VZWIMS"
         type="ims"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="VZW Roaming CBS"
+    <apn carrier="LTE - VZW Roaming CBS"
         mcc="204"
         mnc="04"
         apn="VZWAPP"
@@ -120,32 +126,36 @@
         password="vzwtest"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="Test Internet"
+    <apn carrier="LTE - Test Internet"
         mcc="001"
         mnc="01"
         apn="VZWINTERNET"
         type="default,dun"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="Test FOTA"
+    <apn carrier="LTE - Test FOTA"
         mcc="001"
         mnc="01"
         apn="VZWADMIN"
         type="fota"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="Test IMS"
+    <apn carrier="LTE - Test IMS"
         mcc="001"
         mnc="01"
         apn="VZWIMS"
         type="ims"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="Test CBS"
+    <apn carrier="LTE - Test CBS"
         mcc="001"
         mnc="01"
         apn="VZWAPP"
@@ -155,32 +165,36 @@
         password="vzwtest"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="VZW Test Internet"
+    <apn carrier="LTE - VZW Test Internet"
         mcc="001"
         mnc="010"
         apn="VZWINTERNET"
         type="default,dun"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="VZW Test FOTA"
+    <apn carrier="LTE - VZW Test FOTA"
         mcc="001"
         mnc="010"
         apn="VZWADMIN"
         type="fota"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="VZW Test IMS"
+    <apn carrier="LTE - VZW Test IMS"
         mcc="001"
         mnc="010"
         apn="VZWIMS"
         type="ims"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="VZW Test CBS"
+    <apn carrier="LTE - VZW Test CBS"
         mcc="001"
         mnc="010"
         apn="VZWAPP"
@@ -190,32 +204,36 @@
         password="vzwtest"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="VZW Test Internet"
+    <apn carrier="LTE - VZW Test Internet"
         mcc="246"
         mnc="81"
         apn="VZWINTERNET"
         type="default,dun"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="VZW Test FOTA"
+    <apn carrier="LTE - VZW Test FOTA"
         mcc="246"
         mnc="81"
         apn="VZWADMIN"
         type="fota"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="VZW Test IMS"
+    <apn carrier="LTE - VZW Test IMS"
         mcc="246"
         mnc="81"
         apn="VZWIMS"
         type="ims"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="VZW Test CBS"
+    <apn carrier="LTE - VZW Test CBS"
         mcc="246"
         mnc="81"
         apn="VZWAPP"
@@ -225,32 +243,36 @@
         password="vzwtest"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-   <apn carrier="VZW Test Internet"
+   <apn carrier="LTE - VZW Test Internet"
         mcc="246"
         mnc="081"
         apn="VZWINTERNET"
         type="default,dun"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="VZW Test FOTA"
+    <apn carrier="LTE - VZW Test FOTA"
         mcc="246"
         mnc="081"
         apn="VZWADMIN"
         type="fota"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="VZW Test IMS"
+    <apn carrier="LTE - VZW Test IMS"
         mcc="246"
         mnc="081"
         apn="VZWIMS"
         type="ims"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
-    <apn carrier="VZW Test CBS"
+    <apn carrier="LTE - VZW Test CBS"
         mcc="246"
         mnc="081"
         apn="VZWAPP"
@@ -260,6 +282,244 @@
         password="vzwtest"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
+        bearer="14"
     />
     <!-- END modify Apn database for VZW LTE support -->
+    <!-- Modify Apn database for VZW EHRPD support -->
+    <apn carrier="EHRPD - Verizon Internet"
+        mcc="311"
+        mnc="480"
+        apn="VZWINTERNET"
+        type="default,dun"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - Verizon FOTA"
+        mcc="311"
+        mnc="480"
+        apn="VZWADMIN"
+        type="fota"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - Verizon IMS"
+        mcc="311"
+        mnc="480"
+        apn="VZWIMS"
+        type="ims"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - Verizon CBS"
+        mcc="311"
+        mnc="480"
+        apn="VZWAPP"
+        type="cbs,mms"
+        mmsc="http://vzpix.com/servlets/mms"
+        user="hrltest@vztest.com"
+        password="vzwtest"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - VZW Roaming Internet"
+        mcc="204"
+        mnc="04"
+        apn="VZWINTERNET"
+        type="default,dun"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - VZW Roaming FOTA"
+        mcc="204"
+        mnc="04"
+        apn="VZWADMIN"
+        type="fota"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - VZW Roaming IMS"
+        mcc="204"
+        mnc="04"
+        apn="VZWIMS"
+        type="ims"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - VZW Roaming CBS"
+        mcc="204"
+        mnc="04"
+        apn="VZWAPP"
+        type="cbs,mms"
+        mmsc="http://vzpix.com/servlets/mms"
+        user="hrltest@vztest.com"
+        password="vzwtest"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - Test Internet"
+        mcc="001"
+        mnc="01"
+        apn="VZWINTERNET"
+        type="default,dun"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - Test FOTA"
+        mcc="001"
+        mnc="01"
+        apn="VZWADMIN"
+        type="fota"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - Test IMS"
+        mcc="001"
+        mnc="01"
+        apn="VZWIMS"
+        type="ims"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - Test CBS"
+        mcc="001"
+        mnc="01"
+        apn="VZWAPP"
+        type="cbs,mms"
+        mmsc="http://vzpix.com/servlets/mms"
+        user="hrltest@vztest.com"
+        password="vzwtest"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - VZW Test Internet"
+        mcc="001"
+        mnc="010"
+        apn="VZWINTERNET"
+        type="default,dun"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - VZW Test FOTA"
+        mcc="001"
+        mnc="010"
+        apn="VZWADMIN"
+        type="fota"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - VZW Test IMS"
+        mcc="001"
+        mnc="010"
+        apn="VZWIMS"
+        type="ims"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - VZW Test CBS"
+        mcc="001"
+        mnc="010"
+        apn="VZWAPP"
+        type="cbs,mms"
+        mmsc="http://vzpix.com/servlets/mms"
+        user="hrltest@vztest.com"
+        password="vzwtest"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - VZW Test Internet"
+        mcc="246"
+        mnc="81"
+        apn="VZWINTERNET"
+        type="default,dun"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - VZW Test FOTA"
+        mcc="246"
+        mnc="81"
+        apn="VZWADMIN"
+        type="fota"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - VZW Test IMS"
+        mcc="246"
+        mnc="81"
+        apn="VZWIMS"
+        type="ims"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - VZW Test CBS"
+        mcc="246"
+        mnc="81"
+        apn="VZWAPP"
+        type="cbs,mms"
+        mmsc="http://vzpix.com/servlets/mms"
+        user="hrltest@vztest.com"
+        password="vzwtest"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+   <apn carrier="EHRPD - VZW Test Internet"
+        mcc="246"
+        mnc="081"
+        apn="VZWINTERNET"
+        type="default,dun"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - VZW Test FOTA"
+        mcc="246"
+        mnc="081"
+        apn="VZWADMIN"
+        type="fota"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - VZW Test IMS"
+        mcc="246"
+        mnc="081"
+        apn="VZWIMS"
+        type="ims"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <apn carrier="EHRPD - VZW Test CBS"
+        mcc="246"
+        mnc="081"
+        apn="VZWAPP"
+        type="cbs,mms"
+        mmsc="http://vzpix.com/servlets/mms"
+        user="hrltest@vztest.com"
+        password="vzwtest"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+    <!-- END modify Apn database for VZW EHRPD support -->
+
 </apns>