Bug 1039465 - [Contacts DataRefactor] Tweak global_contacts_data module and multi_contact