Merge "Increase timeout for waiting a validated network"