Merge "fix(zynqmp): fix xck24 silicon ID" into integration