diff --git a/build/tools/roomservice.py b/build/tools/roomservice.py
index a1b69cda..e7ba8f76 100755
--- a/build/tools/roomservice.py
+++ b/build/tools/roomservice.py
@@ -201,9 +201,10 @@ def add_to_manifest(repositories, fallback_branch = None):
     f.close()
 
 def fetch_dependencies(repo_path, fallback_branch = None):
-    print('Looking for dependencies')
+    print('Looking for dependencies in %s' % repo_path)
     dependencies_path = repo_path + '/cm.dependencies'
     syncable_repos = []
+    verify_repos = []
 
     if os.path.exists(dependencies_path):
         dependencies_file = open(dependencies_path, 'r')
@@ -214,6 +215,9 @@ def fetch_dependencies(repo_path, fallback_branch = None):
             if not is_in_manifest(dependency['target_path']):
                 fetch_list.append(dependency)
                 syncable_repos.append(dependency['target_path'])
+                verify_repos.append(dependency['target_path'])
+            elif re.search("android_device_.*_.*$", dependency['repository']):
+                verify_repos.append(dependency['target_path'])
 
         dependencies_file.close()
 
@@ -227,7 +231,7 @@ def fetch_dependencies(repo_path, fallback_branch = None):
         print('Syncing dependencies')
         os.system('repo sync --force-sync %s' % ' '.join(syncable_repos))
 
-    for deprepo in syncable_repos:
+    for deprepo in verify_repos:
         fetch_dependencies(deprepo)
 
 def has_branch(branches, revision):