am 489e1089: (-s ours) DO NOT MERGE: Fix up checksums instead of recalculating them.

* commit '489e108988036facb25c59d59eb5250cf076fd3a':
  DO NOT MERGE: Fix up checksums instead of recalculating them.