Merge changes from topic "checkpoint-enable" am: 03d3856c90 am: 4523a86873
am: 71e4b705e5

Change-Id: I13b027bc2d7072d264a44be15de812c3ef1fefe5