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

* commit '94933e43dc9793f1bb788bee06000f8fbd8ed959':
  UsbDeviceManager: fix b/21429947 regression (try #2)