Merge change 24714

* changes:
  Remove duplicate copies of ICU error translation.