Merge change I56e83543

* changes:
  Switching to the new sort key on Contacts