Merge "C2 VTS: Format using clang-format"