Merge cherrypicks of [3422737, 3422885, 3422909, 3422910, 3422878, 3423352] into oc-m2-release

Change-Id: I7f763eb7fbf764fb78fb8e16fa38a0f608e51c36
diff --git a/apns-full-conf.xml b/apns-full-conf.xml
index 99a8d3d..e6ca051 100644
--- a/apns-full-conf.xml
+++ b/apns-full-conf.xml
@@ -1742,13 +1742,13 @@
   <apn carrier="internet simyo"
       mcc="214"
       mnc="03"
-      apn="orange"
+      apn="orangeworld"
       user="orange"
-      password="telecable"
+      password="orange"
       authtype="1"
       mvno_type="spn"
       mvno_match_data="simyo"
-      type="default,supl"
+      type="default,supl,dun"
   />
 
   <apn carrier="simyo MMS"
@@ -26361,6 +26361,13 @@
       mmsport="80"
   />
 
+  <apn carrier="Telstra Tethering"
+       mcc="505"
+       mnc="01"
+       apn="telstra.internet"
+       type="dun"
+  />
+
   <apn carrier="Optus Yes Internet"
       mcc="505"
       mnc="02"