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

Change-Id: I46dbd5ffdb9692711cacfb5fd5f7a8e897ab3ed7