ticket:10268: Merge r34850 r34876 from trunk.

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