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

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