Merge "Add new IKeystoreService methods to KeyStore"