ICU-9287 merge of r31895,r31896 of #9258 and #9336 for 49.x

X-SVN-Rev: 31897
2 files changed