Merge "increase interval and timeout for wait_check_network method"