Merge "Revert "Set default wait-for-network timeout to 0.""