Merge "Add APN Settings for UK  MVNO Jump.co.uk (Dual-IMSI MCC/MNC)"
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index c44533f..82c7138 100755
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -974,6 +974,29 @@
       type="default,supl"
   />
 
+  <apn carrier="netgprs.com"
+      mcc="206"
+      mnc="10"
+      apn="netgprs.com"
+      user="tsl"
+      password="tsl"
+      type="default,supl"
+      mvno_match_data="BE-Transatel"
+      mvno_type="spn"
+   />
+
+
+ <apn carrier="netgprs.com"
+      mcc="206"
+      mnc="10"
+      apn="netgprs.com"
+      user="tsl"
+      password="tsl"
+      type="default,supl"
+      mvno_match_data="BB00"
+      mvno_type="gid"
+  />
+
   <apn carrier="BASE WAP"
       mcc="206"
       mnc="20"
@@ -1531,6 +1554,17 @@
       type="default,supl,mms"
   />
 
+  <apn carrier="netgprs.com"
+      mcc="208"
+      mnc="22"
+      apn="netgprs.com"
+      user="tsl"
+      password="tsl"
+      type="default,supl"
+      mvno_match_data="FR-Transatel"
+      mvno_type="spn"
+  />
+
   <apn carrier="Virgin mobile"
       mcc="208"
       mnc="23"
@@ -3115,6 +3149,28 @@
       type="mms"
   />
 
+  <apn carrier="netgprs.com"
+      mcc="228"
+      mnc="03"
+      apn="netgprs.com"
+      user="tsl"
+      password="tsl"
+      type="default,supl"
+      mvno_match_data="CH-Transatel"
+      mvno_type="spn"
+   />
+
+   <apn carrier="netgprs.com"
+      mcc="228"
+      mnc="03"
+      apn="netgprs.com"
+      user="tsl"
+      password="tsl"
+      type="default,supl"
+      mvno_match_data="BB00"
+      mvno_type="gid"
+  />
+
   <apn carrier="T-Mobile CZ"
       mcc="230"
       mnc="01"
@@ -5581,6 +5637,13 @@
       type="mms"
   />
 
+  <apn carrier="VODA internet"
+      mcc="250"
+      mnc="28"
+      apn="vodalte.ru"
+      type="default,supl"
+  />
+
   <apn carrier="Beeline Internet"
       mcc="250"
       mnc="99"
@@ -6262,6 +6325,28 @@
       type="mms"
   />
 
+   <apn carrier="netgprs.com"
+      mcc="270"
+      mnc="77"
+      apn="netgprs.com"
+      user="tsl"
+      password="tsl"
+      type="default,supl"
+      mvno_match_data="BB00"
+      mvno_type="gid"
+  />
+
+  <apn carrier="netgprs.com"
+      mcc="270"
+      mnc="77"
+      apn="netgprs.com"
+      user="tsl"
+      password="tsl"
+      type="default,supl"
+      mvno_match_data="LU-Transatel"
+      mvno_type="spn"
+  />
+
   <apn carrier="Orange"
       mcc="270"
       mnc="99"
@@ -8657,7 +8742,7 @@
       mmsc="http://mms.sprintpcs.com"
       mmsproxy="68.28.31.7"
       mmsport="80"
-      type="default,supl,mms"
+      type="default,supl,mms,dun"
       bearer_bitmask="1|2|3|9|10|11|15|16"
   />
 
@@ -8786,8 +8871,8 @@
       mnc="160"
       apn=""
       type="ia"
-      protocol="IPV6"
-      roaming_protocol="IP"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
       mtu="1440"
   />
 
@@ -8818,6 +8903,17 @@
       mcc="310"
       mnc="160"
       apn="fast.metropcs.com"
+      type="ia"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_match_data="6D"
+      mvno_type="gid"
+  />
+
+  <apn carrier="MetroPCS 160"
+      mcc="310"
+      mnc="160"
+      apn="fast.metropcs.com"
       mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
       type="default,supl,mms"
       protocol="IPV6"
@@ -8826,6 +8922,16 @@
       mvno_type="gid"
   />
 
