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

Change-Id: Ib95d75c80af12db8bb617df5ce0bcc0cd6c6c028