Merge "Add missing build nodes for OOF jobs"