diff --git a/recipe_modules/android_virtual_device/api.py b/recipe_modules/android_virtual_device/api.py
index 215912d..0296ca5 100644
--- a/recipe_modules/android_virtual_device/api.py
+++ b/recipe_modules/android_virtual_device/api.py
@@ -35,8 +35,7 @@
     self._initialized = True
 
   @contextmanager
-  def __call__(self, env, env_prefixes, version="31"):
-    version = version or self.m.properties.get('avd_version')
+  def __call__(self, env, env_prefixes, version='31'):
     self._initialize(env, env_prefixes)
     try:
       self.emulator_pid = self.start(env, env_prefixes, version)
@@ -77,7 +76,7 @@
     env['AVD_ROOT'] = self.avd_root
     env['ADB_PATH'] = self.adb_path
 
-  def start(self, env, env_prefixes, version=None):
+  def start(self, env, env_prefixes, version):
     """Starts an android avd emulator.
 
     Args:
@@ -85,7 +84,7 @@
       env_prefixes(dict):  Current environment prefixes variables.
       version(string): The android API version of the emulator as a string.
     """
-    self.version = version or '31'
+    self.version = version
     self.emulator_pid = ''
     with self.m.step.nest('start avd'):
       with self.m.context(env=env, env_prefixes=env_prefixes,
diff --git a/recipes/flutter/android_views.expected/flutter_drive_clean_exit.json b/recipes/flutter/android_views.expected/flutter_drive_clean_exit.json
index 2e92e86..3ec383d 100644
--- a/recipes/flutter/android_views.expected/flutter_drive_clean_exit.json
+++ b/recipes/flutter/android_views.expected/flutter_drive_clean_exit.json
@@ -235,6 +235,7 @@
       "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
       "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "EMULATOR_VERSION": "31",
       "GIT_BRANCH": "",
       "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
       "GRADLE_USER_HOME": "[CACHE]/gradle",
@@ -244,7 +245,8 @@
       "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk",
+      "USE_EMULATOR": "True"
     },
     "env_prefixes": {
       "PATH": [
@@ -300,6 +302,7 @@
       "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
       "AVD_ROOT": "[CACHE]/avd",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "EMULATOR_VERSION": "31",
       "GIT_BRANCH": "",
       "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
       "GRADLE_USER_HOME": "[CACHE]/gradle",
@@ -309,7 +312,8 @@
       "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk",
+      "USE_EMULATOR": "True"
     },
     "env_prefixes": {
       "PATH": [
@@ -357,6 +361,7 @@
       "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
       "AVD_ROOT": "[CACHE]/avd",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "EMULATOR_VERSION": "31",
       "GIT_BRANCH": "",
       "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
       "GRADLE_USER_HOME": "[CACHE]/gradle",
@@ -366,7 +371,8 @@
       "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk",
+      "USE_EMULATOR": "True"
     },
     "env_prefixes": {
       "PATH": [
@@ -413,6 +419,7 @@
       "AVD_ROOT": "[CACHE]/avd",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "EMULATOR_PID": "17687",
+      "EMULATOR_VERSION": "31",
       "GIT_BRANCH": "",
       "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
       "GRADLE_USER_HOME": "[CACHE]/gradle",
@@ -422,7 +429,8 @@
       "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk",
+      "USE_EMULATOR": "True"
     },
     "env_prefixes": {
       "PATH": [
@@ -455,6 +463,7 @@
       "AVD_ROOT": "[CACHE]/avd",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "EMULATOR_PID": "17687",
+      "EMULATOR_VERSION": "31",
       "GIT_BRANCH": "",
       "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
       "GRADLE_USER_HOME": "[CACHE]/gradle",
@@ -464,7 +473,8 @@
       "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk",
+      "USE_EMULATOR": "True"
     },
     "env_prefixes": {
       "PATH": [
@@ -507,6 +517,7 @@
       "AVD_ROOT": "[CACHE]/avd",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "EMULATOR_PID": "17687",
+      "EMULATOR_VERSION": "31",
       "GIT_BRANCH": "",
       "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
       "GRADLE_USER_HOME": "[CACHE]/gradle",
@@ -516,7 +527,8 @@
       "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk",
+      "USE_EMULATOR": "True"
     },
     "env_prefixes": {
       "PATH": [
@@ -548,6 +560,7 @@
       "AVD_ROOT": "[CACHE]/avd",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "EMULATOR_PID": "17687",
+      "EMULATOR_VERSION": "31",
       "GIT_BRANCH": "",
       "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
       "GRADLE_USER_HOME": "[CACHE]/gradle",
@@ -557,7 +570,8 @@
       "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk",
+      "USE_EMULATOR": "True"
     },
     "env_prefixes": {
       "PATH": [
@@ -591,6 +605,7 @@
       "AVD_ROOT": "[CACHE]/avd",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "EMULATOR_PID": "17687",
+      "EMULATOR_VERSION": "31",
       "GIT_BRANCH": "",
       "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
       "GRADLE_USER_HOME": "[CACHE]/gradle",
@@ -600,7 +615,8 @@
       "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk",
+      "USE_EMULATOR": "True"
     },
     "env_prefixes": {
       "PATH": [
@@ -633,6 +649,7 @@
       "AVD_ROOT": "[CACHE]/avd",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "EMULATOR_PID": "17687",
+      "EMULATOR_VERSION": "31",
       "GIT_BRANCH": "",
       "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
       "GRADLE_USER_HOME": "[CACHE]/gradle",
@@ -642,7 +659,8 @@
       "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk",
+      "USE_EMULATOR": "True"
     },
     "env_prefixes": {
       "PATH": [
@@ -677,6 +695,7 @@
       "AVD_ROOT": "[CACHE]/avd",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "EMULATOR_PID": "17687",
+      "EMULATOR_VERSION": "31",
       "GIT_BRANCH": "",
       "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
       "GRADLE_USER_HOME": "[CACHE]/gradle",
@@ -686,7 +705,8 @@
       "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk",
+      "USE_EMULATOR": "True"
     },
     "env_prefixes": {
       "PATH": [
@@ -721,6 +741,7 @@
       "AVD_ROOT": "[CACHE]/avd",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "EMULATOR_PID": "17687",
+      "EMULATOR_VERSION": "31",
       "GIT_BRANCH": "",
       "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
       "GRADLE_USER_HOME": "[CACHE]/gradle",
@@ -730,7 +751,8 @@
       "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk",
+      "USE_EMULATOR": "True"
     },
     "env_prefixes": {
       "PATH": [
@@ -769,6 +791,7 @@
       "AVD_ROOT": "[CACHE]/avd",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "EMULATOR_PID": "17687",
+      "EMULATOR_VERSION": "31",
       "GIT_BRANCH": "",
       "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
       "GRADLE_USER_HOME": "[CACHE]/gradle",
@@ -778,7 +801,8 @@
       "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk",
+      "USE_EMULATOR": "True"
     },
     "env_prefixes": {
       "PATH": [
diff --git a/recipes/flutter/android_views.expected/flutter_drive_zombie_process.json b/recipes/flutter/android_views.expected/flutter_drive_zombie_process.json
index e526c2c..5e02398 100644
--- a/recipes/flutter/android_views.expected/flutter_drive_zombie_process.json
+++ b/recipes/flutter/android_views.expected/flutter_drive_zombie_process.json
@@ -235,6 +235,7 @@
       "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
       "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "EMULATOR_VERSION": "31",
       "GIT_BRANCH": "",
       "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
       "GRADLE_USER_HOME": "[CACHE]/gradle",
@@ -244,7 +245,8 @@
       "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk",
+      "USE_EMULATOR": "True"
     },
     "env_prefixes": {
       "PATH": [
@@ -300,6 +302,7 @@
       "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
       "AVD_ROOT": "[CACHE]/avd",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "EMULATOR_VERSION": "31",
       "GIT_BRANCH": "",
       "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
       "GRADLE_USER_HOME": "[CACHE]/gradle",
@@ -309,7 +312,8 @@
       "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk",
+      "USE_EMULATOR": "True"
     },
     "env_prefixes": {
       "PATH": [
@@ -357,6 +361,7 @@
       "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
       "AVD_ROOT": "[CACHE]/avd",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "EMULATOR_VERSION": "31",
       "GIT_BRANCH": "",
       "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
       "GRADLE_USER_HOME": "[CACHE]/gradle",
@@ -366,7 +371,8 @@
       "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk",
+      "USE_EMULATOR": "True"
     },
     "env_prefixes": {
       "PATH": [
@@ -413,6 +419,7 @@
       "AVD_ROOT": "[CACHE]/avd",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "EMULATOR_PID": "17687",
+      "EMULATOR_VERSION": "31",
       "GIT_BRANCH": "",
       "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
       "GRADLE_USER_HOME": "[CACHE]/gradle",
@@ -422,7 +429,8 @@
       "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk",
+      "USE_EMULATOR": "True"
     },
     "env_prefixes": {
       "PATH": [
@@ -455,6 +463,7 @@
       "AVD_ROOT": "[CACHE]/avd",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "EMULATOR_PID": "17687",
+      "EMULATOR_VERSION": "31",
       "GIT_BRANCH": "",
       "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
       "GRADLE_USER_HOME": "[CACHE]/gradle",
@@ -464,7 +473,8 @@
       "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk",
+      "USE_EMULATOR": "True"
     },
     "env_prefixes": {
       "PATH": [
@@ -507,6 +517,7 @@
       "AVD_ROOT": "[CACHE]/avd",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "EMULATOR_PID": "17687",
+      "EMULATOR_VERSION": "31",
       "GIT_BRANCH": "",
       "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
       "GRADLE_USER_HOME": "[CACHE]/gradle",
@@ -516,7 +527,8 @@
       "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk",
+      "USE_EMULATOR": "True"
     },
     "env_prefixes": {
       "PATH": [
@@ -548,6 +560,7 @@
       "AVD_ROOT": "[CACHE]/avd",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "EMULATOR_PID": "17687",
+      "EMULATOR_VERSION": "31",
       "GIT_BRANCH": "",
       "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
       "GRADLE_USER_HOME": "[CACHE]/gradle",
@@ -557,7 +570,8 @@
       "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk",
+      "USE_EMULATOR": "True"
     },
     "env_prefixes": {
       "PATH": [
@@ -591,6 +605,7 @@
       "AVD_ROOT": "[CACHE]/avd",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "EMULATOR_PID": "17687",
+      "EMULATOR_VERSION": "31",
       "GIT_BRANCH": "",
       "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
       "GRADLE_USER_HOME": "[CACHE]/gradle",
@@ -600,7 +615,8 @@
       "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk",
+      "USE_EMULATOR": "True"
     },
     "env_prefixes": {
       "PATH": [
@@ -633,6 +649,7 @@
       "AVD_ROOT": "[CACHE]/avd",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "EMULATOR_PID": "17687",
+      "EMULATOR_VERSION": "31",
       "GIT_BRANCH": "",
       "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
       "GRADLE_USER_HOME": "[CACHE]/gradle",
@@ -642,7 +659,8 @@
       "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk",
+      "USE_EMULATOR": "True"
     },
     "env_prefixes": {
       "PATH": [
@@ -677,6 +695,7 @@
       "AVD_ROOT": "[CACHE]/avd",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "EMULATOR_PID": "17687",
+      "EMULATOR_VERSION": "31",
       "GIT_BRANCH": "",
       "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
       "GRADLE_USER_HOME": "[CACHE]/gradle",
@@ -686,7 +705,8 @@
       "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk",
+      "USE_EMULATOR": "True"
     },
     "env_prefixes": {
       "PATH": [
@@ -721,6 +741,7 @@
       "AVD_ROOT": "[CACHE]/avd",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "EMULATOR_PID": "17687",
+      "EMULATOR_VERSION": "31",
       "GIT_BRANCH": "",
       "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
       "GRADLE_USER_HOME": "[CACHE]/gradle",
@@ -730,7 +751,8 @@
       "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk",
+      "USE_EMULATOR": "True"
     },
     "env_prefixes": {
       "PATH": [
@@ -769,6 +791,7 @@
       "AVD_ROOT": "[CACHE]/avd",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "EMULATOR_PID": "17687",
+      "EMULATOR_VERSION": "31",
       "GIT_BRANCH": "",
       "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
       "GRADLE_USER_HOME": "[CACHE]/gradle",
@@ -778,7 +801,8 @@
       "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk",
+      "USE_EMULATOR": "True"
     },
     "env_prefixes": {
       "PATH": [
diff --git a/recipes/flutter/android_views.py b/recipes/flutter/android_views.py
index da477a7..f396b6f 100644
--- a/recipes/flutter/android_views.py
+++ b/recipes/flutter/android_views.py
@@ -50,7 +50,14 @@
       env, env_prefixes, api.properties.get('dependencies', [])
   )
 
-  with api.android_virtual_device(env=env, env_prefixes=env_prefixes):
+  deps = api.properties.get('dependencies', [])
+  dep_list = {d['dependency']: d.get('version') for d in deps}
+  # If the emulator dependency is present then we assume it is wanted for testing.
+  if 'android_virtual_device' in dep_list.keys():
+    env['USE_EMULATOR'] = True
+    env['EMULATOR_VERSION'] = dep_list.get('android_virtual_device')
+
+  with api.android_virtual_device(env=env, env_prefixes=env_prefixes, version=env['EMULATOR_VERSION']):
     with api.context(env=env, env_prefixes=env_prefixes, cwd=checkout_path):
       views_test_dir = checkout_path.join(
         'dev', 'integration_tests', 'android_views'