Format affected files with clang-format

Format affected files with clang-format #9029