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

Change-Id: I04e3fedecf97c0dc4e2cf7b6b3f099ce6a81d633