Merge "Update all usb ports in enableUsbDataSignal" into tm-dev