Merge "Always set the usb config when modifying it." into mnc-dr-dev