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

Change-Id: I2213f75007d44cf899b9b3ed55461160e101b467