Merge "O2UK, O2 Pay & Go, TESCO, giffgaff: APN change." into nyc-mr2-dev
diff --git a/WCNSS_qcom_cfg.ini b/WCNSS_qcom_cfg.ini
index 27284f9..939e54a 100644
--- a/WCNSS_qcom_cfg.ini
+++ b/WCNSS_qcom_cfg.ini
@@ -233,6 +233,8 @@
 #If set to 0, will not scan DFS channels
 gEnableDFSChnlScan=1
 
+gInformBssRssiRaw=0
+
 #############################################
 # Power related configurations
 #############################################
diff --git a/apns-full-conf.xml b/apns-full-conf.xml
index de62008..c4b5c11 100644
--- a/apns-full-conf.xml
+++ b/apns-full-conf.xml
@@ -348,6 +348,15 @@
      mvno_type="imsi"
   />
 
+  <apn carrier="Jump Roam"
+      mcc="204"
+      mnc="04"
+      apn="mobiledata"
+      authtype="0"
+      mvno_type="spn"
+      mvno_match_data="Jump"
+  />
+
   <apn carrier="Truphone"
       mcc="204"
       mnc="04"
@@ -3409,7 +3418,7 @@
       password="password"
       authtype="1"
       mmsc="http://mmsc.mms.o2.co.uk:8002"
-      type="default, hipri, supl, mms"
+      type="default,hipri,supl,mms"
   />
 
   <apn carrier="O2 Pay &amp; Go"
@@ -3485,6 +3494,15 @@
       mvno_match_data="giffgaff"
   />
 
+  <apn carrier="Jump UK"
+      mcc="234"
+      mnc="10"
+      apn="mobiledata"
+      authtype="0"
+      mvno_type="spn"
+      mvno_match_data="Jump"
+  />
+
   <apn carrier="O2 MOBILE WEB"
       mcc="234"
       mnc="11"
@@ -5976,6 +5994,16 @@
       type="default,supl"
   />
 
+  <apn carrier="Rebtel"
+      mcc="260"
+      mnc="44"
+      apn="rebtel"
+      mmsc="http://mmsc.rebtel.com"
+      mmsproxy="185.114.248.80"
+      mmsport="8080"
+      type="default,supl,mms"
+  />
+
   <apn carrier="Telekom IMS"
       mcc="262"
       mnc="01"
@@ -7199,6 +7227,14 @@
 
   <apn carrier="Bell Mobility Test IMS"
       mcc="302"
+      mnc="630"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="Bell Mobility Test IMS"
+      mcc="302"
       mnc="640"
       apn="ims"
       type="ims"
@@ -8868,19 +8904,9 @@
   <apn carrier="T-Mobile US 160"
       mcc="310"
       mnc="160"
-      apn=""
-      type="ia"
-      protocol="IPV6"
-      roaming_protocol="IP"
-      mtu="1440"
-  />
-
-  <apn carrier="T-Mobile US 160"
-      mcc="310"
-      mnc="160"
       apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-      type="default,supl,mms"
+      type="default,supl,mms,ia"
       protocol="IPV6"
       roaming_protocol="IP"
       mtu="1440"
@@ -8994,19 +9020,9 @@
   <apn carrier="T-Mobile US 200"
       mcc="310"
       mnc="200"
-      apn=""
-      type="ia"
-      protocol="IPV6"
-      roaming_protocol="IP"
-      mtu="1440"
-  />
-
-  <apn carrier="T-Mobile US 200"
-      mcc="310"
-      mnc="200"
       apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-      type="default,supl,mms"
+      type="default,supl,mms,ia"
       protocol="IPV6"
       roaming_protocol="IP"
       mtu="1440"
@@ -9062,19 +9078,9 @@
   <apn carrier="T-Mobile US 210"
       mcc="310"
       mnc="210"
-      apn=""
-      type="ia"
-      protocol="IPV6"
-      roaming_protocol="IP"
-      mtu="1440"
-  />
-
-  <apn carrier="T-Mobile US 210"
-      mcc="310"
-      mnc="210"
       apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-      type="default,supl,mms"
