diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
index 9efbf23b46d..2dbc6608908 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
@@ -619,26 +619,11 @@ int getContentPaddingBottom() {
     // Zoom
     //
 
-    /**
-     * Returns the current zoom level of the map view.
-     *
-     * @return The current zoom.
-     */
-    @UiThread
-    @FloatRange(from = MapboxConstants.MINIMUM_ZOOM, to = MapboxConstants.MAXIMUM_ZOOM)
-    public double getZoom() {
+    double getZoom() {
         return mNativeMapView.getZoom();
     }
 
-    /**
-     * <p>
-     * Sets the minimum zoom level the map can be displayed at.
-     * </p>
-     *
-     * @param minZoom The new minimum zoom level.
-     */
-    @UiThread
-    public void setMinZoom(@FloatRange(from = MapboxConstants.MINIMUM_ZOOM, to = MapboxConstants.MAXIMUM_ZOOM) double minZoom) {
+    void setMinZoom(@FloatRange(from = MapboxConstants.MINIMUM_ZOOM, to = MapboxConstants.MAXIMUM_ZOOM) double minZoom) {
         mNativeMapView.setMinZoom(minZoom);
     }
 
@@ -654,19 +639,7 @@ void setMaxZoom(@FloatRange(from = MapboxConstants.MINIMUM_ZOOM, to = MapboxCons
         return mNativeMapView.getMaxZoom();
     }
 
-    /**
-     * <p>
-     * Sets whether the zoom controls are enabled.
-     * If enabled, the zoom controls are a pair of buttons
-     * (one for zooming in, one for zooming out) that appear on the screen.
-     * When pressed, they cause the camera to zoom in (or out) by one zoom level.
-     * If disabled, the zoom controls are not shown.
-     * </p>
-     * By default the zoom controls are enabled if the device is only single touch capable;
-     *
-     * @param enabled If true, the zoom controls are enabled.
-     */
-    public void setZoomControlsEnabled(boolean enabled) {
+    void setZoomControlsEnabled(boolean enabled) {
         mZoomButtonsController.setVisible(enabled);
     }
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
index 9530096131f..6c9806f79bf 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
@@ -1,6 +1,7 @@
 package com.mapbox.mapboxsdk.maps;
 
 import android.content.Context;
+
 import android.location.Location;
 import android.os.Bundle;
 import android.os.SystemClock;
diff --git a/platform/ios/test/KIF b/platform/ios/test/KIF
index 0e56388a71b..21a137bc806 160000
--- a/platform/ios/test/KIF
+++ b/platform/ios/test/KIF
@@ -1 +1 @@
-Subproject commit 0e56388a71b0fce94e0df58fa33f81287fa27a72
+Subproject commit 21a137bc8068f9fb738f835c6e285d44fe2ce4dd