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

Change-Id: If915c7f08a7d383f7afb5430ebdd087cf96b9b0c