Merge "Fix HostsideVpnTests flakyness"