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

Change-Id: Ie1c573d76c863684df360735d94796e7f0336cb6