Merge "Update OWNERS file" into udc-dev