diff --git a/proguard.flags b/proguard.flags
index b7b9f18..80ffe0a 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -73,6 +73,7 @@
 -keep class com.android.contacts.common.util.DeviceLocalAccountTypeFactory { *; }
 -keep class com.android.contacts.common.util.DeviceLocalAccountTypeFactory$* { *; }
 -keep class com.android.contacts.common.util.NameConverter { *; }
+-keep class com.android.contacts.common.util.PermissionsUtil { *; }
 -keep class com.android.contacts.common.util.SearchUtil { *; }
 -keep class com.android.contacts.common.util.SearchUtil$* { *; }
 -keep class com.android.contacts.ContactsApplication { *; }
diff --git a/tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java b/tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java
index a196ffa..8364b7b 100644
--- a/tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java
+++ b/tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java
@@ -3,6 +3,7 @@
 import android.Manifest;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.MediumTest;
 import android.support.test.runner.AndroidJUnit4;
@@ -75,6 +76,12 @@
 
         device.wait(Until.hasObject(By.textEndsWith("make and manage phone calls?")), TIMEOUT);
 
+        final PackageManager packageManager = mTargetContext.getPackageManager();
+        if (!packageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
+            device.waitForIdle();
+            return;
+        }
+
         final UiObject2 grantPhonePermissionButton = device.findObject(By.text("ALLOW"));
 
         grantPhonePermissionButton.clickAndWait(Until.newWindow(), TIMEOUT);