Merge "[cleanup] Fix a clang-tidy warning"