Merge "[clang-tidy] Do not dereference a null BaseType"