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

* commit '57bee8dc2206404164606d4f5cabde272505f5fa':
  Change Checkpoint API to return total number of checkpoints