Merge "Fail startCheckpoint if checkpoints not supported"