am c93442ee: am 93363482: Evict the key before we delete it.

* commit 'c93442eea4b74858b0b45c69f0642d05bce7e8e8':
  Evict the key before we delete it.