am 03038725: am da7645d6: am 7fa5c04d: am c14a850f: am ea2afa46: Merge "Fix parsing of extension string" into mnc-dev

* commit '0303872548e88e2caf7272bf26a9aa974077c1b4':
  Fix parsing of extension string