Merge "Mark all clients of Allocator HAL"