Merge "Track external/icu API changes for factory registration" into nyc-dev