Merge "fix(zynqmp): fix for incorrect afi write mask value" into integration