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

* commit '4b4244cb03bb6f5339859c4631717fe0ddeec4e8':
  Remove M codename, version number is 6.0.