Merge "Reapply "Simplify addRoutesToLocalNetwork calls"" into main