Merge "autojoin fix for devices which are using the enableNEtwork API"