Merge "Add checkpointing support for A/B updates" am: ba1752008d am: 0b875d7630
am: 9e9f7cb820

Change-Id: I76999218377271621d14502f9315739dd1b894a5