am a886a23c: Merge change 25848 into eclair

Merge commit 'a886a23cf162fdad6ca0e25441550a3783f0cd29' into eclair-plus-aosp

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