Merge "Remove usage of checksumCrc32"