Switch to CM's PhoneCommon