am 969016a3: am f4dbf25a: am 4b4244cb: am 56866c4d: Merge "Remove M codename, version number is 6.0." into mnc-dev

* commit '969016a37c7f7894d110c6855b2cc364bb37690b':
  Remove M codename, version number is 6.0.