diff --git a/atoll/WCNSS_qcom_cfg.ini b/atoll/WCNSS_qcom_cfg.ini
index 220af26c13e9a1c112d99cc730a51d1408146e05..629067cbe3526420fa7ae47e24dca3b92bcc8571 100644
--- a/atoll/WCNSS_qcom_cfg.ini
+++ b/atoll/WCNSS_qcom_cfg.ini
@@ -468,8 +468,6 @@ adapt_dwell_wifi_act_threshold=10
 
 MAWCEnabled=0
 
-drop_bcn_on_chan_mismatch=0
-
 # Enable/Disable rtt sta mac randomization
 enable_rtt_mac_randomization=1
 
diff --git a/bengal/WCNSS_qcom_cfg.ini b/bengal/WCNSS_qcom_cfg.ini
index a8c269cf1c5ccd238c21f0939f19782393c2933a..4002d7d3d009349a2c745a1a35b9f581fb559d9e 100644
--- a/bengal/WCNSS_qcom_cfg.ini
+++ b/bengal/WCNSS_qcom_cfg.ini
@@ -468,13 +468,14 @@ adapt_dwell_wifi_act_threshold=10
 
 MAWCEnabled=0
 
-drop_bcn_on_chan_mismatch=0
-
 # Enable/Disable rtt sta mac randomization
 enable_rtt_mac_randomization=1
 
 #Enable/Disable SNR monitoring
 gEnableSNRMonitoring=1
+
+#Enable/Disable Ring Buffer
+gEnableRingBuffer=0
 END
 
 # Note: Configuration parser would not read anything past the END marker
diff --git a/bengal/wlan.mk b/bengal/wlan.mk
index bd30ed350414dba48d87359edb526745c070a030..e8d55e57b106bb76c09a0a2fdd5606011c9278ec 100644
--- a/bengal/wlan.mk
+++ b/bengal/wlan.mk
@@ -26,3 +26,6 @@ WIFI_HIDL_FEATURE_DUAL_INTERFACE := true
 
 # Enable SAP + SAP Feature.
 QC_WIFI_HIDL_FEATURE_DUAL_AP := true
+
+#Enable cal delete feature
+TARGET_CAL_DATA_CLEAR := true
diff --git a/default/WCNSS_qcom_cfg.ini b/default/WCNSS_qcom_cfg.ini
index 8f6471851a8b5b496c17c56c687484b4d8f83884..f5b7ecc13eb8dcdc98cf58a3506671e45dd4d339 100644
--- a/default/WCNSS_qcom_cfg.ini
+++ b/default/WCNSS_qcom_cfg.ini
@@ -422,8 +422,6 @@ adapt_dwell_wifi_act_threshold=10
 
 MAWCEnabled=0
 
-drop_bcn_on_chan_mismatch=0
-
 # Enable/Disable rtt sta mac randomization
 enable_rtt_mac_randomization=1
 
diff --git a/kona/WCNSS_qcom_cfg.ini b/kona/WCNSS_qcom_cfg.ini
index a7a8c47abc80ecb1f040929b50a0f8731c5682c7..ad60e2a41ad20c96695f7144cc9c96f750510a45 100644
--- a/kona/WCNSS_qcom_cfg.ini
+++ b/kona/WCNSS_qcom_cfg.ini
@@ -263,8 +263,6 @@ genable_nan_datapath=1
 
 hostscan_adaptive_dwell_mode=1
 
-drop_bcn_on_chan_mismatch=0
-
 # Enable/Disable rtt sta mac randomization
 enable_rtt_mac_randomization=1
 
diff --git a/lahaina/WCNSS_qcom_cfg.ini b/lahaina/WCNSS_qcom_cfg.ini
index 8f6471851a8b5b496c17c56c687484b4d8f83884..f5b7ecc13eb8dcdc98cf58a3506671e45dd4d339 100644
--- a/lahaina/WCNSS_qcom_cfg.ini
+++ b/lahaina/WCNSS_qcom_cfg.ini
@@ -422,8 +422,6 @@ adapt_dwell_wifi_act_threshold=10
 
 MAWCEnabled=0
 
-drop_bcn_on_chan_mismatch=0
-
 # Enable/Disable rtt sta mac randomization
 enable_rtt_mac_randomization=1
 
diff --git a/lito/WCNSS_qcom_cfg.ini b/lito/WCNSS_qcom_cfg.ini
index 38b9bed774437c4e5c455c15846f28ae1a631bb2..dc2e509d56a2bc8465774dbf80cecb2df1d632a9 100644
--- a/lito/WCNSS_qcom_cfg.ini
+++ b/lito/WCNSS_qcom_cfg.ini
@@ -468,8 +468,6 @@ adapt_dwell_wifi_act_threshold=10
 
 MAWCEnabled=0
 
-drop_bcn_on_chan_mismatch=0
-
 # Enable/Disable rtt sta mac randomization
 enable_rtt_mac_randomization=1
 
