Defer deleteKey in KeyStorage in Checkpointing mode am: 8cc5716ef1 am: cfc8afa3c4
am: 87d1282e5e

Change-Id: I9f37a64bfc5205197f4b52e6ee28d98f74c9a398