Merge "Switch back to NativeAllocationRegistry"