Merge "Updates OWNERS files" into sc-dev