Merge change 25848 into eclair

* changes:
  Switching to streamlined naming of contact Data columns.