Merge "Add supportsCheckpoint" am: 9b2b8fd459
am: 908a4569e9

Change-Id: I44edd3fed37f5e41c29b8265eb549ab3d39bb0a6