Merge "Add support for checkpointing" am: a3381ffc3f
am: 7e84915c17

Change-Id: I25333406617a7fcf2109aaa0448e6cc216bf5670