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

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