Merge "Fix KeyStoreClientImpl::doesKeyExist to return correct result"