Merge "UsbService: Handle the case where a USB accessory connects as the device is booting" into honeycomb-mr1