Merge "Change MNC codename to just M." into mnc-dev