Merge "StartsWith/EndsWith now allow std::string prefixes/suffixes."