Bug 898976 - [Contacts] uplift to v1-train

https://bugzilla.mozilla.org/show_bug.cgi?id=898976