Merge "On-device signing: Use correct deleteKey() instance."