Merge "Step 3: Change remaining integration jobs"