+  <apn carrier="IMS"
+      mcc="310"
+      mnc="170"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+
   <apn carrier="DataConnect"
       mcc="310"
       mnc="170"
@@ -8876,8 +8982,8 @@
       mnc="200"
       apn=""
       type="ia"
-      protocol="IPV6"
-      roaming_protocol="IP"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
       mtu="1440"
   />
 
@@ -8908,6 +9014,17 @@
       mcc="310"
       mnc="200"
       apn="fast.metropcs.com"
+      type="ia"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_match_data="6D"
+      mvno_type="gid"
+  />
+
+  <apn carrier="MetroPCS 200"
+      mcc="310"
+      mnc="200"
+      apn="fast.metropcs.com"
       mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
       type="default,supl,mms"
       protocol="IPV6"
@@ -8921,8 +9038,8 @@
       mnc="210"
       apn=""
       type="ia"
-      protocol="IPV6"
-      roaming_protocol="IP"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
       mtu="1440"
   />
 
@@ -8953,6 +9070,17 @@
       mcc="310"
       mnc="210"
       apn="fast.metropcs.com"
+      type="ia"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_match_data="6D"
+      mvno_type="gid"
+  />
+
+  <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"
@@ -8966,8 +9094,8 @@
       mnc="220"
       apn=""
       type="ia"
-      protocol="IPV6"
-      roaming_protocol="IP"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
       mtu="1440"
   />
 
@@ -8998,6 +9126,17 @@
       mcc="310"
       mnc="220"
       apn="fast.metropcs.com"
+      type="ia"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_match_data="6D"
+      mvno_type="gid"
+  />
+
+  <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"
@@ -9011,8 +9150,8 @@
       mnc="230"
       apn=""
       type="ia"
-      protocol="IPV6"
-      roaming_protocol="IP"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
       mtu="1440"
   />
 
@@ -9043,6 +9182,17 @@
       mcc="310"
       mnc="230"
       apn="fast.metropcs.com"
+      type="ia"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_match_data="6D"
+      mvno_type="gid"
+  />
+
+  <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"
@@ -9056,8 +9206,8 @@
       mnc="240"
       apn=""
       type="ia"
-      protocol="IPV6"
-      roaming_protocol="IP"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
       mtu="1440"
   />
 
@@ -9088,6 +9238,17 @@
       mcc="310"
       mnc="240"
       apn="fast.metropcs.com"
+      type="ia"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_match_data="6D"
+      mvno_type="gid"
+  />
+
+  <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"
@@ -9101,8 +9262,8 @@
       mnc="250"
       apn=""
       type="ia"
-      protocol="IPV6"
-      roaming_protocol="IP"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
       mtu="1440"
   />
 
@@ -9133,6 +9294,17 @@
       mcc="310"
       mnc="250"
       apn="fast.metropcs.com"
+      type="ia"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_match_data="6D"
+      mvno_type="gid"
+  />
+
+  <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"
@@ -9146,8 +9318,8 @@
       mnc="260"
       apn=""
       type="ia"
-      protocol="IPV6"
-      roaming_protocol="IP"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
       mtu="1440"
   />
 
@@ -9169,6 +9341,39 @@
       type="mms"
       protocol="IPV6"
       roaming_protocol="IP"
+      bearer_bitmask="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17"
+  />
+
+  <apn carrier="T-Mobile MMS"
+       mcc="310"
+       mnc="260"
+       apn="TMUS"
+       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+       type="mms"
+       protocol="IPV6"
+       roaming_protocol="IPV6"
+       bearer_bitmask="18"
+  />
+
+  <apn carrier="T-Mobile IMS"
+       mcc="310"
+       mnc="260"
+       apn="ims"
+       type="ims"
+       modem_cognitive="true"
+       protocol="IPV6"
+       bearer_bitmask="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17"
+  />
+
+  <apn carrier="T-Mobile IMS"
+       mcc="310"
+       mnc="260"
+       apn="ims"
+       type="ims"
+       modem_cognitive="true"
+       protocol="IPV6"
+       roaming_protocol="IPV6"
+       bearer_bitmask="18"
   />
 
   <apn carrier="Project Fi - T"
