Merge "Update format of UEID claim."