Merge remote-tracking branch 'xin/translate/usb-image' into feature/15292-usb-image