am 9146cbdb: Merge "Fix CRCs in file so it passes the new CRC check" into mnc-dev

* commit '9146cbdb556a814628176f599f7cd9bde28b75d9':
  Fix CRCs in file so it passes the new CRC check