Merge "apply clang-format" into nextgenv2