Merge "Merge "BluetoothChat: Clean up code" into nyc-mr1-dev am: dc77d5bb am: 11f2af5b am: 105d2a26" into nyc-mr2-dev-plus-aosp