Merge "[ToA] Update owner to team" into main