diff --git a/device-akita.mk b/device-akita.mk
index 0c8b342..df24564 100644
--- a/device-akita.mk
+++ b/device-akita.mk
@@ -381,8 +381,15 @@ PRODUCT_VENDOR_PROPERTIES += \
 	persist.vendor.vibrator.hal.context.settlingtime=5000
 
 # Increment the SVN for any official public releases
+ifdef RELEASE_SVN_AKITA
+TARGET_SVN ?= $(RELEASE_SVN_AKITA)
+else
+# Set this for older releases that don't use build flag
+TARGET_SVN ?= 18
+endif
+
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=10
+    ro.vendor.build.svn=$(TARGET_SVN)
 
 # Keyboard height ratio and bottom padding in dp for portrait mode
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/location/gnssd/release/android.hardware.gnss-service b/location/gnssd/release/android.hardware.gnss-service
index 428798a..c96a344 100644
Binary files a/location/gnssd/release/android.hardware.gnss-service and b/location/gnssd/release/android.hardware.gnss-service differ
diff --git a/location/gnssd/release/gnssd b/location/gnssd/release/gnssd
index 7e05541..7946906 100644
Binary files a/location/gnssd/release/gnssd and b/location/gnssd/release/gnssd differ
diff --git a/location/gnssd/release/gps.cfg b/location/gnssd/release/gps.cfg
index a81c6bd..fc32a7e 100644
--- a/location/gnssd/release/gps.cfg
+++ b/location/gnssd/release/gps.cfg
@@ -110,6 +110,8 @@ navicUsedInUSPolicy=2
 # DFS: 0 = Disabled (default), 1 = Enabled
 Chip_Configuration_FeatureCfg_DVS = 1
 Chip_Configuration_FeatureCfg_DFS = 1
+# MTPL: 0 = Disabled, 1 = Enabled (default)
+Chip_Configuration_FeatureCfg_MTPL = 0
 
 # This is a bitfield that will disable incoming interrupts for mailboxes
 # AP   = 0x1
@@ -118,7 +120,7 @@ Chip_Configuration_FeatureCfg_DFS = 1
 # CHUB = 0x8
 # The CHUB on the neus continually triggers a bit so this is to prevent
 # it from continually waking the gnss.
-mailboxDisabled=0x8
+mailboxDisabled=0x0
 
 ### Specify RFIC ID for K40 ###
 # 55200001 = S5520 EVT1
diff --git a/location/gnssd/release/gps_user.cfg b/location/gnssd/release/gps_user.cfg
index de26457..ed40ec5 100644
--- a/location/gnssd/release/gps_user.cfg
+++ b/location/gnssd/release/gps_user.cfg
@@ -34,7 +34,8 @@ qzssUsedInUSPolicy=2
 navicUsedInUSPolicy=2
 Chip_Configuration_FeatureCfg_DVS = 1
 Chip_Configuration_FeatureCfg_DFS = 1
-mailboxDisabled=0x8
+Chip_Configuration_FeatureCfg_MTPL = 0
+mailboxDisabled=0x0
 gnss_rfic_chip_id=55200001
 UseRtcForAiding=1
 rtc_min_num_of_fixes=10
diff --git a/location/gnssd/release/kepler.bin b/location/gnssd/release/kepler.bin
index f6a5ac2..ba6ea45 100644
Binary files a/location/gnssd/release/kepler.bin and b/location/gnssd/release/kepler.bin differ
diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index f43162c..ff45641 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -140,7 +140,7 @@
 
     <!-- Boolean indicating whether we should enable the STA current connected indoor channel
      for SAP, WFD GO, Wi-Fi Aware -->
-    <bool translatable="false" name="config_wifiEnableStaIndoorChannelForPeerNetwork">true</bool>
+    <bool translatable="false" name="config_wifiEnableStaIndoorChannelForPeerNetwork">false</bool>
     <!-- Boolean indicating whether we should enable the STA current connected DFS channel
          for SAP, WFD GO, Wi-Fi Aware -->
     <bool translatable="false" name="config_wifiEnableStaDfsChannelForPeerNetwork">true</bool>