Bug 898976 - [Contacts] uplift to v1-train