Merge "Simplify csit-auto-update job"