Merge "Clean up USER_OWNER in contacts provider"