Claims need to have their GUID set

Change-Id: If3e65cd9acf15fbc6381ab3227d0385f5b633c99