Merge "Update Bluetooth related string" into pi-dev