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

* commit '003ee843b4cbbdd774214a8ed29ede0198519899':
  Move Contacts off private ICU API.