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

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

Change-Id: I4525969b47f1352a9387c83ced89421253fdf4fd