am 6942ae0d: am a886a23c: Merge change 25848 into eclair

Merge commit '6942ae0d131d4ad750acf4f7a9a1fa989271d863'

* commit '6942ae0d131d4ad750acf4f7a9a1fa989271d863':
  Switching to streamlined naming of contact Data columns.