Merge "Get rid of manually created IKeystoreService."