Merge "Remove M codename, version number is 6.0." into mnc-dev