Merge "Expose UsbPort and UsbPortStatus as system API"