Merge change 20787

* changes:
  Removing primary/default phone number and email on contact from the API.