Merge "Revert "Base: Delete ostream<< with std::string*"" am: 7178e29c22 am: 3578488787 am: 29769551c0
am: 88253f1511

Change-Id: I56a66cab7b379ca51d6fb21e504a15a164700d53