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

* commit 'e10831550ede1de3e0e00cb6d4a82319765c1f67':
  Let UsbDeviceManager choose the appropriate function default