Revert "Remove NewClaim dependancy on Lib"

Follow ups not ready

This reverts commit 22f03ba17e4a5479541099c920c41a47e521ec2b.

Change-Id: I36928168b6e42e5b783a0c6c6150149553012593
Merge "Revert "Remove NewClaim dependancy on Lib""