Revert "Revert "Rollback Bluetooth changes for now.""

This reverts commit ff927296cef143bd525080caf173c7658e01b7ff.

Change-Id: I57e25afc02f13d7ef567a67b222b217661eacb95