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

* commit '0cd23f20e25ceb184a1cd4edd02c41de04e4869b':