Merge "Slightly refactor IPv4 default router interface selection"
am: 701421c6c9

Change-Id: I1c8b9f95c8711c191e0e95cf72a5f4e5a3c3fc53