Merge change 24673 into eclair

* changes:
  Add tests and misc fixes on keystore.