Merge "Fix combined checksum calculation to use isa."
am: 82a0229

* commit '82a0229e949eb3ea209c2bd33fe2d60908f5dbc7':
  Fix combined checksum calculation to use isa.

Change-Id: I94ed5fb0d1a738111974e8bf502251859e8df855