Merge bd2e1fd0043920a345cf30f2b1e4afff53acf573 on remote branch

Change-Id: Iba4e150a62941c17bf039fca9deceae8da205a6c
diff --git a/bt-commonsys-intf-legacy-board.mk b/bt-commonsys-intf-legacy-board.mk
index 0e93c12..14b2a44 100644
--- a/bt-commonsys-intf-legacy-board.mk
+++ b/bt-commonsys-intf-legacy-board.mk
@@ -25,6 +25,6 @@
 
 ifeq ($(TARGET_BOARD_PLATFORM),msm8937)
 ifeq ($(TARGET_BOARD_SUFFIX),_32go)
-BOARD_HAVE_QTI_BT_LAZY_SERVICE := true
+TARGET_USE_QTI_BT_SAR := false
 endif
 endif
diff --git a/bt-system-opensource-product.mk b/bt-system-opensource-product.mk
index 6a6e918..83f1731 100644
--- a/bt-system-opensource-product.mk
+++ b/bt-system-opensource-product.mk
@@ -15,7 +15,9 @@
 PRODUCT_PACKAGES += Bluetooth
 
 ifeq ($(TARGET_FWK_SUPPORTS_FULL_VALUEADDS), true)
+ifneq ($(TARGET_BOARD_TYPE),auto)
 TARGET_USE_QTI_BT_STACK := true
+endif
 
 ifeq ($(TARGET_USE_QTI_BT_STACK),true)
 # BT Related Libs