Track contacts and contactscommon

Change-Id: Ib1d193bbc388a66086bfb7c621bb044c984e9548
Signed-off-by: iceandfire <arhamjamal@gmail.com>