Merge "Fix csi_x86 build failure"