am a700b119: Merge "Various icu-related test fixes."

* commit 'a700b1190f5126361b1531c8b927058a0b83a2a9':
  Various icu-related test fixes.