Merge "Checkpoints: Support validation and roll forward on fail" am: 9ff07121ff
am: aa4aa48be5

Change-Id: Iec1ad69b919371963bd21602e17a1e7a233af029