Do not reuse variable in SetClaim

Change-Id: Ie2c9013d28e4c6e7903889a3e9b103fe57fb47bd
Merge "Do not reuse variable in SetClaim"