Merge "Migrate INetd String16 method to std::string"