Merge "fix(versal): check smc_fid 23:16 bits" into integration