Merge "Revert "Add janitors to the OWNERS file"" into main