diff --git a/plugins/android/jps-plugin/android-jps-plugin.iml b/plugins/android/jps-plugin/android-jps-plugin.iml
index 0f00a0b60824..a4d0b0482d49 100644
--- a/plugins/android/jps-plugin/android-jps-plugin.iml
+++ b/plugins/android/jps-plugin/android-jps-plugin.iml
@@ -14,6 +14,7 @@
     <orderEntry type="library" name="NanoXML" level="project" />
     <orderEntry type="module" module-name="jps-model-api" />
     <orderEntry type="module" module-name="jps-model-serialization" />
+    <orderEntry type="module" module-name="jps-model-impl" />
   </component>
 </module>
 
diff --git a/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidJpsUtil.java b/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidJpsUtil.java
index dad9955674e3..47f3e080d314 100644
--- a/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidJpsUtil.java
+++ b/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidJpsUtil.java
@@ -36,6 +36,7 @@ import org.jetbrains.jps.model.JpsSimpleElement;
 import org.jetbrains.jps.model.java.JavaSourceRootType;
 import org.jetbrains.jps.model.java.JpsJavaClasspathKind;
 import org.jetbrains.jps.model.java.JpsJavaExtensionService;
+import org.jetbrains.jps.model.java.impl.JpsJavaDependenciesEnumerationHandler;
 import org.jetbrains.jps.model.library.JpsLibrary;
 import org.jetbrains.jps.model.library.JpsLibraryRoot;
 import org.jetbrains.jps.model.library.JpsOrderRootType;
@@ -74,8 +75,9 @@ public class AndroidJpsUtil {
   }
 
   private static boolean shouldProcessDependenciesRecursively(JpsModule module) {
-    // todo: return false for mavenized modules
-    return true;
+    return JpsJavaDependenciesEnumerationHandler.shouldProcessDependenciesRecursively(
+      JpsJavaDependenciesEnumerationHandler.createHandlers(
+        Collections.singletonList(module)));
   }
 
   @Nullable