@@ -9185,16 +9390,18 @@
        mvno_type="IMSI"
   />
 
-  <apn carrier="T-Mobile IMS"
+  <apn carrier="MetroPCS 260"
       mcc="310"
       mnc="260"
-      apn="ims"
-      type="ims"
-      modem_cognitive="true"
-      protocol="IPV6"
+      apn="fast.metropcs.com"
+      type="ia"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_match_data="6D"
+      mvno_type="gid"
   />
 
-  <apn carrier="MetroPCS"
+  <apn carrier="MetroPCS 260"
       mcc="310"
       mnc="260"
       apn="fast.metropcs.com"
@@ -9263,8 +9470,8 @@
       mnc="270"
       apn=""
       type="ia"
-      protocol="IPV6"
-      roaming_protocol="IP"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
       mtu="1440"
   />
 
@@ -9295,6 +9502,17 @@
       mcc="310"
       mnc="270"
       apn="fast.metropcs.com"
+      type="ia"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_match_data="6D"
+      mvno_type="gid"
+  />
+
+  <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"
@@ -9313,6 +9531,16 @@
   <apn carrier="T-Mobile US 300"
       mcc="310"
       mnc="300"
+      apn=""
+      type="ia"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mtu="1440"
+  />
+
+  <apn carrier="T-Mobile US 300"
+      mcc="310"
+      mnc="300"
       apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
       type="default,supl,mms"
@@ -9337,6 +9565,17 @@
       mcc="310"
       mnc="300"
       apn="fast.metropcs.com"
+      type="ia"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_match_data="6D"
+      mvno_type="gid"
+  />
+
+  <apn carrier="MetroPCS 300"
+      mcc="310"
+      mnc="300"
+      apn="fast.metropcs.com"
       mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
       type="default,supl,mms"
       protocol="IPV6"
@@ -9365,8 +9604,8 @@
       mnc="310"
       apn=""
       type="ia"
-      protocol="IPV6"
-      roaming_protocol="IP"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
       mtu="1440"
   />
 
@@ -9397,6 +9636,17 @@
       mcc="310"
       mnc="310"
       apn="fast.metropcs.com"
+      type="ia"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_match_data="6D"
+      mvno_type="gid"
+  />
+
+  <apn carrier="MetroPCS 310"
+      mcc="310"
+      mnc="310"
+      apn="fast.metropcs.com"
       mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
       type="default,supl,mms"
       protocol="IPV6"
@@ -9633,6 +9883,15 @@
       roaming_protocol="IPV4V6"
   />
 
+  <apn carrier="AGMS Global"
+      mcc="310"
+      mnc="380"
+      apn="agms.nl.gmm"
+      type="default"
+      mvno_type="gid"
+      mvno_match_data="50"
+  />
+
   <apn carrier="Celloneet MMS"
       mcc="310"
       mnc="390"
@@ -9657,6 +9916,15 @@
       roaming_protocol="IPV4V6"
   />
 
+  <apn carrier="IMS"
+      mcc="310"
+      mnc="410"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
   <apn carrier="ATT Phone"
       mcc="310"
       mnc="410"
@@ -9959,8 +10227,8 @@
       mnc="490"
       apn=""
       type="ia"
-      protocol="IPV6"
-      roaming_protocol="IP"
+      protocol="IPiV4V6"
+      roaming_protocol="IPV4V6"
       mtu="1440"
   />
 
@@ -9991,6 +10259,17 @@
       mcc="310"
       mnc="490"
       apn="fast.metropcs.com"
+      type="ia"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_match_data="6D"
+      mvno_type="gid"
+  />
+
+  <apn carrier="MetroPCS 490"
+      mcc="310"
+      mnc="490"
+      apn="fast.metropcs.com"
       mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
       type="default,supl,mms"
       protocol="IPV6"
@@ -10022,6 +10301,16 @@
   <apn carrier="T-Mobile US 530"
       mcc="310"
       mnc="530"
+      apn=""
+      type="ia"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mtu="1440"
+  />
+
+  <apn carrier="T-Mobile US 530"
+      mcc="310"
+      mnc="530"
       apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
       type="default,supl,mms"
