Merge "Enable clang-format on presubmit"