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

* commit '7fa5c04d22416a3de239beea4c0f9d20229cf10a':
  Fix parsing of extension string