diff --git a/Android.mk b/Android.mk
index 5c069fe..f8f2bb4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,2 +1,14 @@
 LOCAL_PATH := $(call my-dir)
+
+#Disable WFD for selected 32-bit targets
+ifeq ($(call is-board-platform,bengal),true)
+ifeq ($(TARGET_BOARD_SUFFIX),_32)
+WFD_DISABLE_PLATFORM_LIST := bengal
+endif
+endif
+
+ifneq ($(call is-board-platform-in-list,$(WFD_DISABLE_PLATFORM_LIST)),true)
+ifneq ($(TARGET_HAS_LOW_RAM), true)
 include $(call all-makefiles-under, $(LOCAL_PATH))
+endif
+endif