Merge "init: failed to set sys.usb.controller" into rvc-dev am: 5b07f4f322

Change-Id: I9817c2239b059747b7946f27d7f8b049313457ab