Merge "DO NOT MERGE UsbManager: squashed commit of:" into gingerbread