ICU-8787 merge fix for #8864

X-SVN-Rev: 31321
2 files changed