Merge "Enable the clang-format pre-submit hook" into oc-dev