Merge "Change the definition of noDefaultNetwork and noValidatedNetwork" into sc-dev