Merge "Fix KeyDeletionTest.DeleteAllKeys"