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

* commit '0e474bdb425d08b40fcd3fad150fa1aab1ea2012':
  Change Checkpoint API to return total number of checkpoints