Merge "Avoid use of std::string where we have const char*."