ticket:8176: merge r33200 to r33343 from trunk.

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