Merge "Update OWNERS to include current team" into main