Merge change 22654 into eclair

* changes:
  Move some Contacts fields to new CommonDataKinds rows