Merge "Slightly refactor IPv4 default router interface selection" am: 701421c6c9 am: 95c373341e
am: 8ac26bad64

Change-Id: I7ab4b7b3eaa7c81d58990747f3f894e8f9dacfd6