Merge commit '4777fd12d863a78ef378b322f1929690341946a5' * commit '4777fd12d863a78ef378b322f1929690341946a5': Fix the reporting of NO_CONNECTIVITY.
Merge commit '4777fd12d863a78ef378b322f1929690341946a5' * commit '4777fd12d863a78ef378b322f1929690341946a5': Fix the reporting of NO_CONNECTIVITY.