Merge "[releng] update oxygen job"