Merge "Do not revalidate before network is ready"