Merge "Remove icu4j dependency."