Merge d23bbc508323164a9ed3a4e43caa37daeb9a6bcb on remote branch

Change-Id: I6d308c3c4fb3393b9b038052e12fe208ff7ae33f
diff --git a/bt-commonsys-intf-board.mk b/bt-commonsys-intf-board.mk
index 87bc57e..89eb7d2 100644
--- a/bt-commonsys-intf-board.mk
+++ b/bt-commonsys-intf-board.mk
@@ -6,7 +6,11 @@
 BOARD_HAVE_BLUETOOTH_QCOM := true
 
 #FM
-ifneq ($(TARGET_BOARD_TYPE),auto)
+ifeq ($(TARGET_BOARD_TYPE),auto)
+BOARD_HAVE_QCOM_FM := false
+else ifeq ($(TARGET_BOARD_AUTO),true)
+BOARD_HAVE_QCOM_FM := false
+else
 BOARD_HAVE_QCOM_FM := true
 endif