Merge "KeyStore: Fix key name decoding"