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

Change-Id: I39795019a58b2c91bd427775e304e4b1b934db85