am 812c2ff6: am 197fe269: Merge "Add OEM specific USB mode enumeration based...
am 812c2ff6: am 197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1
* commit '812c2ff6':
Add OEM specific USB mode enumeration based on ro.bootmode property