diff --git a/msmnile/WCNSS_qcom_cfg.ini b/msmnile/WCNSS_qcom_cfg.ini
index 5a0ee4751835a66bdc5dbbfc21395f9c8c74c497..7945ca9a4775f7faf0e01d5269f8d57e3776a52c 100644
--- a/msmnile/WCNSS_qcom_cfg.ini
+++ b/msmnile/WCNSS_qcom_cfg.ini
@@ -468,8 +468,6 @@ adapt_dwell_wifi_act_threshold=10
 
 MAWCEnabled=0
 
-drop_bcn_on_chan_mismatch=0
-
 # Enable/Disable rtt sta mac randomization
 enable_rtt_mac_randomization=1
 
diff --git a/msmnile_au/WCNSS_qcom_cfg.ini b/msmnile_au/WCNSS_qcom_cfg.ini
index 881d81ffc7b29163c51b280ed04c391d64742f92..ed61f235ae6c53da453dec94c6658e30da12616e 100644
--- a/msmnile_au/WCNSS_qcom_cfg.ini
+++ b/msmnile_au/WCNSS_qcom_cfg.ini
@@ -466,8 +466,6 @@ adapt_dwell_wifi_act_threshold=10
 
 MAWCEnabled=0
 
-drop_bcn_on_chan_mismatch=0
-
 # Enable/Disable rtt sta mac randomization
 enable_rtt_mac_randomization=1
 
diff --git a/msmnile_au/WCNSS_qcom_cfg_qca6174.ini b/msmnile_au/WCNSS_qcom_cfg_qca6174.ini
index 4defd8cd114fe5de27b3ceb9c78a459caefff20e..022e3d9230e98c734d78db5e69a7ca60d9cbd5ac 100644
--- a/msmnile_au/WCNSS_qcom_cfg_qca6174.ini
+++ b/msmnile_au/WCNSS_qcom_cfg_qca6174.ini
@@ -466,8 +466,6 @@ adapt_dwell_wifi_act_threshold=10
 
 MAWCEnabled=0
 
-drop_bcn_on_chan_mismatch=0
-
 # Enable/Disable rtt sta mac randomization
 enable_rtt_mac_randomization=1
 
diff --git a/msmnile_au/WCNSS_qcom_cfg_qca6390.ini b/msmnile_au/WCNSS_qcom_cfg_qca6390.ini
index 3c3542130bc22bd2401c5cb5cf10dd64c65a2b21..f2751881cc6bb8ded897b342d10e1a831675a2c5 100644
--- a/msmnile_au/WCNSS_qcom_cfg_qca6390.ini
+++ b/msmnile_au/WCNSS_qcom_cfg_qca6390.ini
@@ -487,8 +487,6 @@ adapt_dwell_wifi_act_threshold=10
 
 MAWCEnabled=0
 
-drop_bcn_on_chan_mismatch=0
-
 # Enable/Disable rtt sta mac randomization
 enable_rtt_mac_randomization=1
 
diff --git a/sdmshrike_au/WCNSS_qcom_cfg.ini b/sdmshrike_au/WCNSS_qcom_cfg.ini
index 881d81ffc7b29163c51b280ed04c391d64742f92..ed61f235ae6c53da453dec94c6658e30da12616e 100644
--- a/sdmshrike_au/WCNSS_qcom_cfg.ini
+++ b/sdmshrike_au/WCNSS_qcom_cfg.ini
@@ -466,8 +466,6 @@ adapt_dwell_wifi_act_threshold=10
 
 MAWCEnabled=0
 
-drop_bcn_on_chan_mismatch=0
-
 # Enable/Disable rtt sta mac randomization
 enable_rtt_mac_randomization=1
 
diff --git a/sdmshrike_au/WCNSS_qcom_cfg_qca6174.ini b/sdmshrike_au/WCNSS_qcom_cfg_qca6174.ini
index 881d81ffc7b29163c51b280ed04c391d64742f92..ed61f235ae6c53da453dec94c6658e30da12616e 100644
--- a/sdmshrike_au/WCNSS_qcom_cfg_qca6174.ini
+++ b/sdmshrike_au/WCNSS_qcom_cfg_qca6174.ini
@@ -466,8 +466,6 @@ adapt_dwell_wifi_act_threshold=10
 
 MAWCEnabled=0
 
-drop_bcn_on_chan_mismatch=0
-
 # Enable/Disable rtt sta mac randomization
 enable_rtt_mac_randomization=1
 
diff --git a/sdmshrike_au/WCNSS_qcom_cfg_qca6390.ini b/sdmshrike_au/WCNSS_qcom_cfg_qca6390.ini
index c7c5f9b04dda93202fe2e144676810f2197916cd..d2297eea99fc53bb93073069c284d3ceda58e9f1 100644
--- a/sdmshrike_au/WCNSS_qcom_cfg_qca6390.ini
+++ b/sdmshrike_au/WCNSS_qcom_cfg_qca6390.ini
@@ -487,8 +487,6 @@ adapt_dwell_wifi_act_threshold=10
 
 MAWCEnabled=0
 
-drop_bcn_on_chan_mismatch=0
-
 # Enable/Disable rtt sta mac randomization
 enable_rtt_mac_randomization=1
 
