diff --git a/dev/bots/deploy_gallery.sh b/dev/bots/deploy_gallery.sh
index c4ebeb7..6c957f8 100755
--- a/dev/bots/deploy_gallery.sh
+++ b/dev/bots/deploy_gallery.sh
@@ -34,7 +34,7 @@
     fi
     set -x
 
-    # ANDROID_HOME must be set in the env.
+    # ANDROID_SDK_ROOT must be set in the env.
     (
       cd examples/flutter_gallery
       flutter build apk --release -t lib/main_publish.dart
diff --git a/dev/bots/test.dart b/dev/bots/test.dart
index 289b5de..41dd11e 100644
--- a/dev/bots/test.dart
+++ b/dev/bots/test.dart
@@ -184,7 +184,9 @@
 
 Future<void> _flutterBuildApk(String relativePathToApplication) async {
   // TODO(dnfield): See if we can get Android SDK on all Cirrus platforms.
-  if (Platform.environment['ANDROID_HOME']?.isEmpty ?? true) {
+  if (
+        (Platform.environment['ANDROID_HOME']?.isEmpty ?? true) &&
+        (Platform.environment['ANDROID_SDK_ROOT']?.isEmpty ?? true)) {
     return;
   }
   print('Running APK build tests...');