cm's phonecommon + contactscommon

Change-Id: I334c1e279519040b833fb0b3efb6d49516ccf855