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

Change-Id: I2529699a1b5571f49ab360ceb3bab4b81b24fd94