Merge "API updated for ICU4J 58.1"