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

* commit '56866c4d0e31bbc65e333754bb69accb2b0f4a36':
  Remove M codename, version number is 6.0.