Merge "Fix addCleanup in AutoAllocateNetworkTest"