diff --git a/clear-factory-images-variables.sh b/clear-factory-images-variables.sh
new file mode 100644
index 0000000..5528938
--- /dev/null
+++ b/clear-factory-images-variables.sh
@@ -0,0 +1,23 @@
+# Copyright 2012 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+unset BOOTLOADER
+unset BOOTLOADERSRC
+unset BUILD
+unset CDMARADIO
+unset PRODUCT
+unset RADIO
+unset RADIOSRC
+unset SRCPREFIX
+unset VERSION
diff --git a/generate-factory-images-common.sh b/generate-factory-images-common.sh
index 95441a6..ef58ae4 100644
--- a/generate-factory-images-common.sh
+++ b/generate-factory-images-common.sh
@@ -22,18 +22,29 @@
 fi
 rm -rf tmp
 mkdir -p tmp/$PRODUCT-$VERSION
-unzip -d tmp signed-$PRODUCT-target_files-$BUILD.zip RADIO/$RADIOSRC RADIO/$BOOTLOADERSRC
+unzip -d tmp ${SRCPREFIX}$PRODUCT-target_files-$BUILD.zip RADIO/$BOOTLOADERSRC
+if test "$RADIO" != ""
+then
+  unzip -d tmp ${SRCPREFIX}$PRODUCT-target_files-$BUILD.zip RADIO/$RADIOSRC
+fi
 if test "$CDMARADIO" != ""
 then
-  unzip -d tmp signed-$PRODUCT-target_files-$BUILD.zip RADIO/radio-cdma.img
+  unzip -d tmp ${SRCPREFIX}$PRODUCT-target_files-$BUILD.zip RADIO/radio-cdma.img
 fi
-cp signed-$PRODUCT-img-$BUILD.zip tmp/$PRODUCT-$VERSION/image-$PRODUCT-$VERSION.zip
+cp ${SRCPREFIX}$PRODUCT-img-$BUILD.zip tmp/$PRODUCT-$VERSION/image-$PRODUCT-$VERSION.zip
 cp tmp/RADIO/$BOOTLOADERSRC tmp/$PRODUCT-$VERSION/bootloader-$DEVICE-$BOOTLOADER.img
-cp tmp/RADIO/$RADIOSRC tmp/$PRODUCT-$VERSION/radio-$DEVICE-$RADIO.img
+if test "$RADIO" != ""
+then
+  cp tmp/RADIO/$RADIOSRC tmp/$PRODUCT-$VERSION/radio-$DEVICE-$RADIO.img
+fi
 if test "$CDMARADIO" != ""
 then
   cp tmp/RADIO/radio-cdma.img tmp/$PRODUCT-$VERSION/radio-cdma-$DEVICE-$CDMARADIO.img
 fi
+if test "$SLEEPDURATION" = ""
+then
+  SLEEPDURATION=5
+fi
 cat > tmp/$PRODUCT-$VERSION/flash-all.sh << EOF
 #!/bin/sh
 
@@ -53,17 +64,22 @@
 
 fastboot flash bootloader bootloader-$DEVICE-$BOOTLOADER.img
 fastboot reboot-bootloader
-sleep 5
+sleep $SLEEPDURATION
+EOF
+if test "$RADIO" != ""
+then
+cat >> tmp/$PRODUCT-$VERSION/flash-all.sh << EOF
 fastboot flash radio radio-$DEVICE-$RADIO.img
 fastboot reboot-bootloader
-sleep 5
+sleep $SLEEPDURATION
 EOF
+fi
 if test "$CDMARADIO" != ""
 then
 cat >> tmp/$PRODUCT-$VERSION/flash-all.sh << EOF
 fastboot flash radio-cdma radio-cdma-$DEVICE-$CDMARADIO.img
 fastboot reboot-bootloader
-sleep 5
+sleep $SLEEPDURATION
 EOF
 fi
 cat >> tmp/$PRODUCT-$VERSION/flash-all.sh << EOF
@@ -89,17 +105,22 @@
 
 fastboot flash bootloader bootloader-$DEVICE-$BOOTLOADER.img
 fastboot reboot-bootloader
-sleep 5
+sleep $SLEEPDURATION
+EOF
+if test "$RADIO" != ""
+then
+cat >> tmp/$PRODUCT-$VERSION/flash-base.sh << EOF
 fastboot flash radio radio-$DEVICE-$RADIO.img
 fastboot reboot-bootloader
-sleep 5
+sleep $SLEEPDURATION
 EOF
+fi
 if test "$CDMARADIO" != ""
 then
 cat >> tmp/$PRODUCT-$VERSION/flash-base.sh << EOF
 fastboot flash radio-cdma radio-cdma-$DEVICE-$CDMARADIO.img
 fastboot reboot-bootloader
-sleep 5
+sleep $SLEEPDURATION
 EOF
 fi
 chmod a+x tmp/$PRODUCT-$VERSION/flash-base.sh