diff --git a/android-sdk/build.gradle b/android-sdk/build.gradle
index 4a3def597..a9d16f4f6 100644
--- a/android-sdk/build.gradle
+++ b/android-sdk/build.gradle
@@ -50,6 +50,10 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
     }
+
+    dexOptions {
+        javaMaxHeapSize "4g"
+    }
 }
 
 dependencies {
diff --git a/android-sdk/src/main/java/com/optimizely/ab/android/sdk/OptimizelyClient.java b/android-sdk/src/main/java/com/optimizely/ab/android/sdk/OptimizelyClient.java
index fe9dd87f2..a028b0f04 100644
--- a/android-sdk/src/main/java/com/optimizely/ab/android/sdk/OptimizelyClient.java
+++ b/android-sdk/src/main/java/com/optimizely/ab/android/sdk/OptimizelyClient.java
@@ -184,7 +184,7 @@ public void track(@NonNull String eventName,
 
     /**
      * Track an event for a user with attributes and a value
-     * @see Optimizely#track(String, String, Map, Long)
+     * @see Optimizely#track(String, String, Map, long)
      * @deprecated see {@link Optimizely#track(String, String, Map, Map)} and pass in revenue values as event tags instead.
      * @param eventName the String name of the event
      * @param userId the String user id
diff --git a/android-sdk/src/main/java/com/optimizely/ab/android/sdk/OptimizelyClientEngine.java b/android-sdk/src/main/java/com/optimizely/ab/android/sdk/OptimizelyClientEngine.java
index 21a2962e1..49f8745a1 100644
--- a/android-sdk/src/main/java/com/optimizely/ab/android/sdk/OptimizelyClientEngine.java
+++ b/android-sdk/src/main/java/com/optimizely/ab/android/sdk/OptimizelyClientEngine.java
@@ -20,7 +20,6 @@
 import android.content.Context;
 import android.content.res.Configuration;
 import android.support.annotation.NonNull;
-import android.support.annotation.VisibleForTesting;
 
 import com.optimizely.ab.event.internal.payload.Event;
 
@@ -35,7 +34,6 @@ public class OptimizelyClientEngine {
      * @param context any valid Android {@link Context}
      * @return String value of client engine
      */
-    @VisibleForTesting
     public static Event.ClientEngine getClientEngineFromContext(@NonNull Context context) {
         UiModeManager uiModeManager = (UiModeManager) context.getSystemService(Context.UI_MODE_SERVICE);