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

* commit 'c14a850f65b2946cad808c0abb8740e800b74ab8':
  Fix parsing of extension string