Check for FormatJson returning null in setclaim

Change-Id: I921ef5834dc2be72fd160d993b7507b2fde4349a
Merge "Check for FormatJson returning null in setclaim"