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