Merge "Mark A/B Boot success before committing checkpoint" am: d6bbe746d7
am: 294a252092

Change-Id: I8887afd2726724d6c9b9da0fa7595bde741fb748