Merge "Update OWNERS file to match master" into sc-v2-dev