Merge "Fix HostsideVpnTest#testExcludedRoutes"