Avoid hardcoded property IDs in SetClaimTest

Change-Id: I14d337fb817508ece6ee237ea9e5f45810e6bd5d
Merge "Avoid hardcoded property IDs in SetClaimTest"