Merge "KeyStore: Fix key name decoding" am: 41bf9b04e4 am: fd9c8781e8
am: 17c18c2e45

Change-Id: Idbd30b4b8dd273c93df7a91fd42338da36882a8c