Bug 898976 - [Contacts] uplift to v1-train
Bug 899070 - wrapTextIntoSafeHTMLString should really return a safe html string. r=asuth