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

Change-Id: Iea6fa5051cf9e16ee68dda9bf0900772d5e672fa