Track ContactsCommon + cleanup

Change-Id: I6ac3399a97aaa235f1017d48f511df417c65c76b