ICU-12188 Merge trunk r38542 #12406 to maint-57

X-SVN-Rev: 38543
2 files changed