Make GetClaimsTest compatible with DataModel 1.0

Change-Id: I81a1ec3c209edfd8d8a4279f624e0d9b89234450
Merge "Make GetClaimsTest compatible with DataModel 1.0"