Merge "Split NetworkUtils and NetworkUtilsInternal"