diff --git a/device-husky.mk b/device-husky.mk
index be6f0ee..1c1e3b0 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -406,7 +406,7 @@ ifdef RELEASE_SVN_HUSKY
 TARGET_SVN ?= $(RELEASE_SVN_HUSKY)
 else
 # Set this for older releases that don't use build flag
-TARGET_SVN ?= 32
+TARGET_SVN ?= 35
 endif
 
 PRODUCT_VENDOR_PROPERTIES += \
diff --git a/device-shiba.mk b/device-shiba.mk
index 06e190d..a6b6093 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -383,7 +383,7 @@ ifdef RELEASE_SVN_SHIBA
 TARGET_SVN ?= $(RELEASE_SVN_SHIBA)
 else
 # Set this for older releases that don't use build flag
-TARGET_SVN ?= 32
+TARGET_SVN ?= 35
 endif
 
 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>