Merge "Add feature annotation to UsbManager"