Merge "Preserve leading 0s in mcc mnc"
am: 593d767e15

Change-Id: I97041a9f2a50d8448a95226e66162b55a42f841b