+      type="default,supl,mms,ia"
       protocol="IPV6"
       roaming_protocol="IP"
       mtu="1440"
@@ -9130,19 +9136,9 @@
   <apn carrier="T-Mobile US 220"
       mcc="310"
       mnc="220"
-      apn=""
-      type="ia"
-      protocol="IPV6"
-      roaming_protocol="IP"
-      mtu="1440"
-  />
-
-  <apn carrier="T-Mobile US 220"
-      mcc="310"
-      mnc="220"
       apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-      type="default,supl,mms"
+      type="default,supl,mms,ia"
       protocol="IPV6"
       roaming_protocol="IP"
       mtu="1440"
@@ -9198,19 +9194,9 @@
   <apn carrier="T-Mobile US 230"
       mcc="310"
       mnc="230"
-      apn=""
-      type="ia"
-      protocol="IPV6"
-      roaming_protocol="IP"
-      mtu="1440"
-  />
-
-  <apn carrier="T-Mobile US 230"
-      mcc="310"
-      mnc="230"
       apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-      type="default,supl,mms"
+      type="default,supl,mms,ia"
       protocol="IPV6"
       roaming_protocol="IP"
       mtu="1440"
@@ -9265,19 +9251,9 @@
   <apn carrier="T-Mobile US 240"
       mcc="310"
       mnc="240"
-      apn=""
-      type="ia"
-      protocol="IPV6"
-      roaming_protocol="IP"
-      mtu="1440"
-  />
-
-  <apn carrier="T-Mobile US 240"
-      mcc="310"
-      mnc="240"
       apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-      type="default,supl,mms"
+      type="default,supl,mms,ia"
       protocol="IPV6"
       roaming_protocol="IP"
       mtu="1440"
@@ -9332,19 +9308,9 @@
   <apn carrier="T-Mobile US 250"
       mcc="310"
       mnc="250"
-      apn=""
-      type="ia"
-      protocol="IPV6"
-      roaming_protocol="IP"
-      mtu="1440"
-  />
-
-  <apn carrier="T-Mobile US 250"
-      mcc="310"
-      mnc="250"
       apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-      type="default,supl,mms"
+      type="default,supl,mms,ia"
       protocol="IPV6"
       roaming_protocol="IP"
       mtu="1440"
@@ -9400,18 +9366,8 @@
   <apn carrier="T-Mobile US 260"
       mcc="310"
       mnc="260"
-      apn=""
-      type="ia"
-      protocol="IPV6"
-      roaming_protocol="IP"
-      mtu="1440"
-  />
-
-  <apn carrier="T-Mobile US 260"
-      mcc="310"
-      mnc="260"
       apn="fast.t-mobile.com"
-      type="default,supl"
+      type="default,supl,ia"
       protocol="IPV6"
       roaming_protocol="IP"
       mtu="1440"
@@ -9435,7 +9391,7 @@
       protocol="IPV6"
       roaming_protocol="IPV6"
       mtu="1440"
-      bearer_bitmask="18"
+      bearer="18"
   />
 
   <apn carrier="T-Mobile MMS"
@@ -9457,7 +9413,7 @@
        type="mms"
        protocol="IPV6"
        roaming_protocol="IPV6"
-       bearer_bitmask="18"
+       bearer="18"
   />
 
   <apn carrier="Project Fi - T"
@@ -9613,19 +9569,9 @@
   <apn carrier="T-Mobile US 270"
       mcc="310"
       mnc="270"
-      apn=""
-      type="ia"
-      protocol="IPV6"
-      roaming_protocol="IP"
-      mtu="1440"
-  />
-
-  <apn carrier="T-Mobile US 270"
-      mcc="310"
-      mnc="270"
       apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-      type="default,supl,mms"
+      type="default,supl,mms,ia"
       protocol="IPV6"
       roaming_protocol="IP"
       mtu="1440"
@@ -9688,19 +9634,9 @@
   <apn carrier="T-Mobile US 300"
       mcc="310"
       mnc="300"