@@ -10046,6 +10335,17 @@
       mcc="310"
       mnc="530"
       apn="fast.metropcs.com"
+      type="ia"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_match_data="6D"
+      mvno_type="gid"
+  />
+
+  <apn carrier="MetroPCS 530"
+      mcc="310"
+      mnc="530"
+      apn="fast.metropcs.com"
       mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
       type="default,supl,mms"
       protocol="IPV6"
@@ -10054,6 +10354,28 @@
       mvno_type="gid"
   />
 
+  <apn carrier="ATT Nextgenphone"
+      mcc="310"
+      mnc="560"
+      apn="nxtgenphone"
+      mmsc="http://mmsc.mobile.att.net"
+      mmsproxy="proxy.mobile.att.net"
+      mmsport="80"
+      type="default,mms,supl,fota,hipri"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mtu="1410"
+  />
+
+  <apn carrier="IMS"
+      mcc="310"
+      mnc="560"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
   <apn carrier="DobsonMMS"
       mcc="310"
       mnc="560"
@@ -10190,6 +10512,16 @@
   <apn carrier="T-Mobile US 590"
       mcc="310"
       mnc="590"
+      apn=""
+      type="ia"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mtu="1440"
+  />
+
+  <apn carrier="T-Mobile US 590"
+      mcc="310"
+      mnc="590"
       apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
       type="default,supl,mms"
@@ -10214,6 +10546,17 @@
       mcc="310"
       mnc="590"
       apn="fast.metropcs.com"
+      type="ia"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_match_data="6D"
+      mvno_type="gid"
+  />
+
+  <apn carrier="MetroPCS 590"
+      mcc="310"
+      mnc="590"
+      apn="fast.metropcs.com"
       mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
       type="default,supl,mms"
       protocol="IPV6"
@@ -10335,6 +10678,16 @@
   <apn carrier="T-Mobile US 640"
       mcc="310"
       mnc="640"
+      apn=""
+      type="ia"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mtu="1440"
+  />
+
+  <apn carrier="T-Mobile US 640"
+      mcc="310"
+      mnc="640"
       apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
       type="default,supl,mms"
@@ -10358,6 +10711,17 @@
       mcc="310"
       mnc="640"
       apn="fast.metropcs.com"
+      type="ia"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_match_data="6D"
+      mvno_type="gid"
+  />
+
+  <apn carrier="MetroPCS 640"
+      mcc="310"
+      mnc="640"
+      apn="fast.metropcs.com"
       mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
       type="default,supl,mms"
       protocol="IPV6"
@@ -10371,8 +10735,8 @@
       mnc="660"
       apn=""
       type="ia"
-      protocol="IPV6"
-      roaming_protocol="IP"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
       mtu="1440"
   />
 
@@ -10403,6 +10767,17 @@
       mcc="310"
       mnc="660"
       apn="fast.metropcs.com"
+      type="ia"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_match_data="6D"
+      mvno_type="gid"
+  />
+
+  <apn carrier="MetroPCS 660"
+      mcc="310"
+      mnc="660"
+      apn="fast.metropcs.com"
       mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
       type="default,supl,mms"
       protocol="IPV6"
@@ -10557,8 +10932,8 @@
       mnc="800"
       apn=""
       type="ia"
-      protocol="IPV6"
-      roaming_protocol="IP"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
       mtu="1440"
   />
 
@@ -10589,6 +10964,17 @@
       mcc="310"
       mnc="800"
       apn="fast.metropcs.com"
+      type="ia"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_match_data="6D"
+      mvno_type="gid"
+  />
+
+  <apn carrier="MetroPCS 800"
+      mcc="310"
+      mnc="800"
+      apn="fast.metropcs.com"
       mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
       type="default,supl,mms"
       protocol="IPV6"
@@ -13413,45 +13799,6 @@
       user_visible="false"
   />
 
