ticket:8464: Merge r34582 to r34628 from trunk.

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