Merge "Base: Warn on using ostream<< with std::string*" am: 7229576bfe
am: b2af36f208

Change-Id: Ie9e38c5edb7dd231a36ece79bb132ea4f322fbcf