Merge "Add package-level control to CallerId and Contacts"