Merge "Refactor KeyStore Recovery Manager."