Updating EMEA APNs

202-09 Q Internet - New APN definition
208-10 Simplicime - Removing APNs - Simplicime has been merged into Laposte Mobile
208-10 Laposte Mobile - Combining default and MMS APNs
214-01 Airtel ES - Updating APN name per carrier request
404-68 MTNL IN - Updating and combining default and MMS APNs
404-69 MTNL IN - Updating and combining default and MMS APNs
419-04 Viva KW - Combining default and MMS APNs
420-04 Zain - Updating Zain APNs config

b/17928467
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index d38fcb1..202032a 100755
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -408,6 +408,13 @@
       type="mms"
   />
 
+  <apn carrier="Q Internet"
+      mcc="202"
+      mnc="09"
+      apn="myq"
+      type="default,supl"
+  />
+
   <apn carrier="Q-Telecom MMS GPRS"
       mcc="202"
       mnc="09"
@@ -1292,25 +1299,6 @@
       mvno_type="spn"
   />
 
-  <apn carrier="WAP Simplicime"
-      mcc="208"
-      mnc="10"
-      proxy="192.168.21.3"
-      port="8080"
-      apn="wapdebitel"
-      type="default,supl"
-  />
-
-  <apn carrier="MMS Simplicime"
-      mcc="208"
-      mnc="10"
-      mmsc="http://mmsdebitel"
-      mmsproxy="10.143.156.3"
-      mmsport="8080"
-      apn="mmsdebitel"
-      type="mms"
-  />
-
   <apn carrier="WAP LeclercMobile"
       mcc="208"
       mnc="10"
@@ -1370,20 +1358,11 @@
       mnc="10"
       proxy="192.168.21.3"
       port="8080"
-      apn="wapdebitel"
-      type="default,supl"
-      mvno_match_data="4C"
-      mvno_type="gid"
-  />
-
-  <apn carrier="MMS La Poste Mobile"
-      mcc="208"
-      mnc="10"
+      apn="sl2sfr"
       mmsc="http://mmsdebitel"
       mmsproxy="10.143.156.3"
       mmsport="8080"
-      apn="mmsdebitel"
-      type="mms"
+      type="default,mms,supl"
       mvno_match_data="4C"
       mvno_type="gid"
   />
@@ -1586,7 +1565,7 @@
       mvno_type="gid"
   />
 
-  <apn carrier="Internet movil"
+  <apn carrier="Internet móvil"
       mcc="214"
       mnc="01"
       apn="airtelwap.es"
@@ -20549,88 +20528,32 @@
       type="default,supl"
   />
 
-  <apn carrier="Dolphin_Delhi MMS"
+  <apn carrier="MTNL"
       mcc="404"
       mnc="68"
-      apn="gprsmtnldel"
+      apn="mtnl.net"
+      authtype="0"
       user="mtnl"
       password="mtnl123"
-      mmsc="http://172.16.31.136/mms/"
-      mmsproxy="172.16.31.10"
-      mmsport="80"
-      type="mms"
-  />
-
-  <apn carrier="Dolphin_Delhi"
-      mcc="404"
-      mnc="68"
-      apn="gprsmtnldel"
-      user="mtnl"
-      password="mtnl123"
-      type="default,supl"
-  />
-
-  <apn carrier="Dolphin_Delhi_3G MMS"
-      mcc="404"
-      mnc="68"
-      apn="mtnl3g"
-      user="mtnl"
-      password="mtnl123"
-      mmsc="http://172.16.31.165/mms/"
-      mmsproxy="172.16.31.10"
+      mmsc="http://mtnlmms/"
+      mmsproxy="10.10.10.10"
       mmsport="9401"
-      type="mms"
+      type="default,mms,supl,agps,fota,dun"
   />
 
-  <apn carrier="Dolphin_Delhi_3G"
-      mcc="404"
-      mnc="68"
-      apn="mtnl3g"
-      user="mtnl"
-      password="mtnl123"
-      type="default,supl"
-  />
-
-  <apn carrier="Dolphin_Mumbai MMS"
+  <apn carrier="MTNL"
       mcc="404"
       mnc="69"
-      apn="gprsmtnlmum"
+      apn="mtnl.net"
+      authtype="0"
       user="mtnl"
       password="mtnl123"
-      mmsc="http://172.16.39.140/mms/"
-      mmsproxy="172.16.39.10"
-      mmsport="80"
-      type="mms"
-  />
-
-  <apn carrier="Dolphin_Mumbai"
-      mcc="404"
-      mnc="69"
-      apn="gprsmtnlmum"
-      user="mtnl"
-      password="mtnl123"
-      type="default,supl"
-  />
-
-  <apn carrier="Dolphin_Mumbai_3G MMS"
-      mcc="404"
-      mnc="69"
-      apn="mtnl3g"
-      user="mtnl"
-      password="mtnl123"
-      mmsc="http://172.16.31.165/mms/"
-      mmsproxy="172.16.39.10"
+      mmsc="http://mtnlmms/"
+      mmsproxy="10.10.10.10"
       mmsport="9401"
-      type="mms"
-  />
-
-  <apn carrier="Dolphin_Mumbai_3G"
-      mcc="404"
-      mnc="69"
-      apn="mtnl3g"
-      user="mtnl"
-      password="mtnl123"
-      type="default,supl"
+      type="default,mms,supl,agps,fota,dun"
+      protocol="IP"
+      roaming_protocol="IP"
   />
 
   <apn carrier="Mobile Office"
@@ -25847,23 +25770,15 @@
       type="mms"
   />
 
-  <apn carrier="VIVA MMS"
+  <apn carrier="VIVA - KW"
       mcc="419"
       mnc="04"
-      apn="VIVA"
+      apn="viva"
+      authtype="0"
       mmsc="http://172.16.128.80:38090/was"
       mmsproxy="172.16.128.228"
       mmsport="8080"
-      type="mms"
-  />
-
-  <apn carrier="VIVA INTERNET"
-      mcc="419"
-      mnc="04"
-      apn="VIVA"
-      proxy="172.16.128.228"
-      port="8080"
-      type="default,supl"
+      type="default,supl,mms"
   />
 
   <apn carrier="STC - GPRS"
@@ -25935,32 +25850,24 @@
       type="mms"
   />
 
-
-
   <apn carrier="zain-Internet Wap"
       mcc="420"
       mnc="04"
       apn="zain"
-      type="default,supl"
-  />
-
-  <apn carrier="zain WAP"
-      mcc="420"
-      mnc="04"
-      apn="zain"
-      proxy="10.122.200.10"
-      port="8080"
+      authtype="0"
       type="default,supl"
   />
 
   <apn carrier="zain-mms"
       mcc="420"
       mnc="04"
-      apn="zain"
+      apn="zainmms"
       mmsc="http://10.122.200.12:8002"
       mmsproxy="10.122.200.10"
       mmsport="8080"
       type="mms"
+      protocol="IP"
+      roaming_protocol="IP"
   />
 
   <apn carrier="SabaFon"