am 73d983a3: (-s ours) am ea2afa46: Merge "Fix parsing of extension string" into mnc-dev

* commit '73d983a30b1fc798860f8af9b5902090e297312c':