diff --git a/device-husky.mk b/device-husky.mk
index 8e123ae..f1aec80 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -395,8 +395,15 @@ PRODUCT_VENDOR_PROPERTIES += \
     ro.vendor.vibrator.hal.pm.activetimeout=5
 
 # Increment the SVN for any official public releases
+ifdef RELEASE_SVN_HUSKY
+TARGET_SVN ?= $(RELEASE_SVN_HUSKY)
+else
+# Set this for older releases that don't use build flag
+TARGET_SVN ?= 35
+endif
+
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=27
+    ro.vendor.build.svn=$(TARGET_SVN)
 
 # WLC userdebug specific
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
diff --git a/device-shiba.mk b/device-shiba.mk
index 8da0637..eadaa37 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -372,8 +372,15 @@ PRODUCT_VENDOR_PROPERTIES += \
     ro.vendor.vibrator.hal.pm.activetimeout=5
 
 # Increment the SVN for any official public releases
+ifdef RELEASE_SVN_SHIBA
+TARGET_SVN ?= $(RELEASE_SVN_SHIBA)
+else
+# Set this for older releases that don't use build flag
+TARGET_SVN ?= 35
+endif
+
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=27
+    ro.vendor.build.svn=$(TARGET_SVN)
 
 # P23 Devices no longer need rlsservice
 PRODUCT_VENDOR_PROPERTIES += \
diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index 61a2e7f..6519607 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -152,7 +152,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>