ticket:10017: Merge r33623 to r33707 from trunk.

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