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

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