Reapply "Simplify addRoutesToLocalNetwork calls"

This reverts commit 316346be6e99f32aa73b8dbb4de8d434a50cd3e1.

Change-Id: I86977f6e7a5451d037c7ea6fee5c4bc7082935ff
2 files changed