Merge "Prefer std::string over String8"