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