Merge \"Support unlimited pending checkpoints\"
am: f84bef9dd7

Change-Id: I5a5bf6688474fd7261e140fd7283ec1a93b0da2e