Merge "Update son-handler csit yaml file"