Merge "Fix OldSystemTest gc"