Merge "UsbDescriptor: Add finite timeout to control transfer" am: 20dca26f41 am: 4bff76be80
am: db3a291e9d

Change-Id: Ibf2bc0673e156919baf77c0db2033aa521b08052