diff --git a/Android.mk b/Android.mk
index 8eab88c..b21b98f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -70,8 +70,6 @@ LOCAL_CERTIFICATE := platform
 
 LOCAL_SDK_VERSION := current
 
-LOCAL_COMPATIBILITY_SUITE := device-tests
-
 include $(BUILD_PACKAGE)
 
 include $(call all-makefiles-under, $(LOCAL_PATH))
diff --git a/proguard.flags b/proguard.flags
index ff83f12..44f6ccd 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -21,9 +21,6 @@
 -keepclassmembers class * {
   @com.google.common.annotations.VisibleForTesting *;
 }
--keepclassmembers class * {
-  @com.android.messaging.ui.contact.ContactPickerFragment *;
-}
 
 # Keep methods that have the @VisibleForAnimation annotation
 -keep @interface com.android.messaging.annotation.VisibleForAnimation