Merge "Rename Bluetooth HID Service"