Merge "Extract ICU registration code into separate files"