Merge "Add team members to core/res/OWNERS"