Merge "Work around clang-tidy segmentation fault."