Merge "Avoid UNKNOWN state for Wifi in bug2542613, not a common user case." into froyo