Don\'t fail if a key we want to delete is already deleted
am: ab0b56aef3

Change-Id: I08920a3e330443e7466f0acc924cd21dbebba4c4