diff --git a/wifi/WCNSS_qcom_cfg.ini b/wifi/WCNSS_qcom_cfg.ini
index 9c255ba..855f4b6 100644
--- a/wifi/WCNSS_qcom_cfg.ini
+++ b/wifi/WCNSS_qcom_cfg.ini
@@ -415,7 +415,7 @@ gEnableMgmtLogging=1
 rps_mask=0f
 
 
-gEnableMacAddrSpoof=1
+gEnableMacAddrSpoof=2
 
 gEnableTDLSScan=1
 gTDLSExternalControl=1
@@ -430,13 +430,12 @@ gTDLSIdlePacketThreshold=5
 gEnableTDLSScanCoexistence=1
 gBtcEnableIndTimerVal=5
 
-gIgnorePeerErpInfo=1
-
-# BTC policy during wifi connection
 gBtcFastWlanConnPref=0
 
-#Disable Firmware memery dump for vts
-gEnableFwrMemDump=0
+gIgnorePeerErpInfo=1
+
+#Disable RTT as recommended by QC
+gEnableRTTSupport=0
 
 END
 
diff --git a/wifi/p2p_supplicant_overlay.conf b/wifi/p2p_supplicant_overlay.conf
index 7c9bbed..e484ebe 100644
--- a/wifi/p2p_supplicant_overlay.conf
+++ b/wifi/p2p_supplicant_overlay.conf
@@ -1,3 +1,3 @@
 disable_scan_offload=1
 p2p_no_group_iface=1
-persistent_reconnect=1
\ No newline at end of file
+persistent_reconnect=1