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

Change-Id: Ia3fa0dcafc9799f2c24bba33419ce99ed80c308e