Merge "Do not construct std::function with Allocator argument"