Updating EMEA, Canada and Japan APNs

240-07  Tele2 - Updating APNs config
302-220 PC Mobile - Updating APN name
419-03  OOREDOO - Updating APNs config
440-20  Y!Mobile - Updating APNs config

b/18023195
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index 6194d98..2088088 100755
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -4431,38 +4431,15 @@
       type="mms"
   />
 
-  <apn carrier="Tele2 Internet"
+  <apn carrier="Tele2"
       mcc="240"
       mnc="07"
-      apn="4g.tele2.se"
-      type="default,supl"
-  />
-
-  <apn carrier="Tele2 MMS"
-      mcc="240"
-      mnc="07"
-      apn="4g.tele2.se"
-      mmsc="http://mmsc.tele2.se"
-      mmsproxy="130.244.202.30"
+      apn="internet.tele2.no"
+      mmsc="http://mmsc.tele2.no"
+      mmsproxy="193.12.40.14"
       mmsport="8080"
-      type="mms"
-  />
-
-  <apn carrier="Tele2 Internet 3G"
-      mcc="240"
-      mnc="07"
-      apn="internet.tele2.se"
-      type="default,supl"
-  />
-
-  <apn carrier="Tele2 MMS 3G"
-      mcc="240"
-      mnc="07"
-      apn="internet.tele2.se"
-      mmsc="http://mmsc.tele2.se"
-      mmsproxy="130.244.202.30"
-      mmsport="8080"
-      type="mms"
+      protocol="IP"
+      type="default,supl,mms"
   />
 
   <apn carrier="Tele2 Internet"
@@ -6746,7 +6723,7 @@
       mvno_type="gid"
   />
 
-  <apn carrier="PC mobile"
+  <apn carrier="Mobile Internet"
       mcc="302"
       mnc="220"
       apn="sp.mb.com"
@@ -25907,15 +25884,7 @@
       mcc="419"
       mnc="03"
       apn="action.wataniya.com"
-      type="default,supl"
-  />
-
-  <apn carrier="WAPAction"
-      mcc="419"
-      mnc="03"
-      apn="wap.wataniya.com"
-      proxy="194.126.53.64"
-      port="8080"
+      authtype="0"
       type="default,supl"
   />
 
@@ -25926,6 +25895,7 @@
       mmsc="http://action.wataniya.com"
       mmsproxy="194.126.53.64"
       mmsport="8080"
+      authtype="0"
       type="mms"
   />
 
@@ -26949,12 +26919,12 @@
       mcc="440"
       mnc="20"
       apn="plus.acs.jp"
-      user="plusw6q9tattkmpk"
-      password="msfbbam83bsdetxb"
-      mmsproxy="andmms.plusacs.ne.jp"
+      user="ym"
+      password="ym"
+      mmsproxy="andmms.plus.acs.ne.jp"
       mmsport="8080"
       mmsc="http://mms-s"
-      type="default,mms,supl"
+      type="default,mms,supl,hipri"
       authtype="2"
   />