-      apn=""
-      type="ia"
-      protocol="IPV6"
-      roaming_protocol="IP"
-      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"
+      type="default,supl,mms,ia"
       protocol="IPV6"
       roaming_protocol="IP"
       mtu="1440"
@@ -9771,19 +9707,9 @@
   <apn carrier="T-Mobile US 310"
       mcc="310"
       mnc="310"
-      apn=""
-      type="ia"
-      protocol="IPV6"
-      roaming_protocol="IP"
-      mtu="1440"
-  />
-
-  <apn carrier="T-Mobile US 310"
-      mcc="310"
-      mnc="310"
       apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-      type="default,supl,mms"
+      type="default,supl,mms,ia"
       protocol="IPV6"
       roaming_protocol="IP"
       mtu="1440"
@@ -10404,19 +10330,9 @@
   <apn carrier="T-Mobile US 490"
       mcc="310"
       mnc="490"
-      apn=""
-      type="ia"
-      protocol="IPV6"
-      roaming_protocol="IP"
-      mtu="1440"
-  />
-
-  <apn carrier="T-Mobile US 490"
-      mcc="310"
-      mnc="490"
       apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-      type="default,supl,mms"
+      type="default,supl,mms,ia"
       protocol="IPV6"
       roaming_protocol="IP"
       mtu="1440"
@@ -10492,19 +10408,9 @@
   <apn carrier="T-Mobile US 530"
       mcc="310"
       mnc="530"
-      apn=""
-      type="ia"
-      protocol="IPV6"
-      roaming_protocol="IP"
-      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"
+      type="default,supl,mms,ia"
       protocol="IPV6"
       roaming_protocol="IP"
       mtu="1440"
@@ -10705,19 +10611,9 @@
   <apn carrier="T-Mobile US 590"
       mcc="310"
       mnc="590"
-      apn=""
-      type="ia"
-      protocol="IPV6"
-      roaming_protocol="IP"
-      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"
+      type="default,supl,mms,ia"
       protocol="IPV6"
       roaming_protocol="IP"
       mtu="1440"
@@ -10882,19 +10778,9 @@
   <apn carrier="T-Mobile US 640"
       mcc="310"
       mnc="640"
-      apn=""
-      type="ia"
-      protocol="IPV6"
-      roaming_protocol="IP"
-      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"
+      type="default,supl,mms,ia"
       protocol="IPV6"
       roaming_protocol="IP"
       mtu="1440"
@@ -10950,18 +10836,9 @@
   <apn carrier="T-Mobile US 660"
       mcc="310"
       mnc="660"
-      apn=""
-      type="ia"
-      protocol="IPV6"
-      roaming_protocol="IP"
-      mtu="1440"
-  />
-  <apn carrier="T-Mobile US 660"
-      mcc="310"
-      mnc="660"
       apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-      type="default,supl,mms"
+      type="default,supl,mms,ia"
       protocol="IPV6"
       roaming_protocol="IP"
       mtu="1440"
@@ -11157,19 +11034,9 @@
   <apn carrier="T-Mobile US 800"
       mcc="310"
       mnc="800"
-      apn=""
-      type="ia"
-      protocol="IPV6"
-      roaming_protocol="IP"
-      mtu="1440"
-  />
-
-  <apn carrier="T-Mobile US 800"
-      mcc="310"
-      mnc="800"
       apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-      type="default,supl,mms"
+      type="default,supl,mms,ia"
       protocol="IPV6"
       roaming_protocol="IP"
       mtu="1440"
@@ -22779,13 +22646,12 @@
       protocol="IPV4V6"
   />
 
-  <apn carrier="Internet"
+  <apn carrier="Jio 4G"
       mcc="405"
       mnc="840"
       apn="jionet"
       type="default,supl"
       protocol="IPV4V6"
-      roaming_protocol="IP"
   />
 
   <apn carrier="IMS"
@@ -22794,7 +22660,7 @@
       apn="ims"
       type="ims"
       protocol="IPV4V6"
-      roaming_protocol="IP"
+      user_visible="false"
   />
 
   <apn carrier="Videocon MMS"
