Merge "Fix a few clang-tidy issues and add NOLINT for others"