Merge "Snap for 11566117 from b4a2dd41a30c90b86a1e62ab9285c37e4a0351c5 to sdk-release" into sdk-release
diff --git a/populate-new-device.sh b/populate-new-device.sh
index db5da3d..013e8fe 100755
--- a/populate-new-device.sh
+++ b/populate-new-device.sh
@@ -43,7 +43,7 @@
 
 PRODUCT_MAKEFILES := \$(LOCAL_DIR)/full_$2.mk
 
-COMMON_LUNCH_CHOICES := full_$2-userdebug
+COMMON_LUNCH_CHOICES := full_$2-trunk_staging-userdebug
 EOF
 
 cat > device/$1/$2/full_$2.mk << EOF