Merge "Fixing null deference in android.hardware.usb.gadget-service.example"