Fix claim weirdness
(cherry picked from commit 46948189c275acd63429f6e42e26d3bc551e9ee4)

Bug: 55514
Change-Id: I8b961c297fb8de918ec7770bcec2ae59266d783b