Merge "Revert "Set the owners to look at the same branch not to be fixed to main."" into main