[automerger skipped] Merge "Add support for checkpointing" am: a3381ffc3f am: 7e84915c17
am: 51ff91abda  -s ours

Change-Id: Ice08fc079b1cb8101ba375f65ad1afe81ca81a61