Merge "Add more methods to RecoverableKeyStoreLoader."