Merge "Stop setting usb config from recovery init script"