Merge "Switch BaseAdminNetworkTest on test_routers_dvr"