Merge "Fix NO_CONNECTIVITY flag in some cases."