Merge "Fix build for clang-r522817" into main