Change claims.id index to be primary

Change-Id: Iea73e0f69b6fa05963dd1c9a4f5b391df758ef68
Merge "Change claims.id index to be primary"