am 24a4f48d: am 302ae3fd: Merge "Move Contacts off private ICU API."

* commit '24a4f48dc5c768188143648e267889477e4185e8':
  Move Contacts off private ICU API.