am bdfa8a1a: (-s ours) am 5a0fd1fd: am 9d5a9434: Merge "Update ICU_Delegate methods. DO NOT MERGE" into klp-dev

* commit 'bdfa8a1ae0a4d10abd14cffb93f629803e469464':
  Update ICU_Delegate methods. DO NOT MERGE