@@ -23145,14 +23011,12 @@
       protocol="IPV4V6"
   />
 
-  <apn carrier="Internet"
+  <apn carrier="Jio 4G"
       mcc="405"
       mnc="854"
       apn="jionet"
       type="default,supl"
       protocol="IPV4V6"
-      roaming_protocol="IP"
-      carrier_enabled="true"
   />
 
   <apn carrier="IMS"
@@ -23161,17 +23025,15 @@
       apn="ims"
       type="ims"
       protocol="IPV4V6"
-      roaming_protocol="IP"
+      user_visible="false"
   />
 
-  <apn carrier="Internet"
+  <apn carrier="Jio 4G"
       mcc="405"
       mnc="855"
       apn="jionet"
       type="default,supl"
       protocol="IPV4V6"
-      roaming_protocol="IP"
-      carrier_enabled="true"
   />
 
   <apn carrier="IMS"
@@ -23180,17 +23042,15 @@
       apn="ims"
       type="ims"
       protocol="IPV4V6"
-      roaming_protocol="IP"
+      user_visible="false"
   />
 
-  <apn carrier="Internet"
+  <apn carrier="Jio 4G"
       mcc="405"
       mnc="856"
       apn="jionet"
       type="default,supl"
       protocol="IPV4V6"
-      roaming_protocol="IP"
-      carrier_enabled="true"
   />
 
   <apn carrier="IMS"
@@ -23199,17 +23059,15 @@
       apn="ims"
       type="ims"
       protocol="IPV4V6"
-      roaming_protocol="IP"
+      user_visible="false"
   />
 
-  <apn carrier="Internet"
+  <apn carrier="Jio 4G"
       mcc="405"
       mnc="857"
       apn="jionet"
       type="default,supl"
       protocol="IPV4V6"
-      roaming_protocol="IP"
-      carrier_enabled="true"
   />
 
   <apn carrier="IMS"
@@ -23218,17 +23076,15 @@
       apn="ims"
       type="ims"
       protocol="IPV4V6"
-      roaming_protocol="IP"
+      user_visible="false"
   />
 
-  <apn carrier="Internet"
+  <apn carrier="Jio 4G"
       mcc="405"
       mnc="858"
       apn="jionet"
       type="default,supl"
       protocol="IPV4V6"
-      roaming_protocol="IP"
-      carrier_enabled="true"
   />
 
   <apn carrier="IMS"
@@ -23237,17 +23093,15 @@
       apn="ims"
       type="ims"
       protocol="IPV4V6"
-      roaming_protocol="IP"
+      user_visible="false"
   />
 
-  <apn carrier="Internet"
+  <apn carrier="Jio 4G"
       mcc="405"
       mnc="859"
       apn="jionet"
       type="default,supl"
       protocol="IPV4V6"
-      roaming_protocol="IP"
-      carrier_enabled="true"
   />
 
   <apn carrier="IMS"
@@ -23256,17 +23110,15 @@
       apn="ims"
       type="ims"
       protocol="IPV4V6"
-      roaming_protocol="IP"
+      user_visible="false"
   />
 
-  <apn carrier="Internet"
+  <apn carrier="Jio 4G"
       mcc="405"
       mnc="860"
       apn="jionet"
       type="default,supl"
       protocol="IPV4V6"
-      roaming_protocol="IP"
-      carrier_enabled="true"
   />
 
   <apn carrier="IMS"
@@ -23275,17 +23127,15 @@
       apn="ims"
       type="ims"
       protocol="IPV4V6"
-      roaming_protocol="IP"
+      user_visible="false"
   />
 
-  <apn carrier="Internet"
+  <apn carrier="Jio 4G"
       mcc="405"
       mnc="861"
       apn="jionet"
       type="default,supl"
       protocol="IPV4V6"
-      roaming_protocol="IP"
-      carrier_enabled="true"
   />
 
   <apn carrier="IMS"
@@ -23294,17 +23144,15 @@
       apn="ims"
       type="ims"
       protocol="IPV4V6"
-      roaming_protocol="IP"
+      user_visible="false"
   />
 
