Merge "Change Checkpoint API to return total number of checkpoints" am: 57bee8dc22
am: 3a1bc28195

* commit '3a1bc2819548ee539a5aad63d1855b60a4e91e76':
  Change Checkpoint API to return total number of checkpoints