Merge "Fix test failures due to the ICU-52 update."