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

Change-Id: Ie9983ffb6fe10bb85530b6a6ed677cbf990fdd50