diff --git a/AndroidKernel.mk b/AndroidKernel.mk
index d97d3c3c9cb..588688c2df4 100644
--- a/AndroidKernel.mk
+++ b/AndroidKernel.mk
@@ -1,6 +1,11 @@
 #Android makefile to build kernel as a part of Android Build
 PERL		= perl
 
+KERNEL_TARGET := $(strip $(INSTALLED_KERNEL_TARGET))
+ifeq ($(KERNEL_TARGET),)
+INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/kernel
+endif
+
 ifeq ($(TARGET_PREBUILT_KERNEL),)
 
 KERNEL_OUT := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ
diff --git a/scripts/gcc-wrapper.py b/scripts/gcc-wrapper.py
index 548d655085f..f503aa2edf3 100755
--- a/scripts/gcc-wrapper.py
+++ b/scripts/gcc-wrapper.py
@@ -41,6 +41,7 @@ import subprocess
 
 allowed_warnings = set([
     "return_address.c:62",
+    "hci_conn.c:407",
  ])
 
 # Capture the name of the object file, can find it.