Merge changes I99aeeefe,If0f67661

* changes:
  Clean up rkpd client in keystore2
  Fix hanging unit test