Merge "Creates People ContentProvider" into sc-dev