Merge commit '7714401570e01086f84e11e0383209eb0ccaf25f' * commit '7714401570e01086f84e11e0383209eb0ccaf25f': Revert "ContactsContract: Adding joined columns to the Data class definition."
Merge commit '7714401570e01086f84e11e0383209eb0ccaf25f' * commit '7714401570e01086f84e11e0383209eb0ccaf25f': Revert "ContactsContract: Adding joined columns to the Data class definition."