am 9405a81f: Merge "Let UsbDeviceManager choose the appropriate function default" into mnc-dev

* commit '9405a81f7ac4116e2715f5739fb5d7fd5c6458d8':
  Let UsbDeviceManager choose the appropriate function default