Merge "Update OWNERS file to match master"