Merge "Fix KeyStoreClientImpl::doesKeyExist to return correct result" am: 8ba1cb3268 am: 7017d49cb9
am: 1d7a2e7e58

Change-Id: I7e12b243ceb7d50ff0be0b6b4b7708e3c82e6b5c