Merge "fix(xilinx): fix coding style violations" into integration