Merge "New strings for Bluetooth" into gingerbread