Merge "Suppress existing clang-tidy warnings"