am 5a0fd1fd: am 9d5a9434: Merge "Update ICU_Delegate methods. DO NOT MERGE" into klp-dev

* commit '5a0fd1fd0fb5d734bf65d26e56e413dba2821b07':
  Update ICU_Delegate methods. DO NOT MERGE