Merge "usb string update" into oc-mr1-dev