Merge "Fix destruction issues relating to AllocationAdapter."