-  <!-- bearer 1, 2, 3, 9, 10, 11, 15, 16 -->
-  <apn carrier="Sprint"
-      mcc="311"
-      mnc="490"
-      apn="cinet.spcs"
-      user="none"
-      server="*"
-      password="none"
-      mmsproxy="68.28.31.2"
-      mmsport="80"
-      mmsc="http://mmsc.vmobl.com:8088"
-      type="default,mms"
-      bearer_bitmask="1|2|3|9|10|11|15|16"
-  />
-
-  <apn carrier="Sprint CdmaNai"
-      mcc="311"
-      mnc="490"
-      mmsproxy="68.28.31.2"
-      mmsport="80"
-      mmsc="http://mmsc.vmobl.com:8088"
-      type="default,mms"
-      authtype="3"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer_bitmask="6"
-  />
-
-  <!-- bearer 13, 14 -->
-  <apn carrier="Sprint"
-      mcc="311"
-      mnc="490"
-      apn="otasn"
-      type="ota"
-      carrier_enabled="true"
-      protocol="IPV4V6"
-      bearer_bitmask="13|14"
-  />
-
   <apn carrier="24-7 WAP"
       mcc="311"
       mnc="500"
@@ -14461,43 +14808,27 @@
       roaming_protocol="IP"
   />
 
-  <!-- bearer 1, 2, 3, 9, 10, 11, 15, 16 -->
-  <apn carrier="Sprint"
+  <apn carrier="Cleartalk"
       mcc="311"
-      mnc="870"
-      apn="cinet.spcs"
-      user="none"
-      server="*"
-      password="none"
-      mmsproxy="68.28.31.7"
-      mmsport="80"
-      mmsc="http://mm.myboostmobile.com"
-      type="default,mms"
-      bearer_bitmask="1|2|3|9|10|11|15|16"
-  />
-
-  <apn carrier="Sprint CdmaNai"
-      mcc="311"
-      mnc="870"
-      mmsproxy="68.28.31.7"
-      mmsport="80"
-      mmsc="http://mm.myboostmobile.com"
-      type="default,mms"
+      mnc="750"
+      apn="CdmaNai"
       authtype="3"
+      type="default,mms,supl,dun"
+      mmsc="http://mms.cleartalk.us/cleartalk/mms.php"
       protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
       bearer_bitmask="6"
   />
-
-  <!-- bearer 13, 14 -->
-  <apn carrier="Sprint"
+  <apn carrier="ClearTalk LTE"
       mcc="311"
-      mnc="870"
-      apn="otasn"
-      type="ota"
+      mnc="750"
+      apn="home.netamerica.com"
+      type="default,mms,supl,dun"
+      bearer_bitmask="14"
       protocol="IPV4V6"
-      bearer_bitmask="13|14"
-  />
+      roaming_protocol="IPV4V6"
+      mmsc="http://mms.cleartalk.us/cleartalk/mms.php"
+      mtu="1428"
+    />
 
   <apn carrier="MobileNation"
       mcc="311"
@@ -14869,44 +15200,6 @@
       protocol="IPV4V6"
   />
 
-  <apn carrier="Sprint CdmaNai"
-      mcc="312"
-      mnc="530"
-      mmsproxy="68.28.31.7"
-      mmsport="80"
-      mmsc="http://mms.sprintpcs.com"
-      authtype="3"
-      type="default,mms"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer_bitmask="6"
-  />
-
-  <!-- bearer 1, 2, 3, 9, 10, 11, 15, 16 -->
-  <apn carrier="Sprint"
-      mcc="312"
-      mnc="530"
-      apn="cinet.spcs"
-      user="none"
-      server="*"
-      password="none"
-      mmsproxy="68.28.31.7"
-      mmsport="80"
-      mmsc="http://mms.sprintpcs.com"
-      type="default,mms"
-      bearer_bitmask="1|2|3|9|10|11|15|16"
-  />
-
-  <!-- bearer 13, 14 -->
-  <apn carrier="Sprint"
-      mcc="312"
-      mnc="530"
-      apn="otasn"
-      type="ota"
-      protocol="IPV4V6"
-      bearer_bitmask="13|14"
-  />
-
   <apn carrier="Blue Wireless"
       mcc="312"
       mnc="570"
@@ -14921,19 +15214,6 @@
       protocol="IPV4V6"
   />
 
