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

Change-Id: Id0a30badf557476f99031d9e11f53cfdddc819b7