Merge "Use ICU APIs not impl types"