Merge "Update CSIT for non SNAPSHOT"