Merge "Updated Bluetooth assets to fix sizing problems" into honeycomb