Merge "Fix test breakage introduced in ICU upgrade."