diff --git a/android/bazel_handler.go b/android/bazel_handler.go
index 210d67a8..221aabc 100644
--- a/android/bazel_handler.go
+++ b/android/bazel_handler.go
@@ -119,7 +119,9 @@
 }
 
 func NewBazelContext(c *config) (BazelContext, error) {
-	if c.Getenv("USE_BAZEL") != "1" {
+	// TODO(cparsons): Assess USE_BAZEL=1 instead once "mixed Soong/Bazel builds"
+	// are production ready.
+	if c.Getenv("USE_BAZEL_ANALYSIS") != "1" {
 		return noopBazelContext{}, nil
 	}