Merge "Base: Delete ostream<< with std::string*"
am: 2dd3b6e349

Change-Id: I6aac826ec56dec657f70357e3bdaad76f8ddb871