Merge "Fixing ClangTidy issues reported by downstream integration"