Merge "Bluetooth string changes"