Bluez fixes

Change-Id: Ic125d881ad1590b4995efd3ffee0f98996c0c667
Bluez fixes 2

Change-Id: Ic00c080d33c503b89f1289a33d804275dc00ca44