am bdfbd821: am 0eb10ede: Merge "Always set the usb config when modifying it." into mnc-dr-dev

* commit 'bdfbd82154b58592597a70064c0806d774446746':
  Always set the usb config when modifying it.