am eb5a9394: Merge "Fix test failures due to the ICU-52 update."

* commit 'eb5a9394278fddbc9c210452b0ecc7126422ff19':
  Fix test failures due to the ICU-52 update.