Merge "Revert "Simplify addRoutesToLocalNetwork calls"" into main