Merge "Big RecoverableKeyStoreLoader refactoring."