Merge "Reformat some clock files that were excluded from ktfmt" into main