Merge "Fix String alignment issue while displaying MCC/MNC pair." into mnc-dev