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

Change-Id: I77b54d6328634b284c930a756b2dd324c2b3a493