am f3c117ca: Merge "Add new IKeystoreService methods to KeyStore"

* commit 'f3c117ca0d116b01174732790be1939282d0a5a0':
  Add new IKeystoreService methods to KeyStore