Merge "Throw on attempt to unwrap a WrappedKey with old PlatformKey"