Make re-runs of the script possible without -c

Change-Id: I9180324818398da17164b5dda43584e0d9bc6954
(cherry picked from commit 2ea8dda65d2af90bfffafaaa1971936db2c4c404)
1 file changed