Merge "Updating OWNERS file" into main