am 8ad7c8f9: am 94933e43: am 2eafb06f: am b2c71814: am 97b68bbe: Merge "UsbDeviceManager: fix b/21429947 regression (try #2)" into mnc-dev

* commit '8ad7c8f9553611798fa39ff20cea3313c5b64922':
  UsbDeviceManager: fix b/21429947 regression (try #2)