am 2030d78d: am 8fc3540f: Merge "be a bit more defensive when parsing...
am 2030d78d: am 8fc3540f: Merge "be a bit more defensive when parsing extension strings" into ics-mr1
* commit '2030d78d':
be a bit more defensive when parsing extension strings