Merge "Adding KeyChain API and IKeyChainService"