diff --git a/tests/robotests/Android.mk b/tests/robotests/Android.mk
index 0a5dd90174c..c59b3471379 100644
--- a/tests/robotests/Android.mk
+++ b/tests/robotests/Android.mk
@@ -8,8 +8,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 # Include the testing libraries (JUnit4 + Robolectric libs).
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    platform-system-robolectric \
-    truth-prebuilt
+    platform-system-robolectric
 
 LOCAL_JAVA_LIBRARIES := \
     junit4-target \
@@ -37,4 +36,4 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
 
 LOCAL_TEST_PACKAGE := Settings
 
-include prebuilts/misc/common/robolectric/run_robotests.mk
+include prebuilts/misc/common/robolectric/run_robotests.mk
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java
index 6a100b7e19e..04f241e8131 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java
@@ -3,24 +3,23 @@ package com.android.settings.datausage;
 import android.net.NetworkPolicy;
 import android.net.NetworkTemplate;
 import com.android.settings.TestConfig;
-import com.android.settingslib.net.DataUsageController.DataUsageInfo;
+import junit.framework.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-import static com.google.common.truth.Truth.assertThat;
+import static com.android.settingslib.net.DataUsageController.*;
+import static junit.framework.Assert.assertTrue;
+import static junit.framework.Assert.fail;
+import static org.junit.Assert.assertEquals;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class DataUsageInfoControllerTest {
     private DataUsageInfoController mInfoController;
-    private DataUsageInfo info;
-    private static final int NEGATIVE = -1;
-    private static final int ZERO = 0;
-    private static final int POSITIVE_SMALL = 1;
-    private static final int POSITIVE_LARGE = 5;
+    private  DataUsageInfo info;
 
     @Before
     public void setUp()  {
@@ -28,53 +27,52 @@ public class DataUsageInfoControllerTest {
         info = new DataUsageInfo();
     }
 
-
     @Test
     public void testLowUsageLowWarning_LimitUsed() {
-        info.warningLevel = POSITIVE_SMALL;
-        info.limitLevel = POSITIVE_LARGE;
-        info.usageLevel = POSITIVE_SMALL;
-        assertThat(mInfoController.getSummaryLimit(info)).isEqualTo(info.limitLevel);
+        info.warningLevel = 5;
+        info.limitLevel = 10;
+        info.usageLevel = 5;
+        assertEquals(mInfoController.getSummaryLimit(info), info.limitLevel);
     }
 
     @Test
     public void testLowUsageEqualWarning_LimitUsed() {
-        info.warningLevel = POSITIVE_LARGE;
-        info.limitLevel = POSITIVE_LARGE;
-        info.usageLevel = POSITIVE_SMALL;
-        assertThat(mInfoController.getSummaryLimit(info)).isEqualTo(info.limitLevel);
+        info.warningLevel = 10;
+        info.limitLevel = 10;
+        info.usageLevel = 5;
+        assertEquals(mInfoController.getSummaryLimit(info), info.limitLevel);
     }
 
     @Test
     public void testNoLimitNoUsage_WarningUsed() {
-        info.warningLevel = POSITIVE_LARGE;
-        info.limitLevel = ZERO;
-        info.usageLevel = ZERO;
-        assertThat(mInfoController.getSummaryLimit(info)).isEqualTo(info.warningLevel);
+        info.warningLevel = 10;
+        info.limitLevel = 0;
+        info.usageLevel = 0;
+        assertEquals(mInfoController.getSummaryLimit(info), info.warningLevel);
     }
 
     @Test
     public void testNoLimitLowUsage_WarningUsed() {
-        info.warningLevel = POSITIVE_LARGE;
-        info.limitLevel = ZERO;
-        info.usageLevel = POSITIVE_SMALL;
-        assertThat(mInfoController.getSummaryLimit(info)).isEqualTo(info.warningLevel);
+        info.warningLevel = 10;
+        info.limitLevel = 0;
+        info.usageLevel = 5;
+        assertEquals(mInfoController.getSummaryLimit(info), info.warningLevel);
     }
 
     @Test
     public void testLowWarningNoLimit_UsageUsed() {
-        info.warningLevel = POSITIVE_SMALL;
-        info.limitLevel = ZERO;
-        info.usageLevel = POSITIVE_LARGE;
-        assertThat(mInfoController.getSummaryLimit(info)).isEqualTo(info.usageLevel);
+        info.warningLevel = 5;
+        info.limitLevel = 0;
+        info.usageLevel = 10;
+        assertEquals(mInfoController.getSummaryLimit(info), info.usageLevel);
     }
 
     @Test
     public void testLowWarningLowLimit_UsageUsed() {
-        info.warningLevel = POSITIVE_SMALL;
-        info.limitLevel = POSITIVE_SMALL;
-        info.usageLevel = POSITIVE_LARGE;
-        assertThat(mInfoController.getSummaryLimit(info)).isEqualTo(info.usageLevel);
+        info.warningLevel = 5;
+        info.limitLevel = 5;
+        info.usageLevel = 10;
+        assertEquals(mInfoController.getSummaryLimit(info), info.usageLevel);
     }
 
     private NetworkPolicy getDefaultNetworkPolicy() {
@@ -89,56 +87,60 @@ public class DataUsageInfoControllerTest {
 
     @Test
     public void testNullArguments_NoError() {
-        mInfoController.updateDataLimit(null, null);
-        mInfoController.updateDataLimit(info, null);
-        mInfoController.updateDataLimit(null, getDefaultNetworkPolicy());
+        try {
+            mInfoController.updateDataLimit(null, null);
+            mInfoController.updateDataLimit(info, null);
+            mInfoController.updateDataLimit(null, getDefaultNetworkPolicy());
+        } catch (Exception e) {
+            fail("Update Data Limit should drop calls with null arguments");
+        }
     }
 
     @Test
     public void testNegativeWarning_UpdatedToZero() {
         NetworkPolicy policy = getDefaultNetworkPolicy();
-        policy.warningBytes = NEGATIVE;
+        policy.warningBytes = -5;
         mInfoController.updateDataLimit(info, policy);
-        assertThat(info.warningLevel).isEqualTo(ZERO);
+        Assert.assertEquals(0, info.warningLevel);
     }
 
     @Test
     public void testWarningZero_UpdatedToZero() {
         NetworkPolicy policy = getDefaultNetworkPolicy();
-        policy.warningBytes = ZERO;
+        policy.warningBytes = 0;
         mInfoController.updateDataLimit(info, policy);
-        assertThat(info.warningLevel).isEqualTo(ZERO);
+        Assert.assertEquals(0, info.warningLevel);
     }
 
     @Test
     public void testWarningPositive_UpdatedToWarning() {
         NetworkPolicy policy = getDefaultNetworkPolicy();
-        policy.warningBytes = POSITIVE_SMALL;
+        policy.warningBytes = 5;
         mInfoController.updateDataLimit(info, policy);
-        assertThat(info.warningLevel).isEqualTo(policy.warningBytes);
+        Assert.assertEquals(policy.warningBytes, info.warningLevel);
     }
 
     @Test
     public void testLimitNegative_UpdatedToZero() {
         NetworkPolicy policy = getDefaultNetworkPolicy();
-        policy.limitBytes = NEGATIVE;
+        policy.limitBytes = -5;
         mInfoController.updateDataLimit(info, policy);
-        assertThat(info.limitLevel).isEqualTo(ZERO);
+        Assert.assertEquals(0, info.limitLevel);
     }
 
     @Test
     public void testLimitZero_UpdatedToZero() {
         NetworkPolicy policy = getDefaultNetworkPolicy();
-        policy.limitBytes = ZERO;
+        policy.limitBytes = 0;
         mInfoController.updateDataLimit(info, policy);
-        assertThat(info.limitLevel).isEqualTo(ZERO);
+        Assert.assertEquals(0, info.limitLevel);
     }
 
     @Test
     public void testLimitPositive_UpdatedToLimit() {
         NetworkPolicy policy = getDefaultNetworkPolicy();
-        policy.limitBytes = POSITIVE_SMALL;
+        policy.limitBytes = 5;
         mInfoController.updateDataLimit(info, policy);
-        assertThat(info.limitLevel).isEqualTo(policy.limitBytes);
+        Assert.assertEquals(policy.limitBytes, info.limitLevel);
     }
 }