ticket:10445: merge of r34487 and r34490

git-svn-id: http://source.icu-project.org/repos/icu/icu@34491 251d0590-4201-4cf1-90de-194747b24ca1