Merge "Fix NativeAllocationRegistryTest"