Merge "Change checkpoint_gc to run until threshold is met" am: 632a01f745
am: 14c86ddd39

Change-Id: I5918a1b0a6b052e49e465b2637caca87b008f015