Merge "Avoid going through char* for std::string API"