diff --git a/arm_krait/AndroidProducts.mk b/arm_krait/AndroidProducts.mk
index 91934dd..8c0d38f 100644
--- a/arm_krait/AndroidProducts.mk
+++ b/arm_krait/AndroidProducts.mk
@@ -18,4 +18,4 @@
     $(LOCAL_DIR)/arm_krait.mk
 
 COMMON_LUNCH_CHOICES := \
-    arm_krait-eng
+    arm_krait-trunk_staging-eng
diff --git a/arm_v7_v8/AndroidProducts.mk b/arm_v7_v8/AndroidProducts.mk
index 7d6a244..04819ca 100644
--- a/arm_v7_v8/AndroidProducts.mk
+++ b/arm_v7_v8/AndroidProducts.mk
@@ -21,4 +21,4 @@
     $(LOCAL_DIR)/arm_v7_v8.mk
 
 COMMON_LUNCH_CHOICES := \
-    arm_v7_v8-eng
+    arm_v7_v8-trunk_staging-eng
diff --git a/armv8/AndroidProducts.mk b/armv8/AndroidProducts.mk
index a2327e4..410545e 100644
--- a/armv8/AndroidProducts.mk
+++ b/armv8/AndroidProducts.mk
@@ -18,4 +18,4 @@
     $(LOCAL_DIR)/armv8.mk
 
 COMMON_LUNCH_CHOICES := \
-    armv8-eng
+    armv8-trunk_staging-eng
diff --git a/armv8_cortex_a55/AndroidProducts.mk b/armv8_cortex_a55/AndroidProducts.mk
index 7275325..d9b807d 100644
--- a/armv8_cortex_a55/AndroidProducts.mk
+++ b/armv8_cortex_a55/AndroidProducts.mk
@@ -18,4 +18,4 @@
     $(LOCAL_DIR)/armv8_cortex_a55.mk
 
 COMMON_LUNCH_CHOICES := \
-    armv8_cortex_a55-eng
+    armv8_cortex_a55-trunk_staging-eng
diff --git a/armv8_kryo385/AndroidProducts.mk b/armv8_kryo385/AndroidProducts.mk
index 1cfc959..c19d5ed 100644
--- a/armv8_kryo385/AndroidProducts.mk
+++ b/armv8_kryo385/AndroidProducts.mk
@@ -18,4 +18,4 @@
     $(LOCAL_DIR)/armv8_kryo385.mk
 
 COMMON_LUNCH_CHOICES := \
-    armv8_kryo385-eng
+    armv8_kryo385-trunk_staging-eng
diff --git a/riscv64/AndroidProducts.mk b/riscv64/AndroidProducts.mk
index 995ad74..ffaaadb 100644
--- a/riscv64/AndroidProducts.mk
+++ b/riscv64/AndroidProducts.mk
@@ -18,4 +18,4 @@
     $(LOCAL_DIR)/riscv64.mk
 
 COMMON_LUNCH_CHOICES := \
-    riscv64-eng
+    riscv64-trunk_staging-eng
diff --git a/silvermont/AndroidProducts.mk b/silvermont/AndroidProducts.mk
index 9fa0864..f3f53dc 100644
--- a/silvermont/AndroidProducts.mk
+++ b/silvermont/AndroidProducts.mk
@@ -18,4 +18,4 @@
      $(LOCAL_DIR)/silvermont.mk \
 
 COMMON_LUNCH_CHOICES := \
-    silvermont-eng
+    silvermont-trunk_staging-eng