diff --git a/sdmshrike_au/wlan.mk b/sdmshrike_au/wlan.mk
index 85f94627a45e640086e2a1023faba92328de61ae..432a7cddb6d4809991f17bf11cd0b069dc5fb69a 100644
--- a/sdmshrike_au/wlan.mk
+++ b/sdmshrike_au/wlan.mk
@@ -5,9 +5,9 @@ PRODUCT_PACKAGES += wifilearner
 WIFI_HIDL_FEATURE_AWARE := true
 
 PRODUCT_COPY_FILES += \
-	device/qcom/wlan/msmnile_au/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf \
-	device/qcom/wlan/msmnile_au/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \
-	device/qcom/wlan/msmnile_au/icm.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/icm.conf \
+	device/qcom/wlan/sdmshrike_au/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf \
+	device/qcom/wlan/sdmshrike_au/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \
+	device/qcom/wlan/sdmshrike_au/icm.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/icm.conf \
 	frameworks/native/data/etc/android.hardware.wifi.aware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.aware.xml \
 	frameworks/native/data/etc/android.hardware.wifi.rtt.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.rtt.xml \
         frameworks/native/data/etc/android.hardware.wifi.passpoint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.passpoint.xml
@@ -21,11 +21,11 @@ PRODUCT_WLAN_DRIVER_ALWAYS_LOADED := true
 ifeq ($(strip $(shell expr $(words $(strip $(TARGET_WLAN_CHIP))) \>= 2)), 1)
 PRODUCT_COPY_FILES += \
 $(foreach chip, $(TARGET_WLAN_CHIP), \
-    device/qcom/wlan/msmnile_au/WCNSS_qcom_cfg_$(chip).ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/$(chip)/WCNSS_qcom_cfg.ini)
+    device/qcom/wlan/sdmshrike_au/WCNSS_qcom_cfg_$(chip).ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/$(chip)/WCNSS_qcom_cfg.ini)
 else
 TARGET_WLAN_CHIP := wlan
 PRODUCT_COPY_FILES += \
-    device/qcom/wlan/msmnile_au/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/WCNSS_qcom_cfg.ini
+    device/qcom/wlan/sdmshrike_au/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/WCNSS_qcom_cfg.ini
 endif
 
 PRODUCT_PACKAGES += $(foreach chip, $(TARGET_WLAN_CHIP), $(WLAN_CHIPSET)_$(chip).ko)
@@ -35,7 +35,7 @@ ifeq ($(PRODUCT_WLAN_DRIVER_ALWAYS_LOADED), true)
 # which will trigger wlan driver loading.
 PRODUCT_PACKAGES += init.qcom.wlan.sh
 PRODUCT_COPY_FILES += \
-    device/qcom/wlan/msmnile_au/init.qcom.wlan.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qcom.wlan.sh
+    device/qcom/wlan/sdmshrike_au/init.qcom.wlan.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qcom.wlan.sh
 endif
 
 ifeq ($(TARGET_USES_AOSP_FOR_WLAN), true)
diff --git a/sm6150_au/WCNSS_qcom_cfg_qca6390.ini b/sm6150_au/WCNSS_qcom_cfg_qca6390.ini
index c7c5f9b04dda93202fe2e144676810f2197916cd..d2297eea99fc53bb93073069c284d3ceda58e9f1 100644
--- a/sm6150_au/WCNSS_qcom_cfg_qca6390.ini
+++ b/sm6150_au/WCNSS_qcom_cfg_qca6390.ini
@@ -487,8 +487,6 @@ adapt_dwell_wifi_act_threshold=10
 
 MAWCEnabled=0
 
-drop_bcn_on_chan_mismatch=0
-
 # Enable/Disable rtt sta mac randomization
 enable_rtt_mac_randomization=1
 
diff --git a/talos/WCNSS_qcom_cfg.ini b/talos/WCNSS_qcom_cfg.ini
index a8c269cf1c5ccd238c21f0939f19782393c2933a..7c22d59c53a8bf56e30ebaba3077691bea0b249a 100644
--- a/talos/WCNSS_qcom_cfg.ini
+++ b/talos/WCNSS_qcom_cfg.ini
@@ -468,8 +468,6 @@ adapt_dwell_wifi_act_threshold=10
 
 MAWCEnabled=0
 
-drop_bcn_on_chan_mismatch=0
-
 # Enable/Disable rtt sta mac randomization
 enable_rtt_mac_randomization=1
 
diff --git a/trinket/WCNSS_qcom_cfg.ini b/trinket/WCNSS_qcom_cfg.ini
index a8c269cf1c5ccd238c21f0939f19782393c2933a..7c22d59c53a8bf56e30ebaba3077691bea0b249a 100644
--- a/trinket/WCNSS_qcom_cfg.ini
+++ b/trinket/WCNSS_qcom_cfg.ini
@@ -468,8 +468,6 @@ adapt_dwell_wifi_act_threshold=10
 
 MAWCEnabled=0
 
-drop_bcn_on_chan_mismatch=0
-
 # Enable/Disable rtt sta mac randomization
 enable_rtt_mac_randomization=1