Remove usage of LibRegistry in ClaimSaver

Change-Id: I7bf2df144c2c44c69fa587a65bb87fbfad328b97
Merge "Remove usage of LibRegistry in ClaimSaver"