Merge "Preserve leading 0s in mcc mnc"