Merge "usb string update" into oc-mr1-dev
am: e25757a106

Change-Id: I2c9f9096eeb849191050ed543c7e024ebc088db0