Merge "Update csit for stable/lithium"