Merge "Remove contacts affinity from contact permission descriptions"