[automerger skipped] Merge "Defer deleteKey in KeyStorage in Checkpointing mode" am: fc4ad04ffe
am: 288fca9266
-s ours
am:gugelfrei5890c72489
-s ours am skip reason: change_id Ie5fc2d098355e2d095c53e9a95a6a8c7ab7ed051 with SHA18cc5716ef1
is in history Change-Id: I27daa9c7758bec8234a1dc41a5242309fe2e5c08
commit
911454093c