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

* commit 'da7645d6aba7c56b70c4b854685baf421a0c40f0':
  Fix parsing of extension string