Merge change 21858 into eclair

* changes:
  Upgrading CallerInfo to the new Contacts API