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