am 6d3e6099: am a2411eed: Merge "init.usb.rc: set sys.usb.config to none...
am 6d3e6099: am a2411eed: Merge "init.usb.rc: set sys.usb.config to none before changing it" into jb-mr1.1-dev
* commit '6d3e6099':
init.usb.rc: set sys.usb.config to none before changing it