-  <apn carrier="Sprint APN"
-      mcc="316"
-      mnc="010"
-      apn="cinet.spcs"
-      user="none"
-      server="*"
-      password="none"
-      mmsproxy="68.28.31.7"
-      mmsport="80"
-      mmsc="http://mms.sprintpcs.com"
-      type="default"
-  />
-
   <apn carrier="openmobile"
       mcc="330"
       mnc="000"
@@ -23198,6 +23478,13 @@
       type="default,supl"
   />
 
+  <apn carrier="Ooredoo Internet"
+      mcc="414"
+      mnc="05"
+      apn="Internet"
+      type="default,supl"
+  />
+
   <apn carrier="Alfa Internet"
       mcc="415"
       mnc="01"
@@ -23439,18 +23726,18 @@
       type="mms"
   />
 
-  <apn carrier="Asiacell GPRS"
+  <apn carrier="Asiacell Internet"
       mcc="418"
       mnc="05"
       apn="net.asiacell.com"
-      type="default,supl"
+      type="default"
   />
 
-  <apn carrier="Asiacell MMS"
+  <apn carrier="MMS"
       mcc="418"
       mnc="05"
       apn="wap.asiacell.com"
-      mmsc="http://192.168.107.10:19090/was"
+      mmsc="http://mvas.asiacell.com/uportal"
       mmsproxy="192.168.107.50"
       mmsport="8080"
       type="mms"
@@ -23600,23 +23887,23 @@
       type="mms"
   />
 
-  <apn carrier="Internet Action"
+  <apn carrier="Ooredoo Action"
       mcc="419"
       mnc="03"
-      apn="action.wataniya.com"
-      authtype="0"
-      type="default,supl"
+      apn="action.ooredoo.com"
+      authtype="1"
+      type="default"
   />
 
-  <apn carrier="Wataniya MMS"
+  <apn carrier="Ooredoo MMS"
       mcc="419"
       mnc="03"
-      apn="mms.wataniya.com"
-      mmsc="http://action.wataniya.com"
+      apn="mms.ooredoo.com"
+      mmsc="http://action.ooredoo.com"
       mmsproxy="194.126.53.64"
       mmsport="8080"
-      authtype="0"
-      type="mms"
+      authtype="1"
+      type="default"
   />
 
   <apn carrier="VIVA - KW"
@@ -24151,28 +24438,21 @@
       type="mms"
   />
 
-  <apn carrier="Mozaic Mob"
+  <apn carrier="Internet"
       mcc="427"
       mnc="01"
-      apn="gprs.qtel"
-      user="gprs"
-      password="gprs"
-      authtype="1"
-      proxy="10.23.8.3"
-      port="8080"
+      apn="data"
       type="default,supl"
+      authtype="1"
   />
 
-  <apn carrier="Qtel MMS"
+  <apn carrier="MMS"
       mcc="427"
       mnc="01"
-      apn="mms.qtel"
-      user="10"
-      password="11"
-      authtype="1"
+      apn="data"
+      mmsc="http://mmsr.ooredoomms.qa"
       mmsproxy="10.23.8.3"
       mmsport="8080"
-      mmsc="http://mmsr.qtelmms.qa"
       type="mms"
   />
 
@@ -25808,11 +26088,21 @@
       type="default,supl"
   />
 
-  <apn carrier="Wataniya"
+  <apn carrier="OoredooData"
       mcc="472"
       mnc="02"
-      apn="default"
-      type="default,supl"
+      apn="OoredooData"
+      type="default"
+  />
+
+  <apn carrier="MMS"
+      mcc="472"
+      mnc="02"
+      apn="OoredooData"
+      mmsc="http://mms.ooredoo.mv"
+      mmsproxy="172.24.10.20"
+      mmsport="8080"
+      type="mms"
   />
 
   <apn carrier="DiGi Internet"
@@ -26133,6 +26423,13 @@
       type="default,supl,mms"
   />
 
+  <apn carrier="Truphone"
+      mcc="505"
+      mnc="38"
+      apn="truphone.com"
+      type="default,supl"
+  />
+
   <apn carrier="Telstra MMS"
       mcc="505"
       mnc="71"
