diff --git a/BoardConfig.mk b/BoardConfig.mk
index 0376cb39..2633315d 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -113,6 +113,7 @@ WIFI_DRIVER_FW_PATH_AP  := "ap"
 WIFI_DRIVER_FW_PATH_P2P := "p2p"
 BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE)
 BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE)
+WIFI_HIDL_FEATURE_AWARE := true
 
 # Audio
 BOARD_USES_ALSA_AUDIO := true
diff --git a/WCNSS_qcom_cfg.ini b/WCNSS_qcom_cfg.ini
index 35dec212..d7ecd97d 100644
--- a/WCNSS_qcom_cfg.ini
+++ b/WCNSS_qcom_cfg.ini
@@ -92,6 +92,9 @@ gSelfGenFrmPwr=3
 # Enable or Disable NAN
 # 1=Enable (default), 0=Disable
 gEnableNanSupport=1
+
+genable_nan_datapath=1
+gnan_datapath_ndi_channel=6
 ################ NAN feature set end #####################
 
 gIgnorePeerHTopMode=1
diff --git a/device.mk b/device.mk
index 1d05287f..b8435f1f 100644
--- a/device.mk
+++ b/device.mk
@@ -139,6 +139,7 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.telephony.cdma.xml:system/etc/permissions/android.hardware.telephony.cdma.xml \
     frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \
     frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
+    frameworks/native/data/etc/android.hardware.wifi.aware.xml:system/etc/permissions/android.hardware.wifi.aware.xml \
     frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml \
     frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \
     frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \