Fix handling of repeated executions.

Bug:21762834
Change-Id: I2fc198b63ef7c30a5d6c601e506b36a7f1d4b3b3
6 files changed