Merge "Add remove method to RecoverableKeyStoreLoader."