Bluetooth: Fix some error messages

Change-Id: I368003da596bfa08e48354404f88b2ae1fbf8bb6
Merge branch 'cm' into HEAD