-  <apn carrier="Internet"
+  <apn carrier="Jio 4G"
       mcc="405"
       mnc="862"
       apn="jionet"
       type="default,supl"
       protocol="IPV4V6"
-      roaming_protocol="IP"
-      carrier_enabled="true"
   />
 
   <apn carrier="IMS"
@@ -23313,17 +23161,15 @@
       apn="ims"
       type="ims"
       protocol="IPV4V6"
-      roaming_protocol="IP"
+      user_visible="false"
   />
 
-  <apn carrier="Internet"
+  <apn carrier="Jio 4G"
       mcc="405"
       mnc="863"
       apn="jionet"
       type="default,supl"
       protocol="IPV4V6"
-      roaming_protocol="IP"
-      carrier_enabled="true"
   />
 
   <apn carrier="IMS"
@@ -23332,17 +23178,15 @@
       apn="ims"
       type="ims"
       protocol="IPV4V6"
-      roaming_protocol="IP"
+      user_visible="false"
   />
 
-  <apn carrier="Internet"
+  <apn carrier="Jio 4G"
       mcc="405"
       mnc="864"
       apn="jionet"
       type="default,supl"
       protocol="IPV4V6"
-      roaming_protocol="IP"
-      carrier_enabled="true"
   />
 
   <apn carrier="IMS"
@@ -23351,17 +23195,15 @@
       apn="ims"
       type="ims"
       protocol="IPV4V6"
-      roaming_protocol="IP"
+      user_visible="false"
   />
 
-  <apn carrier="Internet"
+  <apn carrier="Jio 4G"
       mcc="405"
       mnc="865"
       apn="jionet"
       type="default,supl"
       protocol="IPV4V6"
-      roaming_protocol="IP"
-      carrier_enabled="true"
   />
 
   <apn carrier="IMS"
@@ -23370,17 +23212,15 @@
       apn="ims"
       type="ims"
       protocol="IPV4V6"
-      roaming_protocol="IP"
+      user_visible="false"
   />
 
-  <apn carrier="Internet"
+  <apn carrier="Jio 4G"
       mcc="405"
       mnc="866"
       apn="jionet"
       type="default,supl"
       protocol="IPV4V6"
-      roaming_protocol="IP"
-      carrier_enabled="true"
   />
 
   <apn carrier="IMS"
@@ -23389,17 +23229,15 @@
       apn="ims"
       type="ims"
       protocol="IPV4V6"
-      roaming_protocol="IP"
+      user_visible="false"
   />
 
-  <apn carrier="Internet"
+  <apn carrier="Jio 4G"
       mcc="405"
       mnc="867"
       apn="jionet"
       type="default,supl"
       protocol="IPV4V6"
-      roaming_protocol="IP"
-      carrier_enabled="true"
   />
 
   <apn carrier="IMS"
@@ -23408,17 +23246,15 @@
       apn="ims"
       type="ims"
       protocol="IPV4V6"
-      roaming_protocol="IP"
+      user_visible="false"
   />
 
-  <apn carrier="Internet"
+  <apn carrier="Jio 4G"
       mcc="405"
       mnc="868"
       apn="jionet"
       type="default,supl"
       protocol="IPV4V6"
-      roaming_protocol="IP"
-      carrier_enabled="true"
   />
 
   <apn carrier="IMS"
@@ -23427,17 +23263,15 @@
       apn="ims"
       type="ims"
       protocol="IPV4V6"
-      roaming_protocol="IP"
+      user_visible="false"
   />
 
-  <apn carrier="Internet"
+  <apn carrier="Jio 4G"
       mcc="405"
       mnc="869"
       apn="jionet"
       type="default,supl"
       protocol="IPV4V6"
-      roaming_protocol="IP"
-      carrier_enabled="true"
   />
 
   <apn carrier="IMS"
@@ -23446,17 +23280,15 @@
       apn="ims"
       type="ims"
       protocol="IPV4V6"
-      roaming_protocol="IP"
+      user_visible="false"
   />
 
