Bug 907951 - [System] replace forward images of wrapper
Bug 938564 - [Contacts] backout commit dadecdea
Merge pull request #13710 from fabi1cazenave/backout-commit-dadecdea

Bug 938564 - [Contacts] backout commit dadecdea
Merge branch 'v1-train' into v1.1.0hd