Merge commit '3e229076203cd8cfee0adac44cd3c930dfa0e59c' * commit '3e229076203cd8cfee0adac44cd3c930dfa0e59c': Fix the reporting of NO_CONNECTIVITY.
Merge commit '3e229076203cd8cfee0adac44cd3c930dfa0e59c' * commit '3e229076203cd8cfee0adac44cd3c930dfa0e59c': Fix the reporting of NO_CONNECTIVITY.