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

Change-Id: I3ab32e4f3290e52f1ad27054a957b0632567f4bd