Merge "Add checkpointing support for A/B updates"