Merge "Import RestoreKeyFetcher"