Merge "Update builder minion labels"