Merge "fix(smccc): check smc_fid [23:17] bits" into integration