Merge "NativeAllocationRegistryTest fix and cleanup"