Merge "Fix synchrnoization issue in car-usb-handler"