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

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

Change-Id: I6b7ad47114b6770bf062286629f0297dc97596fb