Merge "Mark A/B Boot success before committing checkpoint"