am 191c472e: am a24fc7c5: (-s ours) Merge "Revert "DO NOT MERGE: Fix up checksums instead of recalculating them."" into klp-dev

* commit '191c472e6c98446cde8169533c7b3804728c1011':
  Revert "DO NOT MERGE: Fix up checksums instead of recalculating them."