Merge "Fix RecoverableKeyStore unit tests."