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

Change-Id: I6bbc85c470151521537578980306a2a510aa10b6