Merge remote-tracking branch 'albertopq/merge-contacts-list-without-823025' into v1-train
(cherry picked from commit f486e806e61e206186c325b3e065e44d59988339)