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

Change-Id: Ica199c67c5083a5fdb9d08331ff6b2560625fa0e