Bluez fixes

Change-Id: I0b328079dfd429d91168044e7a88e1613bb72020
Bluez fixes 2

Change-Id: I1299f082723db46d11516884ed0be7bb6a2578d5