Resolve "keymgr 19-old-keys failing on penguin"

Merge request reports