Merge "Add supportsCheckpoint"
am: 9b2b8fd459

Change-Id: I893b20737f20c0a21be2a4068fb8b49cdb54ed80