Merge "Schedule upgrade jobs 1 hour earlier"