ticket:10017: Merge r33505 to r33568 from trunk.

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