Fix build breakage: Revert "Fix broken Contacts tests"

This reverts commit dca4d855aac546f0969113d611355aaf3a698656.

Change-Id: If68bf7fd2191c8403b8e3fe18d22610fc96dab4a
9 files changed