fixes for bluetooth

Change-Id: Iac251cb450eeaaf73be16204b9fda888633b8486