Merge "Fix issues with DoCreateNetworkInstance"