am 561f2cbf: (-s ours) am 1dd20863: Merge "Change MNC codename to just M." into mnc-dev

* commit '561f2cbf0042c18bbbf3d0f64bef2bfbd57035ce':