@@ -26210,7 +26507,7 @@
       mmsport="8080"
   />
 
-  <apn carrier="Indosat-SNS"
+  <apn carrier="indosatgprs"
       mcc="510"
       mnc="01"
       apn="indosatgprs"
@@ -26218,18 +26515,6 @@
       type="default,supl"
   />
 
-  <apn carrier="Indosat GPRS"
-      mcc="510"
-      mnc="01"
-      apn="indosatgprs"
-      user="indosat"
-      password="indosat"
-      authtype="1"
-      proxy="10.19.19.19"
-      port="8080"
-      type="default,supl"
-  />
-
   <apn carrier="Indosat MMS"
       mcc="510"
       mnc="01"
@@ -27331,34 +27616,20 @@
       type="mms"
   />
 
-  <apn carrier="nedjmawap"
-      mcc="603"
-      mnc="03"
-      apn="nedjmawap"
-      proxy="192.168.52.2"
-      port="3128"
-      user="wap"
-      password="wap"
-      authtype="1"
-      type="default,supl"
-  />
-
-  <apn carrier="Nedjma.dz"
+  <apn carrier="Ooredoo internet"
       mcc="603"
       mnc="03"
       apn="internet"
-      user="nedjma"
-      password="nedjma"
       type="default,supl"
+      authtype="1"
   />
 
-  <apn carrier="nedjmamms"
+  <apn carrier="Ooredoo mms"
       mcc="603"
       mnc="03"
-      apn="nedjmamms"
+      apn="ooredoomms"
       user="mms"
       password="mms"
-      authtype="1"
       mmsc="http://10.10.111.1"
       mmsproxy="192.168.52.3"
       mmsport="3128"
@@ -27499,22 +27770,18 @@
       type="mms"
   />
 
-  <apn carrier="Tunisiana-Internet"
+  <apn carrier="Ooredoo TN Internet"
       mcc="605"
       mnc="03"
-      apn="internet.tunisiana.com"
-      authtype="1"
-      type="default,supl"
+      apn="internet.ooredoo.tn"
+      type="default"
   />
 
-  <apn carrier="MMS Tunisiana"
+  <apn carrier="Ooredoo TN MMS"
       mcc="605"
       mnc="03"
-      apn="mms.tunisiana.com"
-      user="mms"
-      password="mms"
-      authtype="1"
-      mmsc="http://mmsc.tunisiana.com"
+      apn="mms.ooredoo.tn"
+      mmsc="http://mmsc.ooredoo.tn"
       mmsproxy="10.3.2.100"
       mmsport="80"
       type="mms"
diff --git a/products/product_launched_with_l.mk b/products/product_launched_with_l.mk
new file mode 100644
index 0000000..2911993
--- /dev/null
+++ b/products/product_launched_with_l.mk
@@ -0,0 +1,3 @@
+#ro.product.first_api_level indicates the first api level, device has been commercially launced on.
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.product.first_api_level=21
diff --git a/products/product_launched_with_l_mr1.mk b/products/product_launched_with_l_mr1.mk
new file mode 100644
index 0000000..10d629f
--- /dev/null
+++ b/products/product_launched_with_l_mr1.mk
@@ -0,0 +1,3 @@
+#ro.product.first_api_level indicates the first api level, device has been commercially launced on.
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.product.first_api_level=22
diff --git a/products/product_launched_with_m.mk b/products/product_launched_with_m.mk
new file mode 100644
index 0000000..d82a255
--- /dev/null
+++ b/products/product_launched_with_m.mk
@@ -0,0 +1,3 @@
+#ro.product.first_api_level indicates the first api level, device has been commercially launced on.
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.product.first_api_level=23
diff --git a/products/product_launched_with_n.mk b/products/product_launched_with_n.mk
new file mode 100644
index 0000000..72f34d8
--- /dev/null
+++ b/products/product_launched_with_n.mk
@@ -0,0 +1,3 @@
+#ro.product.first_api_level indicates the first api level, device has been commercially launced on.
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.product.first_api_level=24