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

Change-Id: Ie1906ef96432bed1058cc8ce6ecb6cd58adc769c