Added claims to entity patching

Change-Id: Ifbdbfcc689779230ee383a02df23eedb8c64e2c1
Merge "Added claims to entity patching"