Merge "Fix valgrind large_object_space_test"