Switch use of entity->newClaim

REQUIRES: I3aca0ab2f5a3e50 in DataModel

Change-Id: Ibd4a56196af8068bd4f5790f6167b326d2686983
Merge "Switch use of entity->newClaim"