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

Change-Id: I048286d22d4ec064a8128df89e56c8c731734437