Fix claim weirdness

Bug: 55514

Change-Id: I8b961c297fb8de918ec7770bcec2ae59266d783b