Revert "Track AOKPs ContactsCommon"

This reverts commit b26e89b93b24ed7ef780ce1415430ebb5c5c9d27.