Add non-gray_u1_c1_csi & non-gray_u1_c2_csi