Bug 454741 - Gather auto-save failure stats

Better use of deferred to reset state

Change-Id: If30468d730193a652c19d9d4012583f6e5dc14e0