ticket:8892: merge into 4.8.x r32038 and r32039 from #9408


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