Merge "diag: Add AXI prefetch related padding for CI controller"