ticket:10640: Merge from trunk.

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