Merge "Don't reset sys.usb.configfs during userspace reboot" am: 03aaecbd99 am: 863d5fd4c3 am: d3f14f4878

Change-Id: I51e4c5fcce377d530b3ad1911557122e4feb6c3c