Snap for 4579913 from 3554171770e3d867f136a8d3a005269069e477bb to pi-release

Change-Id: I4e2e4b10fd1489b84b4d828361d82ec1de8ceedd
diff --git a/shared/BoardConfig.mk b/shared/BoardConfig.mk
index 31b0789..2fb166c 100644
--- a/shared/BoardConfig.mk
+++ b/shared/BoardConfig.mk
@@ -127,5 +127,3 @@
 DHCPCD_USE_SCRIPT := yes
 
 USE_XML_AUDIO_POLICY_CONF := 1
-
-BOARD_VNDK_VERSION := current
\ No newline at end of file
diff --git a/shared/device.mk b/shared/device.mk
index 5460bb7..e1e57b5 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -321,3 +321,8 @@
 
 PRODUCT_PACKAGES += \
     vsoc_mem_json
+
+# WLAN driver configuration files
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf
+
diff --git a/shared/wpa_supplicant_overlay.conf b/shared/wpa_supplicant_overlay.conf
new file mode 100644
index 0000000..e1f530d
--- /dev/null
+++ b/shared/wpa_supplicant_overlay.conf
@@ -0,0 +1,3 @@
+disable_scan_offload=1
+p2p_disabled=1
+tdls_external_control=1