ticket:10567: merge r34744 and r34756 for #10557


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