diff --git a/Android.mk b/Android.mk
index 09214ba..5be9f0a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,14 +23,16 @@ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 LOCAL_USE_AAPT2 := true
 
 LOCAL_STATIC_ANDROID_LIBRARIES := \
+    androidx.appcompat_appcompat \
+    androidx.collection_collection \
     androidx.core_core \
+    androidx.fragment_fragment \
     androidx.media_media \
     androidx.legacy_legacy-support-core-utils \
     androidx.legacy_legacy-support-core-ui \
-    androidx.fragment_fragment \
-    androidx.appcompat_appcompat \
     androidx.palette_palette \
     androidx.recyclerview_recyclerview \
+    androidx.viewpager_viewpager \
     androidx.legacy_legacy-support-v13 \
     colorpicker \
     libchips \
diff --git a/proguard-test.flags b/proguard-test.flags
index 353970a..50f69a2 100755
--- a/proguard-test.flags
+++ b/proguard-test.flags
@@ -18,8 +18,6 @@
 -dontobfuscate
 -dontoptimize
 
-
-
 # FLAG(dnotario): Until we rationalize how to handle tests (extensive unit tests will want similar
 # settings to these, but maybe we want to require VisibleForTesting attribute), just expose all
 # non-private methods. This means we cannot run tests on user builds for the moment.
@@ -35,7 +33,7 @@
   !private *;
 }
 
--keep class com.android.messaging.ui.contact.* { *; }
+-keep class com.android.messaging.ui.*.* { *; }
 
 # Keep the classes needed by emma
 -keep class com.vladium.** { *; }
diff --git a/proguard.flags b/proguard.flags
index cb04900..c5bbb42 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -21,7 +21,9 @@
 -keepclassmembers class * {
   @com.google.common.annotations.VisibleForTesting *;
 }
--keep class com.android.messaging.ui.contact.* { *; }
+-keep class com.android.messaging.* { *; }
+-keep class com.android.messaging.*.* { *; }
+-keep class com.android.messaging.*.*.* { *; }
 
 # Keep methods that have the @VisibleForAnimation annotation
 -keep @interface com.android.messaging.annotation.VisibleForAnimation
@@ -39,10 +41,13 @@
 -keep public class * extends androidx.fragment.app.Fragment
 -keep public class com.android.vcard.* { *; }
 
+-keep class androidx.collection.* { *; }
 -keep class androidx.core.* { *; }
 -keep class androidx.core.*.* { *; }
 -keep class androidx.appcompat.* { *; }
 -keep class androidx.appcompat.*.* { *; }
+-keep class androidx.recyclerview.widget.* { *; }
+-keep class androidx.viewpager.widget.* { *; }
 
 # Keep rastermill classes that need to be accessed from native code (JNI)
 -keep class android.support.rastermill.** { *; }
diff --git a/src/com/android/messaging/datamodel/DatabaseHelper.java b/src/com/android/messaging/datamodel/DatabaseHelper.java
index 2025e2c..ed4a287 100644
--- a/src/com/android/messaging/datamodel/DatabaseHelper.java
+++ b/src/com/android/messaging/datamodel/DatabaseHelper.java
@@ -603,7 +603,6 @@ public class DatabaseHelper extends SQLiteOpenHelper {
      */
     @VisibleForTesting
     static DatabaseHelper getNewInstanceForTest(final Context context) {
-        Assert.isEngBuild();
         Assert.isTrue(BugleApplication.isRunningTests());
         return new DatabaseHelper(context);
     }
diff --git a/tests/src/com/android/messaging/ui/contact/ContactPickerFragmentTest.java b/tests/src/com/android/messaging/ui/contact/ContactPickerFragmentTest.java
index 1997a4d..47b65f1 100644
--- a/tests/src/com/android/messaging/ui/contact/ContactPickerFragmentTest.java
+++ b/tests/src/com/android/messaging/ui/contact/ContactPickerFragmentTest.java
@@ -18,6 +18,7 @@ package com.android.messaging.ui.contact;
 
 import android.content.Context;
 import android.database.Cursor;
+import androidx.viewpager.widget.PagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 import android.test.suitebuilder.annotation.LargeTest;
 import android.view.View;
diff --git a/tests/src/com/android/messaging/ui/conversation/ConversationFragmentTest.java b/tests/src/com/android/messaging/ui/conversation/ConversationFragmentTest.java
index 797a2f1..658a1be 100644
--- a/tests/src/com/android/messaging/ui/conversation/ConversationFragmentTest.java
+++ b/tests/src/com/android/messaging/ui/conversation/ConversationFragmentTest.java
@@ -20,6 +20,7 @@ import android.app.Activity;
 import android.app.Fragment;
 import android.database.Cursor;
 import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.Adapter;
 import android.test.suitebuilder.annotation.LargeTest;
 
 import com.android.messaging.FakeFactory;