Merge "init: failed to set sys.usb.controller" am: 7c1c167307

Change-Id: Ic07e38c5bd3dac7404ec4ae742dcafb15c835769