Merge commit 'e7eb85cae02375b8bc486d71f429ca0c60980d79' * commit 'e7eb85cae02375b8bc486d71f429ca0c60980d79': API_CHANGE: Cleanup, javadoc and unhide more Bluetooth API.
Merge commit 'e7eb85cae02375b8bc486d71f429ca0c60980d79' * commit 'e7eb85cae02375b8bc486d71f429ca0c60980d79': API_CHANGE: Cleanup, javadoc and unhide more Bluetooth API.