Merge "KeyStore: Fix key name decoding"
am: 41bf9b04e4

Change-Id: I991fd10898581acc2ca68b517297c7c34a077d72