bluetooth changes

Change-Id: Idfc4623e5bf3930c27a445deb4278a70fe14a3aa