am d0af7f90: am 31522ad0: Merge change I931ce71e into eclair

Merge commit 'd0af7f905fc39704c98cfd51961199722e551f9b'

* commit 'd0af7f905fc39704c98cfd51961199722e551f9b':
  Add unit test for the new keystore.