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

* commit '9d5a9434d3fe65d32aae0a400502dde8357f0ec7':
  Update ICU_Delegate methods. DO NOT MERGE