Fix build breakage: Revert "Fix broken contacts tests"

This reverts commit 90ef577763f3ccb2d43fda1d21c62533acbbecdb.

Change-Id: If98147879e1658c3a48d04b855c033d191fec2f6
7 files changed