am 7a47dd05: am 0cd23f20: (-s ours) am 4026e2ae: Merge "Fix String alignment issue while displaying MCC/MNC pair." into mnc-dev

* commit '7a47dd05909beb8cdba1975f389378a291701659':