-  <apn carrier="Internet"
+  <apn carrier="Jio 4G"
       mcc="405"
       mnc="870"
       apn="jionet"
       type="default,supl"
       protocol="IPV4V6"
-      roaming_protocol="IP"
-      carrier_enabled="true"
   />
 
   <apn carrier="IMS"
@@ -23465,17 +23297,15 @@
       apn="ims"
       type="ims"
       protocol="IPV4V6"
-      roaming_protocol="IP"
+      user_visible="false"
   />
 
-  <apn carrier="Internet"
+  <apn carrier="Jio 4G"
       mcc="405"
       mnc="871"
       apn="jionet"
       type="default,supl"
       protocol="IPV4V6"
-      roaming_protocol="IP"
-      carrier_enabled="true"
   />
 
   <apn carrier="IMS"
@@ -23484,17 +23314,15 @@
       apn="ims"
       type="ims"
       protocol="IPV4V6"
-      roaming_protocol="IP"
+      user_visible="false"
   />
 
-  <apn carrier="Internet"
+  <apn carrier="Jio 4G"
       mcc="405"
       mnc="872"
       apn="jionet"
       type="default,supl"
       protocol="IPV4V6"
-      roaming_protocol="IP"
-      carrier_enabled="true"
   />
 
   <apn carrier="IMS"
@@ -23503,17 +23331,15 @@
       apn="ims"
       type="ims"
       protocol="IPV4V6"
-      roaming_protocol="IP"
+      user_visible="false"
   />
 
-  <apn carrier="Internet"
+  <apn carrier="Jio 4G"
       mcc="405"
       mnc="873"
       apn="jionet"
       type="default,supl"
       protocol="IPV4V6"
-      roaming_protocol="IP"
-      carrier_enabled="true"
   />
 
   <apn carrier="IMS"
@@ -23522,17 +23348,15 @@
       apn="ims"
       type="ims"
       protocol="IPV4V6"
-      roaming_protocol="IP"
+      user_visible="false"
   />
 
-  <apn carrier="Internet"
+  <apn carrier="Jio 4G"
       mcc="405"
       mnc="874"
       apn="jionet"
       type="default,supl"
       protocol="IPV4V6"
-      roaming_protocol="IP"
-      carrier_enabled="true"
   />
 
   <apn carrier="IMS"
@@ -23541,7 +23365,7 @@
       apn="ims"
       type="ims"
       protocol="IPV4V6"
-      roaming_protocol="IP"
+      user_visible="false"
   />
 
   <apn carrier="Uninor Internet"
@@ -26809,7 +26633,7 @@
       mmsproxy="10.0.0.172"
       mmsport="80"
       mmsc="http://mmsc.myuni.com.cn"
-      type="default, mms"/>
+      type="default,mms"/>
 
   <apn carrier="ctlte"
       mcc="460"
diff --git a/init.common.rc b/init.common.rc
index 97fd351..dab4160 100755
--- a/init.common.rc
+++ b/init.common.rc
@@ -61,6 +61,15 @@
     # mount RW partitions which need run fsck
     mount_all fstab.${ro.hardware} --late
 
+    # boot time fs tune
+    write /sys/block/sda/queue/iostats 0
+    write /sys/block/sda/queue/scheduler cfq
+    write /sys/block/sda/queue/iosched/slice_idle 0
+    write /sys/block/sda/queue/read_ahead_kb 2048
+    write /sys/block/sda/queue/nr_requests 256
+    write /sys/block/dm-0/queue/read_ahead_kb 2048
+    write /sys/block/dm-1/queue/read_ahead_kb 2048
+
 on post-fs-data
     # restart qseecomd once we have /data/
     restart qseecomd
@@ -533,7 +542,7 @@
 
 on property:persist.sys.ssr.enable_ramdumps=1
     write /sys/module/subsystem_restart/parameters/enable_ramdumps 1
-    mkdir /data/ramdump 760 root system
+    mkdir /data/ramdump 761 root system
     start ss_ramdump
 
 on property:persist.sys.ssr.enable_ramdumps=0
