Defer deleteKey in KeyStorage in Checkpointing mode
am: 8cc5716ef1

Change-Id: Iecd54afeec49d27ce0c74d1ee41fa3aefe169c84