Merge "Fix string %d insertions" into mnc-dev