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

Change-Id: Iafa95e268f23472cd87ae857a44ccfa7398c2db4