bluetooth tweaks...

Change-Id: I9ab27dea2910b8528fbaf271d757b7c88b0b0346