Merge "Update sdc merge job to use 8c X 8g system"