@@ -706,7 +715,12 @@
     write /dev/cpuset/foreground/cpus 0-2
     write /dev/cpuset/background/cpus 0
     write /dev/cpuset/system-background/cpus 0-2
-
+    # end boot time fs tune
+    write /sys/block/sda/queue/read_ahead_kb 128
+    write /sys/block/sda/queue/nr_requests 128
+    write /sys/block/dm-0/queue/read_ahead_kb 128
+    write /sys/block/dm-1/queue/read_ahead_kb 128
+    write /sys/block/sda/queue/iostats 1
 
 # battery driver settings for the retail demo environment where
 # the device will be perpertually plugged in to a power source
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 2b78891..f88d334 100755
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -244,9 +244,16 @@
     <!-- Boolean indicating whether Hotspot 2.0/Passpoint and ANQP queries is enabled -->
     <bool translatable="false" name="config_wifi_hotspot2_enabled">true</bool>
 
+    <!-- Boolean indicating whether 802.11r Fast BSS Transition is enabled on this platform -->
+    <bool translatable="false" name="config_wifi_fast_bss_transition_enabled">true</bool>
+
     <!-- Boolean indicating whether the wifi chipset has background scan support -->
     <bool translatable="false" name="config_wifi_background_scan_support">true</bool>
 
+    <!-- Integer thresholds, do not connect to APs with RSSI lower than these values  -->
+    <integer translatable="false" name="config_wifi_framework_wifi_score_bad_rssi_threshold_5GHz">-77</integer>
+    <integer translatable="false" name="config_wifi_framework_wifi_score_bad_rssi_threshold_24GHz">-80</integer>
+
     <!-- Setting this true forces the headset jack switches to use the/dev/input/event subsystem
          rather than the uevent framework. -->
     <bool name="config_useDevInputEventForAudioJack">true</bool>
@@ -409,4 +416,7 @@
 
     <!-- If this is true, device supports Sustained Performance Mode. -->
     <bool name="config_sustainedPerformanceModeSupported">true</bool>
+
+     <!-- True if Unprocessed audio source supports the required frequency range and level -->
+    <bool name="config_supportAudioSourceUnprocessed">true</bool>
 </resources>
diff --git a/sepolicy/file.te b/sepolicy/file.te
index 0489a8f..ef5b950 100755
--- a/sepolicy/file.te
+++ b/sepolicy/file.te
@@ -7,7 +7,7 @@
 type diag_logs, file_type, data_file_type, mlstrustedobject;
 type location_data_file, file_type, data_file_type;
 type perfd_data_file, file_type, data_file_type;
-type ramdump_data_file, file_type, data_file_type;
+type ramdump_data_file, file_type, data_file_type, mlstrustedobject;
 type time_data_file, file_type, data_file_type;
 type display_data_file, file_type, data_file_type;
 
diff --git a/sepolicy/platform_app.te b/sepolicy/platform_app.te
index 16f2126..b95ad58 100644
--- a/sepolicy/platform_app.te
+++ b/sepolicy/platform_app.te
@@ -3,4 +3,6 @@
    allow platform_app diag_logs:dir rw_dir_perms;
    allow platform_app diag_logs:file create_file_perms;
    allow platform_app diag_device:chr_file rw_file_perms;
+   allow platform_app ramdump_data_file:dir { getattr open read remove_name rmdir search write };
+   allow platform_app ramdump_data_file:file { getattr open read unlink };
 ')
diff --git a/sepolicy/system_app.te b/sepolicy/system_app.te
index 4b032f6..b2da4a6 100644
--- a/sepolicy/system_app.te
+++ b/sepolicy/system_app.te
@@ -3,9 +3,9 @@
 allow system_app cne_service:service_manager add;
 allow system_app time:unix_stream_socket connectto;
 get_prop(system_app, hw_sku_prop);
+r_dir_file(system_app, sysfs_msm_subsys)
 userdebug_or_eng(`
   allow system_app ramdump_data_file:dir r_dir_perms;
   allow system_app ramdump_data_file:file r_file_perms;
-  r_dir_file(system_app, sysfs_msm_subsys)
   get_prop(system_app, ssr_prop)
 ')