Merge "Fix UsbDeviceManager null object reference"
am: 9b1db24f6e

Change-Id: I70cb3a014eb19ee6214f4590d50e705ab4b9130f