diff --git a/proguard.flags b/proguard.flags
index 19d09fa..a4282bf 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -14,15 +14,26 @@
 
 # Needed for tests
 -keep class com.android.contacts.compat.CompatUtils { *; }
--keep class com.android.contacts.common.Collapser { *; }
--keep class com.android.contacts.common.ContactPhotoManager { *; }
--keep class com.android.contacts.common.ContactsUtils { *; }
+-keep class com.android.contacts.Collapser { *; }
+-keep class com.android.contacts.ContactPhotoManager { *; }
+-keep class com.android.contacts.ContactsApplication { *; }
+-keep class com.android.contacts.ContactsUtils { *; }
+-keep class com.android.contacts.ContactSaveService { *; }
+-keep class com.android.contacts.ContactSaveService$* { *; }
 -keep class com.android.contacts.database.NoNullCursorAsyncQueryHandler { *; }
 -keep class com.android.contacts.database.SimContactDao { *; }
 -keep class com.android.contacts.database.SimContactDao$* { *; }
 -keep class com.android.contacts.database.SimContactDaoImpl { *; }
+-keep class com.android.contacts.DynamicShortcuts { *; }
+-keep class com.android.contacts.editor.ContactEditorUtils { *; }
+-keep class com.android.contacts.editor.EditorUiUtils { *; }
 -keep class com.android.contacts.format.FormatUtils { *; }
 -keep class com.android.contacts.format.TextHighlighter { *; }
+-keep class com.android.contacts.group.GroupUtil { *; }
+-keep class com.android.contacts.interactions.CallLogInteraction { *; }
+-keep class com.android.contacts.interactions.CallLogInteractionsLoader { *; }
+-keep class com.android.contacts.interactions.ContactDeletionInteraction { *; }
+-keep class com.android.contacts.interactions.ContactInteractionUtil { *; }
 -keep class com.android.contacts.list.ContactListItemView { *; }
 -keep class com.android.contacts.list.ContactsSectionIndexer { *; }
 -keep class com.android.contacts.location.CountryDetector { *; }
@@ -69,9 +80,11 @@
 -keep class com.android.contacts.model.SimCard { *; }
 -keep class com.android.contacts.model.SimContact { *; }
 -keep class com.android.contacts.model.ValuesDelta { *; }
--keep class com.android.contacts.common.MoreContactUtils { *; }
+-keep class com.android.contacts.MoreContactUtils { *; }
 -keep class com.android.contacts.preference.ContactsPreferences { *; }
--keep class com.android.contacts.common.test.mocks.MockContactPhotoManager { *; }
+-keep class com.android.contacts.SimImportService { *; }
+-keep class com.android.contacts.SimImportService$* { *; }
+-keep class com.android.contacts.test.mocks.MockContactPhotoManager { *; }
 -keep class com.android.contacts.testing.InjectedServices { *; }
 -keep class com.android.contacts.util.BitmapUtil { *; }
 -keep class com.android.contacts.util.ContactDisplayUtils { *; }
@@ -82,19 +95,6 @@
 -keep class com.android.contacts.util.PermissionsUtil { *; }
 -keep class com.android.contacts.util.SearchUtil { *; }
 -keep class com.android.contacts.util.SearchUtil$* { *; }
--keep class com.android.contacts.ContactsApplication { *; }
--keep class com.android.contacts.ContactSaveService { *; }
--keep class com.android.contacts.ContactSaveService$* { *; }
--keep class com.android.contacts.SimImportService { *; }
--keep class com.android.contacts.SimImportService$* { *; }
--keep class com.android.contacts.DynamicShortcuts { *; }
--keep class com.android.contacts.editor.ContactEditorUtils { *; }
--keep class com.android.contacts.editor.EditorUiUtils { *; }
--keep class com.android.contacts.group.GroupUtil { *; }
--keep class com.android.contacts.interactions.CallLogInteraction { *; }
--keep class com.android.contacts.interactions.CallLogInteractionsLoader { *; }
--keep class com.android.contacts.interactions.ContactDeletionInteraction { *; }
--keep class com.android.contacts.interactions.ContactInteractionUtil { *; }
 -keep class com.android.contacts.util.SyncUtil { *; }
 -keep class com.android.contacts.widget.CompositeListAdapter { *; }
 -keep class com.google.common.base.Function { *; }