Merge "AllocationAdapter cleanup."