Merge "Remove SystemApi on resetUsbPort"