Merge "Update OWNERS file" into main