Merge "Fail startCheckpoint if checkpoints not supported"
am: 6c704f736c

Change-Id: I631c9828782452ab763d108d85082cd2120c5ee7