Merge pull request #10988 from markdroth/clang-format

clang-format