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

* commit '9e2182adc2f91ed3a5e7713ce214aafb537fab43':
  init.usb.rc: set sys.usb.config to none before changing it