Bluez changes

Change-Id: I7878f0ded108a04201eb6a0f6700017b19cad873