Merge "Unhide RecoverableKeyStoreLoader API."