Merge "Defer marking boot successful when checkpointing"
am: 90edbb17f8

Change-Id: Ic211f79ddd70dd4dcf6c7de7336d5ec98f7b46d6