ticket:9721: Merge r33412 from #10013 and r33413


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