diff --git a/ipacm/src/Android.mk b/ipacm/src/Android.mk
index d9f3145..64ee3ec 100644
--- a/ipacm/src/Android.mk
+++ b/ipacm/src/Android.mk
@@ -1,3 +1,6 @@
+BOARD_PLATFORM_LIST := msm8916
+BOARD_PLATFORM_LIST += msm8909
+ifneq ($(call is-board-platform-in-list,$(BOARD_PLATFORM_LIST)),true)
 ifneq (,$(filter $(QCOM_BOARD_PLATFORMS),$(TARGET_BOARD_PLATFORM)))
 ifneq (, $(filter aarch64 arm arm64, $(TARGET_ARCH)))
 ifneq ($(TARGET_USES_AOSP),true)
@@ -90,3 +93,4 @@
 endif # not (TARGET_USES_AOSP)
 endif # $(TARGET_ARCH)
 endif
+endif
\ No newline at end of file
diff --git a/ipacm/src/IPACM_Main.cpp b/ipacm/src/IPACM_Main.cpp
index 3d4ad5b..478fad2 100644
--- a/ipacm/src/IPACM_Main.cpp
+++ b/ipacm/src/IPACM_Main.cpp
@@ -275,7 +275,7 @@
 	ipacm_event_data_all* new_neigh_data;
 
 	fd = open(IPA_DRIVER, O_RDWR);
-	if (fd == 0)
+	if (fd < 0)
 	{
 		IPACMERR("Failed opening %s.\n", IPA_DRIVER);
 		return NULL;
diff --git a/ipanat/src/Android.mk b/ipanat/src/Android.mk
index a97b6ce..ea14920 100644
--- a/ipanat/src/Android.mk
+++ b/ipanat/src/Android.mk
@@ -1,3 +1,6 @@
+BOARD_PLATFORM_LIST := msm8916
+BOARD_PLATFORM_LIST += msm8909
+ifneq ($(call is-board-platform-in-list,$(BOARD_PLATFORM_LIST)),true)
 ifneq (,$(filter $(QCOM_BOARD_PLATFORMS),$(TARGET_BOARD_PLATFORM)))
 ifneq (, $(filter aarch64 arm arm64, $(TARGET_ARCH)))
 
@@ -22,3 +25,4 @@
 
 endif # $(TARGET_ARCH)
 endif
+endif
\ No newline at end of file
diff --git a/ipanat/test/Android.mk b/ipanat/test/Android.mk
index c5336e4..4c94b56 100644
--- a/ipanat/test/Android.mk
+++ b/ipanat/test/Android.mk
@@ -1,3 +1,6 @@
+BOARD_PLATFORM_LIST := msm8916
+BOARD_PLATFORM_LIST += msm8909
+ifneq ($(call is-board-platform-in-list,$(BOARD_PLATFORM_LIST)),true)
 ifneq (,$(filter $(QCOM_BOARD_PLATFORMS),$(TARGET_BOARD_PLATFORM)))
 ifneq (, $(filter aarch64 arm arm64, $(TARGET_ARCH)))
 
@@ -47,3 +50,4 @@
 
 endif # $(TARGET_ARCH)
 endif
+endif
\ No newline at end of file