Improve idempotency across multiple runs

Change-Id: Ibf84d9347974ef6978b0d9c241f271945b2f331e
3 files changed