Merge "Fix combined checksum calculation to use isa."