Merge "Fix clang-tidy performance-faster-string-find warnings"