Merge "Fix deleting legacy key blobs"