Merge "Make checkpoint_gc.sh robust against interference" am: 07a8c9f8de am: dfc3247d58
am: 5c73e66be5

Change-Id: Ie086639b64a774270b1d140445d4e360387f5d9c