Fix for statements on properties in ChangeOpClaim

Bug: 72671
Change-Id: I7aa7d96cae135d08fcbf5f75b4e029928bf56739
Merge "Fix for statements on properties in ChangeOpClaim"