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

Change-Id: I9384ed0c3b8adcd406e38b3d5ca7ee1eb27efef8