[automerger skipped] Merge "Defer deleteKey in KeyStorage in Checkpointing mode" am: fc4ad04ffe
am:gugelfrei288fca9266
-s ours am skip reason: change_id Ie5fc2d098355e2d095c53e9a95a6a8c7ab7ed051 with SHA18cc5716ef1
is in history Change-Id: I7d9f111a30c196b86f84cdaa3fd1081733be789f
commit
5890c72489