am 8fc3540f: Merge "be a bit more defensive when parsing extension strings" into ics-mr1

* commit '8fc3540fdf759ff3bb03b00e81d94d6c4102d530':
  be a bit more defensive when parsing extension strings