Merge commit 'f4692640a8c40b8bbba1f00841c2f8fbe7b28d7a' * commit 'f4692640a8c40b8bbba1f00841c2f8fbe7b28d7a': Add unit tests for netkeystore.
Merge commit 'f4692640a8c40b8bbba1f00841c2f8fbe7b28d7a' * commit 'f4692640a8c40b8bbba1f00841c2f8fbe7b28d7a': Add unit tests for netkeystore.