ticket:9721: Merge r33387 and r33389 from #9732


git-svn-id: http://source.icu-project.org/repos/icu/icu/branches/maint@33407 251d0590-4201-4cf1-90de-194747b24ca1
ticket:9721: Merge r33392 from #10018


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