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

Change-Id: I463777238185d14bdda88ed23eaa2e1253878731