ICU-12779 merge r39468 r39469 from #12798 into maint-58

X-SVN-Rev: 39471
2 files changed