am ce277da0: Merge "Fix ICU tests"

* commit 'ce277da069d9ec805ffd0c182b4ded4618565925':
  Fix ICU tests