Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1