Merge "Revert "Base: Delete ostream<< with std::string*""