Merge "Enable CCSDK CSIT"