Bug 898976 - [Contacts] uplift to v1-train
Merge branch 'v1-train' into v1.1.0hd