bluetooth: backport from caf-msm-jb_3.2.1
Thanks johnnyslt

Change-Id: I05dd7418d7bea8fe1d0d1f8d934de25c9fd77023