Merge "Base: Delete ostream<< with std::string*" am: 2dd3b6e349 am: 35fc039afc am: 433a382d9d
am: b399e775ac

Change-Id: I0619651238bfe7642e6393b821adf2f7ad1e5323