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

Change-Id: I5ff2fa3cac81f845793e39eb70e7edb1263874dc