Merge "Re-indent clatd code with clang-format"