Revert "Revert "Rebundle contacts""

This reverts commit dcbe19962b3aacbcd1c9228c34cbcc655c60d2cc.

Change-Id: Ib82d6825fdf66e1ba3b4f55051fea7a9d2f90742
1 file changed