Improve idempotency across multiple runs

Change-Id: Ibf84d9347974ef6978b0d9c241f271945b2f331e
(cherry picked from commit 310abc1ea9c90853e8f003301a6e0ff80a0966b3)
3 files changed