Merge "Use API RouteInfo constructor in VpnConfig"