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

Change-Id: I545b0fb45d3ed1bde6fa4002c37675cce6a6a37d