Use ClaimGuidParser instead of deprecated method

Change-Id: I23b97c611b6b49d070bcab6934a5da802742e6af
Merge "Use ClaimGuidParser instead of deprecated method"