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

Change-Id: I33d144fe33ed91941fa925c451522ffe169acba5