Merge "Update OWNERS" into udc-dev